]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-decnet.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10
[tcpdump] / print-decnet.c
diff --git a/print-decnet.c b/print-decnet.c
index cbde8e67665542c5c4d8f5036190eb75e47a69ef..989776b4df316af5fc91082fa39beac1dc56a6eb 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -20,29 +20,27 @@
  */
 
 /* \summary: DECnet printer */
  */
 
 /* \summary: DECnet printer */
+/*
+ * specification: Section 10.0 MESSAGES
+ * DECnet Digital Network Architecture
+ * Phase IV
+ * Routing Layer Functional Specification
+ * Order No. AA-X435A-TK
+ * Version 2.0.0 December 1983
+ */
 
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <netdissect-stdinc.h>
-
-struct mbuf;
-struct rtentry;
+#include <config.h>
 
 
-#ifdef HAVE_NETDNET_DNETDB_H
-#include <netdnet/dnetdb.h>
-#endif
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = "[|decnet]";
 
 #ifndef _WIN32
 typedef nd_uint8_t byte;               /* single byte field */
 
 #ifndef _WIN32
 typedef nd_uint8_t byte;               /* single byte field */
@@ -59,15 +57,13 @@ typedef nd_uint32_t longword;               /* 4 bytes field */
 /*
  * Definitions for DECNET Phase IV protocol headers
  */
 /*
  * Definitions for DECNET Phase IV protocol headers
  */
-union etheraddress {
-       nd_byte   dne_addr[6];          /* full ethernet address */
+typedef union {
+       nd_mac48 dne_addr;      /* full Ethernet address */
        struct {
                nd_byte dne_hiord[4];   /* DECnet HIORD prefix */
                nd_byte dne_nodeaddr[2]; /* DECnet node address */
        } dne_remote;
        struct {
                nd_byte dne_hiord[4];   /* DECnet HIORD prefix */
                nd_byte dne_nodeaddr[2]; /* DECnet node address */
        } dne_remote;
-};
-
-typedef union etheraddress etheraddr;  /* Ethernet address */
+} etheraddr;   /* Ethernet address */
 
 #define HIORD 0x000400aa               /* high 32-bits of address (swapped) */
 
 
 #define HIORD 0x000400aa               /* high 32-bits of address (swapped) */
 
@@ -75,12 +71,6 @@ typedef union etheraddress etheraddr;        /* Ethernet address */
 #define        AREASHIFT       10              /* bit-offset for area field */
 #define NODEMASK       01777           /* mask for node address field */
 
 #define        AREASHIFT       10              /* bit-offset for area field */
 #define NODEMASK       01777           /* mask for node address field */
 
-#define DN_MAXADDL     20              /* max size of DECnet address */
-struct dn_naddr {
-       uint16_t        a_len;          /* length of address */
-       uint8_t         a_addr[DN_MAXADDL]; /* address as bytes */
-};
-
 /*
  * Define long and short header formats.
  */
 /*
  * Define long and short header formats.
  */
@@ -173,18 +163,6 @@ union routehdr
 /*
  * Define control message formats.
  */
 /*
  * Define control message formats.
  */
