]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-decnet.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Again, we don't replace vfprintf().
[tcpdump] / print-decnet.c
diff --git a/print-decnet.c b/print-decnet.c
index b1f538cb564c7ed1d1700d5d047947807e5e7a45..8aa63e8f60ba41e43683863ffb6b2c581dc10bb2 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -22,10 +22,10 @@
 /* \summary: DECnet printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: DECnet printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -511,18 +511,18 @@ decnet_print(netdissect_options *ndo,
        const u_char *nspp;
 
        if (length < sizeof(struct shorthdr)) {
        const u_char *nspp;
 
        if (length < sizeof(struct shorthdr)) {
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
                return;
        }
 
        ND_TCHECK_LEN(ap, sizeof(short));
        pktlen = EXTRACT_LE_U_2(ap);
        if (pktlen < sizeof(struct shorthdr)) {
                return;
        }
 
        ND_TCHECK_LEN(ap, sizeof(short));
        pktlen = EXTRACT_LE_U_2(ap);
        if (pktlen < sizeof(struct shorthdr)) {
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
                return;
        }
        if (pktlen > length) {
                return;
        }
        if (pktlen > length) {
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
                return;
        }
        length = pktlen;
                return;
        }
        length = pktlen;
@@ -535,9 +535,9 @@ decnet_print(netdissect_options *ndo,
            /* pad bytes of some sort in front of message */
            u_int padlen = mflags & RMF_PADMASK;
            if (ndo->ndo_vflag)
            /* 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));
+               ND_PRINT("%s", tstr);
                return;
            }
            ND_TCHECK_LEN(ap + sizeof(short), padlen);
                return;
            }
            ND_TCHECK_LEN(ap + sizeof(short), padlen);
@@ -550,7 +550,7 @@ decnet_print(netdissect_options *ndo,
        }
 
        if (mflags & RMF_FVER) {
        }
 
        if (mflags & RMF_FVER) {
-               ND_PRINT((ndo, "future-version-decnet"));
+               ND_PRINT("future-version-decnet");
                ND_DEFAULTPRINT(ap, min(length, caplen));
                return;
        }
                ND_DEFAULTPRINT(ap, min(length, caplen));
                return;
        }
@@ -565,7 +565,7 @@ decnet_print(netdissect_options *ndo,
        switch (mflags & RMF_MASK) {
        case RMF_LONG:
            if (length < sizeof(struct longhdr)) {
        switch (mflags & RMF_MASK) {
        case RMF_LONG:
            if (length < sizeof(struct longhdr)) {
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
                return;
            }
            ND_TCHECK(rhp->rh_long);
                return;
            }
            ND_TCHECK(rhp->rh_long);
@@ -586,21 +586,21 @@ decnet_print(netdissect_options *ndo,
            nsplen = length - sizeof(struct shorthdr);
            break;
        default:
            nsplen = length - sizeof(struct shorthdr);
            break;
        default:
-           ND_PRINT((ndo, "unknown message flags under mask"));
+           ND_PRINT("unknown message flags under mask");
            ND_DEFAULTPRINT((const u_char *)ap, min(length, caplen));
            return;
        }
 
            ND_DEFAULTPRINT((const u_char *)ap, min(length, caplen));
            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))
@@ -608,7 +608,7 @@ decnet_print(netdissect_options *ndo,
        return;
 
 trunc:
        return;
 
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       ND_PRINT("%s", tstr);
        return;
 }
 
        return;
 }
 
@@ -628,7 +628,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
 
        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))
                goto trunc;
            ND_TCHECK(cmp->cm_init);
            if (length < sizeof(struct initmsg))
                goto trunc;
            ND_TCHECK(cmp->cm_init);
@@ -640,54 +640,53 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ueco = EXTRACT_U_1(cmp->cm_init.in_ueco);
            hello = EXTRACT_LE_U_2(cmp->cm_init.in_hello);
            print_t_info(ndo, info);
            ueco = EXTRACT_U_1(cmp->cm_init.in_ueco);
            hello = EXTRACT_LE_U_2(cmp->cm_init.in_hello);
            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));
+                       hello);
            ret = 1;
            break;
        case RMF_VER:
            ret = 1;
            break;
        case RMF_VER:
-           ND_PRINT((ndo, "verification "));
+           ND_PRINT("verification ");
            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);
            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));
+           ND_PRINT("src %s fcnval %o", dnaddr_string(ndo, src), other);
            ret = 1;
            break;
        case RMF_TEST:
            ret = 1;
            break;
        case RMF_TEST:
-           ND_PRINT((ndo, "test "));
+           ND_PRINT("test ");
            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);
            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));
+           ND_PRINT("src %s data %o", dnaddr_string(ndo, src), other);
            ret = 1;
            break;
        case RMF_L1ROUT:
            ret = 1;
            break;
        case RMF_L1ROUT:
-           ND_PRINT((ndo, "lev-1-routing "));
+           ND_PRINT("lev-1-routing ");
            if (length < sizeof(struct l1rout))
                goto trunc;
            ND_TCHECK(cmp->cm_l1rou);
            src = EXTRACT_LE_U_2(cmp->cm_l1rou.r1_src);
            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)));
+           ND_PRINT("src %s ", dnaddr_string(ndo, src));
            ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),
                                length - sizeof(struct l1rout));
            break;
        case RMF_L2ROUT:
            ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),
                                length - sizeof(struct l1rout));
            break;
        case RMF_L2ROUT:
-           ND_PRINT((ndo, "lev-2-routing "));
+           ND_PRINT("lev-2-routing ");
            if (length < sizeof(struct l2rout))
                goto trunc;
            ND_TCHECK(cmp->cm_l2rout);
            src = EXTRACT_LE_U_2(cmp->cm_l2rout.r2_src);
            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)));
+           ND_PRINT("src %s ", dnaddr_string(ndo, src));
            ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),
                                length - sizeof(struct l2rout));
            break;
        case RMF_RHELLO:
            ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),
                                length - sizeof(struct l2rout));
            break;
        case RMF_RHELLO:
-           ND_PRINT((ndo, "router-hello "));
+           ND_PRINT("router-hello ");
            if (length < sizeof(struct rhellomsg))
                goto trunc;
            ND_TCHECK(cmp->cm_rhello);
            if (length < sizeof(struct rhellomsg))
                goto trunc;
            ND_TCHECK(cmp->cm_rhello);
@@ -702,15 +701,14 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            priority = EXTRACT_U_1(cmp->cm_rhello.rh_priority);
            hello = EXTRACT_LE_U_2(cmp->cm_rhello.rh_hello);
            print_i_info(ndo, info);
            priority = EXTRACT_U_1(cmp->cm_rhello.rh_priority);
            hello = EXTRACT_LE_U_2(cmp->cm_rhello.rh_hello);
            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));
+                       blksize, priority, hello);
            ret = print_elist(&(rhpx[sizeof(struct rhellomsg)]),
                                length - sizeof(struct rhellomsg));
            break;
        case RMF_EHELLO:
            ret = print_elist(&(rhpx[sizeof(struct rhellomsg)]),
                                length - sizeof(struct rhellomsg));
            break;
        case RMF_EHELLO:
-           ND_PRINT((ndo, "endnode-hello "));
+           ND_PRINT("endnode-hello ");
            if (length < sizeof(struct ehellomsg))
                goto trunc;
            ND_TCHECK(cmp->cm_ehello);
            if (length < sizeof(struct ehellomsg))
                goto trunc;
            ND_TCHECK(cmp->cm_ehello);
@@ -729,15 +727,14 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            hello = EXTRACT_LE_U_2(cmp->cm_ehello.eh_hello);
            other = EXTRACT_U_1(cmp->cm_ehello.eh_data);
            print_i_info(ndo, info);
            hello = EXTRACT_LE_U_2(cmp->cm_ehello.eh_hello);
            other = EXTRACT_U_1(cmp->cm_ehello.eh_data);
            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));
+                       blksize, dnaddr_string(ndo, dst), hello, other);
            ret = 1;
            break;
 
        default:
            ret = 1;
            break;
 
        default:
-           ND_PRINT((ndo, "unknown control message"));
+           ND_PRINT("unknown control message");
            ND_DEFAULTPRINT((const u_char *)rhp, min(length, caplen));
            ret = 1;
            break;
            ND_DEFAULTPRINT((const u_char *)rhp, min(length, caplen));
            ret = 1;
            break;
@@ -754,15 +751,15 @@ 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 int
@@ -787,8 +784,8 @@ print_l1_routes(netdissect_options *ndo,
            info = EXTRACT_LE_U_2(rp);
            rp += sizeof(short);
            len -= sizeof(short);
            info = EXTRACT_LE_U_2(rp);
            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);
 
        }
        return (1);
 
@@ -818,8 +815,8 @@ print_l2_routes(netdissect_options *ndo,
            info = EXTRACT_LE_U_2(rp);
            rp += sizeof(short);
            len -= sizeof(short);
            info = EXTRACT_LE_U_2(rp);
            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);
 
        }
        return (1);
 
@@ -833,17 +830,17 @@ 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
 }
 
 static int
@@ -874,7 +871,7 @@ 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;
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    u_int ack;
@@ -886,9 +883,9 @@ print_nsp(netdissect_options *ndo,
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    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)
                            goto trunc;
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                            goto trunc;
@@ -896,9 +893,9 @@ print_nsp(netdissect_options *ndo,
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        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)
                                goto trunc;
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                                goto trunc;
@@ -906,11 +903,11 @@ print_nsp(netdissect_options *ndo,
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                            ack = EXTRACT_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;
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    u_int ack;
@@ -922,9 +919,9 @@ print_nsp(netdissect_options *ndo,
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    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)
                            goto trunc;
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                            goto trunc;
@@ -932,9 +929,9 @@ print_nsp(netdissect_options *ndo,
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        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)
                                goto trunc;
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                                goto trunc;
@@ -942,11 +939,11 @@ print_nsp(netdissect_options *ndo,
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                            ack = EXTRACT_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 =
@@ -960,59 +957,59 @@ print_nsp(netdissect_options *ndo,
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    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);
                        ND_TCHECK(shp->sh_seq[1]);
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ND_TCHECK(shp->sh_seq[1]);
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        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);
                            ND_TCHECK(shp->sh_seq[2]);
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                            ND_TCHECK(shp->sh_seq[2]);
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
-                   ND_PRINT((ndo, "seg %u ", ack & SGQ_MASK));
+                   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);
                    switch (lsflags & LSI_MASK) {
                    case LSI_DATA:
                    ND_TCHECK_SIZE(lsmp);
                    lsflags = EXTRACT_U_1(lsmp->ls_lsflags);
                    fcval = EXTRACT_U_1(lsmp->ls_fcval);
                    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;
                {
                    const struct ackmsg *amp = (const struct ackmsg *)nspp;
                    u_int ack;
@@ -1023,21 +1020,21 @@ print_nsp(netdissect_options *ndo,
                    ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
                    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);
                        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
                        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;
                {
                    const struct ackmsg *amp = (const struct ackmsg *)nspp;
                    u_int ack;
@@ -1048,25 +1045,25 @@ print_nsp(netdissect_options *ndo,
                    ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
                    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);
                        ND_TCHECK(amp->ak_acknum[1]);
                        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ND_TCHECK(amp->ak_acknum[1]);
                        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
                        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;
@@ -1075,10 +1072,10 @@ 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;
                {
                    const struct cimsg *cimp = (const struct cimsg *)nspp;
                    u_int services, info, segsize;
@@ -1094,31 +1091,31 @@ print_nsp(netdissect_options *ndo,
                    case COS_NONE:
                        break;
                    case COS_SEGMENT:
                    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;
                {
                    const struct ccmsg *ccmp = (const struct ccmsg *)nspp;
                    u_int services, info;
@@ -1136,34 +1133,34 @@ print_nsp(netdissect_options *ndo,
                    case COS_NONE:
                        break;
                    case COS_SEGMENT:
                    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;
                {
                    const struct dimsg *dimp = (const struct dimsg *)nspp;
                    u_int reason;
@@ -1177,12 +1174,12 @@ print_nsp(netdissect_options *ndo,
 
                    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;
@@ -1194,12 +1191,12 @@ print_nsp(netdissect_options *ndo,
                }
                break;
            default:
                }
                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);
@@ -1238,7 +1235,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 *
[mirror] the TCPdump network dissector