Eliminate some unused parameters.

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index efe98e98273712388618a00abf96a0d76e155593..1db7c7b59268d4508055e1f5de4ff81c4ce2e824 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,7 +1,5 @@
-/*     $NetBSD: interface.h,v 1.2 1995/03/06 19:10:18 mycroft Exp $    */
-

 /*
 /*

- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000

  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -20,40 +18,69 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.107 1999-10-17 21:56:53 mcr Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.171 2001-09-17 21:57:52 fenner Exp $ (LBL)

  */
 
  */
 

-#ifdef __GNUC__
-#define inline __inline
-#ifndef __dead
-#define __dead volatile
+#ifndef tcpdump_interface_h
+#define tcpdump_interface_h
+
+#ifdef HAVE_OS_PROTO_H
+#include "os-proto.h"

 #endif
 #endif

-#else
-#define inline
-#define __dead
+#include <sys/types.h>
+#include <sys/time.h>
+
+#ifndef HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+/* snprintf et al */
+
+#include <stdarg.h>
+
+#if !defined(HAVE_SNPRINTF)
+int snprintf(char *, size_t, const char *, ...)
+     __attribute__((format(printf, 3, 4)));
+#endif
+
+#if !defined(HAVE_VSNPRINTF)
+int vsnprintf(char *, size_t, const char *, va_list)
+     __attribute__((format(printf, 3, 0)));

 #endif
 
 #endif
 

-#include "os.h"                        /* operating system stuff */
-#include "md.h"                        /* machine dependent stuff */
+#ifndef HAVE_STRLCAT
+extern size_t strlcat(char *, const char *, size_t);
+#endif
+#ifndef HAVE_STRLCPY
+extern size_t strlcpy(char *, const char *, size_t);
+#endif

 
 

-#ifndef SIGRET
-#define SIGRET void            /* default */
+#ifndef HAVE_STRDUP
+extern char *strdup(const char *);

 #endif
 
 #endif
 

-struct token {
+struct tok {

        int v;                  /* value */
        int v;                  /* value */

-       char *s;                /* string */
+       const char *s;          /* string */

 };
 
 };
 

+extern int aflag;              /* translate network and broadcast addresses */

 extern int dflag;              /* print filter code */
 extern int eflag;              /* print ethernet header */
 extern int dflag;              /* print filter code */
 extern int eflag;              /* print ethernet header */

+extern int fflag;              /* don't translate "foreign" IP address */

 extern int nflag;              /* leave addresses as numbers */
 extern int Nflag;              /* remove domains from printed host names */
 extern int qflag;              /* quick (shorter) output */
 extern int nflag;              /* leave addresses as numbers */
 extern int Nflag;              /* remove domains from printed host names */
 extern int qflag;              /* quick (shorter) output */

+extern int Rflag;              /* print sequence # field in AH/ESP*/
+extern int sflag;              /* use the libsmi to translate OIDs */

 extern int Sflag;              /* print raw TCP sequence numbers */
 extern int tflag;              /* print packet arrival time */
 extern int Sflag;              /* print raw TCP sequence numbers */
 extern int tflag;              /* print packet arrival time */

+extern int uflag;              /* Print undecoded NFS handles */

 extern int vflag;              /* verbose */
 extern int xflag;              /* print packet in hex */
 extern int vflag;              /* verbose */
 extern int xflag;              /* print packet in hex */

+extern int Xflag;              /* print packet in hex/ascii */
+
+extern char *espsecret;

 
 extern int packettype;         /* as specified by -T */
 #define PT_VAT         1       /* Visual Audio Tool */
 
 extern int packettype;         /* as specified by -T */
 #define PT_VAT         1       /* Visual Audio Tool */


@@ -62,6 +89,7 @@ extern int packettype;                /* as specified by -T */
 #define PT_RTP         4       /* Real-Time Applications protocol */
 #define PT_RTCP                5       /* Real-Time Applications control protocol */
 #define PT_SNMP                6       /* Simple Network Management Protocol */
 #define PT_RTP         4       /* Real-Time Applications protocol */
 #define PT_RTCP                5       /* Real-Time Applications control protocol */
 #define PT_SNMP                6       /* Simple Network Management Protocol */

+#define PT_CNFP                7       /* Cisco NetFlow protocol */

 
 #ifndef min
 #define min(a,b) ((a)>(b)?(b):(a))
 
 #ifndef min
 #define min(a,b) ((a)>(b)?(b):(a))


