]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-decnet.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
the failed/passed count was not kept in the right place
[tcpdump] / print-decnet.c
diff --git a/print-decnet.c b/print-decnet.c
index 06985d0d5147d0a98623da9472bb855e5ea0de66..31166e3f31df60d09924d7563a332da562642760 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -502,7 +502,8 @@ 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;
 
@@ -513,7 +514,7 @@ decnet_print(netdissect_options *ndo,
        }
 
        ND_TCHECK_LEN(ap, sizeof(short));
-       pktlen = EXTRACT_LE_U_2(ap);
+       pktlen = GET_LE_U_2(ap);
        if (pktlen < sizeof(struct shorthdr)) {
                nd_print_trunc(ndo);
                return;
@@ -526,7 +527,7 @@ decnet_print(netdissect_options *ndo,
 
        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 */
@@ -543,7 +544,7 @@ decnet_print(netdissect_options *ndo,
            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) {
@@ -567,18 +568,18 @@ decnet_print(netdissect_options *ndo,
            }
            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;
@@ -615,9 +616,10 @@ 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;
+       uint16_t src, dst;
+       u_int info, blksize, eco, ueco, hello, other, vers;
        u_int priority;
        const u_char *rhpx = (const u_char *)rhp;
        int ret;
@@ -628,13 +630,13 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            if (length < sizeof(struct initmsg))
                goto trunc;
            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,
@@ -646,8 +648,8 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            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);
+           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;
@@ -656,8 +658,8 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            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);
+           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;
@@ -666,7 +668,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            if (length < sizeof(struct l1rout))
                goto trunc;
            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)]),
                                length - sizeof(struct l1rout));
@@ -676,7 +678,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            if (length < sizeof(struct l2rout))
                goto trunc;
            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)]),
                                length - sizeof(struct l2rout));
@@ -686,15 +688,15 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            if (length < sizeof(struct rhellomsg))
                goto trunc;
            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);
+           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 =
-               EXTRACT_LE_U_2(cmp->cm_rhello.rh_src.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);
+               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),
@@ -707,18 +709,18 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            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);
+           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 =
-               EXTRACT_LE_U_2(cmp->cm_ehello.eh_src.dne_remote.dne_nodeaddr);
-           info = EXTRACT_U_1(cmp->cm_ehello.eh_info);
-           blksize = EXTRACT_LE_U_2(cmp->cm_ehello.eh_blksize);
+               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*/
            dst =
-               EXTRACT_LE_U_2(cmp->cm_ehello.eh_router.dne_remote.dne_nodeaddr);
-           hello = EXTRACT_LE_U_2(cmp->cm_ehello.eh_hello);
-           other = EXTRACT_U_1(cmp->cm_ehello.eh_data);
+               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),
@@ -766,15 +768,15 @@ 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 */
            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,
@@ -797,15 +799,15 @@ 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 */
            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,
@@ -853,9 +855,9 @@ print_nsp(netdissect_options *ndo,
        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);
+       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:
@@ -873,7 +875,7 @@ print_nsp(netdissect_options *ndo,
                    if (nsplen < data_off)
                        goto trunc;
                    ND_TCHECK_2(shp->sh_seq[0]);
-                   ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
+                   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);
@@ -883,7 +885,7 @@ print_nsp(netdissect_options *ndo,
                        if (nsplen < data_off)
                            goto trunc;
                        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) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                                ND_PRINT("onak %u ", ack & SGQ_MASK);
@@ -893,7 +895,7 @@ print_nsp(netdissect_options *ndo,
                            if (nsplen < data_off)
                                goto trunc;
                            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);
@@ -909,7 +911,7 @@ print_nsp(netdissect_options *ndo,
                    if (nsplen < data_off)
                        goto trunc;
                    ND_TCHECK_2(shp->sh_seq[0]);
-                   ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
+                   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);
@@ -919,7 +921,7 @@ print_nsp(netdissect_options *ndo,
                        if (nsplen < data_off)
                            goto trunc;
                        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);
@@ -929,7 +931,7 @@ print_nsp(netdissect_options *ndo,
                            if (nsplen < data_off)
                                goto trunc;
                            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);
@@ -947,27 +949,27 @@ print_nsp(netdissect_options *ndo,
                    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]);
+                   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);
@@ -1010,13 +1012,13 @@ print_nsp(netdissect_options *ndo,
                    if (nsplen < sizeof(struct ackmsg))
                        goto trunc;
                    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);
@@ -1035,14 +1037,14 @@ print_nsp(netdissect_options *ndo,
                    if (nsplen < sizeof(struct ackmsg))
                        goto trunc;
                    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);
@@ -1076,9 +1078,9 @@ print_nsp(netdissect_options *ndo,
                    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);
+                   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:
@@ -1117,10 +1119,10 @@ print_nsp(netdissect_options *ndo,
                    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);
+                   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:
@@ -1162,8 +1164,8 @@ print_nsp(netdissect_options *ndo,
                    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);
+                   reason = GET_LE_U_2(dimp->di_reason);
+                   optlen = GET_U_1(dimp->di_optlen);
 
                    print_reason(ndo, reason);
                    if (optlen) {
@@ -1178,7 +1180,7 @@ print_nsp(netdissect_options *ndo,
                    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);
                }
@@ -1243,7 +1245,7 @@ dnnum_string(netdissect_options *ndo, u_short dnaddr)
        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);
+       snprintf(str, siz, "%u.%u", area, node);
        return(str);
 }
 
[mirror] the TCPdump network dissector