X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/546558eabd81cfc36a81a4df728fdfea0d83b41a..HEAD:/print-decnet.c diff --git a/print-decnet.c b/print-decnet.c index 6f68feb8..989776b4 100644 --- a/print-decnet.c +++ b/print-decnet.c @@ -20,41 +20,27 @@ */ /* \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 -#endif #include "netdissect-stdinc.h" #include #include -#include - -#ifdef HAVE_DNET_HTOA - #ifdef HAVE_NETDNET_DN_H - #include - #endif - #ifndef HAVE_STRUCT_DN_NADDR -#define DN_MAXADDL 20 /* max size of DECnet address */ -struct dn_naddr { - unsigned short a_len; /* length of address */ - unsigned char a_addr[DN_MAXADDL]; /* address as bytes */ -}; - #endif /* HAVE_STRUCT_DN_NADDR */ - #ifdef HAVE_NETDNET_DNETDB_H - #include - #endif - #ifndef NETDNET_DNETDB_H_DECLARES_DNET_HTOA - extern char *dnet_htoa(struct dn_naddr *); - #endif -#endif +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" #include "addrtoname.h" -static const char tstr[] = "[|decnet]"; #ifndef _WIN32 typedef nd_uint8_t byte; /* single byte field */ @@ -72,7 +58,7 @@ typedef nd_uint32_t longword; /* 4 bytes field */ * Definitions for DECNET Phase IV protocol headers */ typedef union { - nd_byte dne_addr[6]; /* full ethernet address */ + nd_mac48 dne_addr; /* full Ethernet address */ struct { nd_byte dne_hiord[4]; /* DECnet HIORD prefix */ nd_byte dne_nodeaddr[2]; /* DECnet node address */ @@ -177,18 +163,6 @@ union routehdr /* * 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 */ @@ -489,10 +463,10 @@ 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); -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 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); @@ -503,31 +477,35 @@ decnet_print(netdissect_options *ndo, { 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; ndo->ndo_protocol = "decnet"; if (length < sizeof(struct shorthdr)) { - ND_PRINT("%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)) { - ND_PRINT("%s", tstr); - return; + ND_PRINT(" (pktlen %u < %zu)", pktlen, sizeof(struct shorthdr)); + goto invalid; } if (pktlen > length) { - ND_PRINT("%s", tstr); - return; + ND_PRINT(" (pktlen %u > %u)", pktlen, length); + goto invalid; } length = pktlen; rhp = (const union routehdr *)(ap + sizeof(short)); - ND_TCHECK_1(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 */ @@ -535,57 +513,55 @@ decnet_print(netdissect_options *ndo, if (ndo->ndo_vflag) ND_PRINT("[pad:%u] ", padlen); if (length < padlen + 2) { - ND_PRINT("%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_1(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) { ND_PRINT("future-version-decnet"); - ND_DEFAULTPRINT(ap, min(length, caplen)); + 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)) - goto trunc; + goto invalid; return; } switch (mflags & RMF_MASK) { case RMF_LONG: if (length < sizeof(struct longhdr)) { - ND_PRINT("%s", tstr); - return; + ND_PRINT(" (length %u < %zu)", length, sizeof(struct longhdr)); + goto invalid; } ND_TCHECK_SIZE(&rhp->rh_long); 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 = - 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: - ND_TCHECK_SIZE(&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: ND_PRINT("unknown message flags under mask"); - ND_DEFAULTPRINT((const u_char *)ap, min(length, caplen)); + ND_DEFAULTPRINT((const u_char *)ap, ND_MIN(length, caplen)); return; } @@ -602,12 +578,11 @@ decnet_print(netdissect_options *ndo, } if (!print_nsp(ndo, nspp, nsplen)) - goto trunc; + goto invalid; return; -trunc: - ND_PRINT("%s", tstr); - return; +invalid: + nd_print_invalid(ndo); } static int @@ -616,130 +591,118 @@ print_decnet_ctlmsg(netdissect_options *ndo, 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; - 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; - const char *rhpx = (const char *)rhp; - int ret; + const u_char *rhpx = (const u_char *)rhp; switch (mflags & RMF_CTLMASK) { case RMF_INIT: ND_PRINT("init "); if (length < sizeof(struct initmsg)) - goto trunc; + goto invalid; ND_TCHECK_SIZE(&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); + 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); ND_PRINT("src %sblksize %u vers %u eco %u ueco %u hello %u", dnaddr_string(ndo, src), blksize, vers, eco, ueco, hello); - ret = 1; break; case RMF_VER: ND_PRINT("verification "); if (length < sizeof(struct verifmsg)) - goto trunc; - ND_TCHECK_SIZE(&cmp->cm_ver); - src = EXTRACT_LE_U_2(cmp->cm_ver.ve_src); - other = EXTRACT_U_1(cmp->cm_ver.ve_fcnval); + 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); - ret = 1; break; case RMF_TEST: ND_PRINT("test "); if (length < sizeof(struct testmsg)) - goto trunc; - ND_TCHECK_SIZE(&cmp->cm_test); - src = EXTRACT_LE_U_2(cmp->cm_test.te_src); - other = EXTRACT_U_1(cmp->cm_test.te_data); + 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); - ret = 1; break; case RMF_L1ROUT: ND_PRINT("lev-1-routing "); if (length < sizeof(struct l1rout)) - goto trunc; + goto invalid; ND_TCHECK_SIZE(&cmp->cm_l1rou); - src = EXTRACT_LE_U_2(cmp->cm_l1rou.r1_src); + src = GET_LE_U_2(cmp->cm_l1rou.r1_src); ND_PRINT("src %s ", dnaddr_string(ndo, src)); - ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]), + print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]), length - sizeof(struct l1rout)); break; case RMF_L2ROUT: ND_PRINT("lev-2-routing "); if (length < sizeof(struct l2rout)) - goto trunc; + goto invalid; ND_TCHECK_SIZE(&cmp->cm_l2rout); - src = EXTRACT_LE_U_2(cmp->cm_l2rout.r2_src); + src = GET_LE_U_2(cmp->cm_l2rout.r2_src); ND_PRINT("src %s ", dnaddr_string(ndo, src)); - ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]), + print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]), length - sizeof(struct l2rout)); break; case RMF_RHELLO: ND_PRINT("router-hello "); if (length < sizeof(struct rhellomsg)) - goto trunc; + goto invalid; ND_TCHECK_SIZE(&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); + 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); ND_PRINT("vers %u eco %u ueco %u src %s blksize %u pri %u hello %u", vers, eco, ueco, dnaddr_string(ndo, src), blksize, priority, hello); - ret = print_elist(&(rhpx[sizeof(struct rhellomsg)]), + print_elist(&(rhpx[sizeof(struct rhellomsg)]), length - sizeof(struct rhellomsg)); break; case RMF_EHELLO: ND_PRINT("endnode-hello "); if (length < sizeof(struct ehellomsg)) - goto trunc; - ND_TCHECK_SIZE(&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*/ - 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); 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), blksize, dnaddr_string(ndo, dst), hello, other); - ret = 1; break; default: ND_PRINT("unknown control message"); - ND_DEFAULTPRINT((const u_char *)rhp, min(length, caplen)); - ret = 1; + ND_DEFAULTPRINT((const u_char *)rhp, ND_MIN(length, caplen)); break; } - return (ret); + return (1); -trunc: +invalid: return (0); } @@ -760,9 +723,9 @@ print_t_info(netdissect_options *ndo, ND_PRINT("blo "); } -static int +static void 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; @@ -771,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)); - count = EXTRACT_LE_U_2(rp); + count = GET_LE_U_2(rp); 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); - id = EXTRACT_LE_U_2(rp); + id = GET_LE_U_2(rp); rp += sizeof(short); len -= sizeof(short); - info = EXTRACT_LE_U_2(rp); + info = GET_LE_U_2(rp); rp += sizeof(short); len -= sizeof(short); 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, - const char *rp, u_int len) + const u_char *rp, u_int len) { u_int count; u_int area; @@ -802,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)); - count = EXTRACT_LE_U_2(rp); + count = GET_LE_U_2(rp); 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); - area = EXTRACT_LE_U_2(rp); + area = GET_LE_U_2(rp); rp += sizeof(short); len -= sizeof(short); - info = EXTRACT_LE_U_2(rp); + info = GET_LE_U_2(rp); rp += sizeof(short); len -= sizeof(short); 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 @@ -841,11 +796,10 @@ print_i_info(netdissect_options *ndo, 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 */ - return (1); } static int @@ -855,12 +809,13 @@ print_nsp(netdissect_options *ndo, const struct nsphdr *nsphp = (const struct nsphdr *)nspp; u_int dst, src, flags; - if (nsplen < sizeof(struct nsphdr)) - goto trunc; - ND_TCHECK_SIZE(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: @@ -876,9 +831,8 @@ print_nsp(netdissect_options *ndo, u_int data_off = sizeof(struct minseghdr); if (nsplen < data_off) - goto trunc; - ND_TCHECK_2(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) ND_PRINT("nak %u ", ack & SGQ_MASK); @@ -886,9 +840,8 @@ print_nsp(netdissect_options *ndo, ND_PRINT("ack %u ", ack & SGQ_MASK); data_off += sizeof(short); if (nsplen < data_off) - goto trunc; - ND_TCHECK_2(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) ND_PRINT("onak %u ", ack & SGQ_MASK); @@ -896,9 +849,8 @@ print_nsp(netdissect_options *ndo, ND_PRINT("oack %u ", ack & SGQ_MASK); data_off += sizeof(short); if (nsplen < data_off) - goto trunc; - ND_TCHECK_2(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("seg %u ", ack & SGQ_MASK); @@ -912,9 +864,8 @@ print_nsp(netdissect_options *ndo, u_int data_off = sizeof(struct minseghdr); if (nsplen < data_off) - goto trunc; - ND_TCHECK_2(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) ND_PRINT("nak %u ", ack & SGQ_MASK); @@ -922,9 +873,8 @@ print_nsp(netdissect_options *ndo, ND_PRINT("ack %u ", ack & SGQ_MASK); data_off += sizeof(short); if (nsplen < data_off) - goto trunc; - ND_TCHECK_2(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) ND_PRINT("nakdat %u ", ack & SGQ_MASK); @@ -932,9 +882,8 @@ print_nsp(netdissect_options *ndo, ND_PRINT("ackdat %u ", ack & SGQ_MASK); data_off += sizeof(short); if (nsplen < data_off) - goto trunc; - ND_TCHECK_2(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("seg %u ", ack & SGQ_MASK); @@ -950,29 +899,25 @@ print_nsp(netdissect_options *ndo, u_int lsflags, fcval; if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg)) - goto trunc; - ND_TCHECK_2(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) ND_PRINT("nak %u ", ack & SGQ_MASK); else ND_PRINT("ack %u ", ack & SGQ_MASK); - ND_TCHECK_2(shp->sh_seq[1]); - ack = EXTRACT_LE_U_2(shp->sh_seq[1]); + ack = GET_LE_U_2(shp->sh_seq[1]); if (ack & SGQ_OACK) { /* ackdat field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) ND_PRINT("nakdat %u ", ack & SGQ_MASK); else ND_PRINT("ackdat %u ", ack & SGQ_MASK); - ND_TCHECK_2(shp->sh_seq[2]); - ack = EXTRACT_LE_U_2(shp->sh_seq[2]); + ack = GET_LE_U_2(shp->sh_seq[2]); } } ND_PRINT("seg %u ", ack & SGQ_MASK); - ND_TCHECK_SIZE(lsmp); - lsflags = EXTRACT_U_1(lsmp->ls_lsflags); - fcval = EXTRACT_U_1(lsmp->ls_fcval); + lsflags = GET_U_1(lsmp->ls_lsflags); + fcval = GET_U_1(lsmp->ls_fcval); switch (lsflags & LSI_MASK) { case LSI_DATA: ND_PRINT("dat seg count %u ", fcval); @@ -1013,15 +958,15 @@ print_nsp(netdissect_options *ndo, u_int ack; if (nsplen < sizeof(struct ackmsg)) - goto trunc; + goto invalid; ND_TCHECK_SIZE(amp); - ack = EXTRACT_LE_U_2(amp->ak_acknum[0]); + ack = GET_LE_U_2(amp->ak_acknum[0]); if (ack & SGQ_ACK) { /* acknum field */ if ((ack & SGQ_NAK) == SGQ_NAK) ND_PRINT("nak %u ", ack & SGQ_MASK); else ND_PRINT("ack %u ", ack & SGQ_MASK); - ack = EXTRACT_LE_U_2(amp->ak_acknum[1]); + ack = GET_LE_U_2(amp->ak_acknum[1]); if (ack & SGQ_OACK) { /* ackoth field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) ND_PRINT("onak %u ", ack & SGQ_MASK); @@ -1038,16 +983,15 @@ print_nsp(netdissect_options *ndo, u_int ack; if (nsplen < sizeof(struct ackmsg)) - goto trunc; + goto invalid; ND_TCHECK_SIZE(amp); - ack = EXTRACT_LE_U_2(amp->ak_acknum[0]); + ack = GET_LE_U_2(amp->ak_acknum[0]); if (ack & SGQ_ACK) { /* acknum field */ if ((ack & SGQ_NAK) == SGQ_NAK) ND_PRINT("nak %u ", ack & SGQ_MASK); else ND_PRINT("ack %u ", ack & SGQ_MASK); - ND_TCHECK_2(amp->ak_acknum[1]); - ack = EXTRACT_LE_U_2(amp->ak_acknum[1]); + ack = GET_LE_U_2(amp->ak_acknum[1]); if (ack & SGQ_OACK) { /* ackdat field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) ND_PRINT("nakdat %u ", ack & SGQ_MASK); @@ -1079,11 +1023,10 @@ print_nsp(netdissect_options *ndo, u_int services, info, segsize; if (nsplen < sizeof(struct cimsg)) - goto trunc; - ND_TCHECK_SIZE(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: @@ -1120,12 +1063,11 @@ print_nsp(netdissect_options *ndo, u_int segsize, optlen; if (nsplen < sizeof(struct ccmsg)) - goto trunc; - ND_TCHECK_SIZE(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: @@ -1165,10 +1107,9 @@ print_nsp(netdissect_options *ndo, u_int optlen; if (nsplen < sizeof(struct dimsg)) - goto trunc; - ND_TCHECK_SIZE(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) { @@ -1182,8 +1123,7 @@ print_nsp(netdissect_options *ndo, const struct dcmsg *dcmp = (const struct dcmsg *)nspp; u_int reason; - ND_TCHECK_SIZE(dcmp); - reason = EXTRACT_LE_U_2(dcmp->dc_reason); + reason = GET_LE_U_2(dcmp->dc_reason); print_reason(ndo, reason); } @@ -1199,7 +1139,7 @@ print_nsp(netdissect_options *ndo, } return (1); -trunc: +invalid: return (0); } @@ -1247,26 +1187,7 @@ dnnum_string(netdissect_options *ndo, u_short dnaddr) /* malloc() return used by the 'dnaddrtable' hash table: do not free() */ str = (char *)malloc(siz = sizeof("00.0000")); if (str == NULL) - (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "dnnum_string: malloc"); - nd_snprintf(str, siz, "%u.%u", area, node); + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: malloc", __func__); + 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 -}