@@ -73,40 +101,20 @@ extern int packettype;             /* as specified by -T */
 /*
  * The default snapshot length.  This value allows most printers to print
  * useful information while keeping the amount of unwanted data down.
 /*
  * The default snapshot length.  This value allows most printers to print
  * useful information while keeping the amount of unwanted data down.

- * In particular, it allows for an ethernet header, tcp/ip header, and
- * 14 bytes of data (assuming no ip options).

  */
  */

-#define DEFAULT_SNAPLEN 68
+#ifndef INET6
+#define DEFAULT_SNAPLEN 68     /* ether + IPv4 + TCP + 14 */
+#else
+#define DEFAULT_SNAPLEN 96     /* ether + IPv6 + TCP + 22 */
+#endif

 
 #ifndef BIG_ENDIAN
 #define BIG_ENDIAN 4321
 #define LITTLE_ENDIAN 1234
 #endif
 
 
 #ifndef BIG_ENDIAN
 #define BIG_ENDIAN 4321
 #define LITTLE_ENDIAN 1234
 #endif
 

-#ifdef ETHER_HEADER_HAS_EA
-#define ESRC(ep) ((ep)->ether_shost.ether_addr_octet)
-#define EDST(ep) ((ep)->ether_dhost.ether_addr_octet)
-#else

 #define ESRC(ep) ((ep)->ether_shost)
 #define EDST(ep) ((ep)->ether_dhost)
 #define ESRC(ep) ((ep)->ether_shost)
 #define EDST(ep) ((ep)->ether_dhost)

-#endif
-
-#ifdef ETHER_ARP_HAS_X
-#define SHA(ap) ((ap)->arp_xsha)
-#define THA(ap) ((ap)->arp_xtha)
-#define SPA(ap) ((ap)->arp_xspa)
-#define TPA(ap) ((ap)->arp_xtpa)
-#else
-#ifdef ETHER_ARP_HAS_EA
-#define SHA(ap) ((ap)->arp_sha.ether_addr_octet)
-#define THA(ap) ((ap)->arp_tha.ether_addr_octet)
-#else
-#define SHA(ap) ((ap)->arp_sha)
-#define THA(ap) ((ap)->arp_tha)
-#endif
-#define SPA(ap) ((ap)->arp_spa)
-#define TPA(ap) ((ap)->arp_tpa)
-#endif

 
 #ifndef NTOHL
 #define NTOHL(x)       (x) = ntohl(x)
 
 #ifndef NTOHL
 #define NTOHL(x)       (x) = ntohl(x)


@@ -118,97 +126,181 @@ extern int packettype;           /* as specified by -T */
 
 extern char *program_name;     /* used to generate self-identifying messages */
 
 
 extern char *program_name;     /* used to generate self-identifying messages */
 

+extern int32_t thiszone;       /* seconds offset from gmt to local time */
+

 extern int snaplen;
 /* global pointers to beginning and end of current packet (during printing) */
 extern const u_char *packetp;
 extern const u_char *snapend;
 
 extern int snaplen;
 /* global pointers to beginning and end of current packet (during printing) */
 extern const u_char *packetp;
 extern const u_char *snapend;
 

-extern int fddipad;    /* alignment offset for FDDI headers, in bytes */
+/* True if  "l" bytes of "var" were captured */
+#define TTEST2(var, l) ((const u_char *)&(var) <= snapend - (l))

 
 

-/* Eliminate some bogus warnings. */
-struct timeval;
+/* True if "var" was captured */
+#define TTEST(var) TTEST2(var, sizeof(var))

 
 

-typedef void (*printfunc)(u_char *, struct timeval *, int, int);
+/* Bail if "l" bytes of "var" were not captured */
+#define TCHECK2(var, l) if (!TTEST2(var, l)) goto trunc
+
+/* Bail if "var" was not captured */
+#define TCHECK(var) TCHECK2(var, sizeof(var))

 
 extern void ts_print(const struct timeval *);
 
 extern void ts_print(const struct timeval *);

-extern int clock_sigfigs(void);
-int gmt2local(void);
+extern void relts_print(int);

 
 extern int fn_print(const u_char *, const u_char *);
 extern int fn_printn(const u_char *, u_int, const u_char *);
 
 extern int fn_print(const u_char *, const u_char *);
 extern int fn_printn(const u_char *, u_int, const u_char *);

-extern const char *tok2str(const struct token *, const char *, int);
-extern char *dnaddr_string(u_short);
-extern char *savestr(const char *);
+extern const char *tok2str(const struct tok *, const char *, int);
+extern const char *dnaddr_string(u_short);

 
 

-extern int initdevice(char *, int, int *);
-extern void wrapup(int);
+extern void info(int);
+extern int infodelay;
+extern int infoprint;

 
 