-struct initmsgIII                      /* phase III initialization message */
-  {
-    byte       inIII_flags;            /* route flags */
-    word       inIII_src;              /* source node address */
-    byte       inIII_info;             /* routing layer information */
-    word       inIII_blksize;          /* maximum data link block size */
-    byte       inIII_vers;             /* version number */
-    byte       inIII_eco;              /* ECO number */
-    byte       inIII_ueco;             /* user ECO number */
-    byte       inIII_rsvd;             /* reserved image field */
-  };
-
 struct initmsg                         /* initialization message */
   {
     byte       in_flags;               /* route flags */
 struct initmsg                         /* initialization message */
   {
     byte       in_flags;               /* route flags */
@@ -485,17 +463,13 @@ struct dcmsg                              /* disconnect confirm message */
 /* Forwards */
 static int print_decnet_ctlmsg(netdissect_options *, const union routehdr *, u_int, u_int);
 static void print_t_info(netdissect_options *, u_int);
 /* Forwards */
 static int print_decnet_ctlmsg(netdissect_options *, const union routehdr *, u_int, u_int);
 static void print_t_info(netdissect_options *, u_int);
-static int print_l1_routes(netdissect_options *, const char *, u_int);
-static int print_l2_routes(netdissect_options *, const char *, u_int);
+static void print_l1_routes(netdissect_options *, const u_char *, u_int);
+static void print_l2_routes(netdissect_options *, const u_char *, u_int);
 static void print_i_info(netdissect_options *, u_int);
 static void print_i_info(netdissect_options *, u_int);
-static int print_elist(const char *, u_int);
+static void print_elist(const u_char *, u_int);
 static int print_nsp(netdissect_options *, const u_char *, u_int);
 static void print_reason(netdissect_options *, u_int);
 
 static int print_nsp(netdissect_options *, const u_char *, u_int);
 static void print_reason(netdissect_options *, u_int);
 
-#ifndef HAVE_NETDNET_DNETDB_H_DNET_HTOA
-extern char *dnet_htoa(struct dn_naddr *);
-#endif
-
 void
 decnet_print(netdissect_options *ndo,
              const u_char *ap, u_int length,
 void
 decnet_print(netdissect_options *ndo,
              const u_char *ap, u_int length,
@@ -503,110 +477,112 @@ decnet_print(netdissect_options *ndo,
 {
        const union routehdr *rhp;
        u_int mflags;
 {
        const union routehdr *rhp;
        u_int mflags;
-       u_int dst, src, hops;
+       uint16_t dst, src;
+       u_int hops;
        u_int nsplen, pktlen;
        const u_char *nspp;
 
        u_int nsplen, pktlen;
        const u_char *nspp;
 
+       ndo->ndo_protocol = "decnet";
        if (length < sizeof(struct shorthdr)) {
        if (length < sizeof(struct shorthdr)) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
+               ND_PRINT(" (length %u < %zu)", length, sizeof(struct shorthdr));
+               goto invalid;
        }
 
        }
 
-       ND_TCHECK_LEN(ap, sizeof(short));
-       pktlen = EXTRACT_LE_U_2(ap);
+       /*
+        * This length does not seem to be in any specification, but it is present
+        * in the test case packet capture, which is consistent with the Wireshark
+        * protocol decoder.
+        */
+       pktlen = GET_LE_U_2(ap);
        if (pktlen < sizeof(struct shorthdr)) {
        if (pktlen < sizeof(struct shorthdr)) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
+               ND_PRINT(" (pktlen %u < %zu)", pktlen, sizeof(struct shorthdr));
+               goto invalid;
        }
        if (pktlen > length) {
        }
        if (pktlen > length) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
+               ND_PRINT(" (pktlen %u > %u)", pktlen, length);
+               goto invalid;
        }
        length = pktlen;
 
        rhp = (const union routehdr *)(ap + sizeof(short));
        }
        length = pktlen;
 
        rhp = (const union routehdr *)(ap + sizeof(short));
-       ND_TCHECK(rhp->rh_short.sh_flags);
-       mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
+       mflags = GET_U_1(rhp->rh_short.sh_flags);
 
        if (mflags & RMF_PAD) {
            /* pad bytes of some sort in front of message */
            u_int padlen = mflags & RMF_PADMASK;
            if (ndo->ndo_vflag)
 
        if (mflags & RMF_PAD) {
            /* pad bytes of some sort in front of message */
            u_int padlen = mflags & RMF_PADMASK;
            if (ndo->ndo_vflag)
-               ND_PRINT((ndo, "[pad:%u] ", padlen));
+               ND_PRINT("[pad:%u] ", padlen);
            if (length < padlen + 2) {
            if (length < padlen + 2) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
+               ND_PRINT(" (length %u < %u)", length, padlen + 2);
+               goto invalid;
            }
            ND_TCHECK_LEN(ap + sizeof(short), padlen);
            ap += padlen;
            length -= padlen;
            caplen -= padlen;
            rhp = (const union routehdr *)(ap + sizeof(short));
            }
            ND_TCHECK_LEN(ap + sizeof(short), padlen);
            ap += padlen;
            length -= padlen;
            caplen -= padlen;
            rhp = (const union routehdr *)(ap + sizeof(short));
-           ND_TCHECK(rhp->rh_short.sh_flags);
-           mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
+           mflags = GET_U_1(rhp->rh_short.sh_flags);
        }
 
        if (mflags & RMF_FVER) {
        }
 
        if (mflags & RMF_FVER) {
-               ND_PRINT((ndo, "future-version-decnet"));
-               ND_DEFAULTPRINT(ap, min(length, caplen));
+               ND_PRINT("future-version-decnet");
+               ND_DEFAULTPRINT(ap, ND_MIN(length, caplen));
                return;
        }
 
        /* is it a control message? */
        if (mflags & RMF_CTLMSG) {
                if (!print_decnet_ctlmsg(ndo, rhp, length, caplen))
                return;
        }
 
        /* is it a control message? */
        if (mflags & RMF_CTLMSG) {
                if (!print_decnet_ctlmsg(ndo, rhp, length, caplen))
-                       goto trunc;
+                       goto invalid;
                return;
        }
 
        switch (mflags & RMF_MASK) {
        case RMF_LONG:
            if (length < sizeof(struct longhdr)) {
                return;
        }
 
        switch (mflags & RMF_MASK) {
        case RMF_LONG:
            if (length < sizeof(struct longhdr)) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
+               ND_PRINT(" (length %u < %zu)", length, sizeof(struct longhdr));
+               goto invalid;
            }
            }
-           ND_TCHECK(rhp->rh_long);
+           ND_TCHECK_SIZE(&rhp->rh_long);
            dst =
            dst =
-               EXTRACT_LE_U_2(rhp->rh_long.lg_dst.dne_remote.dne_nodeaddr);
+               GET_LE_U_2(rhp->rh_long.lg_dst.dne_remote.dne_nodeaddr);
            src =
            src =
-               EXTRACT_LE_U_2(rhp->rh_long.lg_src.dne_remote.dne_nodeaddr);
-           hops = EXTRACT_U_1(rhp->rh_long.lg_visits);
+               GET_LE_U_2(rhp->rh_long.lg_src.dne_remote.dne_nodeaddr);
+           hops = GET_U_1(rhp->rh_long.lg_visits);
            nspp = ap + sizeof(short) + sizeof(struct longhdr);
            nsplen = length - sizeof(struct longhdr);
            break;
        case RMF_SHORT:
            nspp = ap + sizeof(short) + sizeof(struct longhdr);
            nsplen = length - sizeof(struct longhdr);
            break;
        case RMF_SHORT:
-           ND_TCHECK(rhp->rh_short);
-           dst = EXTRACT_LE_U_2(rhp->rh_short.sh_dst);
-           src = EXTRACT_LE_U_2(rhp->rh_short.sh_src);
-           hops = (EXTRACT_U_1(rhp->rh_short.sh_visits) & VIS_MASK)+1;
+           dst = GET_LE_U_2(rhp->rh_short.sh_dst);
+           src = GET_LE_U_2(rhp->rh_short.sh_src);
+           hops = (GET_U_1(rhp->rh_short.sh_visits) & VIS_MASK)+1;
            nspp = ap + sizeof(short) + sizeof(struct shorthdr);
            nsplen = length - sizeof(struct shorthdr);
            break;
        default:
            nspp = ap + sizeof(short) + sizeof(struct shorthdr);
            nsplen = length - sizeof(struct shorthdr);
            break;
        default:
-           ND_PRINT((ndo, "unknown message flags under mask"));
-           ND_DEFAULTPRINT((const u_char *)ap, min(length, caplen));
+           ND_PRINT("unknown message flags under mask");
+           ND_DEFAULTPRINT((const u_char *)ap, ND_MIN(length, caplen));
            return;
        }
 
            return;
        }
 
-       ND_PRINT((ndo, "%s > %s %u ",
-                       dnaddr_string(ndo, src), dnaddr_string(ndo, dst), pktlen));
+       ND_PRINT("%s > %s %u ",
+                       dnaddr_string(ndo, src), dnaddr_string(ndo, dst), pktlen);
        if (ndo->ndo_vflag) {
            if (mflags & RMF_RQR)
        if (ndo->ndo_vflag) {
            if (mflags & RMF_RQR)
-               ND_PRINT((ndo, "RQR "));
+               ND_PRINT("RQR ");
            if (mflags & RMF_RTS)
            if (mflags & RMF_RTS)
-               ND_PRINT((ndo, "RTS "));
+               ND_PRINT("RTS ");
            if (mflags & RMF_IE)
            if (mflags & RMF_IE)
-               ND_PRINT((ndo, "IE "));
-           ND_PRINT((ndo, "%u hops ", hops));
+               ND_PRINT("IE ");
+           ND_PRINT("%u hops ", hops);
        }
 
        if (!print_nsp(ndo, nspp, nsplen))
        }
 
        if (!print_nsp(ndo, nspp, nsplen))
-               goto trunc;
+               goto invalid;
        return;
 
        return;
 
-trunc:
-       ND_PRINT((ndo, "%s", tstr));
-       return;
+invalid:
+       nd_print_invalid(ndo);
 }
 
 static int
 }
 
 static int
