Revert "autotools: don't link with -lcrypto twice."

[tcpdump] / print-wb.c

diff --git a/print-wb.c b/print-wb.c
index 7ff50055e7f7f3a71edfa8baf68d4e5f0dbb53bc..08113f35bd3f5b58a78702d3de60a368c0452f05 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -21,36 +21,33 @@
 
 /* \summary: White Board printer */
 
 
 /* \summary: White Board printer */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

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

 
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #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"? */

 
 

+#if 0

 /*
  * Largest packet size.  Everything should fit within this space.
  * For instance, multiline objects are sent piecewise.
  */
 #define MAXFRAMESIZE 1024
 /*
  * Largest packet size.  Everything should fit within this space.
  * For instance, multiline objects are sent piecewise.
  */
 #define MAXFRAMESIZE 1024

+#endif

 
 /*
  * Multiple drawing ops can be sent in one packet.  Each one starts on a
  * an even multiple of DOP_ALIGN bytes, which must be a power of two.
  */
 #define DOP_ALIGN 4
 
 /*
  * Multiple drawing ops can be sent in one packet.  Each one starts on a
  * 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)\
        ((const struct dophdr *)((const u_char *)(d) + \
 #define DOP_NEXT(d)\
        ((const struct dophdr *)((const u_char *)(d) + \

-                               DOP_ROUNDUP(EXTRACT_BE_U_2((d)->dh_len) + sizeof(*(d)))))
+                               DOP_ROUNDUP(GET_BE_U_2((d)->dh_len) + sizeof(*(d)))))

 
 /*
  * Format of the whiteboard packet header.
 
 /*
  * Format of the whiteboard packet header.


@@ -73,13 +70,11 @@ struct pkt_hdr {
 #define PT_PREQ         5       /* page vector request */
 #define PT_PREP         7       /* page vector reply */
 
 #define PT_PREQ         5       /* page vector request */
 #define PT_PREP         7       /* page vector reply */
 

-#ifdef PF_USER
-#undef PF_USER                 /* {Digital,Tru64} UNIX define this, alas */
-#endif
-
+#if 0

 /* flags */
 #define PF_USER                0x01    /* hint that packet has interactive data */
 #define PF_VIS         0x02    /* only visible ops wanted */
 /* flags */
 #define PF_USER                0x01    /* hint that packet has interactive data */
 #define PF_VIS         0x02    /* only visible ops wanted */

