Fix a typo.

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 3e8b6c75caec4419b8087bf32b6b5b5037f08864..e9d10220f2d4ec2090ebf44f87b94b9881001f2e 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,13 +18,12 @@
  * 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.123 2000-04-27 10:05:31 itojun Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.134 2000-07-25 05:28:11 guy Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
 #define tcpdump_interface_h
 
  */
 
 #ifndef tcpdump_interface_h
 #define tcpdump_interface_h
 

-#include "gnuc.h"

 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif


@@ -92,6 +91,7 @@ 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;              /* use the libsmi to translate OIDs */
 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 Xflag;              /* print packet in hex/ascii */
 extern int vflag;              /* verbose */
 extern int xflag;              /* print packet in hex */
 extern int Xflag;              /* print packet in hex/ascii */


@@ -185,9 +185,7 @@ extern const u_char *snapend;
 /* Bail if "var" was not captured */
 #define TCHECK(var) TCHECK2(var, sizeof(var))
 
 /* Bail if "var" was not captured */
 #define TCHECK(var) TCHECK2(var, sizeof(var))
 

-#ifdef __STDC__

 struct timeval;
 struct timeval;

-#endif

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


@@ -199,15 +197,16 @@ extern char *dnaddr_string(u_short);
 
 extern void wrapup(int);
 
 
 extern void wrapup(int);
 

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

 extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2)));
 extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2)));

-#endif

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

+extern void safeputchar(int);
+extern void safeputs(const char *);
+

 extern char *isonsap_string(const u_char *);
 extern char *llcsap_string(u_char);
 extern char *protoid_string(const u_char *);
 extern char *isonsap_string(const u_char *);
 extern char *llcsap_string(u_char);
 extern char *protoid_string(const u_char *);


@@ -216,9 +215,7 @@ extern char *dnnum_string(u_short);
 
 /* The printer routines. */
 
 
 /* The printer routines. */
 

-#ifdef __STDC__

 struct pcap_pkthdr;
 struct pcap_pkthdr;

-#endif

 
 extern void ascii_print_with_offset(const u_char *, u_int, u_int);    
 extern void ascii_print(const u_char *, u_int);    
 
 extern void ascii_print_with_offset(const u_char *, u_int, u_int);    
 extern void ascii_print(const u_char *, u_int);    


@@ -242,11 +239,14 @@ extern void dvmrp_print(const u_char *, u_int);
 extern void egp_print(const u_char *, u_int, const u_char *);
 extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
        const u_char *);
 extern void egp_print(const u_char *, u_int, const u_char *);
 extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
        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 gre_print(const u_char *, u_int);
 extern void icmp_print(const u_char *, u_int, const u_char *);
 extern void igrp_print(const u_char *, u_int, const u_char *);
 extern void ip_print(const u_char *, u_int);
 extern void fddi_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 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 ipx_print(const u_char *, u_int);
 extern void isoclns_print(const u_char *, u_int, u_int, const u_char *,
        const u_char *);


@@ -295,6 +295,10 @@ 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 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 *bp, u_int len, int ttl);
+extern void cdp_print(const u_char *p, u_int length, u_int caplen,
+                     const u_char *esrc, const u_char *edst);
+extern void stp_print(const u_char *p, u_int length);

 
 #ifdef INET6
 extern void ip6_print(const u_char *, int);
 
 #ifdef INET6
 extern void ip6_print(const u_char *, int);


@@ -306,6 +310,6 @@ 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 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_short, u_short);
+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 *addr, register int len, u_short csum);
 #endif /*INET6*/
 extern u_short in_cksum(const u_short *addr, register int len, u_short csum);