-extern __dead void error(char *, ...);
-extern void warning(char *, ...);
+extern void error(const char *, ...)
+    __attribute__((noreturn, format (printf, 1, 2)));
+extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2)));

 
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
 
 
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
 

-extern void usage(void);
-extern char *isonsap_string(const u_char *);
-extern char *llcsap_string(u_char);
-extern char *protoid_string(const u_char *);
-extern char *dnname_string(u_short);
-extern char *dnnum_string(u_short);
+extern void safeputchar(int);
+extern void safeputs(const char *);

 
 

-/* The printer routines. */
+extern const char *isonsap_string(const u_char *);
+extern const char *llcsap_string(u_char);
+extern const char *protoid_string(const u_char *);
+extern const char *dnname_string(u_short);
+extern const char *dnnum_string(u_short);

 
 

-struct pcap_pkthdr;
+/* The printer routines. */

 
 

+#include <pcap.h>
+
+extern void ascii_print_with_offset(const u_char *, u_int, u_int);    
+extern void ascii_print(const u_char *, u_int);    
+extern void hex_print_with_offset(const u_char *, u_int, u_int);    
+extern void telnet_print(const u_char *, u_int);    
+extern void hex_print(const u_char *, u_int);    
+extern int ether_encap_print(u_short, const u_char *, u_int, u_int, u_short *);
+extern int llc_print(const u_char *, u_int, u_int, const u_char *,
+       const u_char *, u_short *);
+extern void aarp_print(const u_char *, u_int);
+extern void arp_print(const u_char *, u_int, u_int);
+extern void atalk_print(const u_char *, u_int);
+extern void atm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
+extern void bootp_print(const u_char *, u_int, u_short, u_short);
+extern void bgp_print(const u_char *, int);
+extern void bxxp_print(const u_char *, u_int);
+extern void cnfp_print(const u_char *, u_int, const u_char *);
+extern void decnet_print(const u_char *, u_int, u_int);
+extern void default_print(const u_char *, u_int);
+extern void default_print_unaligned(const u_char *, u_int);
+extern void dvmrp_print(const u_char *, u_int);
+extern void egp_print(const u_char *, u_int, const u_char *);
+extern void arcnet_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);

 extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
 extern void ether_if_print(u_char *, const struct pcap_pkthdr *,

-                          const u_char *);
-extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char*);
-extern void null_if_print(u_char *, const struct pcap_pkthdr *, const u_char*);
+       const u_char *);
+extern void token_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
+extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
+extern void ieee802_11_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
+extern void gre_print(const u_char *, u_int);
+extern void icmp_print(const u_char *, u_int, const u_char *);
+extern void igmp_print(const u_char *, u_int);
+extern void igrp_print(const u_char *, u_int, const u_char *);
+extern void ip_print(const u_char *, u_int);
+extern void ipN_print(const u_char *, u_int);
+extern void ipx_print(const u_char *, u_int);
+extern void isoclns_print(const u_char *, u_int, u_int, const u_char *,
+       const u_char *);
+extern void krb_print(const u_char *, u_int);
+extern void llap_print(const u_char *, u_int);
+extern void ltalk_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
+extern void msdp_print(const unsigned char *, u_int);
+extern void nfsreply_print(const u_char *, u_int, const u_char *);
+extern void nfsreq_print(const u_char *, u_int, const u_char *);
+extern void ns_print(const u_char *, u_int);
+extern void ntp_print(const u_char *, u_int);
+extern void null_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
+extern void ospf_print(const u_char *, u_int, const u_char *);
+extern void pimv1_print(const u_char *, u_int);
+extern void cisco_autorp_print(const u_char *, u_int);
+extern void mobile_print(const u_char *, u_int);
+extern void pim_print(const u_char *, u_int);
+extern void pppoe_print(const u_char *, u_int);
+extern void ppp_print(register const u_char *, u_int);

 extern void ppp_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void ppp_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);

+extern void ppp_hdlc_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
+extern void ppp_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
+extern void pppoe_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
+extern int vjc_print(register const char *, register u_int, u_short);
+extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
+extern void rip_print(const u_char *, u_int);

 extern void sl_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void sl_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);

