X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/877b66b398518d9501513e0860c9f3a8acc70892..0023eaa78f123676bfa9c5fba72ea4b8a59aaa70:/print-beep.c

diff --git a/print-beep.c b/print-beep.c
index 64a162d7..ec5b2f19 100644
--- a/print-beep.c
+++ b/print-beep.c
@@ -11,11 +11,9 @@
 
 /* \summary: Blocks Extensible Exchange Protocol (BEEP) printer */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -31,7 +29,7 @@ static int
 l_strnstart(netdissect_options *ndo, const char *tstr1, u_int tl1,
     const char *str2, u_int l2)
 {
-	if (!ND_TTEST2(*str2, tl1)) {
+	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
@@ -49,20 +47,21 @@ void
 beep_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 
+	ndo->ndo_protocol = "beep";
 	if (l_strnstart(ndo, "MSG", 4, (const char *)bp, length)) /* A REQuest */
-		ND_PRINT((ndo, " BEEP MSG"));
+		ND_PRINT(" BEEP MSG");
 	else if (l_strnstart(ndo, "RPY ", 4, (const char *)bp, length))
-		ND_PRINT((ndo, " BEEP RPY"));
+		ND_PRINT(" BEEP RPY");
 	else if (l_strnstart(ndo, "ERR ", 4, (const char *)bp, length))
-		ND_PRINT((ndo, " BEEP ERR"));
+		ND_PRINT(" BEEP ERR");
 	else if (l_strnstart(ndo, "ANS ", 4, (const char *)bp, length))
-		ND_PRINT((ndo, " BEEP ANS"));
+		ND_PRINT(" BEEP ANS");
 	else if (l_strnstart(ndo, "NUL ", 4, (const char *)bp, length))
-		ND_PRINT((ndo, " BEEP NUL"));
+		ND_PRINT(" BEEP NUL");
 	else if (l_strnstart(ndo, "SEQ ", 4, (const char *)bp, length))
-		ND_PRINT((ndo, " BEEP SEQ"));
+		ND_PRINT(" BEEP SEQ");
 	else if (l_strnstart(ndo, "END", 4, (const char *)bp, length))
-		ND_PRINT((ndo, " BEEP END"));
+		ND_PRINT(" BEEP END");
 	else
-		ND_PRINT((ndo, " BEEP (payload or undecoded)"));
+		ND_PRINT(" BEEP (payload or undecoded)");
 }