Update print-esp.c

[tcpdump] / print-beep.c

diff --git a/print-beep.c b/print-beep.c
index edfad54f53adc6ac7436dd4c1ec1ac63abca4000..ed502b96cabc8e31e68eaec2aa72d7796494ccff 100644 (file)
--- a/print-beep.c
+++ b/print-beep.c
@@ -2,42 +2,31 @@
  * 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
  *
  */
 

+/* \summary: Blocks Extensible Exchange Protocol (BEEP) printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #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 <string.h>
 

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

 
 

-#ifndef lint
-static const char rcsid[] _U_ =
-  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.5 2003-11-15 00:39:16 guy Exp $";
-#endif

 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise
  *
  * Looks at the first few chars up to tl1 ...
  */
 
 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise
  *
  * 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)
 {
 static int
 l_strnstart(const char *tstr1, u_int tl1, const char *str2, u_int l2)
 {


@@ -49,23 +38,23 @@ 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, (const char *)bp, length)) /* A REQuest */
 {
 
        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))
        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))
        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))
        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))
        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))
        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))
        else if (l_strnstart("END", 4, (const char *)bp, length))

-               printf(" BEEP END");
+               ND_PRINT((ndo, " BEEP END"));

        else
        else

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

 }
 }