RIPng: Use more ND_TCHECK_SIZE() macros

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index af74fa0a76ae1de0c1abb078c76c67628faab502..2d3d3a8bf591bc8987182c552593478920b7bfaa 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -22,10 +22,10 @@
 /* \summary: IPv6 routing header printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -50,23 +50,23 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
 
-       ND_TCHECK(dp->ip6r_segleft);
+       ND_TCHECK_1(dp->ip6r_segleft);
 
        len = EXTRACT_U_1(dp->ip6r_len);
-       ND_PRINT((ndo, "srcrt (len=%u", len));  /*)*/
+       ND_PRINT("srcrt (len=%u", len); /*)*/
        type = EXTRACT_U_1(dp->ip6r_type);
-       ND_PRINT((ndo, ", type=%u", type));
-       ND_PRINT((ndo, ", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft)));
+       ND_PRINT(", type=%u", type);
+       ND_PRINT(", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft));
 
        switch (type) {
        case IPV6_RTHDR_TYPE_0:
        case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
                dp0 = (const struct ip6_rthdr0 *)dp;
 
-               ND_TCHECK(dp0->ip6r0_reserved);
+               ND_TCHECK_4(dp0->ip6r0_reserved);
                if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
-                       ND_PRINT((ndo, ", rsv=0x%0x",
-                           EXTRACT_BE_U_4(dp0->ip6r0_reserved)));
+                       ND_PRINT(", rsv=0x%0x",
+                           EXTRACT_BE_U_4(dp0->ip6r0_reserved));
                }
 
                if (len % 2 == 1)
@@ -77,24 +77,26 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                        if ((const u_char *)(addr + 1) > ep)
                                goto trunc;
 
-                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
+                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, addr));
                        addr++;
                }
                /*(*/
-               ND_PRINT((ndo, ") "));
+               ND_PRINT(") ");
                return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
                break;
        case IPV6_RTHDR_TYPE_4:
                srh = (const struct ip6_srh *)dp;
-               ND_PRINT((ndo, ", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent)));
+               ND_TCHECK_1(srh->srh_last_ent);
+               ND_PRINT(", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent));
 
-               ND_TCHECK(srh->srh_flags);
+               ND_TCHECK_1(srh->srh_flags);
                if (EXTRACT_U_1(srh->srh_flags) || ndo->ndo_vflag) {
-                       ND_PRINT((ndo, ", flags=0x%0x",
-                               EXTRACT_U_1(srh->srh_flags)));
+                       ND_PRINT(", flags=0x%0x",
+                               EXTRACT_U_1(srh->srh_flags));
                }
 
-               ND_PRINT((ndo, ", tag=%x", EXTRACT_BE_U_2(srh->srh_tag)));
+               ND_TCHECK_2(srh->srh_tag);
+               ND_PRINT(", tag=%x", EXTRACT_BE_U_2(srh->srh_tag));
 
                if (len % 2 == 1)
                        goto trunc;
@@ -104,11 +106,11 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                        if ((const u_char *)(addr + 1) > ep)
                                goto trunc;
 
-                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
+                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, addr));
                        addr++;
                }
                /*(*/
-               ND_PRINT((ndo, ") "));
+               ND_PRINT(") ");
                return((EXTRACT_U_1(srh->srh_len) + 1) << 3);
                break;
        default:
@@ -117,6 +119,6 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
        }
 
  trunc:
-       ND_PRINT((ndo, "[|srcrt]"));
+       ND_PRINT("[|srcrt]");
        return -1;
 }