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

[tcpdump] / print-beep.c

diff --git a/print-beep.c b/print-beep.c
index 1ddb9eb5f4a95411518f0a7a7a5183b80beb0653..ec5b2f19e25769c25f511d586f23fa17dbe14542 100644 (file)
--- a/print-beep.c
+++ b/print-beep.c
@@ -2,18 +2,18 @@
  * Copyright (C) 2000, Richard Sharpe
  *
  * This software may be distributed either under the terms of the
  * Copyright (C) 2000, Richard Sharpe
  *
  * This software may be distributed either under the terms of the

- * BSD-style licence that accompanies tcpdump or under the GNU GPL
+ * BSD-style license that accompanies tcpdump or under the GNU GPL

  * version 2 or later.
  *
  * print-beep.c
  *
  */
 
  * version 2 or later.
  *
  * print-beep.c
  *
  */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Blocks Extensible Exchange Protocol (BEEP) printer */

 
 

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

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -26,9 +26,17 @@
  */
 
 static int
  */
 
 static int

-l_strnstart(const char *tstr1, u_int tl1, const char *str2, u_int l2)
+l_strnstart(netdissect_options *ndo, const char *tstr1, u_int tl1,
+    const char *str2, u_int l2)

 {
 {

-
+       if (!ND_TTEST_LEN(str2, tl1)) {
+               /*
+                * We don't have tl1 bytes worth of captured data
+                * for the string, so we can't check for this
+                * string.
+                */
+               return 0;
+       }

        if (tl1 > l2)
                return 0;
 
        if (tl1 > l2)
                return 0;
 


@@ -39,20 +47,21 @@ void
 beep_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 
 beep_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 

-       if (l_strnstart("MSG", 4, (const char *)bp, length)) /* A REQuest */
-               ND_PRINT((ndo, " BEEP MSG"));
-       else if (l_strnstart("RPY ", 4, (const char *)bp, length))
-               ND_PRINT((ndo, " BEEP RPY"));
-       else if (l_strnstart("ERR ", 4, (const char *)bp, length))
-               ND_PRINT((ndo, " BEEP ERR"));
-       else if (l_strnstart("ANS ", 4, (const char *)bp, length))
-               ND_PRINT((ndo, " BEEP ANS"));
-       else if (l_strnstart("NUL ", 4, (const char *)bp, length))
-               ND_PRINT((ndo, " BEEP NUL"));
-       else if (l_strnstart("SEQ ", 4, (const char *)bp, length))
-               ND_PRINT((ndo, " BEEP SEQ"));
-       else if (l_strnstart("END", 4, (const char *)bp, length))
-               ND_PRINT((ndo, " BEEP END"));
+       ndo->ndo_protocol = "beep";
+       if (l_strnstart(ndo, "MSG", 4, (const char *)bp, length)) /* A REQuest */
+               ND_PRINT(" BEEP MSG");
+       else if (l_strnstart(ndo, "RPY ", 4, (const char *)bp, length))
+               ND_PRINT(" BEEP RPY");
+       else if (l_strnstart(ndo, "ERR ", 4, (const char *)bp, length))
+               ND_PRINT(" BEEP ERR");
+       else if (l_strnstart(ndo, "ANS ", 4, (const char *)bp, length))
+               ND_PRINT(" BEEP ANS");
+       else if (l_strnstart(ndo, "NUL ", 4, (const char *)bp, length))
+               ND_PRINT(" BEEP NUL");
+       else if (l_strnstart(ndo, "SEQ ", 4, (const char *)bp, length))
+               ND_PRINT(" BEEP SEQ");
+       else if (l_strnstart(ndo, "END", 4, (const char *)bp, length))
+               ND_PRINT(" BEEP END");

        else
        else

-               ND_PRINT((ndo, " BEEP (payload or undecoded)"));
+               ND_PRINT(" BEEP (payload or undecoded)");

 }
 }