That didn't work, either.

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index cbbac30d7f77a355d477ca49cafc4c2746c4f074..bddd5f9b685407f2ae84ea9ebfe54dcab9e2a7d2 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -72,7 +72,7 @@ struct bootp {
        nd_byte         bp_sname[64];   /* server host name */
        nd_byte         bp_file[128];   /* boot file name */
        nd_byte         bp_vend[64];    /* vendor-specific area */
-} ND_UNALIGNED;
+};
 
 #define BOOTPREPLY     2
 #define BOOTPREQUEST   1
@@ -247,7 +247,7 @@ struct cmu_vend {
        nd_ipv4         v_ins1, v_ins2; /* IEN-116 name servers */
        nd_ipv4         v_ts1, v_ts2;   /* Time servers */
        nd_byte         v_unused[24];   /* currently unused */
-} ND_UNALIGNED;
+};
 
 
 /* v_flags values */
@@ -298,7 +298,7 @@ bootp_print(netdissect_options *ndo,
        bp_htype = EXTRACT_U_1(bp->bp_htype);
        bp_hlen = EXTRACT_U_1(bp->bp_hlen);
        if (bp_htype == 1 && bp_hlen == 6 && bp_op == BOOTPREQUEST) {
-               ND_TCHECK_LEN(bp->bp_chaddr, 6);
+               ND_TCHECK_6(bp->bp_chaddr);
                ND_PRINT(" from %s", etheraddr_string(ndo, bp->bp_chaddr));
        }
 
@@ -353,14 +353,14 @@ bootp_print(netdissect_options *ndo,
 
        /* Client's Ethernet address */
        if (bp_htype == 1 && bp_hlen == 6) {
-               ND_TCHECK_LEN(bp->bp_chaddr, 6);
+               ND_TCHECK_6(bp->bp_chaddr);
                ND_PRINT("\n\t  Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr));
        }
 
        ND_TCHECK_1(bp->bp_sname);              /* check first char only */
        if (EXTRACT_U_1(bp->bp_sname)) {
                ND_PRINT("\n\t  sname \"");
-               if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof bp->bp_sname,
+               if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
                    ndo->ndo_snapend)) {
                        ND_PRINT("\"");
                        ND_PRINT("%s", tstr + 1);
@@ -371,7 +371,7 @@ bootp_print(netdissect_options *ndo,
        ND_TCHECK_1(bp->bp_file);               /* check first char only */
        if (EXTRACT_U_1(bp->bp_file)) {
                ND_PRINT("\n\t  file \"");
-               if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof bp->bp_file,
+               if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
                    ndo->ndo_snapend)) {
                        ND_PRINT("\"");
                        ND_PRINT("%s", tstr + 1);
@@ -381,7 +381,7 @@ bootp_print(netdissect_options *ndo,
        }
 
        /* Decode the vendor buffer */
-       ND_TCHECK_LEN(bp->bp_vend, 4);
+       ND_TCHECK_4(bp->bp_vend);
        if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
                    sizeof(uint32_t)) == 0)
                rfc1048_print(ndo, bp->bp_vend);