Default to first interface from pcap_findalldevs()

[tcpdump] / print-wb.c

diff --git a/print-wb.c b/print-wb.c
index 3b7f11e26d4d771d8962a937d8abd3fd249d0d4b..6ad912edb4779b24070a42ecb2de90171a035b9e 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -19,14 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

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

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


@@ -48,17 +47,17 @@ 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)\
 #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.
  * 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_int16_t ph_version;   /* version number */
+       uint32_t ph_src;                /* site id of source */
+       uint32_t ph_ts;         /* time stamp (for skew computation) */
+       uint16_t ph_version;    /* version number */

        u_char ph_type;         /* message type */
        u_char ph_flags;        /* message flags */
 };
        u_char ph_type;         /* message type */
        u_char ph_flags;        /* message flags */
 };


@@ -81,13 +80,13 @@ 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 */
+       uint32_t p_sid;         /* session id of initiator */
+       uint32_t p_uid;         /* page number */

 };
 
 struct dophdr {
 };
 
 struct dophdr {

-       u_int32_t  dh_ts;               /* sender's timestamp */
-       u_int16_t       dh_len;         /* body length */
+       uint32_t  dh_ts;                /* sender's timestamp */
+       uint16_t        dh_len;         /* body length */

        u_char  dh_flags;
        u_char  dh_type;        /* body type */
        /* body follows */
        u_char  dh_flags;
        u_char  dh_type;        /* body type */
        /* body follows */


@@ -116,8 +115,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 */
+       uint32_t        pd_sseq;        /* start sequence number */
+       uint32_t        pd_eseq;        /* end sequence number */

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


@@ -125,31 +124,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 */
+        uint32_t pr_id;           /* source id of drawops to be repaired */

         struct PageID pr_page;           /* page of drawops */
         struct PageID pr_page;           /* page of drawops */

-        u_int32_t pr_sseq;         /* start seqno */
-        u_int32_t pr_eseq;         /* end seqno */
+        uint32_t pr_sseq;         /* start seqno */
+        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  */
+       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;
+        uint32_t id;
+        uint32_t off;

 };
 
 struct pgstate {
 };
 
 struct pgstate {

-       u_int32_t slot;
+       uint32_t slot;

        struct PageID page;
        struct PageID page;

-       u_int16_t nid;
-       u_int16_t rsvd;
+       uint16_t nid;
+       uint16_t rsvd;

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


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

-       u_int32_t pi_mslot;
+       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 */


@@ -166,12 +165,12 @@ 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;
+        uint32_t  pp_low;
+        uint32_t  pp_high;

 };
 
 struct pkt_prep {
 };
 
 struct pkt_prep {

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

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


@@ -186,7 +185,7 @@ wb_id(netdissect_options *ndo,
        int nid;
 
        ND_PRINT((ndo, " wb-id:"));
        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);
 
                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;
 
        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, "\""));
                ND_PRINT((ndo, "\""));

-               (void)fn_print((u_char *)cp, (u_char *)cp + len);
+               fn_print(ndo, (const u_char *)cp, (const u_char *)cp + len);

                ND_PRINT((ndo, "\""));
        }
 
        c = '<';
                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 = ',';
                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:"));
         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>",
                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:"));
         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",
                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);
        }
        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 = '<';
 
                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)));
                    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, ">"));
                        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,19 +307,27 @@ static const char *dopstr[] = {
 };
 
 static int
 };
 
 static int

-wb_dops(netdissect_options *ndo,
-        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)

 {
 {

+       const struct dophdr *dh = (const struct dophdr *)((const u_char *)dop + sizeof(*dop));
+

        ND_PRINT((ndo, " <"));
        for ( ; ss <= es; ++ss) {
        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));
                else {
                        ND_PRINT((ndo, " %s", dopstr[t]));
                        if (t == DT_SKIP || t == DT_HOLE) {
 
                if (t > DT_MAXTYPE)
                        ND_PRINT((ndo, " dop-%d!", t));
                else {
                        ND_PRINT((ndo, " %s", dopstr[t]));
                        if (t == DT_SKIP || t == DT_HOLE) {

-                               u_int32_t ts = EXTRACT_32BITS(&dh->dh_ts);
+                               uint32_t ts = EXTRACT_32BITS(&dh->dh_ts);

                                ND_PRINT((ndo, "%d", ts - ss + 1));
                                if (ss > ts || ts > es) {
                                        ND_PRINT((ndo, "[|]"));
                                ND_PRINT((ndo, "%d", ts - ss + 1));
                                if (ss > ts || ts > es) {
                                        ND_PRINT((ndo, "[|]"));


@@ -331,10 +338,6 @@ wb_dops(netdissect_options *ndo,
                        }
                }
                dh = DOP_NEXT(dh);
                        }
                }
                dh = DOP_NEXT(dh);

-               if ((u_char *)dh > ndo->ndo_snapend) {
-                       ND_PRINT((ndo, "%s", tstr));
-                       break;
-               }

        }
        ND_PRINT((ndo, " >"));
        return (0);
        }
        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:"));
        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);
 
                return (-1);
        len -= sizeof(*rrep);
 


@@ -359,7 +362,7 @@ wb_rrep(netdissect_options *ndo,
            EXTRACT_32BITS(&dop->pd_eseq)));
 
        if (ndo->ndo_vflag)
            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);
                    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:"));
           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);
 
                return (-1);
        len -= sizeof(*dop);
 


@@ -381,7 +384,7 @@ wb_drawop(netdissect_options *ndo,
            EXTRACT_32BITS(&dop->pd_eseq)));
 
        if (ndo->ndo_vflag)
            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);
                                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;
        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;
        }
                ND_PRINT((ndo, "%s", tstr));
                return;
        }


@@ -412,32 +415,32 @@ wb_print(netdissect_options *ndo,
                return;
 
        case PT_ID:
                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:
                        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:
                        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:
                        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:
                        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:
                        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;
 
                        return;
                break;