* PURPOSE.
*/
+/* \summary: Zephyr printer */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdio.h>
#include <string.h>
#include "netdissect.h"
struct z_packet {
- char *version;
+ const char *version;
int numfields;
int kind;
- char *uid;
+ const char *uid;
int port;
int auth;
int authlen;
- char *authdata;
- char *class;
- char *inst;
- char *opcode;
- char *sender;
+ const char *authdata;
+ const char *class;
+ const char *inst;
+ const char *opcode;
+ const char *sender;
const char *recipient;
- char *format;
+ const char *format;
int cksum;
int multi;
- char *multi_uid;
+ const char *multi_uid;
/* Other fields follow here.. */
};
{ 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];
-static char *
-parse_field(netdissect_options *ndo, char **pptr, int *len)
+static const char *
+parse_field(netdissect_options *ndo, const char **pptr, int *len, int *truncated)
{
- char *s;
-
- if (*len <= 0 || !pptr || !*pptr)
- return NULL;
- if (*pptr > (char *) ndo->ndo_snapend)
- return NULL;
+ const char *s;
+ /* Start of string */
s = *pptr;
- while (*pptr <= (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 (!ND_TTEST_SIZE(*pptr)) {
+ /* Ran out of captured data without finding it */
+ *truncated = 1;
+ return NULL;
+ }
+ if (**pptr == '\0') {
+ /* Found it */
+ break;
+ }
+ /* Keep scanning */
(*pptr)++;
(*len)--;
}
+ /* Skip the NUL terminator */
(*pptr)++;
(*len)--;
- if (*len < 0 || *pptr > (char *) ndo->ndo_snapend)
- return NULL;
return s;
}
static const char *
-z_triple(char *class, char *inst, const char *recipient)
+z_triple(const char *class, const char *inst, const char *recipient)
{
if (!*recipient)
recipient = "*";
}
static const char *
-str_to_lower(char *string)
+str_to_lower(const char *string)
{
+ char *zb_string;
+
strncpy(z_buf, string, sizeof(z_buf));
z_buf[sizeof(z_buf)-1] = '\0';
- string = z_buf;
- while (*string) {
- *string = tolower((unsigned char)(*string));
- string++;
+ zb_string = z_buf;
+ while (*zb_string) {
+ *zb_string = ND_TOLOWER((unsigned char)(*zb_string));
+ zb_string++;
}
return z_buf;
void
zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
{
- struct z_packet z;
- char *parse = (char *) cp;
+ 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;
- char *s;
+ const char *s;
int lose = 0;
+ int truncated = 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 \
- s = parse_field(ndo, &parse, &parselen); \
+#define PARSE_STRING \
+ s = parse_field(ndo, &parse, &parselen, &truncated); \
+ if (truncated) goto trunc; \
if (!s) lose = 1;
#define PARSE_FIELD_INT(field) \
PARSE_FIELD_INT(z.multi);
PARSE_FIELD_STR(z.multi_uid);
- if (lose) {
- ND_PRINT((ndo, " [|zephyr] (%d)", length));
- return;
- }
+ if (lose)
+ goto trunc;
- ND_PRINT((ndo, " zephyr"));
+ ND_PRINT(" zephyr");
if (strncmp(z.version+4, "0.2", 3)) {
- ND_PRINT((ndo, " v%s", z.version+4));
+ ND_PRINT(" v%s", 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 */
- char *ackdata = NULL;
+ const char *ackdata = NULL;
PARSE_FIELD_STR(ackdata);
if (!lose && strcmp(ackdata, "SENT"))
- ND_PRINT((ndo, "/%s", str_to_lower(ackdata)));
+ ND_PRINT("/%s", str_to_lower(ackdata));
}
- if (*z.sender) ND_PRINT((ndo, " %s", z.sender));
+ if (*z.sender) ND_PRINT(" %s", 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));
+ ND_PRINT(" locate %s", z.inst);
return;
}
if (!strcmp(z.class, "ZEPHYR_ADMIN")) {
- ND_PRINT((ndo, " zephyr-admin %s", str_to_lower(z.opcode)));
+ ND_PRINT(" zephyr-admin %s", str_to_lower(z.opcode));
return;
}
!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 */
- char *c = NULL, *i = NULL, *r = NULL;
+ 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) ND_PRINT(" %s", 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)));
+ ND_PRINT(" %s", str_to_lower(z.opcode));
return;
}
if (!strcmp(z.inst, "HM")) {
- ND_PRINT((ndo, " %s", str_to_lower(z.opcode)));
+ ND_PRINT(" %s", 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)));
+ ND_PRINT(" hm_ctl %s", str_to_lower(z.inst));
+ ND_PRINT(" %s", 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)));
+ ND_PRINT(" wg_ctl %s", str_to_lower(z.inst));
+ ND_PRINT(" %s", 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;
}
!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)));
+ ND_PRINT(" set-exposure %s", str_to_lower(z.opcode));
return;
}
}
if (!*z.recipient)
z.recipient = "*";
- ND_PRINT((ndo, " to %s", z_triple(z.class, z.inst, z.recipient)));
+ ND_PRINT(" to %s", z_triple(z.class, z.inst, z.recipient));
if (*z.opcode)
- ND_PRINT((ndo, " op %s", z.opcode));
+ ND_PRINT(" op %s", z.opcode);
+ return;
+
+trunc:
+ nd_print_trunc(ndo);
+ return;
}
projects / tcpdump / blobdiff