The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / print-wb.c

diff --git a/print-wb.c b/print-wb.c
index 6c6aa3de3a56bf5269ac0eec3baeb93f3b263655..24520e67796d42a8fde267851f3a1baacfe12196 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -19,26 +19,21 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.26 2001-06-27 05:37:19 guy Exp $ (LBL)";
-#endif
+/* \summary: White Board printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-
-#include <stdio.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

+#include "extract.h"
+

 
 /* XXX need to add byte-swapping macros! */
 
 /* XXX need to add byte-swapping macros! */

+/* XXX - you mean like the ones in "extract.h"? */

 
 /*
  * Largest packet size.  Everything should fit within this space.
 
 /*
  * Largest packet size.  Everything should fit within this space.


@@ -51,21 +46,21 @@ static const char rcsid[] =
  * an even multiple of DOP_ALIGN bytes, which must be a power of two.
  */
 #define DOP_ALIGN 4
  * an even multiple of DOP_ALIGN bytes, which must be a power of two.
  */
 #define DOP_ALIGN 4

-#define DOP_ROUNDUP(x) ((((int)(x)) + (DOP_ALIGN - 1)) & ~(DOP_ALIGN - 1))
+#define DOP_ROUNDUP(x) roundup2(x, DOP_ALIGN)

 #define DOP_NEXT(d)\
 #define DOP_NEXT(d)\

-       ((struct dophdr *)((u_char *)(d) + \
-                         DOP_ROUNDUP(ntohs((d)->dh_len) + sizeof(*(d)))))
+       ((const struct dophdr *)((const u_char *)(d) + \
+                               DOP_ROUNDUP(GET_BE_U_2((d)->dh_len) + sizeof(*(d)))))

 
 /*
  * Format of the whiteboard packet header.
  * The transport level header.
  */
 struct pkt_hdr {
 
 /*
  * Format of the whiteboard packet header.
  * The transport level header.
  */
 struct pkt_hdr {

-       u_int32_t ph_src;               /* site id of source */
-       u_int32_t ph_ts;                /* time stamp (for skew computation) */
-       u_short ph_version;     /* version number */
-       u_char ph_type;         /* message type */
-       u_char ph_flags;        /* message flags */
+       nd_uint32_t ph_src;     /* site id of source */
+       nd_uint32_t ph_ts;      /* time stamp (for skew computation) */
+       nd_uint16_t ph_version; /* version number */
+       nd_uint8_t ph_type;     /* message type */
+       nd_uint8_t ph_flags;    /* message flags */

 };
 
 /* Packet types */
 };
 
 /* Packet types */