-
-extern void arp_print(const u_char *, int, int);
-extern void ip_print(const u_char *, int);
-extern void tcp_print(const u_char *, int, const u_char *);
-extern void udp_print(const u_char *, int, const u_char *);
-extern void icmp_print(const u_char *, const u_char *);
-extern void default_print(const u_char *, int);
-extern void default_print_unaligned(const u_char *, int);
-
-extern void aarp_print(const u_char *, int);
-extern void atalk_print(const u_char *, int);
-extern void bootp_print(const u_char *, int, u_short, u_short);
-extern void decnet_print(const u_char *, int, int);
-extern void egp_print(const u_char *, int, const u_char *);
-extern int ether_encap_print(u_short, const u_char *, int, int);
-extern void ipx_print(const u_char *, int length);
-extern void isoclns_print(const u_char *, int, int,
-                         const u_char *, const u_char *);
-extern int llc_print(const u_char *, int, int, const u_char *, const u_char *);
-extern void nfsreply_print(const u_char *, int, const u_char *);
-extern void nfsreq_print(const u_char *, int, const u_char *);
-extern void ns_print(const u_char *, int);
-extern void ntp_print(const u_char *, int);
-extern void ospf_print(const u_char *, int, const u_char *);
-extern void rip_print(const u_char *, int);
-extern void snmp_print(const u_char *, int);
-extern void sunrpcrequest_print(const u_char *, int, const u_char *);
-extern void tftp_print(const u_char *, int);
-extern void wb_print(const void *, int);
-extern void print_ipproto(u_int proto, const struct ip *ip, const u_char *cp,  int len);
-
-#define min(a,b) ((a)>(b)?(b):(a))
-#define max(a,b) ((b)>(a)?(b):(a))
-
-/*
- * The default snapshot length.  This value allows most printers to print
- * useful information while keeping the amount of unwanted data down.
- * In particular, it allows for an ethernet header, tcp/ip header, and
- * 14 bytes of data (assuming no ip options).
- */
-#define DEFAULT_SNAPLEN 512
-
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN 4321
-#define LITTLE_ENDIAN 1234
+extern void lane_if_print(u_char *, const struct pcap_pkthdr *,const u_char *);
+extern void cip_if_print(u_char *, const struct pcap_pkthdr *,const u_char *);
+extern void sl_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
+    const u_char *);
+extern void chdlc_if_print(u_char *, const struct pcap_pkthdr *,
+    const u_char *);
+extern void chdlc_print(register const u_char *, u_int, u_int);
+extern void sll_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
+extern void snmp_print(const u_char *, u_int);
+extern void sunrpcrequest_print(const u_char *, u_int, const u_char *);
+extern void tcp_print(const u_char *, u_int, const u_char *, int);
+extern void tftp_print(const u_char *, u_int);
+extern void timed_print(const u_char *, u_int);
+extern void udp_print(const u_char *, u_int, const u_char *, int);
+extern void wb_print(const void *, u_int);
+extern int ah_print(register const u_char *, register const u_char *);
+extern int esp_print(register const u_char *, register const u_char *, int *, int *);
+extern void isakmp_print(const u_char *, u_int, const u_char *);
+extern int ipcomp_print(register const u_char *, register const u_char *, int *);
+extern void rx_print(register const u_char *, int, int, int, u_char *);
+extern void netbeui_print(u_short, const u_char *, int);
+extern void ipx_netbios_print(const u_char *, u_int);
+extern void nbt_tcp_print(const u_char *, int);
+extern void nbt_udp137_print(const u_char *, int);
+extern void nbt_udp138_print(const u_char *, int);
+extern char *smb_errstr(int, int);
+extern void print_data(const unsigned char *, int);
+extern void l2tp_print(const u_char *, u_int);
+extern void lcp_print(const u_char *, u_int);
+extern void vrrp_print(const u_char *, u_int, int);
+extern void cdp_print(const u_char *, u_int, u_int, const u_char *,
+       const u_char *);
+extern void stp_print(const u_char *, u_int);
+extern void radius_print(const u_char *, u_int);
+extern void lwres_print(const u_char *, u_int);
+extern void pptp_print(const u_char *, u_int);
+extern void sctp_print(const u_char *, const u_char *, u_int);
+extern void mpls_print(const u_char *, u_int);
+extern void zephyr_print(const u_char *, int);
+extern void hsrp_print(const u_char *, u_int);
+
+#ifdef INET6
+extern void ip6_print(const u_char *, u_int);
+extern void ip6_opt_print(const u_char *, int);
+extern int hbhopt_print(const u_char *);
+extern int dstopt_print(const u_char *);
+extern int frag6_print(const u_char *, const u_char *);
+extern void icmp6_print(const u_char *, const u_char *);
+extern void ripng_print(const u_char *, int);
+extern int rt6_print(const u_char *, const u_char *);
+extern void ospf6_print(const u_char *, u_int);
+extern void dhcp6_print(const u_char *, u_int, u_int16_t, u_int16_t);
+#endif /*INET6*/
+extern u_short in_cksum(const u_short *, register u_int, int);
+
+#ifndef HAVE_BPF_DUMP
+struct bpf_program;
+
+extern void bpf_dump(struct bpf_program *, int);

 #endif
 #endif