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 dd9cadcff0ab2423e287d394f3cadb5352a953ce..ec5b2f19e25769c25f511d586f23fa17dbe14542 100644 (file)
--- a/print-beep.c
+++ b/print-beep.c
@@ -1,49 +1,42 @@
 /*
  * Copyright (C) 2000, Richard Sharpe
  *
 /*
  * 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 
+ * This software may be distributed either under the terms of the
+ * 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
  *
  */
 

-#ifndef lint
-static const char rcsid[] =
-  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.1 2001-12-10 08:21:24 guy Exp $";
-#endif
+/* \summary: Blocks Extensible Exchange Protocol (BEEP) printer */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

-#include <sys/param.h>
-#include <sys/time.h>
+#include "netdissect-stdinc.h"

 
 

-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>

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

-#include <unistd.h>

 
 

-#include "interface.h"
-#include "extract.h"
+#include "netdissect.h"

 
 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise
 
 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise

- * 
+ *

  * Looks at the first few chars up to tl1 ...
  */
 
  * Looks at the first few chars up to tl1 ...
  */
 

-static int l_strnstart(const char *, u_int, const char *, u_int);
-

 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;
 


@@ -51,23 +44,24 @@ l_strnstart(const char *tstr1, u_int tl1, const char *str2, u_int l2)
 }
 
 void
 }
 
 void

-beep_print(const u_char *bp, u_int length)
+beep_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
 
 {
 

-       if (l_strnstart("MSG", 4, bp, length)) /* A REQuest */
-               printf(" BEEP MSG");
-       else if (l_strnstart("RPY ", 4, bp, length))
-               printf(" BEEP RPY");
-       else if (l_strnstart("ERR ", 4, bp, length))
-               printf(" BEEP ERR");
-       else if (l_strnstart("ANS ", 4, bp, length))
-               printf(" BEEP ANS");
-       else if (l_strnstart("NUL ", 4, bp, length))
-               printf(" BEEP NUL");
-       else if (l_strnstart("SEQ ", 4, bp, length))
-               printf(" BEEP SEQ");
-       else if (l_strnstart("END", 4, bp, length))
-               printf(" BEEP END");
-       else 
-               printf(" BEEP (payload or undecoded)");
+       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
+               ND_PRINT(" BEEP (payload or undecoded)");

 }
 }