CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-zephyr.c

diff --git a/print-zephyr.c b/print-zephyr.c
index d2fbf4d05346d471d9276fc591f141f28099548b..796f4e93f79c8dbac4b51f8a350f66f1b6b75815 100644 (file)
--- 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 <[email protected]>
  * All rights reserved.
@@ -22,9 +22,7 @@
 
 /* \summary: Zephyr printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -32,7 +30,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "netdissect-ctype.h"
+
 #include "netdissect.h"
+#include "extract.h"
 
 struct z_packet {
     const char *version;
@@ -83,7 +84,7 @@ static const struct tok z_types[] = {
 static char z_buf[256];
 
 static const char *
-parse_field(netdissect_options *ndo, const char **pptr, int *len, int *truncated)
+parse_field(netdissect_options *ndo, const char **pptr, int *len)
 {
     const char *s;
 
@@ -95,12 +96,7 @@ parse_field(netdissect_options *ndo, const char **pptr, int *len, int *truncated
            /* 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') {
+       if (GET_U_1(*pptr) == '\0') {
            /* Found it */
            break;
        }
@@ -119,7 +115,7 @@ z_triple(const char *class, const char *inst, const char *recipient)
 {
     if (!*recipient)
        recipient = "*";
-    nd_snprintf(z_buf, sizeof(z_buf), "<%s,%s,%s>", class, inst, recipient);
+    snprintf(z_buf, sizeof(z_buf), "<%s,%s,%s>", class, inst, recipient);
     z_buf[sizeof(z_buf)-1] = '\0';
     return z_buf;
 }
@@ -134,47 +130,48 @@ str_to_lower(const char *string)
 
     zb_string = z_buf;
     while (*zb_string) {
-       *zb_string = ND_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 = {
-        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 */
+       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;
-    int truncated = 0;
 
     ndo->ndo_protocol = "zephyr";
     /* squelch compiler warnings */
 
 #define PARSE_STRING                                           \
-       s = parse_field(ndo, &parse, &parselen, &truncated);    \
-       if (truncated) goto trunc;                              \
+       s = parse_field(ndo, &parse, &parselen);        \
        if (!s) lose = 1;
 
 #define PARSE_FIELD_INT(field)                 \
@@ -186,7 +183,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;
 
@@ -208,11 +207,11 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
     PARSE_FIELD_STR(z.multi_uid);
 
     if (lose)
-        goto trunc;
+       goto invalid;
 
     ND_PRINT(" zephyr");
     if (strncmp(z.version+4, "0.2", 3)) {
-       ND_PRINT(" v%s", z.version+4);
+       ZEPHYR_PRINT(" v", z.version+4)
        return;
     }
 
@@ -222,9 +221,9 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
        const char *ackdata = NULL;
        PARSE_FIELD_STR(ackdata);
        if (!lose && strcmp(ackdata, "SENT"))
-           ND_PRINT("/%s", str_to_lower(ackdata));
+           ZEPHYR_PRINT("/", str_to_lower(ackdata))
     }
-    if (*z.sender) ND_PRINT(" %s", z.sender);
+    if (*z.sender) ZEPHYR_PRINT(" ", z.sender);
 
     if (!strcmp(z.class, "USER_LOCATE")) {
        if (!strcmp(z.opcode, "USER_HIDE"))
@@ -232,12 +231,12 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
        else if (!strcmp(z.opcode, "USER_UNHIDE"))
            ND_PRINT(" unhide");
        else
-           ND_PRINT(" locate %s", z.inst);
+           ZEPHYR_PRINT(" locate ", z.inst);
        return;
     }
 
     if (!strcmp(z.class, "ZEPHYR_ADMIN")) {
-       ND_PRINT(" zephyr-admin %s", str_to_lower(z.opcode));
+       ZEPHYR_PRINT(" zephyr-admin ", str_to_lower(z.opcode));
        return;
     }
 
@@ -256,7 +255,7 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
                    PARSE_FIELD_STR(c);
                    PARSE_FIELD_STR(i);
                    PARSE_FIELD_STR(r);
-                   if (!lose) ND_PRINT(" %s", z_triple(c, i, r));
+                   if (!lose) ZEPHYR_PRINT(" ", z_triple(c, i, r));
                }
                return;
            }
@@ -276,12 +275,12 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
                return;
            }
 
-           ND_PRINT(" %s", str_to_lower(z.opcode));
+           ZEPHYR_PRINT(" ", str_to_lower(z.opcode));
            return;
        }
 
        if (!strcmp(z.inst, "HM")) {
-           ND_PRINT(" %s", str_to_lower(z.opcode));
+           ZEPHYR_PRINT(" ", str_to_lower(z.opcode));
            return;
        }
 
@@ -299,8 +298,8 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
     }
 
     if (!strcmp(z.class, "HM_CTL")) {
-       ND_PRINT(" hm_ctl %s", str_to_lower(z.inst));
-       ND_PRINT(" %s", str_to_lower(z.opcode));
+       ZEPHYR_PRINT(" hm_ctl ", str_to_lower(z.inst));
+       ZEPHYR_PRINT(" ", str_to_lower(z.opcode));
        return;
     }
 
@@ -312,8 +311,8 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
     }
 
     if (!strcmp(z.class, "WG_CTL")) {
-       ND_PRINT(" wg_ctl %s", str_to_lower(z.inst));
-       ND_PRINT(" %s", str_to_lower(z.opcode));
+       ZEPHYR_PRINT(" wg_ctl ", str_to_lower(z.inst));
+       ZEPHYR_PRINT(" ", str_to_lower(z.opcode));
        return;
     }
 
@@ -329,7 +328,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(" set-exposure %s", str_to_lower(z.opcode));
+           ZEPHYR_PRINT(" set-exposure ", str_to_lower(z.opcode));
            return;
        }
     }
@@ -337,12 +336,11 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
     if (!*z.recipient)
        z.recipient = "*";
 
-    ND_PRINT(" 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(" op %s", z.opcode);
+       ZEPHYR_PRINT(" op ", z.opcode);
     return;
 
-trunc:
-    nd_print_trunc(ndo);
-    return;
+invalid:
+    nd_print_invalid(ndo);
 }