Revert partially the commit 21b1273

[tcpdump] / print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index 4bdcba5deb4e0d904bca90731adf4eb209e2eb02..8c5bc15d59ebde0270f618b64cbc3b5502af0909 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -163,7 +163,6 @@ print_igmpv3_report(netdissect_options *ndo,
        ND_PRINT(" [invalid len %u]", len);
        return;
     }
-    ND_TCHECK_2(bp + 6);
     ngroups = GET_BE_U_2(bp + 6);
     ND_PRINT(", %u group record(s)", ngroups);
     if (ndo->ndo_vflag > 0) {
@@ -220,7 +219,6 @@ print_igmpv3_query(netdissect_options *ndo,
        ND_PRINT(" [invalid len %u]", len);
        return;
     }
-    ND_TCHECK_1(bp + 1);
     mrc = GET_U_1(bp + 1);
     if (mrc < 128) {
        mrt = mrc;
@@ -236,11 +234,9 @@ print_igmpv3_query(netdissect_options *ndo,
         }
        ND_PRINT("]");
     }
-    ND_TCHECK_4(bp + 4);
     if (GET_BE_U_4(bp + 4) == 0)
        return;
     ND_PRINT(" [gaddr %s", GET_IPADDR_STRING(bp + 4));
-    ND_TCHECK_2(bp + 10);
     nsrcs = GET_BE_U_2(bp + 10);
     if (nsrcs > 0) {
        if (len < 12 + (nsrcs << 2))
@@ -273,21 +269,18 @@ igmp_print(netdissect_options *ndo,
         return;
     }
 
-    ND_TCHECK_1(bp);
     switch (GET_U_1(bp)) {
     case 0x11:
         ND_PRINT("igmp query");
        if (len >= 12)
            print_igmpv3_query(ndo, bp, len);
        else {
-            ND_TCHECK_1(bp + 1);
            if (GET_U_1(bp + 1)) {
                ND_PRINT(" v2");
                if (GET_U_1(bp + 1) != 100)
                    ND_PRINT(" [max resp time %u]", GET_U_1(bp + 1));
            } else
                ND_PRINT(" v1");
-            ND_TCHECK_4(bp + 4);
            if (GET_BE_U_4(bp + 4))
                 ND_PRINT(" [gaddr %s]", GET_IPADDR_STRING(bp + 4));
             if (len != 8)
@@ -295,13 +288,11 @@ igmp_print(netdissect_options *ndo,
        }
         break;
     case 0x12:
-        ND_TCHECK_4(bp + 4);
         ND_PRINT("igmp v1 report %s", GET_IPADDR_STRING(bp + 4));
         if (len != 8)
             ND_PRINT(" [len %u]", len);
         break;
     case 0x16:
-        ND_TCHECK_4(bp + 4);
         ND_PRINT("igmp v2 report %s", GET_IPADDR_STRING(bp + 4));
         break;
     case 0x22:
@@ -309,7 +300,6 @@ igmp_print(netdissect_options *ndo,
        print_igmpv3_report(ndo, bp, len);
         break;
     case 0x17:
-        ND_TCHECK_4(bp + 4);
         ND_PRINT("igmp leave %s", GET_IPADDR_STRING(bp + 4));
         break;
     case 0x13:
@@ -341,7 +331,4 @@ igmp_print(netdissect_options *ndo,
         if (in_cksum(vec, 1))
             ND_PRINT(" bad igmp cksum %x!", GET_BE_U_2(bp + 2));
     }
-    return;
-trunc:
-    nd_print_trunc(ndo);
 }