diff options
| -rw-r--r-- | interface.h | 2 | ||||
| -rw-r--r-- | netdissect.h | 3 | ||||
| -rw-r--r-- | print-ipnet.c | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/interface.h b/interface.h index 9f01f9d1..852bfb7f 100644 --- a/interface.h +++ b/interface.h @@ -322,8 +322,8 @@ 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 u_int bt_if_print(const struct pcap_pkthdr *, const u_char *); - extern u_int usb_linux_print(const struct pcap_pkthdr *, const u_char *); +extern u_int ipnet_if_print(const struct pcap_pkthdr *, const u_char *); #ifdef INET6 extern void ip6_print(const u_char *, u_int); diff --git a/netdissect.h b/netdissect.h index 86b66a09..f7a7ac43 100644 --- a/netdissect.h +++ b/netdissect.h @@ -437,9 +437,6 @@ extern void lwres_print(netdissect_options *,const u_char *, u_int); extern void pptp_print(netdissect_options *,const u_char *, u_int); #endif -extern void ipnet_print(netdissect_options *,const u_char *, u_int, u_int); -extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *); - #if 0 #ifdef INET6 extern void ip6_print(netdissect_options *,const u_char *, u_int); diff --git a/print-ipnet.c b/print-ipnet.c index 32aaeae6..3a5b5a1a 100644 --- a/print-ipnet.c +++ b/print-ipnet.c @@ -43,7 +43,7 @@ ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length) ND_PRINT((ndo, ", length %u: ", length)); } -void +static void ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) { ipnet_hdr_t *hdr; @@ -91,9 +91,9 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int * is the number of bytes actually captured. */ u_int -ipnet_if_print(struct netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) +ipnet_if_print(const struct pcap_pkthdr *h, const u_char *p) { - ipnet_print(ndo, p, h->len, h->caplen); + ipnet_print(gndo, p, h->len, h->caplen); return (sizeof(ipnet_hdr_t)); } |