The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / print-dvmrp.c

diff --git a/print-dvmrp.c b/print-dvmrp.c
index 20c5ec3669d19031b50c671635a23c083462cc31..7e57a49bcd605edbf64ed9dd733fede71a97db8c 100644 (file)
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -22,10 +22,10 @@
 /* \summary: Distance Vector Multicast Routing Protocol printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -73,12 +73,13 @@ dvmrp_print(netdissect_options *ndo,
        u_char type;
        uint8_t major_version, minor_version;
 
-       ep = (const u_char *)ndo->ndo_snapend;
+       ndo->ndo_protocol = "dvmrp";
+       ep = ndo->ndo_snapend;
        if (bp >= ep)
                return;
 
        ND_TCHECK_1(bp + 1);
-       type = EXTRACT_U_1(bp + 1);
+       type = GET_U_1(bp + 1);
 
        /* Skip IGMP header */
        bp += 8;
@@ -123,8 +124,8 @@ dvmrp_print(netdissect_options *ndo,
                 */
                bp -= 4;
                ND_TCHECK_4(bp);
-               major_version = EXTRACT_U_1(bp + 3);
-               minor_version = EXTRACT_U_1(bp + 2);
+               major_version = GET_U_1(bp + 3);
+               minor_version = GET_U_1(bp + 2);
                bp += 4;
                if (print_neighbors2(ndo, bp, ep, len, major_version,
                    minor_version) < 0)
@@ -150,13 +151,13 @@ dvmrp_print(netdissect_options *ndo,
                break;
 
        default:
-               ND_PRINT(" [type %d]", type);
+               ND_PRINT(" [type %u]", type);
                break;
        }
        return;
 
 trunc:
-       ND_PRINT("[|dvmrp]");
+       nd_print_trunc(ndo);
        return;
 }
 
@@ -166,7 +167,7 @@ print_report(netdissect_options *ndo,
              u_int len)
 {
        uint32_t mask, origin;
-       int metric, done;
+       u_int metric, done;
        u_int i, width;
 
        while (len > 0) {
@@ -175,14 +176,14 @@ print_report(netdissect_options *ndo,
                        return (0);
                }
                ND_TCHECK_3(bp);
-               mask = (uint32_t)0xff << 24 | EXTRACT_U_1(bp) << 16 |
-                       EXTRACT_U_1(bp + 1) << 8 | EXTRACT_U_1(bp + 2);
+               mask = (uint32_t)0xff << 24 | GET_U_1(bp) << 16 |
+                       GET_U_1(bp + 1) << 8 | GET_U_1(bp + 2);
                width = 1;
-               if (EXTRACT_U_1(bp))
+               if (GET_U_1(bp))
                        width = 2;
-               if (EXTRACT_U_1(bp + 1))
+               if (GET_U_1(bp + 1))
                        width = 3;
-               if (EXTRACT_U_1(bp + 2))
+               if (GET_U_1(bp + 2))
                        width = 4;
 
                ND_PRINT("\n\tMask %s", intoa(htonl(mask)));
@@ -200,18 +201,18 @@ print_report(netdissect_options *ndo,
                        origin = 0;
                        for (i = 0; i < width; ++i) {
                                ND_TCHECK_1(bp);
-                               origin = origin << 8 | EXTRACT_U_1(bp);
+                               origin = origin << 8 | GET_U_1(bp);
                                bp++;
                        }
                        for ( ; i < 4; ++i)
                                origin <<= 8;
 
                        ND_TCHECK_1(bp);
-                       metric = EXTRACT_U_1(bp);
+                       metric = GET_U_1(bp);
                        bp++;
                        done = metric & 0x80;
                        metric &= 0x7f;
-                       ND_PRINT("\n\t  %s metric %d", intoa(htonl(origin)),
+                       ND_PRINT("\n\t  %s metric %u", intoa(htonl(origin)),
                                metric);
                        len -= width + 1;
                } while (!done);
@@ -234,8 +235,7 @@ print_probe(netdissect_options *ndo,
                ND_PRINT(" [|}");
                return (0);
        }
-       genid = (EXTRACT_U_1(bp) << 24) | (EXTRACT_U_1(bp + 1) << 16) |
-                (EXTRACT_U_1(bp + 2) << 8) | EXTRACT_U_1(bp + 3);
+       genid = GET_BE_U_4(bp);
        bp += 4;
        len -= 4;
        ND_PRINT(ndo->ndo_vflag > 1 ? "\n\t" : " ");
@@ -267,17 +267,17 @@ print_neighbors(netdissect_options *ndo,
                ND_TCHECK_7(bp);
                laddr = bp;
                bp += 4;
-               metric = EXTRACT_U_1(bp);
+               metric = GET_U_1(bp);
                bp++;
-               thresh = EXTRACT_U_1(bp);
+               thresh = GET_U_1(bp);
                bp++;
-               ncount = EXTRACT_U_1(bp);
+               ncount = GET_U_1(bp);
                bp++;
                len -= 7;
                while (--ncount >= 0) {
                        ND_TCHECK_4(bp);
                        ND_PRINT(" [%s ->", ipaddr_string(ndo, laddr));
-                       ND_PRINT(" %s, (%d/%d)]",
+                       ND_PRINT(" %s, (%u/%u)]",
                                   ipaddr_string(ndo, bp), metric, thresh);
                        bp += 4;
                        len -= 4;
@@ -304,18 +304,18 @@ print_neighbors2(netdissect_options *ndo,
                ND_TCHECK_8(bp);
                laddr = bp;
                bp += 4;
-               metric = EXTRACT_U_1(bp);
+               metric = GET_U_1(bp);
                bp++;
-               thresh = EXTRACT_U_1(bp);
+               thresh = GET_U_1(bp);
                bp++;
-               flags = EXTRACT_U_1(bp);
+               flags = GET_U_1(bp);
                bp++;
-               ncount = EXTRACT_U_1(bp);
+               ncount = GET_U_1(bp);
                bp++;
                len -= 8;
                while (--ncount >= 0 && (len >= 4) && (bp + 4) <= ep) {
                        ND_PRINT(" [%s -> ", ipaddr_string(ndo, laddr));
-                       ND_PRINT("%s (%d/%d", ipaddr_string(ndo, bp),
+                       ND_PRINT("%s (%u/%u", ipaddr_string(ndo, bp),
                                     metric, thresh);
                        if (flags & DVMRP_NF_TUNNEL)
                                ND_PRINT("/tunnel");
@@ -349,7 +349,7 @@ print_prune(netdissect_options *ndo,
        ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4));
        bp += 8;
        ND_PRINT(" timer ");
-       unsigned_relts_print(ndo, EXTRACT_BE_U_4(bp));
+       unsigned_relts_print(ndo, GET_BE_U_4(bp));
        return (0);
 trunc:
        return (-1);