X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3a89234642b474ebc957c13f67d1cd96dc3ae180..0ba2f9c718eb3272153cba85db2912b1ad853e6f:/interface.h diff --git a/interface.h b/interface.h index 5703f3d5..93676919 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); @@ -74,6 +80,8 @@ extern char *strsep(char **, const char *); #define PT_RADIUS 11 /* RADIUS authentication Protocol */ #define PT_ZMTP1 12 /* ZeroMQ Message Transport Protocol 1.0 */ #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) */ #ifndef min #define min(a,b) ((a)>(b)?(b):(a)) @@ -134,8 +142,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 **); @@ -221,6 +237,7 @@ 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 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); @@ -314,10 +331,12 @@ extern void mpls_print(const u_char *, u_int); extern void mpls_lsp_ping_print(const u_char *, u_int); extern void zephyr_print(const u_char *, int); extern void zmtp1_print(const u_char *, u_int); +extern void zmtp1_print_datagram(const u_char *, u_int); extern void hsrp_print(const u_char *, u_int); extern void bfd_print(const u_char *, u_int, u_int); extern void sip_print(const u_char *, u_int); extern void syslog_print(const u_char *, u_int); +extern int mptcp_print(const u_char *, u_int, u_char); extern u_int bt_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int usb_linux_48_byte_print(const struct pcap_pkthdr *, const u_char *); extern u_int usb_linux_64_byte_print(const struct pcap_pkthdr *, const u_char *);