+#endif

 
 struct PageID {
        nd_uint32_t p_sid;              /* session id of initiator */
 
 struct PageID {
        nd_uint32_t p_sid;              /* session id of initiator */


@@ -110,7 +105,23 @@ struct dophdr {
 #define DT_REF          13
 #define DT_SKIP         14
 #define DT_HOLE         15
 #define DT_REF          13
 #define DT_SKIP         14
 #define DT_HOLE         15

-#define DT_MAXTYPE      15
+static const struct tok dop_str[] = {
+       { DT_RECT,   "RECT"   },
+       { DT_LINE,   "LINE"   },
+       { DT_ML,     "ML"     },
+       { DT_DEL,    "DEL"    },
+       { DT_XFORM,  "XFORM"  },
+       { DT_ELL,    "ELL"    },
+       { DT_CHAR,   "CHAR"   },
+       { DT_STR,    "STR"    },
+       { DT_NOP,    "NOP"    },
+       { DT_PSCODE, "PSCODE" },
+       { DT_PSCOMP, "PSCOMP" },
+       { DT_REF,    "REF"    },
+       { DT_SKIP,   "SKIP"   },
+       { DT_HOLE,   "HOLE"   },
+       { 0, NULL }
+};

 
 /*
  * A drawing operation.
 
 /*
  * A drawing operation.


@@ -181,61 +192,59 @@ wb_id(netdissect_options *ndo,
       const struct pkt_id *id, u_int len)
 {
        u_int i;
       const struct pkt_id *id, u_int len)
 {
        u_int i;

-       const char *cp;
+       const u_char *sitename;

        const struct id_off *io;
        char c;
        u_int nid;
 
        const struct id_off *io;
        char c;
        u_int nid;
 

-       ND_PRINT((ndo, " wb-id:"));
-       if (len < sizeof(*id) || !ND_TTEST(*id))
+       ND_PRINT(" wb-id:");
+       if (len < sizeof(*id))

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

-       ND_PRINT((ndo, " %u/%s:%u (max %u/%s:%u) ",
-              EXTRACT_BE_U_4(id->pi_ps.slot),
-              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),
-              EXTRACT_BE_U_4(id->pi_mpage.p_uid)));
-
-       nid = EXTRACT_BE_U_2(id->pi_ps.nid);
+       ND_PRINT(" %u/%s:%u (max %u/%s:%u) ",
+              GET_BE_U_4(id->pi_ps.slot),
+              GET_IPADDR_STRING(id->pi_ps.page.p_sid),
+              GET_BE_U_4(id->pi_ps.page.p_uid),
+              GET_BE_U_4(id->pi_mslot),
+              GET_IPADDR_STRING(id->pi_mpage.p_sid),
+              GET_BE_U_4(id->pi_mpage.p_uid));
+       /* now the rest of the fixed-size part of struct pkt_id */
+       ND_TCHECK_SIZE(id);
+
+       nid = GET_BE_U_2(id->pi_ps.nid);
+       if (len < sizeof(*io) * nid)
+               return (-1);

        len -= sizeof(*io) * nid;
        io = (const struct id_off *)(id + 1);
        len -= sizeof(*io) * nid;
        io = (const struct id_off *)(id + 1);

-       cp = (const char *)(io + nid);
-       if (ND_TTEST_LEN(cp, len)) {
-               ND_PRINT((ndo, "\""));
-               fn_print(ndo, (const u_char *)cp, (const u_char *)cp + len);
-               ND_PRINT((ndo, "\""));
-       }
+       sitename = (const u_char *)(io + nid);

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

-       for (i = 0; i < nid && ND_TTEST(*io); ++io, ++i) {
-               ND_PRINT((ndo, "%c%s:%u",
-                   c, ipaddr_string(ndo, &io->id), EXTRACT_BE_U_4(io->off)));
+       for (i = 0; i < nid; ++io, ++i) {
+               ND_PRINT("%c%s:%u",
+                   c, GET_IPADDR_STRING(io->id), GET_BE_U_4(io->off));

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

-       if (i >= nid) {
-               ND_PRINT((ndo, ">"));
-               return (0);
-       }
-       return (-1);
+       ND_PRINT("> \"");
+       nd_printjnp(ndo, sitename, len);
+       ND_PRINT("\"");
+       return (0);

 }
 
 static int
 wb_rreq(netdissect_options *ndo,
         const struct pkt_rreq *rreq, u_int len)
 {
 }
 
 static int
 wb_rreq(netdissect_options *ndo,
         const struct pkt_rreq *rreq, u_int len)
 {

-       ND_PRINT((ndo, " wb-rreq:"));
-       if (len < sizeof(*rreq) || !ND_TTEST(*rreq))
+       ND_PRINT(" wb-rreq:");
+       if (len < sizeof(*rreq))

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

-       ND_PRINT((ndo, " please repair %s %s:%u<%u:%u>",
-              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)));
+       ND_PRINT(" please repair %s %s:%u<%u:%u>",
+              GET_IPADDR_STRING(rreq->pr_id),
+              GET_IPADDR_STRING(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);
 }
 
        return (0);
 }
 


@@ -243,14 +252,16 @@ static int
 wb_preq(netdissect_options *ndo,
         const struct pkt_preq *preq, u_int len)
 {
 wb_preq(netdissect_options *ndo,
         const struct pkt_preq *preq, u_int len)
 {

-       ND_PRINT((ndo, " wb-preq:"));
-       if (len < sizeof(*preq) || !ND_TTEST(*preq))
+       ND_PRINT(" wb-preq:");
+       if (len < sizeof(*preq))

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

-       ND_PRINT((ndo, " need %u/%s:%u",
-              EXTRACT_BE_U_4(preq->pp_low),
-              ipaddr_string(ndo, &preq->pp_page.p_sid),
-              EXTRACT_BE_U_4(preq->pp_page.p_uid)));
+       ND_PRINT(" need %u/%s:%u",
+              GET_BE_U_4(preq->pp_low),
+              GET_IPADDR_STRING(preq->pp_page.p_sid),
+              GET_BE_U_4(preq->pp_page.p_uid));
+       /* now the rest of the fixed-size part of struct pkt_req */
+       ND_TCHECK_SIZE(preq);

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


@@ -260,89 +271,61 @@ wb_prep(netdissect_options *ndo,
 {
        u_int n;
        const struct pgstate *ps;
 {
        u_int n;
        const struct pgstate *ps;

-       const u_char *ep = ndo->ndo_snapend;

 
 

-       ND_PRINT((ndo, " wb-prep:"));
-       if (len < sizeof(*prep) || !ND_TTEST(*prep))
+       ND_PRINT(" wb-prep:");
+       if (len < sizeof(*prep))

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

-       n = EXTRACT_BE_U_4(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 && ND_TTEST(*ps)) {
+       while (n != 0) {

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

-               ND_PRINT((ndo, " %u/%s:%u",
-                   EXTRACT_BE_U_4(ps->slot),
-                   ipaddr_string(ndo, &ps->page.p_sid),
-                   EXTRACT_BE_U_4(ps->page.p_uid)));
+               ND_PRINT(" %u/%s:%u",
+                   GET_BE_U_4(ps->slot),
+                   GET_IPADDR_STRING(ps->page.p_sid),
+                   GET_BE_U_4(ps->page.p_uid));
+               /* now the rest of the fixed-size part of struct pgstate */
+               ND_TCHECK_SIZE(ps);

                io = (const struct id_off *)(ps + 1);
                io = (const struct id_off *)(ps + 1);

-               for (ie = io + EXTRACT_U_1(ps->nid); io < ie && ND_TTEST(*io); ++io) {
-                       ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
-                           EXTRACT_BE_U_4(io->off)));
+               for (ie = io + GET_U_1(ps->nid); io < ie; ++io) {
+                       ND_PRINT("%c%s:%u", c, GET_IPADDR_STRING(io->id),
+                           GET_BE_U_4(io->off));

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

-               ND_PRINT((ndo, ">"));
+               ND_PRINT(">");

                ps = (const struct pgstate *)io;
                n--;
        }
                ps = (const struct pgstate *)io;
                n--;
        }

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

 }
 
 }
 

-
-static const char *dopstr[] = {
-       "dop-0!",
-       "dop-1!",
-       "RECT",
-       "LINE",
-       "ML",
-       "DEL",
-       "XFORM",
-       "ELL",
-       "CHAR",
-       "STR",
-       "NOP",
-       "PSCODE",
-       "PSCOMP",
-       "REF",
-       "SKIP",
-       "HOLE",
-};
-
-static int
+static void

 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));
 
 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, " <"));
+       ND_PRINT(" <");

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

-               if (!ND_TTEST(*dh)) {
-                       ND_PRINT((ndo, "%s", tstr));
-                       break;
-               }
-               t = EXTRACT_U_1(dh->dh_type);
-
-               if (t > DT_MAXTYPE)
-                       ND_PRINT((ndo, " dop-%u!", t));
-               else {
-                       ND_PRINT((ndo, " %s", dopstr[t]));
-                       if (t == DT_SKIP || t == DT_HOLE) {
-                               uint32_t ts = EXTRACT_BE_U_4(dh->dh_ts);
-                               ND_PRINT((ndo, "%u", ts - ss + 1));
-                               if (ss > ts || ts > es) {
-                                       ND_PRINT((ndo, "[|]"));
-                                       if (ts < ss)
-                                               return (0);
-                               }
-                               ss = ts;
+               t = GET_U_1(dh->dh_type);
+
+               ND_PRINT(" %s", tok2str(dop_str, "dop-%u!", t));
+               if (t == DT_SKIP || t == DT_HOLE) {
+                       uint32_t ts = GET_BE_U_4(dh->dh_ts);
+                       ND_PRINT("%u", ts - ss + 1);
+                       if (ss > ts || ts > es) {
+                               ND_PRINT("[|]");
+                               if (ts < ss)
+                                       return;

                        }
                        }

+                       ss = ts;

                }
                dh = DOP_NEXT(dh);
        }
                }
                dh = DOP_NEXT(dh);
        }