@@ -615,133 +591,118 @@ print_decnet_ctlmsg(netdissect_options *ndo,
                     u_int caplen)
 {
        /* Our caller has already checked for mflags */
                     u_int caplen)
 {
        /* Our caller has already checked for mflags */
-       u_int mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
+       u_int mflags = GET_U_1(rhp->rh_short.sh_flags);
        const union controlmsg *cmp = (const union controlmsg *)rhp;
        const union controlmsg *cmp = (const union controlmsg *)rhp;
-       u_int src, dst, info, blksize, eco, ueco, hello, other, vers;
-       etheraddr srcea, rtea;
+       uint16_t src, dst;
+       u_int info, blksize, eco, ueco, hello, other, vers;
        u_int priority;
        u_int priority;
-       const char *rhpx = (const char *)rhp;
-       int ret;
+       const u_char *rhpx = (const u_char *)rhp;
 
        switch (mflags & RMF_CTLMASK) {
        case RMF_INIT:
 
        switch (mflags & RMF_CTLMASK) {
        case RMF_INIT:
-           ND_PRINT((ndo, "init "));
+           ND_PRINT("init ");
            if (length < sizeof(struct initmsg))
            if (length < sizeof(struct initmsg))
-               goto trunc;
-           ND_TCHECK(cmp->cm_init);
-           src = EXTRACT_LE_U_2(cmp->cm_init.in_src);
-           info = EXTRACT_U_1(cmp->cm_init.in_info);
-           blksize = EXTRACT_LE_U_2(cmp->cm_init.in_blksize);
-           vers = EXTRACT_U_1(cmp->cm_init.in_vers);
-           eco = EXTRACT_U_1(cmp->cm_init.in_eco);
-           ueco = EXTRACT_U_1(cmp->cm_init.in_ueco);
-           hello = EXTRACT_LE_U_2(cmp->cm_init.in_hello);
+               goto invalid;
+           ND_TCHECK_SIZE(&cmp->cm_init);
+           src = GET_LE_U_2(cmp->cm_init.in_src);
+           info = GET_U_1(cmp->cm_init.in_info);
+           blksize = GET_LE_U_2(cmp->cm_init.in_blksize);
+           vers = GET_U_1(cmp->cm_init.in_vers);
+           eco = GET_U_1(cmp->cm_init.in_eco);
+           ueco = GET_U_1(cmp->cm_init.in_ueco);
+           hello = GET_LE_U_2(cmp->cm_init.in_hello);
            print_t_info(ndo, info);
            print_t_info(ndo, info);
-           ND_PRINT((ndo,
-               "src %sblksize %u vers %u eco %u ueco %u hello %u",
+           ND_PRINT("src %sblksize %u vers %u eco %u ueco %u hello %u",
                        dnaddr_string(ndo, src), blksize, vers, eco, ueco,
                        dnaddr_string(ndo, src), blksize, vers, eco, ueco,
-                       hello));
-           ret = 1;
+                       hello);
            break;
        case RMF_VER:
            break;
        case RMF_VER:
-           ND_PRINT((ndo, "verification "));
+           ND_PRINT("verification ");
            if (length < sizeof(struct verifmsg))
            if (length < sizeof(struct verifmsg))
-               goto trunc;
-           ND_TCHECK(cmp->cm_ver);
-           src = EXTRACT_LE_U_2(cmp->cm_ver.ve_src);
-           other = EXTRACT_U_1(cmp->cm_ver.ve_fcnval);
-           ND_PRINT((ndo, "src %s fcnval %o", dnaddr_string(ndo, src), other));
-           ret = 1;
+               goto invalid;
+           src = GET_LE_U_2(cmp->cm_ver.ve_src);
+           other = GET_U_1(cmp->cm_ver.ve_fcnval);
+           ND_PRINT("src %s fcnval %o", dnaddr_string(ndo, src), other);
            break;
        case RMF_TEST:
            break;
        case RMF_TEST:
-           ND_PRINT((ndo, "test "));
+           ND_PRINT("test ");
            if (length < sizeof(struct testmsg))
            if (length < sizeof(struct testmsg))
-               goto trunc;
-           ND_TCHECK(cmp->cm_test);
-           src = EXTRACT_LE_U_2(cmp->cm_test.te_src);
-           other = EXTRACT_U_1(cmp->cm_test.te_data);
-           ND_PRINT((ndo, "src %s data %o", dnaddr_string(ndo, src), other));
-           ret = 1;
+               goto invalid;
+           src = GET_LE_U_2(cmp->cm_test.te_src);
+           other = GET_U_1(cmp->cm_test.te_data);
+           ND_PRINT("src %s data %o", dnaddr_string(ndo, src), other);
            break;
        case RMF_L1ROUT:
            break;
        case RMF_L1ROUT:
-           ND_PRINT((ndo, "lev-1-routing "));
+           ND_PRINT("lev-1-routing ");
            if (length < sizeof(struct l1rout))
            if (length < sizeof(struct l1rout))
-               goto trunc;
-           ND_TCHECK(cmp->cm_l1rou);
-           src = EXTRACT_LE_U_2(cmp->cm_l1rou.r1_src);
-           ND_PRINT((ndo, "src %s ", dnaddr_string(ndo, src)));
-           ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),
+               goto invalid;
+           ND_TCHECK_SIZE(&cmp->cm_l1rou);
+           src = GET_LE_U_2(cmp->cm_l1rou.r1_src);
+           ND_PRINT("src %s ", dnaddr_string(ndo, src));
+           print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),
                                length - sizeof(struct l1rout));
            break;
        case RMF_L2ROUT:
                                length - sizeof(struct l1rout));
            break;
        case RMF_L2ROUT:
-           ND_PRINT((ndo, "lev-2-routing "));
+           ND_PRINT("lev-2-routing ");
            if (length < sizeof(struct l2rout))
            if (length < sizeof(struct l2rout))
-               goto trunc;
-           ND_TCHECK(cmp->cm_l2rout);
-           src = EXTRACT_LE_U_2(cmp->cm_l2rout.r2_src);
-           ND_PRINT((ndo, "src %s ", dnaddr_string(ndo, src)));
-           ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),
+               goto invalid;
+           ND_TCHECK_SIZE(&cmp->cm_l2rout);
+           src = GET_LE_U_2(cmp->cm_l2rout.r2_src);
+           ND_PRINT("src %s ", dnaddr_string(ndo, src));
+           print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),
                                length - sizeof(struct l2rout));
            break;
        case RMF_RHELLO:
                                length - sizeof(struct l2rout));
            break;
        case RMF_RHELLO:
-           ND_PRINT((ndo, "router-hello "));
+           ND_PRINT("router-hello ");
            if (length < sizeof(struct rhellomsg))
            if (length < sizeof(struct rhellomsg))
-               goto trunc;
-           ND_TCHECK(cmp->cm_rhello);
-           vers = EXTRACT_U_1(cmp->cm_rhello.rh_vers);
-           eco = EXTRACT_U_1(cmp->cm_rhello.rh_eco);
-           ueco = EXTRACT_U_1(cmp->cm_rhello.rh_ueco);
-           memcpy((char *)&srcea, (const char *)&(cmp->cm_rhello.rh_src),
-               sizeof(srcea));
-           src = EXTRACT_LE_U_2(srcea.dne_remote.dne_nodeaddr);
-           info = EXTRACT_U_1(cmp->cm_rhello.rh_info);
-           blksize = EXTRACT_LE_U_2(cmp->cm_rhello.rh_blksize);
-           priority = EXTRACT_U_1(cmp->cm_rhello.rh_priority);
-           hello = EXTRACT_LE_U_2(cmp->cm_rhello.rh_hello);
+               goto invalid;
+           ND_TCHECK_SIZE(&cmp->cm_rhello);
+           vers = GET_U_1(cmp->cm_rhello.rh_vers);
+           eco = GET_U_1(cmp->cm_rhello.rh_eco);
+           ueco = GET_U_1(cmp->cm_rhello.rh_ueco);
+           src =
+               GET_LE_U_2(cmp->cm_rhello.rh_src.dne_remote.dne_nodeaddr);
+           info = GET_U_1(cmp->cm_rhello.rh_info);
+           blksize = GET_LE_U_2(cmp->cm_rhello.rh_blksize);
+           priority = GET_U_1(cmp->cm_rhello.rh_priority);
+           hello = GET_LE_U_2(cmp->cm_rhello.rh_hello);
            print_i_info(ndo, info);
            print_i_info(ndo, info);
-           ND_PRINT((ndo,
-           "vers %u eco %u ueco %u src %s blksize %u pri %u hello %u",
+           ND_PRINT("vers %u eco %u ueco %u src %s blksize %u pri %u hello %u",
                        vers, eco, ueco, dnaddr_string(ndo, src),
                        vers, eco, ueco, dnaddr_string(ndo, src),
-                       blksize, priority, hello));
-           ret = print_elist(&(rhpx[sizeof(struct rhellomsg)]),
+                       blksize, priority, hello);
+           print_elist(&(rhpx[sizeof(struct rhellomsg)]),
                                length - sizeof(struct rhellomsg));
            break;
        case RMF_EHELLO:
                                length - sizeof(struct rhellomsg));
            break;
        case RMF_EHELLO:
-           ND_PRINT((ndo, "endnode-hello "));
+           ND_PRINT("endnode-hello ");
            if (length < sizeof(struct ehellomsg))
            if (length < sizeof(struct ehellomsg))
-               goto trunc;
-           ND_TCHECK(cmp->cm_ehello);
-           vers = EXTRACT_U_1(cmp->cm_ehello.eh_vers);
-           eco = EXTRACT_U_1(cmp->cm_ehello.eh_eco);
-           ueco = EXTRACT_U_1(cmp->cm_ehello.eh_ueco);
-           memcpy((char *)&srcea, (const char *)&(cmp->cm_ehello.eh_src),
-               sizeof(srcea));
-           src = EXTRACT_LE_U_2(srcea.dne_remote.dne_nodeaddr);
-           info = EXTRACT_U_1(cmp->cm_ehello.eh_info);
-           blksize = EXTRACT_LE_U_2(cmp->cm_ehello.eh_blksize);
+               goto invalid;
+           vers = GET_U_1(cmp->cm_ehello.eh_vers);
+           eco = GET_U_1(cmp->cm_ehello.eh_eco);
+           ueco = GET_U_1(cmp->cm_ehello.eh_ueco);
+           src =
+               GET_LE_U_2(cmp->cm_ehello.eh_src.dne_remote.dne_nodeaddr);
+           info = GET_U_1(cmp->cm_ehello.eh_info);
+           blksize = GET_LE_U_2(cmp->cm_ehello.eh_blksize);
            /*seed*/
            /*seed*/
-           memcpy((char *)&rtea, (const char *)&(cmp->cm_ehello.eh_router),
-               sizeof(rtea));
-           dst = EXTRACT_LE_U_2(rtea.dne_remote.dne_nodeaddr);
-           hello = EXTRACT_LE_U_2(cmp->cm_ehello.eh_hello);
-           other = EXTRACT_U_1(cmp->cm_ehello.eh_data);
+           dst =
+               GET_LE_U_2(cmp->cm_ehello.eh_router.dne_remote.dne_nodeaddr);
+           hello = GET_LE_U_2(cmp->cm_ehello.eh_hello);
+           other = GET_U_1(cmp->cm_ehello.eh_data);
            print_i_info(ndo, info);
            print_i_info(ndo, info);
-           ND_PRINT((ndo,
-       "vers %u eco %u ueco %u src %s blksize %u rtr %s hello %u data %o",
+           ND_PRINT("vers %u eco %u ueco %u src %s blksize %u rtr %s hello %u data %o",
                        vers, eco, ueco, dnaddr_string(ndo, src),
                        vers, eco, ueco, dnaddr_string(ndo, src),
-                       blksize, dnaddr_string(ndo, dst), hello, other));
-           ret = 1;
+                       blksize, dnaddr_string(ndo, dst), hello, other);
            break;
 
        default:
            break;
 
        default:
-           ND_PRINT((ndo, "unknown control message"));
-           ND_DEFAULTPRINT((const u_char *)rhp, min(length, caplen));
-           ret = 1;
+           ND_PRINT("unknown control message");
+           ND_DEFAULTPRINT((const u_char *)rhp, ND_MIN(length, caplen));
            break;
        }
            break;
        }
-       return (ret);
+       return (1);
 
 
-trunc:
+invalid:
        return (0);
 }
 
        return (0);
 }
 
