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 da6cfd388e799a695caf26d13e7ec26e1f5d0d07..885d42e4da0c201e1bafa0bdba38d99147cf6de5 100644 (file)
--- 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 0dc5227303847d0b72cd52f46ef732f1fcb0964c..ad1d8506dde5fb970168d2ce3114861ac815139f 100644 (file)
--- 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