summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuliusz Chroboczek <jch@pps.jussieu.fr>2011-08-27 16:36:10 +0200
committerMichael Richardson <mcr@sandelman.ca>2011-08-27 16:55:32 -0400
commit2e2e33875fc58ce69c208e9f1dcddd40b65eb5bd (patch)
tree8e09f9af578c7540790028992f806fe1fb2231a6
parent79bb56d3187da28ce455b7564a8070097edfb396 (diff)
downloadtcpdump-2e2e33875fc58ce69c208e9f1dcddd40b65eb5bd.tar.gz
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.
-rw-r--r--print-udp.c2
-rw-r--r--udp.h3
2 files changed, 3 insertions, 2 deletions
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