@@ -751,20 +712,20 @@ print_t_info(netdissect_options *ndo,
 {
        u_int ntype = info & 3;
        switch (ntype) {
 {
        u_int ntype = info & 3;
        switch (ntype) {
-       case 0: ND_PRINT((ndo, "reserved-ntype? ")); break;
-       case TI_L2ROUT: ND_PRINT((ndo, "l2rout ")); break;
-       case TI_L1ROUT: ND_PRINT((ndo, "l1rout ")); break;
-       case TI_ENDNODE: ND_PRINT((ndo, "endnode ")); break;
+       case 0: ND_PRINT("reserved-ntype? "); break;
+       case TI_L2ROUT: ND_PRINT("l2rout "); break;
+       case TI_L1ROUT: ND_PRINT("l1rout "); break;
+       case TI_ENDNODE: ND_PRINT("endnode "); break;
        }
        if (info & TI_VERIF)
        }
        if (info & TI_VERIF)
-           ND_PRINT((ndo, "verif "));
+           ND_PRINT("verif ");
        if (info & TI_BLOCK)
        if (info & TI_BLOCK)
-           ND_PRINT((ndo, "blo "));
+           ND_PRINT("blo ");
 }
 
 }
 
-static int
+static void
 print_l1_routes(netdissect_options *ndo,
 print_l1_routes(netdissect_options *ndo,
-                const char *rp, u_int len)
+                const u_char *rp, u_int len)
 {
        u_int count;
        u_int id;
 {
        u_int count;
        u_int id;
@@ -773,29 +734,25 @@ print_l1_routes(netdissect_options *ndo,
        /* The last short is a checksum */
        while (len > (3 * sizeof(short))) {
            ND_TCHECK_LEN(rp, 3 * sizeof(short));
        /* The last short is a checksum */
        while (len > (3 * sizeof(short))) {
            ND_TCHECK_LEN(rp, 3 * sizeof(short));
-           count = EXTRACT_LE_U_2(rp);
+           count = GET_LE_U_2(rp);
            if (count > 1024)
            if (count > 1024)
-               return (1);     /* seems to be bogus from here on */
+               return; /* seems to be bogus from here on */
            rp += sizeof(short);
            len -= sizeof(short);
            rp += sizeof(short);
            len -= sizeof(short);
-           id = EXTRACT_LE_U_2(rp);
+           id = GET_LE_U_2(rp);
            rp += sizeof(short);
            len -= sizeof(short);
            rp += sizeof(short);
            len -= sizeof(short);
-           info = EXTRACT_LE_U_2(rp);
+           info = GET_LE_U_2(rp);
            rp += sizeof(short);
            len -= sizeof(short);
            rp += sizeof(short);
            len -= sizeof(short);
-           ND_PRINT((ndo, "{ids %u-%u cost %u hops %u} ", id, id + count,
-                           RI_COST(info), RI_HOPS(info)));
+           ND_PRINT("{ids %u-%u cost %u hops %u} ", id, id + count,
+                           RI_COST(info), RI_HOPS(info));
        }
        }
-       return (1);
-
-trunc:
-       return (0);
 }
 
 }
 
-static int
+static void
 print_l2_routes(netdissect_options *ndo,
 print_l2_routes(netdissect_options *ndo,
-                const char *rp, u_int len)
+                const u_char *rp, u_int len)
 {
        u_int count;
        u_int area;
 {
        u_int count;
        u_int area;
@@ -804,24 +761,20 @@ print_l2_routes(netdissect_options *ndo,
        /* The last short is a checksum */
        while (len > (3 * sizeof(short))) {
            ND_TCHECK_LEN(rp, 3 * sizeof(short));
        /* The last short is a checksum */
        while (len > (3 * sizeof(short))) {
            ND_TCHECK_LEN(rp, 3 * sizeof(short));
-           count = EXTRACT_LE_U_2(rp);
+           count = GET_LE_U_2(rp);
            if (count > 1024)
            if (count > 1024)
-               return (1);     /* seems to be bogus from here on */
+               return; /* seems to be bogus from here on */
            rp += sizeof(short);
            len -= sizeof(short);
            rp += sizeof(short);
            len -= sizeof(short);
-           area = EXTRACT_LE_U_2(rp);
+           area = GET_LE_U_2(rp);
            rp += sizeof(short);
            len -= sizeof(short);
            rp += sizeof(short);
            len -= sizeof(short);
-           info = EXTRACT_LE_U_2(rp);
+           info = GET_LE_U_2(rp);
            rp += sizeof(short);
            len -= sizeof(short);
            rp += sizeof(short);
            len -= sizeof(short);
-           ND_PRINT((ndo, "{areas %u-%u cost %u hops %u} ", area, area + count,
-                           RI_COST(info), RI_HOPS(info)));
+           ND_PRINT("{areas %u-%u cost %u hops %u} ", area, area + count,
+                           RI_COST(info), RI_HOPS(info));
        }
        }
-       return (1);
-
-trunc:
-       return (0);
 }
 
 static void
 }
 
 static void
@@ -830,24 +783,23 @@ print_i_info(netdissect_options *ndo,
 {
        u_int ntype = info & II_TYPEMASK;
        switch (ntype) {
 {
        u_int ntype = info & II_TYPEMASK;
        switch (ntype) {
-       case 0: ND_PRINT((ndo, "reserved-ntype? ")); break;
-       case II_L2ROUT: ND_PRINT((ndo, "l2rout ")); break;
-       case II_L1ROUT: ND_PRINT((ndo, "l1rout ")); break;
-       case II_ENDNODE: ND_PRINT((ndo, "endnode ")); break;
+       case 0: ND_PRINT("reserved-ntype? "); break;
+       case II_L2ROUT: ND_PRINT("l2rout "); break;
+       case II_L1ROUT: ND_PRINT("l1rout "); break;
+       case II_ENDNODE: ND_PRINT("endnode "); break;
        }
        if (info & II_VERIF)
        }
        if (info & II_VERIF)
-           ND_PRINT((ndo, "verif "));
+           ND_PRINT("verif ");
        if (info & II_NOMCAST)
        if (info & II_NOMCAST)
-           ND_PRINT((ndo, "nomcast "));
+           ND_PRINT("nomcast ");
        if (info & II_BLOCK)
        if (info & II_BLOCK)
-           ND_PRINT((ndo, "blo "));
+           ND_PRINT("blo ");
 }
 
 }
 
-static int
-print_elist(const char *elp _U_, u_int len _U_)
+static void
+print_elist(const u_char *elp _U_, u_int len _U_)
 {
        /* Not enough examples available for me to debug this */
 {
        /* Not enough examples available for me to debug this */
-       return (1);
 }
 
 static int
 }
 
 static int
@@ -857,12 +809,13 @@ print_nsp(netdissect_options *ndo,
        const struct nsphdr *nsphp = (const struct nsphdr *)nspp;
        u_int dst, src, flags;
 
        const struct nsphdr *nsphp = (const struct nsphdr *)nspp;
        u_int dst, src, flags;
 
-       if (nsplen < sizeof(struct nsphdr))
-               goto trunc;
-       ND_TCHECK(*nsphp);
-       flags = EXTRACT_U_1(nsphp->nh_flags);
-       dst = EXTRACT_LE_U_2(nsphp->nh_dst);
-       src = EXTRACT_LE_U_2(nsphp->nh_src);
+       if (nsplen < sizeof(struct nsphdr)) {
+               ND_PRINT(" (nsplen %u < %zu)", nsplen, sizeof(struct nsphdr));
+               goto invalid;
+       }
+       flags = GET_U_1(nsphp->nh_flags);
+       dst = GET_LE_U_2(nsphp->nh_dst);
+       src = GET_LE_U_2(nsphp->nh_src);
 
        switch (flags & NSP_TYPEMASK) {
        case MFT_DATA:
 
        switch (flags & NSP_TYPEMASK) {
        case MFT_DATA:
@@ -871,79 +824,73 @@ print_nsp(netdissect_options *ndo,
            case MFS_MOM:
            case MFS_EOM:
            case MFS_BOM+MFS_EOM:
            case MFS_MOM:
            case MFS_EOM:
            case MFS_BOM+MFS_EOM:
-               ND_PRINT((ndo, "data %u>%u ", src, dst));
+               ND_PRINT("data %u>%u ", src, dst);
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    u_int ack;
                    u_int data_off = sizeof(struct minseghdr);
 
                    if (nsplen < data_off)
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    u_int ack;
                    u_int data_off = sizeof(struct minseghdr);
 
                    if (nsplen < data_off)
-                       goto trunc;
-                   ND_TCHECK(shp->sh_seq[0]);
-                   ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
+                       goto invalid;
+                   ack = GET_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
-                           ND_PRINT((ndo, "nak %u ", ack & SGQ_MASK));
+                           ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                        else
-                           ND_PRINT((ndo, "ack %u ", ack & SGQ_MASK));
+                           ND_PRINT("ack %u ", ack & SGQ_MASK);
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                        data_off += sizeof(short);
                        if (nsplen < data_off)
-                           goto trunc;
-                       ND_TCHECK(shp->sh_seq[1]);
-                       ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
+                           goto invalid;
+                       ack = GET_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
-                               ND_PRINT((ndo, "onak %u ", ack & SGQ_MASK));
+                               ND_PRINT("onak %u ", ack & SGQ_MASK);
                            else
                            else
-                               ND_PRINT((ndo, "oack %u ", ack & SGQ_MASK));
+                               ND_PRINT("oack %u ", ack & SGQ_MASK);
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                            data_off += sizeof(short);
                            if (nsplen < data_off)
-                               goto trunc;
-                           ND_TCHECK(shp->sh_seq[2]);
-                           ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
+                               goto invalid;
+                           ack = GET_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                        }
                    }
-                   ND_PRINT((ndo, "seg %u ", ack & SGQ_MASK));
+                   ND_PRINT("seg %u ", ack & SGQ_MASK);
                }
                break;
            case MFS_ILS+MFS_INT:
                }
                break;
            case MFS_ILS+MFS_INT:
-               ND_PRINT((ndo, "intr "));
+               ND_PRINT("intr ");
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    u_int ack;
                    u_int data_off = sizeof(struct minseghdr);
 
                    if (nsplen < data_off)
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    u_int ack;
                    u_int data_off = sizeof(struct minseghdr);
 
                    if (nsplen < data_off)
-                       goto trunc;
-                   ND_TCHECK(shp->sh_seq[0]);
-                   ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
+                       goto invalid;
+                   ack = GET_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
-                           ND_PRINT((ndo, "nak %u ", ack & SGQ_MASK));
+                           ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                        else
-                           ND_PRINT((ndo, "ack %u ", ack & SGQ_MASK));
+                           ND_PRINT("ack %u ", ack & SGQ_MASK);
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                        data_off += sizeof(short);
                        if (nsplen < data_off)
-                           goto trunc;
-                       ND_TCHECK(shp->sh_seq[1]);
-                       ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
+                           goto invalid;
+                       ack = GET_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
-                               ND_PRINT((ndo, "nakdat %u ", ack & SGQ_MASK));
+                               ND_PRINT("nakdat %u ", ack & SGQ_MASK);
                            else
                            else
-                               ND_PRINT((ndo, "ackdat %u ", ack & SGQ_MASK));
+                               ND_PRINT("ackdat %u ", ack & SGQ_MASK);
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                            data_off += sizeof(short);
                            if (nsplen < data_off)
-                               goto trunc;
-                           ND_TCHECK(shp->sh_seq[2]);
-                           ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
+                               goto invalid;
+                           ack = GET_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                        }
                    }
-                   ND_PRINT((ndo, "seg %u ", ack & SGQ_MASK));
+                   ND_PRINT("seg %u ", ack & SGQ_MASK);
                }
                break;
            case MFS_ILS:
                }
                break;
            case MFS_ILS:
