OpenFlow: Have a function for each message type.

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 7c6a301b69982740f64e98baafb7edefccc31666..0f745d70dfef064115dd3c4ccf19a8ae73d24d41 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -65,9 +65,12 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 {
        const ipnet_hdr_t *hdr;
 
-       ndo->ndo_protocol = "ipnet";
-       if (caplen < sizeof(ipnet_hdr_t))
-               goto trunc;
+       if (caplen < sizeof(ipnet_hdr_t)) {
+               ndo->ndo_ll_hdr_len += caplen;
+               nd_print_trunc(ndo);
+               return;
+       }
+       ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);
 
        if (ndo->ndo_eflag)
                ipnet_hdr_print(ndo, p, length);
@@ -77,7 +80,6 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        hdr = (const ipnet_hdr_t *)p;
        p += sizeof(ipnet_hdr_t);
 
-       ND_TCHECK_1(hdr->iph_family);
        switch (GET_U_1(hdr->iph_family)) {
 
        case IPH_AF_INET:
@@ -97,9 +99,6 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                        ND_DEFAULTPRINT(p, caplen);
                break;
        }
-       return;
-trunc:
-       nd_print_trunc(ndo);
 }
 
 /*
@@ -108,13 +107,11 @@ trunc:
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ipnet_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
-       ndo->ndo_protocol = "ipnet_if";
+       ndo->ndo_protocol = "ipnet";
        ipnet_print(ndo, p, h->len, h->caplen);
-
-       return (sizeof(ipnet_hdr_t));
 }
 #endif /* DLT_IPNET */