Avoid collison with error(), clean up code a bit.

[tcpdump] / print-wb.c

diff --git a/print-wb.c b/print-wb.c
index 49100fa48f4fbbee7efcd498fbfeaef6b347e71d..92b8c2c36691b7e2bdf2fcc94a16b87fbb76b044 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -48,8 +47,8 @@ static const char tstr[] = "[|wb]";
 #define DOP_ALIGN 4
 #define DOP_ROUNDUP(x) ((((int)(x)) + (DOP_ALIGN - 1)) & ~(DOP_ALIGN - 1))
 #define DOP_NEXT(d)\
-       ((struct dophdr *)((u_char *)(d) + \
-                         DOP_ROUNDUP(EXTRACT_16BITS(&(d)->dh_len) + sizeof(*(d)))))
+       ((const struct dophdr *)((const u_char *)(d) + \
+                               DOP_ROUNDUP(EXTRACT_16BITS(&(d)->dh_len) + sizeof(*(d)))))
 
 /*
  * Format of the whiteboard packet header.
@@ -186,7 +185,7 @@ wb_id(netdissect_options *ndo,
        int nid;
 
        ND_PRINT((ndo, " wb-id:"));
-       if (len < sizeof(*id) || (u_char *)(id + 1) > ndo->ndo_snapend)
+       if (len < sizeof(*id) || !ND_TTEST(*id))
                return (-1);
        len -= sizeof(*id);
 
@@ -200,16 +199,16 @@ wb_id(netdissect_options *ndo,
 
        nid = EXTRACT_16BITS(&id->pi_ps.nid);
        len -= sizeof(*io) * nid;
-       io = (struct id_off *)(id + 1);
-       cp = (char *)(io + nid);
-       if ((u_char *)cp + len <= ndo->ndo_snapend) {
+       io = (const struct id_off *)(id + 1);
+       cp = (const char *)(io + nid);
+       if (ND_TTEST2(cp, len)) {
                ND_PRINT((ndo, "\""));
-               fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
+               fn_print(ndo, (const u_char *)cp, (const u_char *)cp + len);
                ND_PRINT((ndo, "\""));
        }
 
        c = '<';
-       for (i = 0; i < nid && (u_char *)(io + 1) <= ndo->ndo_snapend; ++io, ++i) {
+       for (i = 0; i < nid && ND_TTEST(*io); ++io, ++i) {
                ND_PRINT((ndo, "%c%s:%u",
                    c, ipaddr_string(ndo, &io->id), EXTRACT_32BITS(&io->off)));
                c = ',';
@@ -226,7 +225,7 @@ wb_rreq(netdissect_options *ndo,
         const struct pkt_rreq *rreq, u_int len)
 {
        ND_PRINT((ndo, " wb-rreq:"));
-       if (len < sizeof(*rreq) || (u_char *)(rreq + 1) > ndo->ndo_snapend)
+       if (len < sizeof(*rreq) || !ND_TTEST(*rreq))
                return (-1);
 
        ND_PRINT((ndo, " please repair %s %s:%u<%u:%u>",
@@ -243,7 +242,7 @@ wb_preq(netdissect_options *ndo,
         const struct pkt_preq *preq, u_int len)
 {
        ND_PRINT((ndo, " wb-preq:"));
-       if (len < sizeof(*preq) || (u_char *)(preq + 1) > ndo->ndo_snapend)
+       if (len < sizeof(*preq) || !ND_TTEST(*preq))
                return (-1);
 
        ND_PRINT((ndo, " need %u/%s:%u",
@@ -267,7 +266,7 @@ wb_prep(netdissect_options *ndo,
        }
        n = EXTRACT_32BITS(&prep->pp_n);
        ps = (const struct pgstate *)(prep + 1);
-       while (--n >= 0 && (u_char *)(ps + 1) <= ep) {
+       while (--n >= 0 && ND_TTEST(*ps)) {
                const struct id_off *io, *ie;
                char c = '<';
 
@@ -275,16 +274,16 @@ wb_prep(netdissect_options *ndo,
                    EXTRACT_32BITS(&ps->slot),
                    ipaddr_string(ndo, &ps->page.p_sid),
                    EXTRACT_32BITS(&ps->page.p_uid)));
-               io = (struct id_off *)(ps + 1);
-               for (ie = io + ps->nid; io < ie && (u_char *)(io + 1) <= ep; ++io) {
+               io = (const struct id_off *)(ps + 1);
+               for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
                        ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
                            EXTRACT_32BITS(&io->off)));
                        c = ',';
                }
                ND_PRINT((ndo, ">"));
-               ps = (struct pgstate *)io;
+               ps = (const struct pgstate *)io;
        }
-       return ((u_char *)ps <= ep? 0 : -1);
+       return ((const u_char *)ps <= ep? 0 : -1);
 }
 
 
@@ -308,12 +307,20 @@ static const char *dopstr[] = {
 };
 
 static int
-wb_dops(netdissect_options *ndo,
-        const struct dophdr *dh, uint32_t ss, uint32_t es)
+wb_dops(netdissect_options *ndo, const struct pkt_dop *dop,
+        uint32_t ss, uint32_t es)
 {
+       const struct dophdr *dh = (const struct dophdr *)((const u_char *)dop + sizeof(*dop));
+
        ND_PRINT((ndo, " <"));
        for ( ; ss <= es; ++ss) {
-               register int t = dh->dh_type;
+               int t;
+
+               if (!ND_TTEST(*dh)) {
+                       ND_PRINT((ndo, "%s", tstr));
+                       break;
+               }
+               t = dh->dh_type;
 
                if (t > DT_MAXTYPE)
                        ND_PRINT((ndo, " dop-%d!", t));
@@ -331,10 +338,6 @@ wb_dops(netdissect_options *ndo,
                        }
                }
                dh = DOP_NEXT(dh);
-               if ((u_char *)dh > ndo->ndo_snapend) {
-                       ND_PRINT((ndo, "%s", tstr));
-                       break;
-               }
        }
        ND_PRINT((ndo, " >"));
        return (0);
@@ -347,7 +350,7 @@ wb_rrep(netdissect_options *ndo,
        const struct pkt_dop *dop = &rrep->pr_dop;
 
        ND_PRINT((ndo, " wb-rrep:"));
-       if (len < sizeof(*rrep) || (u_char *)(rrep + 1) > ndo->ndo_snapend)
+       if (len < sizeof(*rrep) || !ND_TTEST(*rrep))
                return (-1);
        len -= sizeof(*rrep);
 
@@ -359,7 +362,7 @@ wb_rrep(netdissect_options *ndo,
            EXTRACT_32BITS(&dop->pd_eseq)));
 
        if (ndo->ndo_vflag)
-               return (wb_dops(ndo, (const struct dophdr *)(dop + 1),
+               return (wb_dops(ndo, dop,
                    EXTRACT_32BITS(&dop->pd_sseq),
                    EXTRACT_32BITS(&dop->pd_eseq)));
        return (0);
@@ -370,7 +373,7 @@ wb_drawop(netdissect_options *ndo,
           const struct pkt_dop *dop, u_int len)
 {
        ND_PRINT((ndo, " wb-dop:"));
-       if (len < sizeof(*dop) || (u_char *)(dop + 1) > ndo->ndo_snapend)
+       if (len < sizeof(*dop) || !ND_TTEST(*dop))
                return (-1);
        len -= sizeof(*dop);
 
@@ -381,7 +384,7 @@ wb_drawop(netdissect_options *ndo,
            EXTRACT_32BITS(&dop->pd_eseq)));
 
        if (ndo->ndo_vflag)
-               return (wb_dops(ndo, (const struct dophdr *)(dop + 1),
+               return (wb_dops(ndo, dop,
                                EXTRACT_32BITS(&dop->pd_sseq),
                                EXTRACT_32BITS(&dop->pd_eseq)));
        return (0);
@@ -397,7 +400,7 @@ wb_print(netdissect_options *ndo,
        register const struct pkt_hdr *ph;
 
        ph = (const struct pkt_hdr *)hdr;
-       if (len < sizeof(*ph) || (u_char *)(ph + 1) > ndo->ndo_snapend) {
+       if (len < sizeof(*ph) || !ND_TTEST(*ph)) {
                ND_PRINT((ndo, "%s", tstr));
                return;
        }
@@ -412,32 +415,32 @@ wb_print(netdissect_options *ndo,
                return;
 
        case PT_ID:
-               if (wb_id(ndo, (struct pkt_id *)(ph + 1), len) >= 0)
+               if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_RREQ:
-               if (wb_rreq(ndo, (struct pkt_rreq *)(ph + 1), len) >= 0)
+               if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_RREP:
-               if (wb_rrep(ndo, (struct pkt_rrep *)(ph + 1), len) >= 0)
+               if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_DRAWOP:
-               if (wb_drawop(ndo, (struct pkt_dop *)(ph + 1), len) >= 0)
+               if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_PREQ:
-               if (wb_preq(ndo, (struct pkt_preq *)(ph + 1), len) >= 0)
+               if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_PREP:
-               if (wb_prep(ndo, (struct pkt_prep *)(ph + 1), len) >= 0)
+               if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0)
                        return;
                break;