-               ND_PRINT((ndo, "link-service %u>%u ", src, dst));
+               ND_PRINT("link-service %u>%u ", src, dst);
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    const struct lsmsg *lsmp =
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    const struct lsmsg *lsmp =
@@ -952,118 +899,113 @@ print_nsp(netdissect_options *ndo,
                    u_int lsflags, fcval;
 
                    if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg))
                    u_int lsflags, fcval;
 
                    if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg))
-                       goto trunc;
-                   ND_TCHECK(shp->sh_seq[0]);
-                   ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
+                       goto invalid;
+                   ack = GET_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
-                           ND_PRINT((ndo, "nak %u ", ack & SGQ_MASK));
+                           ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                        else
-                           ND_PRINT((ndo, "ack %u ", ack & SGQ_MASK));
-                       ND_TCHECK(shp->sh_seq[1]);
-                       ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
+                           ND_PRINT("ack %u ", ack & SGQ_MASK);
+                       ack = GET_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
-                               ND_PRINT((ndo, "nakdat %u ", ack & SGQ_MASK));
+                               ND_PRINT("nakdat %u ", ack & SGQ_MASK);
                            else
                            else
-                               ND_PRINT((ndo, "ackdat %u ", ack & SGQ_MASK));
-                           ND_TCHECK(shp->sh_seq[2]);
-                           ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
+                               ND_PRINT("ackdat %u ", ack & SGQ_MASK);
+                           ack = GET_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                        }
                    }
-                   ND_PRINT((ndo, "seg %u ", ack & SGQ_MASK));
-                   ND_TCHECK(*lsmp);
-                   lsflags = EXTRACT_U_1(lsmp->ls_lsflags);
-                   fcval = EXTRACT_U_1(lsmp->ls_fcval);
+                   ND_PRINT("seg %u ", ack & SGQ_MASK);
+                   lsflags = GET_U_1(lsmp->ls_lsflags);
+                   fcval = GET_U_1(lsmp->ls_fcval);
                    switch (lsflags & LSI_MASK) {
                    case LSI_DATA:
                    switch (lsflags & LSI_MASK) {
                    case LSI_DATA:
-                       ND_PRINT((ndo, "dat seg count %u ", fcval));
+                       ND_PRINT("dat seg count %u ", fcval);
                        switch (lsflags & LSM_MASK) {
                        case LSM_NOCHANGE:
                            break;
                        case LSM_DONOTSEND:
                        switch (lsflags & LSM_MASK) {
                        case LSM_NOCHANGE:
                            break;
                        case LSM_DONOTSEND:
-                           ND_PRINT((ndo, "donotsend-data "));
+                           ND_PRINT("donotsend-data ");
                            break;
                        case LSM_SEND:
                            break;
                        case LSM_SEND:
-                           ND_PRINT((ndo, "send-data "));
+                           ND_PRINT("send-data ");
                            break;
                        default:
                            break;
                        default:
-                           ND_PRINT((ndo, "reserved-fcmod? %x", lsflags));
+                           ND_PRINT("reserved-fcmod? %x", lsflags);
                            break;
                        }
                        break;
                    case LSI_INTR:
                            break;
                        }
                        break;
                    case LSI_INTR:
-                       ND_PRINT((ndo, "intr req count %u ", fcval));
+                       ND_PRINT("intr req count %u ", fcval);
                        break;
                    default:
                        break;
                    default:
-                       ND_PRINT((ndo, "reserved-fcval-int? %x", lsflags));
+                       ND_PRINT("reserved-fcval-int? %x", lsflags);
                        break;
                    }
                }
                break;
            default:
                        break;
                    }
                }
                break;
            default:
-               ND_PRINT((ndo, "reserved-subtype? %x %u > %u", flags, src, dst));
+               ND_PRINT("reserved-subtype? %x %u > %u", flags, src, dst);
                break;
            }
            break;
        case MFT_ACK:
            switch (flags & NSP_SUBMASK) {
            case MFS_DACK:
                break;
            }
            break;
        case MFT_ACK:
            switch (flags & NSP_SUBMASK) {
            case MFS_DACK:
-               ND_PRINT((ndo, "data-ack %u>%u ", src, dst));
+               ND_PRINT("data-ack %u>%u ", src, dst);
                {
                    const struct ackmsg *amp = (const struct ackmsg *)nspp;
                    u_int ack;
 
                    if (nsplen < sizeof(struct ackmsg))
                {
                    const struct ackmsg *amp = (const struct ackmsg *)nspp;
                    u_int ack;
 
                    if (nsplen < sizeof(struct ackmsg))
-                       goto trunc;
-                   ND_TCHECK(*amp);
-                   ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
+                       goto invalid;
+                   ND_TCHECK_SIZE(amp);
+                   ack = GET_LE_U_2(amp->ak_acknum[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
-                           ND_PRINT((ndo, "nak %u ", ack & SGQ_MASK));
+                           ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                        else
-                           ND_PRINT((ndo, "ack %u ", ack & SGQ_MASK));
-                       ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
+                           ND_PRINT("ack %u ", ack & SGQ_MASK);
+                       ack = GET_LE_U_2(amp->ak_acknum[1]);
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
-                               ND_PRINT((ndo, "onak %u ", ack & SGQ_MASK));
+                               ND_PRINT("onak %u ", ack & SGQ_MASK);
                            else
                            else
-                               ND_PRINT((ndo, "oack %u ", ack & SGQ_MASK));
+                               ND_PRINT("oack %u ", ack & SGQ_MASK);
                        }
                    }
                }
                break;
            case MFS_IACK:
                        }
                    }
                }
                break;
            case MFS_IACK:
-               ND_PRINT((ndo, "ils-ack %u>%u ", src, dst));
+               ND_PRINT("ils-ack %u>%u ", src, dst);
                {
                    const struct ackmsg *amp = (const struct ackmsg *)nspp;
                    u_int ack;
 
                    if (nsplen < sizeof(struct ackmsg))
                {
                    const struct ackmsg *amp = (const struct ackmsg *)nspp;
                    u_int ack;
 
                    if (nsplen < sizeof(struct ackmsg))
-                       goto trunc;
-                   ND_TCHECK(*amp);
-                   ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
+                       goto invalid;
+                   ND_TCHECK_SIZE(amp);
+                   ack = GET_LE_U_2(amp->ak_acknum[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
-                           ND_PRINT((ndo, "nak %u ", ack & SGQ_MASK));
+                           ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                        else
-                           ND_PRINT((ndo, "ack %u ", ack & SGQ_MASK));
-                       ND_TCHECK(amp->ak_acknum[1]);
-                       ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
+                           ND_PRINT("ack %u ", ack & SGQ_MASK);
+                       ack = GET_LE_U_2(amp->ak_acknum[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
-                               ND_PRINT((ndo, "nakdat %u ", ack & SGQ_MASK));
+                               ND_PRINT("nakdat %u ", ack & SGQ_MASK);
                            else
                            else
-                               ND_PRINT((ndo, "ackdat %u ", ack & SGQ_MASK));
+                               ND_PRINT("ackdat %u ", ack & SGQ_MASK);
                        }
                    }
                }
                break;
            case MFS_CACK:
                        }
                    }
                }
                break;
            case MFS_CACK:
-               ND_PRINT((ndo, "conn-ack %u", dst));
+               ND_PRINT("conn-ack %u", dst);
                break;
            default:
                break;
            default:
-               ND_PRINT((ndo, "reserved-acktype? %x %u > %u", flags, src, dst));
+               ND_PRINT("reserved-acktype? %x %u > %u", flags, src, dst);
                break;
            }
            break;
                break;
            }
            break;
