Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 6a0978e1421e5c2e1c15af8e29ee382efccf3291..33ddb77634ca3fa200bebbe5ca9a38ea49e01c40 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -117,18 +117,10 @@ extern int32_t thiszone;  /* seconds offset from gmt to local time */
 /* 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))
 

-extern void ts_print(const struct timeval *);
-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_printzp(const u_char *, u_int, const u_char *);
-extern int mask2plen(u_int32_t);
+extern int mask2plen(uint32_t);

 extern const char *tok2strary_internal(const char **, int, const char *, int);
 #define        tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
 
 extern const char *tok2strary_internal(const char **, int, const char *, int);
 #define        tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
 

-extern const char *dnaddr_string(u_short);
-

 extern void error(const char *, ...)
      __attribute__((noreturn))
 #ifdef __ATTRIBUTE___FORMAT_OK
 extern void error(const char *, ...)
      __attribute__((noreturn))
 #ifdef __ATTRIBUTE___FORMAT_OK


@@ -144,63 +136,31 @@ extern void warning(const char *, ...)
 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 *, int);
-
-extern const char *isonsap_string(const u_char *, register u_int);
-extern const char *protoid_string(const u_char *);
-extern const char *ipxsap_string(u_short);

 extern const char *dnname_string(u_short);
 extern const char *dnnum_string(u_short);
 
 /* checksum routines */
 extern void init_checksum(void);
 extern const char *dnname_string(u_short);
 extern const char *dnnum_string(u_short);
 
 /* checksum routines */
 extern void init_checksum(void);

-extern u_int16_t verify_crc10_cksum(u_int16_t, const u_char *, int);
-extern u_int16_t create_osi_cksum(const u_int8_t *, int, int);
+extern uint16_t verify_crc10_cksum(uint16_t, const u_char *, int);
+extern uint16_t create_osi_cksum(const uint8_t *, int, int);

 
 /* The printer routines. */
 
 #include <pcap.h>
 
 
 /* The printer routines. */
 
 #include <pcap.h>
 

-extern void ascii_print(const u_char *, u_int);
-extern void decnet_print(const u_char *, u_int, u_int);
-extern void default_print(const u_char *, u_int);
-extern char *q922_string(const u_char *);
-extern void ospf_print(const u_char *, u_int, const u_char *);
-extern void rsvp_print(const u_char *, u_int);
-extern void lldp_print(const u_char *, u_int);
-extern u_int ppp_print(register const u_char *, u_int);
-extern u_int ppp_if_print(const struct pcap_pkthdr *, const u_char *);
-extern u_int ppp_hdlc_if_print(const struct pcap_pkthdr *, const u_char *);
-extern u_int ppp_bsdos_if_print(const struct pcap_pkthdr *, const u_char *);
-extern void tcp_print(const u_char *, u_int, const u_char *, int);
-extern void timed_print(const 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 void smb_tcp_print(const u_char *, int);

 extern char *smb_errstr(int, int);
 extern char *smb_errstr(int, int);

-extern const char *nt_errstr(u_int32_t);
-extern void print_data(const unsigned char *, int);
-extern void cfm_print(const u_char *, u_int);
-extern void lwres_print(const u_char *, u_int);
-extern void sip_print(const u_char *, u_int);
-extern void syslog_print(const u_char *, u_int);
-
+extern const char *nt_errstr(uint32_t);

 
 #ifdef INET6
 
 #ifdef INET6

-extern void babel_print(const u_char *, u_int);

 extern int mask62plen(const u_char *);
 #endif /*INET6*/
 
 struct cksum_vec {
 extern int mask62plen(const u_char *);
 #endif /*INET6*/
 
 struct cksum_vec {

-       const u_int8_t  *ptr;
+       const uint8_t   *ptr;

        int             len;
 };
        int             len;
 };

-extern u_int16_t in_cksum(const struct cksum_vec *, int);
-extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t);
+extern uint16_t in_cksum(const struct cksum_vec *, int);
+extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);

 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;
 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;


@@ -252,4 +212,6 @@ extern netdissect_options *gndo;
 #define snaplen     gndo->ndo_snaplen
 #define snapend     gndo->ndo_snapend
 
 #define snaplen     gndo->ndo_snaplen
 #define snapend     gndo->ndo_snapend
 

+extern void default_print(const u_char *, u_int);
+

 #endif
 #endif