Regenerate.

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 04f767ee1994703d0a601b2e93380ded9f69b509..f0cc5aec08ecbc939ceaa7ab80e9af40255dbcb3 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.59 2001-07-04 21:18:12 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.60 2001-09-17 21:57:56 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -48,8 +48,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 +61,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 +130,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 +164,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,7 +347,7 @@ 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_int len, size;
@@ -486,10 +485,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);
@@ -619,7 +618,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 +627,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);