bgp: Parse BGP extended message support capability

[tcpdump] / print-icmp6.c

diff --git a/print-icmp6.c b/print-icmp6.c
index 2440790452e82cdc5525094c7530d364beacfd96..f16c1fa9d4aed85a098c9954f01ad80e75166659 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -843,7 +843,6 @@ rpl_printopts(netdissect_options *ndo, const uint8_t *opts, u_int length)
         return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -872,7 +871,6 @@ rpl_dio_print(netdissect_options *ndo,
        return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -918,7 +916,6 @@ trunc:
 
 tooshort:
        ND_PRINT(" [|length too short]");
-       return;
 }
 
 static void
@@ -961,7 +958,6 @@ trunc:
 
 tooshort:
        ND_PRINT(" [|dao-length too short]");
-       return;
 }
 
 static void
@@ -1168,7 +1164,6 @@ icmp6_print(netdissect_options *ndo,
                break;
        case ICMP6_ECHO_REQUEST:
        case ICMP6_ECHO_REPLY:
-                /* The check below covers both icmp6_id and icmp6_seq. */
                 ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
                         GET_BE_U_2(dp->icmp6_seq));
                break;
@@ -1519,12 +1514,10 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        case 1:
                                break;
                        case 2:
-                               ND_TCHECK_8(opri + 1);
-                               memcpy(&in6, opri + 1, 8);
+                               GET_CPY_BYTES(&in6, opri + 1, 8);
                                break;
                        case 3:
-                               ND_TCHECK_16(opri + 1);
-                               memcpy(&in6, opri + 1, 16);
+                               GET_CPY_BYTES(&in6, opri + 1, 16);
                                break;
                        default:
                                goto trunc;
@@ -1648,7 +1641,6 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
     ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + 8));
 
     if (ndo->ndo_vflag) {
-        ND_TCHECK_1(bp + 25);
        if (GET_U_1(bp + 24) & 0x08) {
                ND_PRINT(" sflag");
        }
@@ -1678,10 +1670,6 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
                 ND_PRINT(", %u source(s)", nsrcs);
     }
     ND_PRINT("]");
-    return;
-trunc:
-    nd_print_trunc(ndo);
-    return;
 }
 
 static void