X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fd35562d7e7153a339fdcdd02408f877e34a49fb..d00d1670cec6b90d8b8e94c2b6b37f5a08d0ce17:/interface.h diff --git a/interface.h b/interface.h index 1d461244..97c3a0ed 100644 --- a/interface.h +++ b/interface.h @@ -38,13 +38,19 @@ #if !defined(HAVE_SNPRINTF) int snprintf(char *, size_t, const char *, ...) - __attribute__((format(printf, 3, 4))); -#endif +#ifdef __ATTRIBUTE___FORMAT_OK + __attribute__((format(printf, 3, 4))) +#endif /* __ATTRIBUTE___FORMAT_OK */ + ; +#endif /* !defined(HAVE_SNPRINTF) */ #if !defined(HAVE_VSNPRINTF) int vsnprintf(char *, size_t, const char *, va_list) - __attribute__((format(printf, 3, 0))); -#endif +#ifdef __ATTRIBUTE___FORMAT_OK + __attribute__((format(printf, 3, 0))) +#endif /* __ATTRIBUTE___FORMAT_OK */ + ; +#endif /* !defined(HAVE_VSNPRINTF) */ #ifndef HAVE_STRLCAT extern size_t strlcat(char *, const char *, size_t); @@ -76,6 +82,7 @@ extern char *strsep(char **, const char *); #define PT_VXLAN 13 /* Virtual eXtensible Local Area Network */ #define PT_PGM 14 /* [UDP-encapsulated] Pragmatic General Multicast */ #define PT_PGM_ZMTP1 15 /* ZMTP/1.0 inside PGM (native or UDP-encapsulated) */ +#define PT_LMP 16 /* Link Management Protocol */ #ifndef min #define min(a,b) ((a)>(b)?(b):(a)) @@ -136,8 +143,16 @@ extern const char *tok2strary_internal(const char **, int, const char *, int); extern const char *dnaddr_string(u_short); extern void error(const char *, ...) - __attribute__((noreturn, format (printf, 1, 2))); -extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2))); + __attribute__((noreturn)) +#ifdef __ATTRIBUTE___FORMAT_OK + __attribute__((format (printf, 1, 2))) +#endif /* __ATTRIBUTE___FORMAT_OK */ + ; +extern void warning(const char *, ...) +#ifdef __ATTRIBUTE___FORMAT_OK + __attribute__((format (printf, 1, 2))) +#endif /* __ATTRIBUTE___FORMAT_OK */ + ; extern char *read_infile(char *); extern char *copy_argv(char **); @@ -218,14 +233,14 @@ extern u_int llap_print(const u_char *, u_int); extern u_int ltalk_if_print(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 nfsreply_print_noaddr(const u_char *, u_int, const u_char *); extern void nfsreq_print(const u_char *, u_int, const u_char *); +extern void nfsreq_print_noaddr(const u_char *, u_int, const u_char *); extern void ns_print(const u_char *, u_int, int); extern const u_char * ns_nprint (register const u_char *, register const u_char *); extern void ntp_print(const u_char *, u_int); extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *); extern void openflow_print(const u_char *, u_int); -extern const u_char *of10_header_body_print(const u_char *, const u_char *, - const uint8_t, const uint16_t, const uint32_t); extern void ospf_print(const u_char *, u_int, const u_char *); extern void olsr_print (const u_char *, u_int, int); extern void pimv1_print(const u_char *, u_int); @@ -342,6 +357,7 @@ extern void ripng_print(const u_char *, unsigned 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); +extern void ahcp_print(const u_char *, u_int); extern void babel_print(const u_char *, u_int); extern int mask62plen(const u_char *); #endif /*INET6*/