Tweak the description of the "-D" flag, add an indication of when "-D"

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 04f767ee1994703d0a601b2e93380ded9f69b509..11b375574999049a5c8142936eafc469dd09d467 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,21 +22,14 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.59 2001-07-04 21:18:12 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.64 2002-08-01 08:53:02 risso Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-struct mbuf;
-struct rtentry;
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -48,8 +41,8 @@ struct rtentry;
 #include "ether.h"
 #include "bootp.h"
 
-static void rfc1048_print(const u_char *, u_int);
-static void cmu_print(const u_char *, u_int);
+static void rfc1048_print(const u_char *);
+static void cmu_print(const u_char *);
 
 static char tstr[] = " [|bootp]";
 
@@ -61,10 +54,10 @@ bootp_print(register const u_char *cp, u_int length,
            u_short sport, u_short dport)
 {
        register const struct bootp *bp;
-       static u_char vm_cmu[4] = VM_CMU;
-       static u_char vm_rfc1048[4] = VM_RFC1048;
+       static const u_char vm_cmu[4] = VM_CMU;
+       static const u_char vm_rfc1048[4] = VM_RFC1048;
 
-       bp = (struct bootp *)cp;
+       bp = (const struct bootp *)cp;
        TCHECK(bp->bp_op);
        switch (bp->bp_op) {
 
@@ -130,14 +123,14 @@ bootp_print(register const u_char *cp, u_int length,
                register const char *e;
 
                TCHECK2(bp->bp_chaddr[0], 6);
-               eh = (struct ether_header *)packetp;
+               eh = (const struct ether_header *)packetp;
                if (bp->bp_op == BOOTREQUEST)
                        e = (const char *)ESRC(eh);
                else if (bp->bp_op == BOOTREPLY)
                        e = (const char *)EDST(eh);
                else
                        e = 0;
-               if (e == 0 || memcmp((char *)bp->bp_chaddr, e, 6) != 0)
+               if (e == 0 || memcmp((const char *)bp->bp_chaddr, e, 6) != 0)
                        printf(" ether %s", etheraddr_string(bp->bp_chaddr));
        }
 
@@ -164,13 +157,12 @@ bootp_print(register const u_char *cp, u_int length,
 
        /* Decode the vendor buffer */
        TCHECK(bp->bp_vend[0]);
-       length -= sizeof(*bp) - sizeof(bp->bp_vend);
-       if (memcmp((char *)bp->bp_vend, (char *)vm_rfc1048,
+       if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
                 sizeof(u_int32_t)) == 0)
-               rfc1048_print(bp->bp_vend, length);
-       else if (memcmp((char *)bp->bp_vend, (char *)vm_cmu,
+               rfc1048_print(bp->bp_vend);
+       else if (memcmp((const char *)bp->bp_vend, vm_cmu,
                      sizeof(u_int32_t)) == 0)
-               cmu_print(bp->bp_vend, length);
+               cmu_print(bp->bp_vend);
        else {
                u_int32_t ul;
 
@@ -348,15 +340,16 @@ static struct tok arp2str[] = {
 };
 
 static void
-rfc1048_print(register const u_char *bp, register u_int length)
+rfc1048_print(register const u_char *bp)
 {
-       register u_char tag;
+       register u_int16_t tag;
        register u_int len, size;
        register const char *cp;
        register char c;
        int first;
        u_int32_t ul;
-       u_short us;
+       u_int16_t us;
+       u_int8_t uc;
 
        printf(" vend-rfc1048");
 
@@ -377,9 +370,9 @@ rfc1048_print(register const u_char *bp, register u_int length)
                         * preclude overlap of 1-byte and 2-byte spaces.
                         * If not, we need to offset tag after this step.
                         */
-                       cp = tok2str(xtag2str, "?xT%d", tag);
+                       cp = tok2str(xtag2str, "?xT%u", tag);
                } else
-                       cp = tok2str(tag2str, "?T%d", tag);
+                       cp = tok2str(tag2str, "?T%u", tag);
                c = *cp++;
                printf(" %s:", cp);
 
@@ -395,8 +388,8 @@ rfc1048_print(register const u_char *bp, register u_int length)
                }
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {
-                       c = *bp++;
-                       switch (c) {
+                       uc = *bp++;
+                       switch (uc) {
                        case DHCPDISCOVER:      printf("DISCOVER");     break;
                        case DHCPOFFER:         printf("OFFER");        break;
                        case DHCPREQUEST:       printf("REQUEST");      break;
@@ -405,7 +398,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                        case DHCPNAK:           printf("NACK");         break;
                        case DHCPRELEASE:       printf("RELEASE");      break;
                        case DHCPINFORM:        printf("INFORM");       break;
-                       default:                printf("%u", c);        break;
+                       default:                printf("%u", uc);       break;
                        }
                        continue;
                }
@@ -413,8 +406,8 @@ rfc1048_print(register const u_char *bp, register u_int length)
                if (tag == TAG_PARM_REQUEST) {
                        first = 1;
                        while (len-- > 0) {
-                               c = *bp++;
-                               cp = tok2str(tag2str, "?T%d", c);
+                               uc = *bp++;
+                               cp = tok2str(tag2str, "?T%u", uc);
                                if (!first)
                                        putchar('+');
                                printf("%s", cp + 1);
@@ -426,9 +419,9 @@ rfc1048_print(register const u_char *bp, register u_int length)
                        first = 1;
                        while (len > 1) {
                                len -= 2;
-                               c = EXTRACT_16BITS(bp);
+                               us = EXTRACT_16BITS(bp);
                                bp += 2;
-                               cp = tok2str(xtag2str, "?xT%d", c);
+                               cp = tok2str(xtag2str, "?xT%u", us);
                                if (!first)
                                        putchar('+');
                                printf("%s", cp + 1);
@@ -486,10 +479,10 @@ rfc1048_print(register const u_char *bp, register u_int length)
                        while (size >= 2*sizeof(ul)) {
                                if (!first)
                                        putchar(',');
-                               memcpy((char *)&ul, (char *)bp, sizeof(ul));
+                               memcpy((char *)&ul, (const char *)bp, sizeof(ul));
                                printf("(%s:", ipaddr_string(&ul));
                                bp += sizeof(ul);
-                               memcpy((char *)&ul, (char *)bp, sizeof(ul));
+                               memcpy((char *)&ul, (const char *)bp, sizeof(ul));
                                printf("%s)", ipaddr_string(&ul));
                                bp += sizeof(ul);
                                size -= 2*sizeof(ul);
@@ -503,7 +496,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                if (!first)
                                        putchar(',');
                                us = EXTRACT_16BITS(bp);
-                               printf("%d", us);
+                               printf("%u", us);
                                bp += sizeof(us);
                                size -= sizeof(us);
                                first = 0;
@@ -523,7 +516,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                        putchar('Y');
                                        break;
                                default:
-                                       printf("%d?", *bp);
+                                       printf("%u?", *bp);
                                        break;
                                }
                                ++bp;
@@ -542,7 +535,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                if (c == 'x')
                                        printf("%02x", *bp);
                                else
-                                       printf("%d", *bp);
+                                       printf("%u", *bp);
                                ++bp;
                                --size;
                                first = 0;
@@ -569,7 +562,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                if (*bp++)
                                        printf("[svrreg]");
                                if (*bp)
-                                       printf("%d/%d/", *bp, *(bp+1));
+                                       printf("%u/%u/", *bp, *(bp+1));
                                bp += 2;
                                putchar('"');
                                (void)fn_printn(bp, size - 3, NULL);
@@ -583,7 +576,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                size--;
                                if (type == 0) {
                                        putchar('"');
-                                       (void)fn_printn(bp, size, NULL);  
+                                       (void)fn_printn(bp, size, NULL);
                                        putchar('"');
                                        break;
                                } else {
@@ -601,7 +594,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                            }
 
                        default:
-                               printf("[unknown special tag %d, size %d]",
+                               printf("[unknown special tag %u, size %u]",
                                    tag, size);
                                bp += size;
                                size = 0;
@@ -611,7 +604,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
                }
                /* Data left over? */
                if (size)
-                       printf("[len %d]", len);
+                       printf("[len %u]", len);
        }
        return;
 trunc:
@@ -619,7 +612,7 @@ trunc:
 }
 
 static void
-cmu_print(register const u_char *bp, register u_int length)
+cmu_print(register const u_char *bp)
 {
        register const struct cmu_vend *cmu;
 
@@ -628,7 +621,7 @@ cmu_print(register const u_char *bp, register u_int length)
        printf(" %s:%s", s, ipaddr_string(&cmu->m.s_addr)); }
 
        printf(" vend-cmu");
-       cmu = (struct cmu_vend *)bp;
+       cmu = (const struct cmu_vend *)bp;
 
        /* Only print if there are unknown bits */
        TCHECK(cmu->v_flags);