X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/69cb46af9119e8b5554bcc4bf1bf36f39cb82131..82cfcd4391f9f6c748634bfd7b48a44f42e6a53d:/print-zephyr.c diff --git a/print-zephyr.c b/print-zephyr.c index 700d0bc0..11e1e593 100644 --- a/print-zephyr.c +++ b/print-zephyr.c @@ -1,7 +1,7 @@ /* * Decode and print Zephyr packets. * - * http://web.mit.edu/zephyr/doc/protocol + * https://web.mit.edu/zephyr/doc/protocol * * Copyright (c) 2001 Nickolai Zeldovich * All rights reserved. @@ -20,17 +20,22 @@ * PURPOSE. */ +/* \summary: Zephyr printer */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include #include #include -#include "interface.h" +#include "netdissect-ctype.h" + +#include "netdissect.h" +#include "extract.h" struct z_packet { const char *version; @@ -74,7 +79,8 @@ static const struct tok z_types[] = { { Z_PACKET_SERVACK, "serv-ack" }, { Z_PACKET_SERVNAK, "serv-nak" }, { Z_PACKET_CLIENTACK, "client-ack" }, - { Z_PACKET_STAT, "stat" } + { Z_PACKET_STAT, "stat" }, + { 0, NULL } }; static char z_buf[256]; @@ -84,20 +90,25 @@ parse_field(netdissect_options *ndo, const char **pptr, int *len) { const char *s; - if (*len <= 0 || !pptr || !*pptr) - return NULL; - if (*pptr > (const char *) ndo->ndo_snapend) - return NULL; - + /* Start of string */ s = *pptr; - while (*pptr <= (const char *) ndo->ndo_snapend && *len >= 0 && **pptr) { + /* Scan for the NUL terminator */ + for (;;) { + if (*len == 0) { + /* Ran out of packet data without finding it */ + return NULL; + } + if (GET_U_1(*pptr) == '\0') { + /* Found it */ + break; + } + /* Keep scanning */ (*pptr)++; (*len)--; } + /* Skip the NUL terminator */ (*pptr)++; (*len)--; - if (*len < 0 || *pptr > (const char *) ndo->ndo_snapend) - return NULL; return s; } @@ -121,32 +132,47 @@ str_to_lower(const char *string) zb_string = z_buf; while (*zb_string) { - *zb_string = tolower((unsigned char)(*zb_string)); + *zb_string = ND_ASCII_TOLOWER(*zb_string); zb_string++; } return z_buf; } +#define ZEPHYR_PRINT(str1,str2) \ +{ ND_PRINT("%s", (str1)); fn_print_str(ndo, (const u_char *)(str2)); } + void -zephyr_print(netdissect_options *ndo, const u_char *cp, int length) +zephyr_print(netdissect_options *ndo, const u_char *cp, u_int length) { - struct z_packet z; + struct z_packet z = { + NULL, /* version */ + 0, /* numfields */ + 0, /* kind */ + NULL, /* uid */ + 0, /* port */ + 0, /* auth */ + 0, /* authlen */ + NULL, /* authdata */ + NULL, /* class */ + NULL, /* inst */ + NULL, /* opcode */ + NULL, /* sender */ + NULL, /* recipient */ + NULL, /* format */ + 0, /* cksum */ + 0, /* multi */ + NULL /* multi_uid */ + }; const char *parse = (const char *) cp; int parselen = length; const char *s; int lose = 0; + ndo->ndo_protocol = "zephyr"; /* squelch compiler warnings */ - z.kind = 0; - z.class = 0; - z.inst = 0; - z.opcode = 0; - z.sender = 0; - z.recipient = 0; - -#define PARSE_STRING \ +#define PARSE_STRING \ s = parse_field(ndo, &parse, &parselen); \ if (!s) lose = 1; @@ -159,7 +185,9 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length) if (!lose) field = s; PARSE_FIELD_STR(z.version); - if (lose) return; + if (lose) + goto invalid; + if (strncmp(z.version, "ZEPH", 4)) return; @@ -180,39 +208,37 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length) PARSE_FIELD_INT(z.multi); PARSE_FIELD_STR(z.multi_uid); - if (lose) { - ND_PRINT((ndo, " [|zephyr] (%d)", length)); - return; - } + if (lose) + goto invalid; - ND_PRINT((ndo, " zephyr")); + ND_PRINT(" zephyr"); if (strncmp(z.version+4, "0.2", 3)) { - ND_PRINT((ndo, " v%s", z.version+4)); + ZEPHYR_PRINT(" v", z.version+4) return; } - ND_PRINT((ndo, " %s", tok2str(z_types, "type %d", z.kind))); + ND_PRINT(" %s", tok2str(z_types, "type %d", z.kind)); if (z.kind == Z_PACKET_SERVACK) { /* Initialization to silence warnings */ const char *ackdata = NULL; PARSE_FIELD_STR(ackdata); if (!lose && strcmp(ackdata, "SENT")) - ND_PRINT((ndo, "/%s", str_to_lower(ackdata))); + ZEPHYR_PRINT("/", str_to_lower(ackdata)) } - if (*z.sender) ND_PRINT((ndo, " %s", z.sender)); + if (*z.sender) ZEPHYR_PRINT(" ", z.sender); if (!strcmp(z.class, "USER_LOCATE")) { if (!strcmp(z.opcode, "USER_HIDE")) - ND_PRINT((ndo, " hide")); + ND_PRINT(" hide"); else if (!strcmp(z.opcode, "USER_UNHIDE")) - ND_PRINT((ndo, " unhide")); + ND_PRINT(" unhide"); else - ND_PRINT((ndo, " locate %s", z.inst)); + ZEPHYR_PRINT(" locate ", z.inst); return; } if (!strcmp(z.class, "ZEPHYR_ADMIN")) { - ND_PRINT((ndo, " zephyr-admin %s", str_to_lower(z.opcode))); + ZEPHYR_PRINT(" zephyr-admin ", str_to_lower(z.opcode)); return; } @@ -222,79 +248,79 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length) !strcmp(z.opcode, "SUBSCRIBE_NODEFS") || !strcmp(z.opcode, "UNSUBSCRIBE")) { - ND_PRINT((ndo, " %ssub%s", strcmp(z.opcode, "SUBSCRIBE") ? "un" : "", + ND_PRINT(" %ssub%s", strcmp(z.opcode, "SUBSCRIBE") ? "un" : "", strcmp(z.opcode, "SUBSCRIBE_NODEFS") ? "" : - "-nodefs")); + "-nodefs"); if (z.kind != Z_PACKET_SERVACK) { /* Initialization to silence warnings */ const char *c = NULL, *i = NULL, *r = NULL; PARSE_FIELD_STR(c); PARSE_FIELD_STR(i); PARSE_FIELD_STR(r); - if (!lose) ND_PRINT((ndo, " %s", z_triple(c, i, r))); + if (!lose) ZEPHYR_PRINT(" ", z_triple(c, i, r)); } return; } if (!strcmp(z.opcode, "GIMME")) { - ND_PRINT((ndo, " ret")); + ND_PRINT(" ret"); return; } if (!strcmp(z.opcode, "GIMMEDEFS")) { - ND_PRINT((ndo, " gimme-defs")); + ND_PRINT(" gimme-defs"); return; } if (!strcmp(z.opcode, "CLEARSUB")) { - ND_PRINT((ndo, " clear-subs")); + ND_PRINT(" clear-subs"); return; } - ND_PRINT((ndo, " %s", str_to_lower(z.opcode))); + ZEPHYR_PRINT(" ", str_to_lower(z.opcode)); return; } if (!strcmp(z.inst, "HM")) { - ND_PRINT((ndo, " %s", str_to_lower(z.opcode))); + ZEPHYR_PRINT(" ", str_to_lower(z.opcode)); return; } if (!strcmp(z.inst, "REALM")) { if (!strcmp(z.opcode, "ADD_SUBSCRIBE")) - ND_PRINT((ndo, " realm add-subs")); + ND_PRINT(" realm add-subs"); if (!strcmp(z.opcode, "REQ_SUBSCRIBE")) - ND_PRINT((ndo, " realm req-subs")); + ND_PRINT(" realm req-subs"); if (!strcmp(z.opcode, "RLM_SUBSCRIBE")) - ND_PRINT((ndo, " realm rlm-sub")); + ND_PRINT(" realm rlm-sub"); if (!strcmp(z.opcode, "RLM_UNSUBSCRIBE")) - ND_PRINT((ndo, " realm rlm-unsub")); + ND_PRINT(" realm rlm-unsub"); return; } } if (!strcmp(z.class, "HM_CTL")) { - ND_PRINT((ndo, " hm_ctl %s", str_to_lower(z.inst))); - ND_PRINT((ndo, " %s", str_to_lower(z.opcode))); + ZEPHYR_PRINT(" hm_ctl ", str_to_lower(z.inst)); + ZEPHYR_PRINT(" ", str_to_lower(z.opcode)); return; } if (!strcmp(z.class, "HM_STAT")) { if (!strcmp(z.inst, "HMST_CLIENT") && !strcmp(z.opcode, "GIMMESTATS")) { - ND_PRINT((ndo, " get-client-stats")); + ND_PRINT(" get-client-stats"); return; } } if (!strcmp(z.class, "WG_CTL")) { - ND_PRINT((ndo, " wg_ctl %s", str_to_lower(z.inst))); - ND_PRINT((ndo, " %s", str_to_lower(z.opcode))); + ZEPHYR_PRINT(" wg_ctl ", str_to_lower(z.inst)); + ZEPHYR_PRINT(" ", str_to_lower(z.opcode)); return; } if (!strcmp(z.class, "LOGIN")) { if (!strcmp(z.opcode, "USER_FLUSH")) { - ND_PRINT((ndo, " flush_locs")); + ND_PRINT(" flush_locs"); return; } @@ -304,7 +330,7 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length) !strcmp(z.opcode, "REALM-ANNOUNCED") || !strcmp(z.opcode, "NET-VISIBLE") || !strcmp(z.opcode, "NET-ANNOUNCED")) { - ND_PRINT((ndo, " set-exposure %s", str_to_lower(z.opcode))); + ZEPHYR_PRINT(" set-exposure ", str_to_lower(z.opcode)); return; } } @@ -312,7 +338,11 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length) if (!*z.recipient) z.recipient = "*"; - ND_PRINT((ndo, " to %s", z_triple(z.class, z.inst, z.recipient))); + ZEPHYR_PRINT(" to ", z_triple(z.class, z.inst, z.recipient)); if (*z.opcode) - ND_PRINT((ndo, " op %s", z.opcode)); + ZEPHYR_PRINT(" op ", z.opcode); + return; + +invalid: + nd_print_invalid(ndo); }