Update .gitignore for other configurations

[tcpdump] / print-wb.c

diff --git a/print-wb.c b/print-wb.c
index 3eb0626499754237f7290e356aab3a7ebc412189..b27104916aa6014805dbcb7632bbc533e7872d79 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -31,7 +31,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = "[|wb]";
 
 /* XXX need to add byte-swapping macros! */
 /* XXX - you mean like the ones in "extract.h"? */
@@ -193,10 +192,10 @@ wb_id(netdissect_options *ndo,
 
        ND_PRINT(" %u/%s:%u (max %u/%s:%u) ",
               EXTRACT_BE_U_4(id->pi_ps.slot),
-              ipaddr_string(ndo, &id->pi_ps.page.p_sid),
+              ipaddr_string(ndo, id->pi_ps.page.p_sid),
               EXTRACT_BE_U_4(id->pi_ps.page.p_uid),
               EXTRACT_BE_U_4(id->pi_mslot),
-              ipaddr_string(ndo, &id->pi_mpage.p_sid),
+              ipaddr_string(ndo, id->pi_mpage.p_sid),
               EXTRACT_BE_U_4(id->pi_mpage.p_uid));
 
        nid = EXTRACT_BE_U_2(id->pi_ps.nid);
@@ -205,14 +204,14 @@ wb_id(netdissect_options *ndo,
        cp = (const char *)(io + nid);
        if (ND_TTEST_LEN(cp, len)) {
                ND_PRINT("\"");
-               fn_print(ndo, (const u_char *)cp, (const u_char *)cp + len);
+               nd_print(ndo, (const u_char *)cp, (const u_char *)cp + len);
                ND_PRINT("\"");
        }
 
        c = '<';
        for (i = 0; i < nid && ND_TTEST_SIZE(io); ++io, ++i) {
                ND_PRINT("%c%s:%u",
-                   c, ipaddr_string(ndo, &io->id), EXTRACT_BE_U_4(io->off));
+                   c, ipaddr_string(ndo, io->id), EXTRACT_BE_U_4(io->off));
                c = ',';
        }
        if (i >= nid) {
@@ -231,8 +230,8 @@ wb_rreq(netdissect_options *ndo,
                return (-1);
 
        ND_PRINT(" please repair %s %s:%u<%u:%u>",
-              ipaddr_string(ndo, &rreq->pr_id),
-              ipaddr_string(ndo, &rreq->pr_page.p_sid),
+              ipaddr_string(ndo, rreq->pr_id),
+              ipaddr_string(ndo, rreq->pr_page.p_sid),
               EXTRACT_BE_U_4(rreq->pr_page.p_uid),
               EXTRACT_BE_U_4(rreq->pr_sseq),
               EXTRACT_BE_U_4(rreq->pr_eseq));
@@ -249,7 +248,7 @@ wb_preq(netdissect_options *ndo,
 
        ND_PRINT(" need %u/%s:%u",
               EXTRACT_BE_U_4(preq->pp_low),
-              ipaddr_string(ndo, &preq->pp_page.p_sid),
+              ipaddr_string(ndo, preq->pp_page.p_sid),
               EXTRACT_BE_U_4(preq->pp_page.p_uid));
        return (0);
 }
@@ -273,11 +272,11 @@ wb_prep(netdissect_options *ndo,
 
                ND_PRINT(" %u/%s:%u",
                    EXTRACT_BE_U_4(ps->slot),
-                   ipaddr_string(ndo, &ps->page.p_sid),
+                   ipaddr_string(ndo, ps->page.p_sid),
                    EXTRACT_BE_U_4(ps->page.p_uid));
                io = (const struct id_off *)(ps + 1);
                for (ie = io + EXTRACT_U_1(ps->nid); io < ie && ND_TTEST_SIZE(io); ++io) {
-                       ND_PRINT("%c%s:%u", c, ipaddr_string(ndo, &io->id),
+                       ND_PRINT("%c%s:%u", c, ipaddr_string(ndo, io->id),
                            EXTRACT_BE_U_4(io->off));
                        c = ',';
                }
@@ -319,7 +318,7 @@ wb_dops(netdissect_options *ndo, const struct pkt_dop *dop,
                u_int t;
 
                if (!ND_TTEST_SIZE(dh)) {
-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);
                        break;
                }
                t = EXTRACT_U_1(dh->dh_type);
@@ -357,8 +356,8 @@ wb_rrep(netdissect_options *ndo,
        len -= sizeof(*rrep);
 
        ND_PRINT(" for %s %s:%u<%u:%u>",
-           ipaddr_string(ndo, &rrep->pr_id),
-           ipaddr_string(ndo, &dop->pd_page.p_sid),
+           ipaddr_string(ndo, rrep->pr_id),
+           ipaddr_string(ndo, dop->pd_page.p_sid),
            EXTRACT_BE_U_4(dop->pd_page.p_uid),
            EXTRACT_BE_U_4(dop->pd_sseq),
            EXTRACT_BE_U_4(dop->pd_eseq));
@@ -380,7 +379,7 @@ wb_drawop(netdissect_options *ndo,
        len -= sizeof(*dop);
 
        ND_PRINT(" %s:%u<%u:%u>",
-           ipaddr_string(ndo, &dop->pd_page.p_sid),
+           ipaddr_string(ndo, dop->pd_page.p_sid),
            EXTRACT_BE_U_4(dop->pd_page.p_uid),
            EXTRACT_BE_U_4(dop->pd_sseq),
            EXTRACT_BE_U_4(dop->pd_eseq));
@@ -402,9 +401,10 @@ wb_print(netdissect_options *ndo,
        const struct pkt_hdr *ph;
        uint8_t type;
 
+       ndo->ndo_protocol = "wb";
        ph = (const struct pkt_hdr *)hdr;
        if (len < sizeof(*ph) || !ND_TTEST_SIZE(ph)) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
        len -= sizeof(*ph);
@@ -421,37 +421,37 @@ wb_print(netdissect_options *ndo,
        case PT_ID:
                if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_RREQ:
                if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_RREP:
                if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_DRAWOP:
                if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_PREQ:
                if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        case PT_PREP:
                if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0)
                        return;
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                break;
 
        default: