Imported Upstream version 4.9.2upstream/4.9.2

Change-Id: I490892f19c71ba126fa4e1d3d78e730429a3b454

1 files changed, 30 insertions, 33 deletions

diff --git a/print-beep.c b/print-beep.c
index b476dbf..64a162d 100644
--- a/print-beep.c
+++ b/print-beep.c
@@ -2,33 +2,24 @@
  * 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
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.6 2003-11-16 09:36:13 guy Exp $";
-#endif
+/* \summary: Blocks Extensible Exchange Protocol (BEEP) printer */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.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
@@ -36,12 +27,18 @@ static const char rcsid[] _U_ =
  * Looks at the first few chars up to tl1 ...
  */
 
-static int l_strnstart(const char *, u_int, const char *, u_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_TTEST2(*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;
 
@@ -49,23 +46,23 @@ l_strnstart(const char *tstr1, u_int tl1, const char *str2, u_int l2)
 }
 
 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, (const char *)bp, length)) /* A REQuest */
-		printf(" BEEP MSG");
-	else if (l_strnstart("RPY ", 4, (const char *)bp, length))
-		printf(" BEEP RPY");
-	else if (l_strnstart("ERR ", 4, (const char *)bp, length))
-		printf(" BEEP ERR");
-	else if (l_strnstart("ANS ", 4, (const char *)bp, length))
-		printf(" BEEP ANS");
-	else if (l_strnstart("NUL ", 4, (const char *)bp, length))
-		printf(" BEEP NUL");
-	else if (l_strnstart("SEQ ", 4, (const char *)bp, length))
-		printf(" BEEP SEQ");
-	else if (l_strnstart("END", 4, (const char *)bp, length))
-		printf(" BEEP END");
+	if (l_strnstart(ndo, "MSG", 4, (const char *)bp, length)) /* A REQuest */
+		ND_PRINT((ndo, " BEEP MSG"));
+	else if (l_strnstart(ndo, "RPY ", 4, (const char *)bp, length))
+		ND_PRINT((ndo, " BEEP RPY"));
+	else if (l_strnstart(ndo, "ERR ", 4, (const char *)bp, length))
+		ND_PRINT((ndo, " BEEP ERR"));
+	else if (l_strnstart(ndo, "ANS ", 4, (const char *)bp, length))
+		ND_PRINT((ndo, " BEEP ANS"));
+	else if (l_strnstart(ndo, "NUL ", 4, (const char *)bp, length))
+		ND_PRINT((ndo, " BEEP NUL"));
+	else if (l_strnstart(ndo, "SEQ ", 4, (const char *)bp, length))
+		ND_PRINT((ndo, " BEEP SEQ"));
+	else if (l_strnstart(ndo, "END", 4, (const char *)bp, length))
+		ND_PRINT((ndo, " BEEP END"));
 	else
-		printf(" BEEP (payload or undecoded)");
+		ND_PRINT((ndo, " BEEP (payload or undecoded)"));
 }