summaryrefslogtreecommitdiff
path: root/print-ipnet.c
diff options
context:
space:
mode:
authorMichael Richardson <mcr@sandelman.ottawa.on.ca>2010-01-10 14:36:07 -0500
committerMichael Richardson <mcr@sandelman.ottawa.on.ca>2010-01-10 14:36:07 -0500
commitb45fabd132061f97cee56458ef623d9063190833 (patch)
treedc06323463593513173a3bbf50491873ede2122f /print-ipnet.c
parent878889bc2143ac701b270494d0d809c90a90d6d6 (diff)
parentb4883f09472a8f61ef2431e1e4629460db92c289 (diff)
downloadtcpdump-b45fabd132061f97cee56458ef623d9063190833.tar.gz
This commit makes ipnet_if_print the first NDO aware top-level
printer. Merge commit 'origin/master' Conflicts: netdissect.h
Diffstat (limited to 'print-ipnet.c')
-rw-r--r--print-ipnet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/print-ipnet.c b/print-ipnet.c
index 32aaeae6..957bd4f5 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,7 +91,8 @@ 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(struct netdissect_options *ndo,
+ const struct pcap_pkthdr *h, const u_char *p)
{
ipnet_print(ndo, p, h->len, h->caplen);