From: guy <guy>
Date: Mon, 10 Dec 2001 08:21:22 +0000 (+0000)
Subject: The BXXP protocol was replaced by the BEEP protocol; replace the BXXP
X-Git-Tag: tcpdump-3.7.1~16
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/b92f17aa078a0b8d11d9d05d3f8e58c56b8d9bd5

The BXXP protocol was replaced by the BEEP protocol; replace the BXXP
dissector with a BEEP dissector.
---

diff --git a/FILES b/FILES
index a6ef4925..3b4f3d42 100644
--- a/FILES
+++ b/FILES
@@ -88,7 +88,7 @@ print-atalk.c
 print-atm.c
 print-bgp.c
 print-bootp.c
-print-bxxp.c
+print-beep.c
 print-cdp.c
 print-chdlc.c
 print-cip.c
diff --git a/Makefile.in b/Makefile.in
index 0f0e9f25..2cb6924a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.259 2001-10-08 21:25:15 fenner Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.260 2001-12-10 08:21:23 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -68,7 +68,7 @@ INSTALL_DATA = @INSTALL_DATA@
 CSRC =	addrtoname.c gmt2local.c machdep.c parsenfsfh.c \
 	print-802_11.c print-ah.c print-arcnet.c print-arp.c \
 	print-ascii.c print-atalk.c print-atm.c print-bgp.c \
-	print-bootp.c print-bxxp.c print-cdp.c print-chdlc.c \
+	print-bootp.c print-beep.c print-cdp.c print-chdlc.c \
 	print-cip.c print-cnfp.c print-decnet.c print-domain.c \
 	print-dvmrp.c print-egp.c print-esp.c print-ether.c \
 	print-fddi.c print-gre.c print-hsrp.c print-icmp.c \
diff --git a/interface.h b/interface.h
index 27489e0d..6ad68a8d 100644
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.176 2001-11-25 01:48:47 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.177 2001-12-10 08:21:23 guy Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -195,7 +195,7 @@ extern void atalk_print(const u_char *, u_int);
 extern void atm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void bootp_print(const u_char *, u_int, u_short, u_short);
 extern void bgp_print(const u_char *, int);
-extern void bxxp_print(const u_char *, u_int);
+extern void beep_print(const u_char *, u_int);
 extern void cnfp_print(const u_char *, u_int, const u_char *);
 extern void decnet_print(const u_char *, u_int, u_int);
 extern void default_print(const u_char *, u_int);
diff --git a/print-bxxp.c b/print-beep.c
similarity index 63%
rename from print-bxxp.c
rename to print-beep.c
index 4067f3d3..dd9cadcf 100644
--- a/print-bxxp.c
+++ b/print-beep.c
@@ -5,13 +5,13 @@
  * BSD-style licence that accompanies tcpdump or under the GNU GPL 
  * version 2 or later.
  *
- * print-bxxp.c
+ * print-beep.c
  *
  */
 
 #ifndef lint
 static const char rcsid[] =
-  "@(#) $Header: /tcpdump/master/tcpdump/Attic/print-bxxp.c,v 1.5 2001-09-17 21:57:56 fenner Exp $";
+  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.1 2001-12-10 08:21:24 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -51,17 +51,23 @@ l_strnstart(const char *tstr1, u_int tl1, const char *str2, u_int l2)
 }
 
 void
-bxxp_print(const u_char *bp, u_int length)
+beep_print(const u_char *bp, u_int length)
 {
 
-	if (l_strnstart("REQ ", 4, bp, length)) /* A REQuest */
-		printf(" BXXP REQ");
-	else if (l_strnstart("RSP ", 4, bp, length))
-		printf(" BXXP RSP");
+	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(" BXXP SEQ");
+		printf(" BEEP SEQ");
 	else if (l_strnstart("END", 4, bp, length))
-		printf(" BXXP END");
+		printf(" BEEP END");
 	else 
-		printf(" BXXP (payload or undecoded)");
+		printf(" BEEP (payload or undecoded)");
 }
diff --git a/print-tcp.c b/print-tcp.c
index 2b50b5d1..cd1299d9 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.94 2001-11-16 08:59:22 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.95 2001-12-10 08:21:24 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -95,7 +95,7 @@ static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE];
 #ifndef PPTP_PORT
 #define PPTP_PORT	1723
 #endif
-#define BXXP_PORT        10288
+#define BEEP_PORT        10288
 #ifndef NFS_PORT
 #define NFS_PORT	2049
 #endif
@@ -603,8 +603,8 @@ tcp_print(register const u_char *bp, register u_int length,
 		else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
 			nbt_tcp_print(bp, length);
 #endif
-		else if (sport == BXXP_PORT || dport == BXXP_PORT)
-			bxxp_print(bp, length);
+		else if (sport == BEEP_PORT || dport == BEEP_PORT)
+			beep_print(bp, length);
 		else if (length > 2 &&
 		    (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT)) {
 			/*