summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguy <guy>2007-08-21 22:02:08 +0000
committerguy <guy>2007-08-21 22:02:08 +0000
commit49895c1b77f5480484b6dac00d7543698dc64b68 (patch)
tree21917aa8f18ed90e505e1f64b7463d927c1545cf
parentb38e7655192dfe512e25869e04a4ff1dca486f44 (diff)
downloadtcpdump-49895c1b77f5480484b6dac00d7543698dc64b68.tar.gz
From Francois-Xavier Le Bail: decode DCHP option 249 (Microsoft's
Classless Static Route option) the same way as option 121 (RFC 3442's Classless Static Route option).
-rw-r--r--bootp.h3
-rw-r--r--print-bootp.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/bootp.h b/bootp.h
index dfda3f43..86ccfd33 100644
--- a/bootp.h
+++ b/bootp.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.15.4.2 2007-07-24 17:29:43 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.15.4.3 2007-08-21 22:02:08 guy Exp $ (LBL) */
/*
* Bootstrap Protocol (BOOTP). RFC951 and RFC1048.
*
@@ -163,6 +163,7 @@ struct bootp {
#define TAG_IP4_SUBNET_SELECT ((u_int8_t) 118)
/* RFC 3442 */
#define TAG_CLASSLESS_STATIC_RT ((u_int8_t) 121)
+#define TAG_CLASSLESS_STA_RT_MS ((u_int8_t) 249)
/* ftp://ftp.isi.edu/.../assignments/bootp-dhcp-extensions */
#define TAG_USER_CLASS ((u_int8_t) 77)
#define TAG_SLP_NAMING_AUTH ((u_int8_t) 80)
diff --git a/print-bootp.c b/print-bootp.c
index 9a9d760c..06a14317 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,7 +22,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78.2.8 2007-07-24 17:29:43 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78.2.9 2007-08-21 22:02:08 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -280,6 +280,7 @@ static struct tok tag2str[] = {
{ TAG_IP4_SUBNET_SELECT, "iSUBNET" },
/* RFC 3442 */
{ TAG_CLASSLESS_STATIC_RT, "$Classless-Static-Route" },
+ { TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" },
/* http://www.iana.org/assignments/bootp-dhcp-extensions/index.htm */
{ TAG_USER_CLASS, "aCLASS" },
{ TAG_SLP_NAMING_AUTH, "aSLP-NA" },
@@ -699,6 +700,7 @@ rfc1048_print(register const u_char *bp)
break;
case TAG_CLASSLESS_STATIC_RT:
+ case TAG_CLASSLESS_STA_RT_MS:
{
u_int mask_width, significant_octets, i;