-       ND_PRINT((ndo, " >"));
-       return (0);
+       ND_PRINT(" >");

 }
 
 static int
 }
 
 static int


@@ -351,22 +334,22 @@ wb_rrep(netdissect_options *ndo,
 {
        const struct pkt_dop *dop = &rrep->pr_dop;
 
 {
        const struct pkt_dop *dop = &rrep->pr_dop;
 

-       ND_PRINT((ndo, " wb-rrep:"));
-       if (len < sizeof(*rrep) || !ND_TTEST(*rrep))
+       ND_PRINT(" wb-rrep:");
+       if (len < sizeof(*rrep))

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

-       ND_PRINT((ndo, " for %s %s:%u<%u:%u>",
-           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)));
+       ND_PRINT(" for %s %s:%u<%u:%u>",
+           GET_IPADDR_STRING(rrep->pr_id),
+           GET_IPADDR_STRING(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)
 
        if (ndo->ndo_vflag)

-               return (wb_dops(ndo, dop,
-                   EXTRACT_BE_U_4(dop->pd_sseq),
-                   EXTRACT_BE_U_4(dop->pd_eseq)));
+               wb_dops(ndo, dop,
+                       GET_BE_U_4(dop->pd_sseq),
+                       GET_BE_U_4(dop->pd_eseq));

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


@@ -374,21 +357,21 @@ static int
 wb_drawop(netdissect_options *ndo,
           const struct pkt_dop *dop, u_int len)
 {
 wb_drawop(netdissect_options *ndo,
           const struct pkt_dop *dop, u_int len)
 {

-       ND_PRINT((ndo, " wb-dop:"));
-       if (len < sizeof(*dop) || !ND_TTEST(*dop))
+       ND_PRINT(" wb-dop:");
+       if (len < sizeof(*dop))

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

-       ND_PRINT((ndo, " %s:%u<%u:%u>",
-           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)));
+       ND_PRINT(" %s:%u<%u:%u>",
+           GET_IPADDR_STRING(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)
 
        if (ndo->ndo_vflag)

-               return (wb_dops(ndo, dop,
-                               EXTRACT_BE_U_4(dop->pd_sseq),
-                               EXTRACT_BE_U_4(dop->pd_eseq)));
+               wb_dops(ndo, dop,
+                       GET_BE_U_4(dop->pd_sseq),
+                       GET_BE_U_4(dop->pd_eseq));

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


@@ -397,65 +380,60 @@ wb_drawop(netdissect_options *ndo,
  */
 void
 wb_print(netdissect_options *ndo,
  */
 void
 wb_print(netdissect_options *ndo,

-         const void *hdr, u_int len)
+         const u_char *hdr, u_int len)

 {
        const struct pkt_hdr *ph;
        uint8_t type;
 {
        const struct pkt_hdr *ph;
        uint8_t type;

+       int print_result;

 
 

+       ndo->ndo_protocol = "wb";

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

-       if (len < sizeof(*ph) || !ND_TTEST(*ph)) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
-       }
+       if (len < sizeof(*ph))
+               goto invalid;
+       ND_TCHECK_SIZE(ph);

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

-       if (EXTRACT_U_1(ph->ph_flags))
-               ND_PRINT((ndo, "*"));
-       type = EXTRACT_U_1(ph->ph_type);
+       if (GET_U_1(ph->ph_flags))
+               ND_PRINT("*");
+       type = GET_U_1(ph->ph_type);

        switch (type) {
 
        case PT_KILL:
        switch (type) {
 
        case PT_KILL:

-               ND_PRINT((ndo, " wb-kill"));
+               ND_PRINT(" wb-kill");

                return;
 
        case PT_ID:
                return;
 
        case PT_ID:

-               if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0)
-                       return;
-               ND_PRINT((ndo, "%s", tstr));
+               print_result = wb_id(ndo, (const struct pkt_id *)(ph + 1), len);

                break;
 
        case PT_RREQ:
                break;
 
        case PT_RREQ:

-               if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0)
-                       return;
-               ND_PRINT((ndo, "%s", tstr));
+               print_result = wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len);

                break;
 
        case PT_RREP:
                break;
 
        case PT_RREP:

-               if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0)
-                       return;
-               ND_PRINT((ndo, "%s", tstr));
+               print_result = wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len);

                break;
 
        case PT_DRAWOP:
                break;
 
        case PT_DRAWOP:

-               if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0)
-                       return;
-               ND_PRINT((ndo, "%s", tstr));
+               print_result = wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len);

                break;
 
        case PT_PREQ:
                break;
 
        case PT_PREQ:

-               if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0)
-                       return;
-               ND_PRINT((ndo, "%s", tstr));
+               print_result = wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len);

                break;
 
        case PT_PREP:
                break;
 
        case PT_PREP:

-               if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0)
-                       return;
-               ND_PRINT((ndo, "%s", tstr));
+               print_result = wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len);

                break;
 
        default:
                break;
 
        default:

-               ND_PRINT((ndo, " wb-%u!", type));
-               return;
+               ND_PRINT(" wb-%u!", type);
+               print_result = -1;

        }
        }

+       if (print_result < 0)
+               goto invalid;
+       return;
+
+invalid:
+       nd_print_invalid(ndo);

 }
 }