From: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Sat, 27 Aug 2011 14:36:10 +0000 (+0200)
Subject: For Babel, recognise both UDP/6696 and UDP/6697.
X-Git-Tag: tcpdump-4.2.1~19
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/b4047e247f28a73b72d3a0cfbdf260383361d558

For Babel, recognise both UDP/6696 and UDP/6697.

IANA has reallocated the Babel port; it is now 6696.  This patch makes
tcpdump recognise both the old and the new Babel ports.
---

diff --git a/print-udp.c b/print-udp.c
index da6cfd38..885d42e4 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -609,7 +609,7 @@ udp_print(register const u_char *bp, u_int length,
 			ripng_print((const u_char *)(up + 1), length);
 		else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT))
 			dhcp6_print((const u_char *)(up + 1), length);
-		else if (ISPORT(BABEL_PORT))
+		else if (ISPORT(BABEL_PORT) || ISPORT(BABEL_PORT_OLD))
 			babel_print((const u_char *)(up + 1), length);
 #endif /*INET6*/
 		/*
diff --git a/udp.h b/udp.h
index 0dc52273..ad1d8506 100644
--- a/udp.h
+++ b/udp.h
@@ -90,5 +90,6 @@ struct udphdr {
 #define RIPNG_PORT 521		/*XXX*/
 #define DHCP6_SERV_PORT 546	/*XXX*/
 #define DHCP6_CLI_PORT 547	/*XXX*/
-#define BABEL_PORT 6697
+#define BABEL_PORT 6696
+#define BABEL_PORT_OLD 6697
 #endif