@@ -1072,136 +1014,132 @@ print_nsp(netdissect_options *ndo,
            case MFS_CI:
            case MFS_RCI:
                if ((flags & NSP_SUBMASK) == MFS_CI)
            case MFS_CI:
            case MFS_RCI:
                if ((flags & NSP_SUBMASK) == MFS_CI)
-                   ND_PRINT((ndo, "conn-initiate "));
+                   ND_PRINT("conn-initiate ");
                else
                else
-                   ND_PRINT((ndo, "retrans-conn-initiate "));
-               ND_PRINT((ndo, "%u>%u ", src, dst));
+                   ND_PRINT("retrans-conn-initiate ");
+               ND_PRINT("%u>%u ", src, dst);
                {
                    const struct cimsg *cimp = (const struct cimsg *)nspp;
                    u_int services, info, segsize;
 
                    if (nsplen < sizeof(struct cimsg))
                {
                    const struct cimsg *cimp = (const struct cimsg *)nspp;
                    u_int services, info, segsize;
 
                    if (nsplen < sizeof(struct cimsg))
-                       goto trunc;
-                   ND_TCHECK(*cimp);
-                   services = EXTRACT_U_1(cimp->ci_services);
-                   info = EXTRACT_U_1(cimp->ci_info);
-                   segsize = EXTRACT_LE_U_2(cimp->ci_segsize);
+                       goto invalid;
+                   services = GET_U_1(cimp->ci_services);
+                   info = GET_U_1(cimp->ci_info);
+                   segsize = GET_LE_U_2(cimp->ci_segsize);
 
                    switch (services & COS_MASK) {
                    case COS_NONE:
                        break;
                    case COS_SEGMENT:
 
                    switch (services & COS_MASK) {
                    case COS_NONE:
                        break;
                    case COS_SEGMENT:
-                       ND_PRINT((ndo, "seg "));
+                       ND_PRINT("seg ");
                        break;
                    case COS_MESSAGE:
                        break;
                    case COS_MESSAGE:
-                       ND_PRINT((ndo, "msg "));
+                       ND_PRINT("msg ");
                        break;
                    }
                    switch (info & COI_MASK) {
                    case COI_32:
                        break;
                    }
                    switch (info & COI_MASK) {
                    case COI_32:
-                       ND_PRINT((ndo, "ver 3.2 "));
+                       ND_PRINT("ver 3.2 ");
                        break;
                    case COI_31:
                        break;
                    case COI_31:
-                       ND_PRINT((ndo, "ver 3.1 "));
+                       ND_PRINT("ver 3.1 ");
                        break;
                    case COI_40:
                        break;
                    case COI_40:
-                       ND_PRINT((ndo, "ver 4.0 "));
+                       ND_PRINT("ver 4.0 ");
                        break;
                    case COI_41:
                        break;
                    case COI_41:
-                       ND_PRINT((ndo, "ver 4.1 "));
+                       ND_PRINT("ver 4.1 ");
                        break;
                    }
                        break;
                    }
-                   ND_PRINT((ndo, "segsize %u ", segsize));
+                   ND_PRINT("segsize %u ", segsize);
                }
                break;
            case MFS_CC:
                }
                break;
            case MFS_CC:
-               ND_PRINT((ndo, "conn-confirm %u>%u ", src, dst));
+               ND_PRINT("conn-confirm %u>%u ", src, dst);
                {
                    const struct ccmsg *ccmp = (const struct ccmsg *)nspp;
                    u_int services, info;
                    u_int segsize, optlen;
 
                    if (nsplen < sizeof(struct ccmsg))
                {
                    const struct ccmsg *ccmp = (const struct ccmsg *)nspp;
                    u_int services, info;
                    u_int segsize, optlen;
 
                    if (nsplen < sizeof(struct ccmsg))
-                       goto trunc;
-                   ND_TCHECK(*ccmp);
-                   services = EXTRACT_U_1(ccmp->cc_services);
-                   info = EXTRACT_U_1(ccmp->cc_info);
-                   segsize = EXTRACT_LE_U_2(ccmp->cc_segsize);
-                   optlen = EXTRACT_U_1(ccmp->cc_optlen);
+                       goto invalid;
+                   services = GET_U_1(ccmp->cc_services);
+                   info = GET_U_1(ccmp->cc_info);
+                   segsize = GET_LE_U_2(ccmp->cc_segsize);
+                   optlen = GET_U_1(ccmp->cc_optlen);
 
                    switch (services & COS_MASK) {
                    case COS_NONE:
                        break;
                    case COS_SEGMENT:
 
                    switch (services & COS_MASK) {
                    case COS_NONE:
                        break;
                    case COS_SEGMENT:
-                       ND_PRINT((ndo, "seg "));
+                       ND_PRINT("seg ");
                        break;
                    case COS_MESSAGE:
                        break;
                    case COS_MESSAGE:
-                       ND_PRINT((ndo, "msg "));
+                       ND_PRINT("msg ");
                        break;
                    }
                    switch (info & COI_MASK) {
                    case COI_32:
                        break;
                    }
                    switch (info & COI_MASK) {
                    case COI_32:
-                       ND_PRINT((ndo, "ver 3.2 "));
+                       ND_PRINT("ver 3.2 ");
                        break;
                    case COI_31:
                        break;
                    case COI_31:
-                       ND_PRINT((ndo, "ver 3.1 "));
+                       ND_PRINT("ver 3.1 ");
                        break;
                    case COI_40:
                        break;
                    case COI_40:
-                       ND_PRINT((ndo, "ver 4.0 "));
+                       ND_PRINT("ver 4.0 ");
                        break;
                    case COI_41:
                        break;
                    case COI_41:
-                       ND_PRINT((ndo, "ver 4.1 "));
+                       ND_PRINT("ver 4.1 ");
                        break;
                    }
                        break;
                    }
-                   ND_PRINT((ndo, "segsize %u ", segsize));
+                   ND_PRINT("segsize %u ", segsize);
                    if (optlen) {
                    if (optlen) {
-                       ND_PRINT((ndo, "optlen %u ", optlen));
+                       ND_PRINT("optlen %u ", optlen);
                    }
                }
                break;
            case MFS_DI:
                    }
                }
                break;
            case MFS_DI:
-               ND_PRINT((ndo, "disconn-initiate %u>%u ", src, dst));
+               ND_PRINT("disconn-initiate %u>%u ", src, dst);
                {
                    const struct dimsg *dimp = (const struct dimsg *)nspp;
                    u_int reason;
                    u_int optlen;
 
                    if (nsplen < sizeof(struct dimsg))
                {
                    const struct dimsg *dimp = (const struct dimsg *)nspp;
                    u_int reason;
                    u_int optlen;
 
                    if (nsplen < sizeof(struct dimsg))
-                       goto trunc;
-                   ND_TCHECK(*dimp);
-                   reason = EXTRACT_LE_U_2(dimp->di_reason);
-                   optlen = EXTRACT_U_1(dimp->di_optlen);
+                       goto invalid;
+                   reason = GET_LE_U_2(dimp->di_reason);
+                   optlen = GET_U_1(dimp->di_optlen);
 
                    print_reason(ndo, reason);
                    if (optlen) {
 
                    print_reason(ndo, reason);
                    if (optlen) {
-                       ND_PRINT((ndo, "optlen %u ", optlen));
+                       ND_PRINT("optlen %u ", optlen);
                    }
                }
                break;
            case MFS_DC:
                    }
                }
                break;
            case MFS_DC:
-               ND_PRINT((ndo, "disconn-confirm %u>%u ", src, dst));
+               ND_PRINT("disconn-confirm %u>%u ", src, dst);
                {
                    const struct dcmsg *dcmp = (const struct dcmsg *)nspp;
                    u_int reason;
 
                {
                    const struct dcmsg *dcmp = (const struct dcmsg *)nspp;
                    u_int reason;
 
-                   ND_TCHECK(*dcmp);
-                   reason = EXTRACT_LE_U_2(dcmp->dc_reason);
+                   reason = GET_LE_U_2(dcmp->dc_reason);
 
                    print_reason(ndo, reason);
                }
                break;
            default:
 
                    print_reason(ndo, reason);
                }
                break;
            default:
-               ND_PRINT((ndo, "reserved-ctltype? %x %u > %u", flags, src, dst));
+               ND_PRINT("reserved-ctltype? %x %u > %u", flags, src, dst);
                break;
            }
            break;
        default:
                break;
            }
            break;
        default:
-           ND_PRINT((ndo, "reserved-type? %x %u > %u", flags, src, dst));
+           ND_PRINT("reserved-type? %x %u > %u", flags, src, dst);
            break;
        }
        return (1);
 
            break;
        }
        return (1);
 
-trunc:
+invalid:
        return (0);
 }
 
        return (0);
 }
 
@@ -1235,7 +1173,7 @@ static void
 print_reason(netdissect_options *ndo,
              u_int reason)
 {
 print_reason(netdissect_options *ndo,
              u_int reason)
 {
-       ND_PRINT((ndo, "%s ", tok2str(reason2str, "reason-%u", reason)));
+       ND_PRINT("%s ", tok2str(reason2str, "reason-%u", reason));
 }
 
 const char *
 }
 
 const char *
@@ -1246,28 +1184,10 @@ dnnum_string(netdissect_options *ndo, u_short dnaddr)
        u_int area = (u_short)(dnaddr & AREAMASK) >> AREASHIFT;
        u_int node = dnaddr & NODEMASK;
 
        u_int area = (u_short)(dnaddr & AREAMASK) >> AREASHIFT;
        u_int node = dnaddr & NODEMASK;
 
+       /* malloc() return used by the 'dnaddrtable' hash table: do not free() */
        str = (char *)malloc(siz = sizeof("00.0000"));
        if (str == NULL)
        str = (char *)malloc(siz = sizeof("00.0000"));
        if (str == NULL)
-               (*ndo->ndo_error)(ndo, "dnnum_string: malloc");
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: malloc", __func__);
        snprintf(str, siz, "%u.%u", area, node);
        return(str);
 }
        snprintf(str, siz, "%u.%u", area, node);
        return(str);
 }
-
-const char *
-dnname_string(netdissect_options *ndo, u_short dnaddr)
-{
-#ifdef HAVE_DNET_HTOA
-       struct dn_naddr dna;
-       char *dnname;
-
-       dna.a_len = sizeof(short);
-       memcpy((char *)dna.a_addr, (char *)&dnaddr, sizeof(short));
-       dnname = dnet_htoa(&dna);
-       if(dnname != NULL)
-               return (strdup(dnname));
-       else
-               return(dnnum_string(ndo, dnaddr));
-#else
-       return(dnnum_string(ndo, dnaddr));      /* punt */
-#endif
-}
[mirror] the TCPdump network dissector