CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-decnet.c

diff --git a/print-decnet.c b/print-decnet.c
index 85ccf267892bd0e229fafa61c8c7842330f0667e..a114e2d3bccda6bf27f0caf1f7ff01bdd56f74b7 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -21,15 +21,12 @@
 
 /* \summary: DECnet printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
@@ -53,7 +50,7 @@ typedef nd_uint32_t longword;         /* 4 bytes field */
  * Definitions for DECNET Phase IV protocol headers
  */
 typedef union {
-       nd_byte dne_addr[MAC_ADDR_LEN]; /* full Ethernet address */
+       nd_mac_addr dne_addr;   /* full Ethernet address */
        struct {
                nd_byte dne_hiord[4];   /* DECnet HIORD prefix */
                nd_byte dne_nodeaddr[2]; /* DECnet node address */
@@ -479,13 +476,13 @@ decnet_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "decnet";
        if (length < sizeof(struct shorthdr)) {
-               ND_PRINT(" (length %u < %u)", length, (unsigned)sizeof(struct shorthdr));
+               ND_PRINT(" (length %u < %zu)", length, sizeof(struct shorthdr));
                goto invalid;
        }
 
        pktlen = GET_LE_U_2(ap);
        if (pktlen < sizeof(struct shorthdr)) {
-               ND_PRINT(" (pktlen %u < %u)", pktlen, (unsigned)sizeof(struct shorthdr));
+               ND_PRINT(" (pktlen %u < %zu)", pktlen, sizeof(struct shorthdr));
                goto invalid;
        }
        if (pktlen > length) {
@@ -530,7 +527,7 @@ decnet_print(netdissect_options *ndo,
        switch (mflags & RMF_MASK) {
        case RMF_LONG:
            if (length < sizeof(struct longhdr)) {
-               ND_PRINT(" (length %u < %u)", length, (unsigned)sizeof(struct longhdr));
+               ND_PRINT(" (length %u < %zu)", length, sizeof(struct longhdr));
                goto invalid;
            }
            ND_TCHECK_SIZE(&rhp->rh_long);
@@ -800,7 +797,7 @@ print_nsp(netdissect_options *ndo,
        u_int dst, src, flags;
 
        if (nsplen < sizeof(struct nsphdr)) {
-               ND_PRINT(" (nsplen %u < %u)", nsplen, (unsigned)sizeof(struct nsphdr));
+               ND_PRINT(" (nsplen %u < %zu)", nsplen, sizeof(struct nsphdr));
                goto invalid;
        }
        flags = GET_U_1(nsphp->nh_flags);