diff options
Diffstat (limited to 'print-wb.c')
| -rw-r--r-- | print-wb.c | 244 |
1 files changed, 126 insertions, 118 deletions
@@ -22,16 +22,15 @@ /* \summary: White Board printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif -#include <netdissect-stdinc.h> +#include "netdissect-stdinc.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"? */ @@ -50,18 +49,18 @@ static const char tstr[] = "[|wb]"; #define DOP_ROUNDUP(x) ((((int)(x)) + (DOP_ALIGN - 1)) & ~(DOP_ALIGN - 1)) #define DOP_NEXT(d)\ ((const struct dophdr *)((const u_char *)(d) + \ - DOP_ROUNDUP(EXTRACT_16BITS(&(d)->dh_len) + sizeof(*(d))))) + DOP_ROUNDUP(EXTRACT_BE_U_2((d)->dh_len) + sizeof(*(d))))) /* * Format of the whiteboard packet header. * The transport level header. */ struct pkt_hdr { - 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 */ + 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 */ @@ -82,15 +81,15 @@ struct pkt_hdr { #define PF_VIS 0x02 /* only visible ops wanted */ struct PageID { - uint32_t p_sid; /* session id of initiator */ - uint32_t p_uid; /* page number */ + nd_uint32_t p_sid; /* session id of initiator */ + nd_uint32_t p_uid; /* page number */ }; struct dophdr { - uint32_t dh_ts; /* sender's timestamp */ - uint16_t 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 */ }; /* @@ -117,8 +116,8 @@ struct dophdr { */ struct pkt_dop { struct PageID pd_page; /* page that operations apply to */ - uint32_t pd_sseq; /* start sequence number */ - uint32_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 */ }; @@ -126,31 +125,31 @@ struct pkt_dop { * A repair request. */ struct pkt_rreq { - uint32_t pr_id; /* source id of drawops to be repaired */ - struct PageID pr_page; /* page of drawops */ - uint32_t pr_sseq; /* start seqno */ - uint32_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 { - uint32_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 { - uint32_t id; - uint32_t off; + nd_uint32_t id; + nd_uint32_t off; }; struct pgstate { - uint32_t slot; + nd_uint32_t slot; struct PageID page; - uint16_t nid; - uint16_t rsvd; + nd_uint16_t nid; + nd_uint16_t rsvd; /* seqptr's */ }; @@ -158,7 +157,7 @@ struct pgstate { * An announcement packet. */ struct pkt_id { - uint32_t pi_mslot; + nd_uint32_t pi_mslot; struct PageID pi_mpage; /* current page */ struct pgstate pi_ps; /* seqptr's */ @@ -167,12 +166,12 @@ struct pkt_id { struct pkt_preq { struct PageID pp_page; - uint32_t pp_low; - uint32_t pp_high; + nd_uint32_t pp_low; + nd_uint32_t pp_high; }; struct pkt_prep { - uint32_t pp_n; /* size of pageid array */ + nd_uint32_t pp_n; /* size of pageid array */ /* pgstate's follow */ }; @@ -180,43 +179,43 @@ static int 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; - int nid; + u_int nid; - ND_PRINT((ndo, " wb-id:")); - if (len < sizeof(*id) || !ND_TTEST(*id)) + ND_PRINT(" wb-id:"); + if (len < sizeof(*id) || !ND_TTEST_SIZE(id)) return (-1); len -= sizeof(*id); - ND_PRINT((ndo, " %u/%s:%u (max %u/%s:%u) ", - EXTRACT_32BITS(&id->pi_ps.slot), - ipaddr_string(ndo, &id->pi_ps.page.p_sid), - EXTRACT_32BITS(&id->pi_ps.page.p_uid), - EXTRACT_32BITS(&id->pi_mslot), - ipaddr_string(ndo, &id->pi_mpage.p_sid), - EXTRACT_32BITS(&id->pi_mpage.p_uid))); + 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), + 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_16BITS(&id->pi_ps.nid); + nid = EXTRACT_BE_U_2(id->pi_ps.nid); len -= sizeof(*io) * nid; io = (const struct id_off *)(id + 1); cp = (const char *)(io + nid); - if (ND_TTEST2(cp, len)) { - ND_PRINT((ndo, "\"")); - fn_print(ndo, (const u_char *)cp, (const u_char *)cp + len); - ND_PRINT((ndo, "\"")); + if (ND_TTEST_LEN(cp, len)) { + ND_PRINT("\""); + nd_print(ndo, (const u_char *)cp, (const u_char *)cp + len); + ND_PRINT("\""); } c = '<'; - 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))); + 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 = ','; } if (i >= nid) { - ND_PRINT((ndo, ">")); + ND_PRINT(">"); return (0); } return (-1); @@ -226,16 +225,16 @@ 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) || !ND_TTEST_SIZE(rreq)) 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_32BITS(&rreq->pr_page.p_uid), - EXTRACT_32BITS(&rreq->pr_sseq), - EXTRACT_32BITS(&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), + EXTRACT_BE_U_4(rreq->pr_page.p_uid), + EXTRACT_BE_U_4(rreq->pr_sseq), + EXTRACT_BE_U_4(rreq->pr_eseq)); return (0); } @@ -243,14 +242,14 @@ static int 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) || !ND_TTEST_SIZE(preq)) return (-1); - ND_PRINT((ndo, " need %u/%s:%u", - EXTRACT_32BITS(&preq->pp_low), - ipaddr_string(ndo, &preq->pp_page.p_sid), - EXTRACT_32BITS(&preq->pp_page.p_uid))); + ND_PRINT(" 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)); return (0); } @@ -258,32 +257,32 @@ static int wb_prep(netdissect_options *ndo, const struct pkt_prep *prep, u_int len) { - int n; + u_int n; const struct pgstate *ps; const u_char *ep = ndo->ndo_snapend; - ND_PRINT((ndo, " wb-prep:")); - if (len < sizeof(*prep)) { + ND_PRINT(" wb-prep:"); + if (len < sizeof(*prep) || !ND_TTEST_SIZE(prep)) return (-1); - } - n = EXTRACT_32BITS(&prep->pp_n); + n = EXTRACT_BE_U_4(prep->pp_n); ps = (const struct pgstate *)(prep + 1); - while (--n >= 0 && ND_TTEST(*ps)) { + while (n != 0 && ND_TTEST_SIZE(ps)) { const struct id_off *io, *ie; char c = '<'; - ND_PRINT((ndo, " %u/%s:%u", - EXTRACT_32BITS(&ps->slot), - ipaddr_string(ndo, &ps->page.p_sid), - EXTRACT_32BITS(&ps->page.p_uid))); + ND_PRINT(" %u/%s:%u", + EXTRACT_BE_U_4(ps->slot), + 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 + ps->nid; io < ie && ND_TTEST(*io); ++io) { - ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id), - EXTRACT_32BITS(&io->off))); + 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), + EXTRACT_BE_U_4(io->off)); c = ','; } - ND_PRINT((ndo, ">")); + ND_PRINT(">"); ps = (const struct pgstate *)io; + n--; } return ((const u_char *)ps <= ep? 0 : -1); } @@ -314,25 +313,25 @@ wb_dops(netdissect_options *ndo, const struct pkt_dop *dop, { const struct dophdr *dh = (const struct dophdr *)((const u_char *)dop + sizeof(*dop)); - ND_PRINT((ndo, " <")); + ND_PRINT(" <"); for ( ; ss <= es; ++ss) { - int t; + u_int t; - if (!ND_TTEST(*dh)) { - ND_PRINT((ndo, "%s", tstr)); + if (!ND_TTEST_SIZE(dh)) { + nd_print_trunc(ndo); break; } - t = dh->dh_type; + t = EXTRACT_U_1(dh->dh_type); if (t > DT_MAXTYPE) - ND_PRINT((ndo, " dop-%d!", t)); + ND_PRINT(" dop-%u!", t); else { - ND_PRINT((ndo, " %s", dopstr[t])); + ND_PRINT(" %s", dopstr[t]); if (t == DT_SKIP || t == DT_HOLE) { - uint32_t ts = EXTRACT_32BITS(&dh->dh_ts); - ND_PRINT((ndo, "%d", ts - ss + 1)); + uint32_t ts = EXTRACT_BE_U_4(dh->dh_ts); + ND_PRINT("%u", ts - ss + 1); if (ss > ts || ts > es) { - ND_PRINT((ndo, "[|]")); + ND_PRINT("[|]"); if (ts < ss) return (0); } @@ -341,7 +340,7 @@ wb_dops(netdissect_options *ndo, const struct pkt_dop *dop, } dh = DOP_NEXT(dh); } - ND_PRINT((ndo, " >")); + ND_PRINT(" >"); return (0); } @@ -351,22 +350,22 @@ wb_rrep(netdissect_options *ndo, { 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) || !ND_TTEST_SIZE(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_32BITS(&dop->pd_page.p_uid), - EXTRACT_32BITS(&dop->pd_sseq), - EXTRACT_32BITS(&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), + EXTRACT_BE_U_4(dop->pd_page.p_uid), + EXTRACT_BE_U_4(dop->pd_sseq), + EXTRACT_BE_U_4(dop->pd_eseq)); if (ndo->ndo_vflag) return (wb_dops(ndo, dop, - EXTRACT_32BITS(&dop->pd_sseq), - EXTRACT_32BITS(&dop->pd_eseq))); + EXTRACT_BE_U_4(dop->pd_sseq), + EXTRACT_BE_U_4(dop->pd_eseq))); return (0); } @@ -374,21 +373,21 @@ static int 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) || !ND_TTEST_SIZE(dop)) return (-1); len -= sizeof(*dop); - ND_PRINT((ndo, " %s:%u<%u:%u>", - ipaddr_string(ndo, &dop->pd_page.p_sid), - EXTRACT_32BITS(&dop->pd_page.p_uid), - EXTRACT_32BITS(&dop->pd_sseq), - EXTRACT_32BITS(&dop->pd_eseq))); + ND_PRINT(" %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)); if (ndo->ndo_vflag) return (wb_dops(ndo, dop, - EXTRACT_32BITS(&dop->pd_sseq), - EXTRACT_32BITS(&dop->pd_eseq))); + EXTRACT_BE_U_4(dop->pd_sseq), + EXTRACT_BE_U_4(dop->pd_eseq))); return (0); } @@ -397,57 +396,66 @@ wb_drawop(netdissect_options *ndo, */ void wb_print(netdissect_options *ndo, - register const void *hdr, register u_int len) + 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; - if (len < sizeof(*ph) || !ND_TTEST(*ph)) { - ND_PRINT((ndo, "%s", tstr)); + if (len < sizeof(*ph) || !ND_TTEST_SIZE(ph)) { + nd_print_trunc(ndo); return; } len -= sizeof(*ph); - if (ph->ph_flags) - ND_PRINT((ndo, "*")); - switch (ph->ph_type) { + if (EXTRACT_U_1(ph->ph_flags)) + ND_PRINT("*"); + type = EXTRACT_U_1(ph->ph_type); + switch (type) { case PT_KILL: - ND_PRINT((ndo, " wb-kill")); + ND_PRINT(" wb-kill"); return; case PT_ID: if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0) return; + nd_print_trunc(ndo); break; case PT_RREQ: if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0) return; + nd_print_trunc(ndo); break; case PT_RREP: if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0) return; + nd_print_trunc(ndo); break; case PT_DRAWOP: if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0) return; + nd_print_trunc(ndo); break; case PT_PREQ: if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0) return; + nd_print_trunc(ndo); break; case PT_PREP: if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0) return; + nd_print_trunc(ndo); break; default: - ND_PRINT((ndo, " wb-%d!", ph->ph_type)); + ND_PRINT(" wb-%u!", type); return; } } |