From e91eac244982a8728f370000c353b16e18174ec9 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Tue, 6 Jan 2015 19:03:11 +0000 Subject: Vendor import of tcpdump 4.6.2. --- print-beep.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) (limited to 'print-beep.c') diff --git a/print-beep.c b/print-beep.c index b476dbf96b61..7982feb5c362 100644 --- a/print-beep.c +++ b/print-beep.c @@ -9,26 +9,16 @@ * */ -#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 - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#ifdef HAVE_MEMORY_H -#include -#endif -#include -#include #include #include "interface.h" -#include "extract.h" /* Check for a string but not go beyond length * Return TRUE on match, FALSE otherwise @@ -36,8 +26,6 @@ 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) { @@ -49,23 +37,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"); + ND_PRINT((ndo, " BEEP MSG")); else if (l_strnstart("RPY ", 4, (const char *)bp, length)) - printf(" BEEP RPY"); + ND_PRINT((ndo, " BEEP RPY")); else if (l_strnstart("ERR ", 4, (const char *)bp, length)) - printf(" BEEP ERR"); + ND_PRINT((ndo, " BEEP ERR")); else if (l_strnstart("ANS ", 4, (const char *)bp, length)) - printf(" BEEP ANS"); + ND_PRINT((ndo, " BEEP ANS")); else if (l_strnstart("NUL ", 4, (const char *)bp, length)) - printf(" BEEP NUL"); + ND_PRINT((ndo, " BEEP NUL")); else if (l_strnstart("SEQ ", 4, (const char *)bp, length)) - printf(" BEEP SEQ"); + ND_PRINT((ndo, " BEEP SEQ")); else if (l_strnstart("END", 4, (const char *)bp, length)) - printf(" BEEP END"); + ND_PRINT((ndo, " BEEP END")); else - printf(" BEEP (payload or undecoded)"); + ND_PRINT((ndo, " BEEP (payload or undecoded)")); } -- cgit v1.2.3