@@ -86,15 +81,15 @@ struct pkt_hdr {
 #define PF_VIS         0x02    /* only visible ops wanted */
 
 struct PageID {
 #define PF_VIS         0x02    /* only visible ops wanted */
 
 struct PageID {

-       u_int32_t p_sid;                /* session id of initiator */
-       u_int32_t p_uid;                /* page number */
+       nd_uint32_t p_sid;              /* session id of initiator */
+       nd_uint32_t p_uid;              /* page number */

 };
 
 struct dophdr {
 };
 
 struct dophdr {

-       u_int32_t  dh_ts;               /* sender's timestamp */
-       u_short dh_len;         /* body length */
-       u_char  dh_flags;
-       u_char  dh_type;        /* body type */
+       nd_uint32_t     dh_ts;          /* sender's timestamp */
+       nd_uint16_t     dh_len;         /* body length */
+       nd_uint8_t      dh_flags;
+       nd_uint8_t      dh_type;        /* body type */

        /* body follows */
 };
 /*
        /* body follows */
 };
 /*


@@ -121,8 +116,8 @@ struct dophdr {
  */
 struct pkt_dop {
        struct PageID pd_page;  /* page that operations apply to */
  */
 struct pkt_dop {
        struct PageID pd_page;  /* page that operations apply to */

-       u_int32_t       pd_sseq;        /* start sequence number */
-       u_int32_t       pd_eseq;        /* end sequence number */
+       nd_uint32_t     pd_sseq;        /* start sequence number */
+       nd_uint32_t     pd_eseq;        /* end sequence number */

        /* drawing ops follow */
 };
 
        /* drawing ops follow */
 };
 


@@ -130,31 +125,31 @@ struct pkt_dop {
  * A repair request.
  */
 struct pkt_rreq {
  * A repair request.
  */
 struct pkt_rreq {

-        u_int32_t pr_id;           /* source id of drawops to be repaired */
-        struct PageID pr_page;           /* page of drawops */
-        u_int32_t pr_sseq;         /* start seqno */
-        u_int32_t pr_eseq;         /* end seqno */
+        nd_uint32_t pr_id;        /* source id of drawops to be repaired */
+        struct PageID pr_page;    /* page of drawops */
+        nd_uint32_t pr_sseq;      /* start seqno */
+        nd_uint32_t pr_eseq;      /* end seqno */

 };
 
 /*
  * A repair reply.
  */
 struct pkt_rrep {
 };
 
 /*
  * A repair reply.
  */
 struct pkt_rrep {

-       u_int32_t pr_id;        /* original site id of ops  */
+       nd_uint32_t pr_id;      /* original site id of ops  */

        struct pkt_dop pr_dop;
        /* drawing ops follow */
 };
 
 struct id_off {
        struct pkt_dop pr_dop;
        /* drawing ops follow */
 };
 
 struct id_off {

-        u_int32_t id;
-        u_int32_t off;
+        nd_uint32_t id;
+        nd_uint32_t off;

 };
 
 struct pgstate {
 };
 
 struct pgstate {

-       u_int32_t slot;
+       nd_uint32_t slot;

        struct PageID page;
        struct PageID page;

-       u_short nid;
-       u_short rsvd;
+       nd_uint16_t nid;
+       nd_uint16_t rsvd;

         /* seqptr's */
 };
 
         /* seqptr's */
 };
 


@@ -162,7 +157,7 @@ struct pgstate {
  * An announcement packet.
  */
 struct pkt_id {
  * An announcement packet.
  */
 struct pkt_id {

-       u_int32_t pi_mslot;
+       nd_uint32_t pi_mslot;

         struct PageID    pi_mpage;        /* current page */
        struct pgstate pi_ps;
         /* seqptr's */
         struct PageID    pi_mpage;        /* current page */
        struct pgstate pi_ps;
         /* seqptr's */


@@ -171,125 +166,129 @@ struct pkt_id {
 
 struct pkt_preq {
         struct PageID  pp_page;
 
 struct pkt_preq {
         struct PageID  pp_page;

-        u_int32_t  pp_low;
-        u_int32_t  pp_high;
+        nd_uint32_t  pp_low;
+        nd_uint32_t  pp_high;

 };
 
 struct pkt_prep {
 };
 
 struct pkt_prep {

-        u_int32_t  pp_n;           /* size of pageid array */
+        nd_uint32_t  pp_n;           /* size of pageid array */

         /* pgstate's follow */
 };
 
 static int
         /* pgstate's follow */
 };
 
 static int

-wb_id(const struct pkt_id *id, u_int len)
+wb_id(netdissect_options *ndo,
+      const struct pkt_id *id, u_int len)

 {
 {

-       int i;
+       u_int i;

        const char *cp;
        const struct id_off *io;
        char c;
        const char *cp;
        const struct id_off *io;
        char c;

-       int nid;
+       u_int nid;

 
 

-       printf(" wb-id:");
-       if (len < sizeof(*id) || (u_char *)(id + 1) > snapend)
+       ND_PRINT(" wb-id:");
+       if (len < sizeof(*id) || !ND_TTEST_SIZE(id))

                return (-1);
        len -= sizeof(*id);
 
                return (-1);
        len -= sizeof(*id);
 

-       printf(" %u/%s:%u (max %u/%s:%u) ",
-              (u_int32_t)ntohl(id->pi_ps.slot),
-              ipaddr_string(&id->pi_ps.page.p_sid),
-              (u_int32_t)ntohl(id->pi_ps.page.p_uid),
-              (u_int32_t)ntohl(id->pi_mslot),
-              ipaddr_string(&id->pi_mpage.p_sid),
-              (u_int32_t)ntohl(id->pi_mpage.p_uid));
+       ND_PRINT(" %u/%s:%u (max %u/%s:%u) ",
+              GET_BE_U_4(id->pi_ps.slot),
+              ipaddr_string(ndo, id->pi_ps.page.p_sid),
+              GET_BE_U_4(id->pi_ps.page.p_uid),
+              GET_BE_U_4(id->pi_mslot),
+              ipaddr_string(ndo, id->pi_mpage.p_sid),
+              GET_BE_U_4(id->pi_mpage.p_uid));

 
 

-       nid = ntohs(id->pi_ps.nid);
+       nid = GET_BE_U_2(id->pi_ps.nid);

        len -= sizeof(*io) * nid;
        len -= sizeof(*io) * nid;

-       io = (struct id_off *)(id + 1);
-       cp = (char *)(io + nid);
-       if ((u_char *)cp + len <= snapend) {
-               putchar('"');
-               (void)fn_print((u_char *)cp, (u_char *)cp + len);
-               putchar('"');
+       io = (const struct id_off *)(id + 1);
+       cp = (const char *)(io + nid);
+       if (ND_TTEST_LEN(cp, len)) {
+               ND_PRINT("\"");
+               nd_print(ndo, (const u_char *)cp, (const u_char *)cp + len);
+               ND_PRINT("\"");

        }
 
        c = '<';
        }
 
        c = '<';

-       for (i = 0; i < nid && (u_char *)io < snapend; ++io, ++i) {
-               printf("%c%s:%u",
-                   c, ipaddr_string(&io->id), (u_int32_t)ntohl(io->off));
+       for (i = 0; i < nid && ND_TTEST_SIZE(io); ++io, ++i) {
+               ND_PRINT("%c%s:%u",
+                   c, ipaddr_string(ndo, io->id), GET_BE_U_4(io->off));

                c = ',';
        }
        if (i >= nid) {
                c = ',';
        }
        if (i >= nid) {

-               printf(">");
+               ND_PRINT(">");

                return (0);
        }
        return (-1);
 }
 
 static int
                return (0);
        }
        return (-1);
 }
 
 static int

-wb_rreq(const struct pkt_rreq *rreq, u_int len)
+wb_rreq(netdissect_options *ndo,
+        const struct pkt_rreq *rreq, u_int len)

 {
 {

-       printf(" wb-rreq:");
-       if (len < sizeof(*rreq) || (u_char *)(rreq + 1) > snapend)
+       ND_PRINT(" wb-rreq:");
+       if (len < sizeof(*rreq) || !ND_TTEST_SIZE(rreq))

                return (-1);
 
                return (-1);
 

-       printf(" please repair %s %s:%u<%u:%u>",
-              ipaddr_string(&rreq->pr_id),
-              ipaddr_string(&rreq->pr_page.p_sid),
-              (u_int32_t)ntohl(rreq->pr_page.p_uid),
-              (u_int32_t)ntohl(rreq->pr_sseq),
-              (u_int32_t)ntohl(rreq->pr_eseq));
+       ND_PRINT(" please repair %s %s:%u<%u:%u>",
+              ipaddr_string(ndo, rreq->pr_id),
+              ipaddr_string(ndo, rreq->pr_page.p_sid),
+              GET_BE_U_4(rreq->pr_page.p_uid),
+              GET_BE_U_4(rreq->pr_sseq),
+              GET_BE_U_4(rreq->pr_eseq));

        return (0);
 }
 
 static int
        return (0);
 }
 
 static int

-wb_preq(const struct pkt_preq *preq, u_int len)
+wb_preq(netdissect_options *ndo,
+        const struct pkt_preq *preq, u_int len)

 {
 {

-       printf(" wb-preq:");
-       if (len < sizeof(*preq) || (u_char *)(preq + 1) > snapend)
+       ND_PRINT(" wb-preq:");
+       if (len < sizeof(*preq) || !ND_TTEST_SIZE(preq))

                return (-1);
 
                return (-1);
 

-       printf(" need %u/%s:%u",
-              (u_int32_t)ntohl(preq->pp_low),
-              ipaddr_string(&preq->pp_page.p_sid),
-              (u_int32_t)ntohl(preq->pp_page.p_uid));
+       ND_PRINT(" need %u/%s:%u",
+              GET_BE_U_4(preq->pp_low),
+              ipaddr_string(ndo, preq->pp_page.p_sid),
+              GET_BE_U_4(preq->pp_page.p_uid));

        return (0);
 }
 
 static int
        return (0);
 }
 
 static int

-wb_prep(const struct pkt_prep *prep, u_int len)
+wb_prep(netdissect_options *ndo,
+        const struct pkt_prep *prep, u_int len)

 {
 {

-       int n;
+       u_int n;

        const struct pgstate *ps;
        const struct pgstate *ps;

-       const u_char *ep = snapend;
+       const u_char *ep = ndo->ndo_snapend;

 
 

-       printf(" wb-prep:");
-       if (len < sizeof(*prep)) {
+       ND_PRINT(" wb-prep:");
+       if (len < sizeof(*prep) || !ND_TTEST_SIZE(prep))

                return (-1);
                return (-1);

-       }
-       n = ntohl(prep->pp_n);
+       n = GET_BE_U_4(prep->pp_n);

        ps = (const struct pgstate *)(prep + 1);
        ps = (const struct pgstate *)(prep + 1);

-       while (--n >= 0 && (u_char *)ps < ep) {
+       while (n != 0 && ND_TTEST_SIZE(ps)) {

                const struct id_off *io, *ie;
                char c = '<';
 
                const struct id_off *io, *ie;
                char c = '<';
 

-               printf(" %u/%s:%u",
-                   (u_int32_t)ntohl(ps->slot),
-                   ipaddr_string(&ps->page.p_sid),
-                   (u_int32_t)ntohl(ps->page.p_uid));
-               io = (struct id_off *)(ps + 1);
-               for (ie = io + ps->nid; io < ie && (u_char *)io < ep; ++io) {
-                       printf("%c%s:%u", c, ipaddr_string(&io->id),
-                           (u_int32_t)ntohl(io->off));
+               ND_PRINT(" %u/%s:%u",
+                   GET_BE_U_4(ps->slot),
+                   ipaddr_string(ndo, ps->page.p_sid),
+                   GET_BE_U_4(ps->page.p_uid));
+               io = (const struct id_off *)(ps + 1);
+               for (ie = io + GET_U_1(ps->nid); io < ie && ND_TTEST_SIZE(io); ++io) {
+                       ND_PRINT("%c%s:%u", c, ipaddr_string(ndo, io->id),
+                           GET_BE_U_4(io->off));

                        c = ',';
                }
                        c = ',';
                }

-               printf(">");
-               ps = (struct pgstate *)io;
+               ND_PRINT(">");
+               ps = (const struct pgstate *)io;
+               n--;

        }
        }

-       return ((u_char *)ps <= ep? 0 : -1);
+       return ((const u_char *)ps <= ep? 0 : -1);

 }
 
 
 }
 
 

-char *dopstr[] = {
+static const char *dopstr[] = {

        "dop-0!",
        "dop-1!",
        "RECT",
        "dop-0!",
        "dop-1!",
        "RECT",


@@ -309,21 +308,30 @@ char *dopstr[] = {
 };
 
 static int
 };
 
 static int

-wb_dops(const struct dophdr *dh, u_int32_t ss, u_int32_t es)
+wb_dops(netdissect_options *ndo, const struct pkt_dop *dop,
+        uint32_t ss, uint32_t es)

 {
 {

-       printf(" <");
+       const struct dophdr *dh = (const struct dophdr *)((const u_char *)dop + sizeof(*dop));
+
+       ND_PRINT(" <");

        for ( ; ss <= es; ++ss) {
        for ( ; ss <= es; ++ss) {

-               register int t = dh->dh_type;
+               u_int t;
+
+               if (!ND_TTEST_SIZE(dh)) {
+                       nd_print_trunc(ndo);
+                       break;
+               }
+               t = GET_U_1(dh->dh_type);

 
                if (t > DT_MAXTYPE)
 
                if (t > DT_MAXTYPE)

-                       printf(" dop-%d!", t);
+                       ND_PRINT(" dop-%u!", t);

                else {
                else {

-                       printf(" %s", dopstr[t]);
+                       ND_PRINT(" %s", dopstr[t]);

                        if (t == DT_SKIP || t == DT_HOLE) {
                        if (t == DT_SKIP || t == DT_HOLE) {

-                               int ts = ntohl(dh->dh_ts);
-                               printf("%d", ts - ss + 1);
+                               uint32_t ts = GET_BE_U_4(dh->dh_ts);
+                               ND_PRINT("%u", ts - ss + 1);

                                if (ss > ts || ts > es) {
                                if (ss > ts || ts > es) {

-                                       printf("[|]");
+                                       ND_PRINT("[|]");

                                        if (ts < ss)
                                                return (0);
                                }
                                        if (ts < ss)
                                                return (0);
                                }


@@ -331,55 +339,55 @@ wb_dops(const struct dophdr *dh, u_int32_t ss, u_int32_t es)
                        }
                }
                dh = DOP_NEXT(dh);
                        }
                }
                dh = DOP_NEXT(dh);

-               if ((u_char *)dh > snapend) {
-                       printf("[|wb]");
-                       break;
-               }

        }
        }

-       printf(" >");
+       ND_PRINT(" >");

        return (0);
 }
 
 static int
        return (0);
 }
 
 static int

-wb_rrep(const struct pkt_rrep *rrep, u_int len)
+wb_rrep(netdissect_options *ndo,
+        const struct pkt_rrep *rrep, u_int len)

 {
        const struct pkt_dop *dop = &rrep->pr_dop;
 
 {
        const struct pkt_dop *dop = &rrep->pr_dop;
 

-       printf(" wb-rrep:");
-       if (len < sizeof(*rrep) || (u_char *)(rrep + 1) > snapend)
+       ND_PRINT(" wb-rrep:");
+       if (len < sizeof(*rrep) || !ND_TTEST_SIZE(rrep))

                return (-1);
        len -= sizeof(*rrep);
 
                return (-1);
        len -= sizeof(*rrep);
 

-       printf(" for %s %s:%u<%u:%u>",
-           ipaddr_string(&rrep->pr_id),
-           ipaddr_string(&dop->pd_page.p_sid),
-           (u_int32_t)ntohl(dop->pd_page.p_uid),
-           (u_int32_t)ntohl(dop->pd_sseq),
-           (u_int32_t)ntohl(dop->pd_eseq));
-
-       if (vflag)
-               return (wb_dops((const struct dophdr *)(dop + 1),
-                   ntohl(dop->pd_sseq), ntohl(dop->pd_eseq)));
+       ND_PRINT(" for %s %s:%u<%u:%u>",
+           ipaddr_string(ndo, rrep->pr_id),
+           ipaddr_string(ndo, dop->pd_page.p_sid),
+           GET_BE_U_4(dop->pd_page.p_uid),
+           GET_BE_U_4(dop->pd_sseq),
+           GET_BE_U_4(dop->pd_eseq));
+
+       if (ndo->ndo_vflag)
+               return (wb_dops(ndo, dop,
+                   GET_BE_U_4(dop->pd_sseq),
+                   GET_BE_U_4(dop->pd_eseq)));

        return (0);
 }
 
 static int
        return (0);
 }
 
 static int

-wb_drawop(const struct pkt_dop *dop, u_int len)
+wb_drawop(netdissect_options *ndo,
+          const struct pkt_dop *dop, u_int len)

 {
 {

-       printf(" wb-dop:");
-       if (len < sizeof(*dop) || (u_char *)(dop + 1) > snapend)
+       ND_PRINT(" wb-dop:");
+       if (len < sizeof(*dop) || !ND_TTEST_SIZE(dop))

                return (-1);
        len -= sizeof(*dop);
 
                return (-1);
        len -= sizeof(*dop);
 

-       printf(" %s:%u<%u:%u>",
-           ipaddr_string(&dop->pd_page.p_sid),
-           (u_int32_t)ntohl(dop->pd_page.p_uid),
-           (u_int32_t)ntohl(dop->pd_sseq),
-           (u_int32_t)ntohl(dop->pd_eseq));
+       ND_PRINT(" %s:%u<%u:%u>",
+           ipaddr_string(ndo, dop->pd_page.p_sid),
+           GET_BE_U_4(dop->pd_page.p_uid),
+           GET_BE_U_4(dop->pd_sseq),
+           GET_BE_U_4(dop->pd_eseq));

 
 

-       if (vflag)
-               return (wb_dops((const struct dophdr *)(dop + 1),
-                               ntohl(dop->pd_sseq), ntohl(dop->pd_eseq)));
+       if (ndo->ndo_vflag)
+               return (wb_dops(ndo, dop,
+                               GET_BE_U_4(dop->pd_sseq),
+                               GET_BE_U_4(dop->pd_eseq)));

        return (0);
 }
 
        return (0);
 }
 


@@ -387,57 +395,67 @@ wb_drawop(const struct pkt_dop *dop, u_int len)
  * Print whiteboard multicast packets.
  */
 void
  * Print whiteboard multicast packets.
  */
 void

-wb_print(register const void *hdr, register u_int len)
+wb_print(netdissect_options *ndo,
+         const u_char *hdr, u_int len)

 {
 {

-       register const struct pkt_hdr *ph;
+       const struct pkt_hdr *ph;
+       uint8_t type;

 
 

+       ndo->ndo_protocol = "wb";

        ph = (const struct pkt_hdr *)hdr;
        ph = (const struct pkt_hdr *)hdr;

-       if (len < sizeof(*ph) || (u_char *)(ph + 1) > snapend) {
-               printf("[|wb]");
+       if (len < sizeof(*ph) || !ND_TTEST_SIZE(ph)) {
+               nd_print_trunc(ndo);

                return;
        }
        len -= sizeof(*ph);
 
                return;
        }
        len -= sizeof(*ph);
 

-       if (ph->ph_flags)
-               printf("*");
-       switch (ph->ph_type) {
+       if (GET_U_1(ph->ph_flags))
+               ND_PRINT("*");
+       type = GET_U_1(ph->ph_type);
+       switch (type) {

 
        case PT_KILL:
 
        case PT_KILL:

-               printf(" wb-kill");
+               ND_PRINT(" wb-kill");

                return;
 
        case PT_ID:
                return;
 
        case PT_ID:

-               if (wb_id((struct pkt_id *)(ph + 1), len) >= 0)
+               if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0)

                        return;
                        return;

+               nd_print_trunc(ndo);

                break;
 
        case PT_RREQ:
                break;
 
        case PT_RREQ:

-               if (wb_rreq((struct pkt_rreq *)(ph + 1), len) >= 0)
+               if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0)

                        return;
                        return;

+               nd_print_trunc(ndo);

                break;
 
        case PT_RREP:
                break;
 
        case PT_RREP:

-               if (wb_rrep((struct pkt_rrep *)(ph + 1), len) >= 0)
+               if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0)

                        return;
                        return;

+               nd_print_trunc(ndo);

                break;
 
        case PT_DRAWOP:
                break;
 
        case PT_DRAWOP:

-               if (wb_drawop((struct pkt_dop *)(ph + 1), len) >= 0)
+               if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0)

                        return;
                        return;

+               nd_print_trunc(ndo);

                break;
 
        case PT_PREQ:
                break;
 
        case PT_PREQ:

-               if (wb_preq((struct pkt_preq *)(ph + 1), len) >= 0)
+               if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0)

                        return;
                        return;

+               nd_print_trunc(ndo);

                break;
 
        case PT_PREP:
                break;
 
        case PT_PREP:

-               if (wb_prep((struct pkt_prep *)(ph + 1), len) >= 0)
+               if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0)

                        return;
                        return;

+               nd_print_trunc(ndo);

                break;
 
        default:
                break;
 
        default:

-               printf(" wb-%d!", ph->ph_type);
+               ND_PRINT(" wb-%u!", type);

                return;
        }
 }
                return;
        }
 }