gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / print-lwres.c

diff --git a/print-lwres.c b/print-lwres.c
index 2518823bc3e1a3164e237c8e7734b3ecb17b4783..b8f9b49ae598c3b410de1bfa31032b0b5f54310b 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -35,9 +35,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -97,7 +94,7 @@ typedef struct lwres_addr lwres_addr_t;
 struct lwres_addr {
        nd_uint32_t                     family;
        nd_uint16_t                     length;
-       /* address folows */
+       /* address follows */
 };
 #define LWRES_ADDR_LEN                 6
 
@@ -185,7 +182,7 @@ static const struct tok opcode[] = {
        { LWRES_OPCODE_GETADDRSBYNAME,  "getaddrsbyname", },
        { LWRES_OPCODE_GETNAMEBYADDR,   "getnamebyaddr", },
        { LWRES_OPCODE_GETRDATABYNAME,  "getrdatabyname", },
-       { 0,                            NULL, },
+       { 0,                            NULL, },
 };
 
 /* print-domain.c */
@@ -194,10 +191,10 @@ extern const struct tok ns_class2str[];
 
 static unsigned
 lwres_printname(netdissect_options *ndo,
-                size_t l, const u_char *p0)
+                u_int l, const u_char *p0)
 {
        ND_PRINT(" ");
-       (void)nd_printn(ndo, p0, l, NULL);
+       nd_printjn(ndo, p0, l);
        p0 += l;
        if (GET_U_1(p0))
                ND_PRINT(" (not NUL-terminated!)");
@@ -294,7 +291,9 @@ lwres_print(netdissect_options *ndo,
        if (ndo->ndo_vflag || v != LWRES_LWPACKETVERSION_0)
                ND_PRINT(" v%u", v);
        if (v != LWRES_LWPACKETVERSION_0) {
-               s = bp + GET_BE_U_4(np->length);
+               uint32_t pkt_len = GET_BE_U_4(np->length);
+               ND_TCHECK_LEN(bp, pkt_len);
+               s = bp + pkt_len;
                goto tail;
        }
 
@@ -549,7 +548,7 @@ lwres_print(netdissect_options *ndo,
                ND_PRINT(" [len: %u != %u]", GET_BE_U_4(np->length),
                          length);
        }
-       if (!unsupported && s < bp + GET_BE_U_4(np->length))
+       if (!unsupported && ND_BYTES_BETWEEN(s, bp) < GET_BE_U_4(np->length))
                ND_PRINT("[extra]");
        return;