Patch sent to Debian by Roderick Schertler <[email protected]> to print

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 51cc395d1bcbd767f84652440f2922dd339be00c..531ca84b8126075617cd09dd86a01cfd8fadb1ad 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.51 2000-09-23 08:03:33 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.53 2000-10-27 23:26:30 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,7 +35,6 @@ static const char rcsid[] =
 
 struct mbuf;
 struct rtentry;
-#include <net/if.h>
 
 #include <netinet/in.h>
 
@@ -189,7 +188,7 @@ static struct tok tag2str[] = {
 /* RFC1048 tags */
        { TAG_PAD,              " PAD" },
        { TAG_SUBNET_MASK,      "iSM" },        /* subnet mask (RFC950) */
-       { TAG_TIME_OFFSET,      "lTZ" },        /* seconds from UTC */
+       { TAG_TIME_OFFSET,      "LTZ" },        /* seconds from UTC */
        { TAG_GATEWAY,          "iDG" },        /* default gateway */
        { TAG_TIME_SERVER,      "iTS" },        /* time servers (RFC868) */
        { TAG_NAME_SERVER,      "iIEN" },       /* IEN name servers (IEN116) */
@@ -360,6 +359,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
 
                case 'i':
                case 'l':
+               case 'L':
                        /* ip addresses/32-bit words */
                        while (size >= sizeof(ul)) {
                                if (!first)
@@ -367,6 +367,8 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                memcpy((char *)&ul, (char *)bp, sizeof(ul));
                                if (c == 'i')
                                        printf("%s", ipaddr_string(&ul));
+                               else if (c == 'L')
+                                       printf("%d", ul);
                                else
                                        printf("%u", ul);
                                bp += sizeof(ul);