Use the EXTRACT_U_1() macro in some utility functions

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 5be109abfc73f499fe0a6b6ac42eb14bf6fe89b9..37a053464782be6844bfb39be303803319846a1f 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,10 +22,10 @@
 /* \summary: BOOTP and IPv4 DHCP printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: BOOTP and IPv4 DHCP printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -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_byte         bp_sname[64];   /* server host name */
        nd_byte         bp_file[128];   /* boot file name */
        nd_byte         bp_vend[64];    /* vendor-specific area */

-} UNALIGNED;
+} ND_UNALIGNED;

 
 #define BOOTPREPLY     2
 #define BOOTPREQUEST   1
 
 #define BOOTPREPLY     2
 #define BOOTPREQUEST   1


@@ -247,7 +247,7 @@ struct cmu_vend {
        struct in_addr  v_ins1, v_ins2; /* IEN-116 name servers */
        struct in_addr  v_ts1, v_ts2;   /* Time servers */
        nd_byte         v_unused[24];   /* currently unused */
        struct in_addr  v_ins1, v_ins2; /* IEN-116 name servers */
        struct in_addr  v_ts1, v_ts2;   /* Time servers */
        nd_byte         v_unused[24];   /* currently unused */

-} UNALIGNED;
+} ND_UNALIGNED;

 
 
 /* v_flags values */
 
 
 /* v_flags values */


@@ -311,19 +311,19 @@ bootp_print(netdissect_options *ndo,
 
        /* The usual hardware address type is 1 (10Mb Ethernet) */
        if (bp_htype != 1)
 
        /* The usual hardware address type is 1 (10Mb Ethernet) */
        if (bp_htype != 1)

-               ND_PRINT(", htype %d", bp_htype);
+               ND_PRINT(", htype %u", bp_htype);

 
        /* The usual length for 10Mb Ethernet address is 6 bytes */
        if (bp_htype != 1 || bp_hlen != 6)
 
        /* The usual length for 10Mb Ethernet address is 6 bytes */
        if (bp_htype != 1 || bp_hlen != 6)

-               ND_PRINT(", hlen %d", bp_hlen);
+               ND_PRINT(", hlen %u", bp_hlen);

 
        /* Only print interesting fields */
        if (EXTRACT_U_1(bp->bp_hops))
 
        /* Only print interesting fields */
        if (EXTRACT_U_1(bp->bp_hops))

-               ND_PRINT(", hops %d", EXTRACT_U_1(bp->bp_hops));
+               ND_PRINT(", hops %u", EXTRACT_U_1(bp->bp_hops));

        if (EXTRACT_BE_U_4(bp->bp_xid))
                ND_PRINT(", xid 0x%x", EXTRACT_BE_U_4(bp->bp_xid));
        if (EXTRACT_BE_U_2(bp->bp_secs))
        if (EXTRACT_BE_U_4(bp->bp_xid))
                ND_PRINT(", xid 0x%x", EXTRACT_BE_U_4(bp->bp_xid));
        if (EXTRACT_BE_U_2(bp->bp_secs))

-               ND_PRINT(", secs %d", EXTRACT_BE_U_2(bp->bp_secs));
+               ND_PRINT(", secs %u", EXTRACT_BE_U_2(bp->bp_secs));

 
        ND_TCHECK_2(bp->bp_flags);
        ND_PRINT(", Flags [%s]",
 
        ND_TCHECK_2(bp->bp_flags);
        ND_PRINT(", Flags [%s]",


@@ -332,22 +332,22 @@ bootp_print(netdissect_options *ndo,
                ND_PRINT(" (0x%04x)", EXTRACT_BE_U_2(bp->bp_flags));
 
        /* Client's ip address */
                ND_PRINT(" (0x%04x)", EXTRACT_BE_U_2(bp->bp_flags));
 
        /* Client's ip address */

-       ND_TCHECK(bp->bp_ciaddr);
+       ND_TCHECK_4(&bp->bp_ciaddr);

        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_ciaddr.s_addr))
                ND_PRINT("\n\t  Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr));
 
        /* 'your' ip address (bootp client) */
        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_ciaddr.s_addr))
                ND_PRINT("\n\t  Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr));
 
        /* 'your' ip address (bootp client) */

-       ND_TCHECK(bp->bp_yiaddr);
+       ND_TCHECK_4(&bp->bp_yiaddr);

        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_yiaddr.s_addr))
                ND_PRINT("\n\t  Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr));
 
        /* Server's ip address */
        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_yiaddr.s_addr))
                ND_PRINT("\n\t  Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr));
 
        /* Server's ip address */

-       ND_TCHECK(bp->bp_siaddr);
+       ND_TCHECK_4(&bp->bp_siaddr);

        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_siaddr.s_addr))
                ND_PRINT("\n\t  Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr));
 
        /* Gateway's ip address */
        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_siaddr.s_addr))
                ND_PRINT("\n\t  Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr));
 
        /* Gateway's ip address */

-       ND_TCHECK(bp->bp_giaddr);
+       ND_TCHECK_4(&bp->bp_giaddr);

        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_giaddr.s_addr))
                ND_PRINT("\n\t  Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr));
 
        if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_giaddr.s_addr))
                ND_PRINT("\n\t  Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr));
 


@@ -603,9 +603,7 @@ rfc1048_print(netdissect_options *ndo,
        const char *cp;
        char c;
        int first, idx;
        const char *cp;
        char c;
        int first, idx;

-       uint32_t ul;
-       uint16_t us;
-       uint8_t uc, subopt, suboptlen;
+       uint8_t subopt, suboptlen;

 
        ND_PRINT("\n\t  Vendor-rfc1048 Extensions");
 
 
        ND_PRINT("\n\t  Vendor-rfc1048 Extensions");
 


@@ -662,18 +660,17 @@ rfc1048_print(netdissect_options *ndo,
                }
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {
                }
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {

-                       uc = EXTRACT_U_1(bp);
+                       ND_PRINT("%s", tok2str(dhcp_msg_values, "Unknown (%u)", EXTRACT_U_1(bp)));

                        bp++;
                        bp++;

-                       ND_PRINT("%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc));

                        continue;
                }
 
                if (tag == TAG_PARM_REQUEST) {
                        idx = 0;
                        continue;
                }
 
                if (tag == TAG_PARM_REQUEST) {
                        idx = 0;

-                       while (len-- > 0) {
-                               uc = EXTRACT_U_1(bp);
+                       while (len > 0) {
+                               cp = tok2str(tag2str, "?Option %u", EXTRACT_U_1(bp));

                                bp++;
                                bp++;

-                               cp = tok2str(tag2str, "?Option %u", uc);
+                               len--;

                                if (idx % 4 == 0)
                                        ND_PRINT("\n\t      ");
                                else
                                if (idx % 4 == 0)
                                        ND_PRINT("\n\t      ");
                                else


@@ -687,10 +684,9 @@ rfc1048_print(netdissect_options *ndo,
                if (tag == TAG_EXTENDED_REQUEST) {
                        first = 1;
                        while (len > 1) {
                if (tag == TAG_EXTENDED_REQUEST) {
                        first = 1;
                        while (len > 1) {

-                               len -= 2;
-                               us = EXTRACT_BE_U_2(bp);
+                               cp = tok2str(xtag2str, "?xT%u", EXTRACT_BE_U_2(bp));

                                bp += 2;
                                bp += 2;

-                               cp = tok2str(xtag2str, "?xT%u", us);
+                               len -= 2;

                                if (!first)
                                        ND_PRINT("+");
                                ND_PRINT("%s", cp + 1);
                                if (!first)
                                        ND_PRINT("+");
                                ND_PRINT("%s", cp + 1);


@@ -728,48 +724,44 @@ rfc1048_print(netdissect_options *ndo,
                case 'l':
                case 'L':
                        /* ip addresses/32-bit words */
                case 'l':
                case 'L':
                        /* ip addresses/32-bit words */

-                       while (len >= sizeof(ul)) {
+                       while (len >= 4) {

                                if (!first)
                                        ND_PRINT(",");
                                if (!first)
                                        ND_PRINT(",");

-                               ul = EXTRACT_BE_U_4(bp);
-                               if (c == 'i') {
-                                       ul = htonl(ul);
-                                       ND_PRINT("%s", ipaddr_string(ndo, &ul));
-                               } else if (c == 'L')
-                                       ND_PRINT("%d", ul);
+                               if (c == 'i')
+                                       ND_PRINT("%s", ipaddr_string(ndo, bp));
+                               else if (c == 'L')
+                                       ND_PRINT("%d", EXTRACT_BE_S_4(bp));

                                else
                                else

-                                       ND_PRINT("%u", ul);
-                               bp += sizeof(ul);
-                               len -= sizeof(ul);
+                                       ND_PRINT("%u", EXTRACT_BE_U_4(bp));
+                               bp += 4;
+                               len -= 4;

                                first = 0;
                        }
                        break;
 
                case 'p':
                        /* IP address pairs */
                                first = 0;
                        }
                        break;
 
                case 'p':
                        /* IP address pairs */

-                       while (len >= 2*sizeof(ul)) {
+                       while (len >= 2*4) {

                                if (!first)
                                        ND_PRINT(",");
                                if (!first)
                                        ND_PRINT(",");

-                               memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-                               ND_PRINT("(%s:", ipaddr_string(ndo, &ul));
-                               bp += sizeof(ul);
-                               memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-                               ND_PRINT("%s)", ipaddr_string(ndo, &ul));
-                               bp += sizeof(ul);
-                               len -= 2*sizeof(ul);
+                               ND_PRINT("(%s:", ipaddr_string(ndo, bp));
+                               bp += 4;
+                               len -= 4;
+                               ND_PRINT("%s)", ipaddr_string(ndo, bp));
+                               bp += 4;
+                               len -= 4;

                                first = 0;
                        }
                        break;
 
                case 's':
                        /* shorts */
                                first = 0;
                        }
                        break;
 
                case 's':
                        /* shorts */

-                       while (len >= sizeof(us)) {
+                       while (len >= 2) {

                                if (!first)
                                        ND_PRINT(",");
                                if (!first)
                                        ND_PRINT(",");

-                               us = EXTRACT_BE_U_2(bp);
-                               ND_PRINT("%u", us);
-                               bp += sizeof(us);
-                               len -= sizeof(us);
+                               ND_PRINT("%u", EXTRACT_BE_U_2(bp));
+                               bp += 2;
+                               len -= 2;

                                first = 0;
                        }
                        break;
                                first = 0;
                        }
                        break;


@@ -962,7 +954,7 @@ rfc1048_print(netdissect_options *ndo,
                                        len--;
                                        /* mask_width <= 32 */
                                        if (mask_width > 32) {
                                        len--;
                                        /* mask_width <= 32 */
                                        if (mask_width > 32) {

-                                               ND_PRINT("[ERROR: Mask width (%d) > 32]", mask_width);
+                                               ND_PRINT("[ERROR: Mask width (%u) > 32]", mask_width);

                                                bp += len;
                                                len = 0;
                                                break;
                                                bp += len;
                                                len = 0;
                                                break;


@@ -982,16 +974,15 @@ rfc1048_print(netdissect_options *ndo,
                                                for (i = 0; i < significant_octets ; i++) {
                                                        if (i > 0)
                                                                ND_PRINT(".");
                                                for (i = 0; i < significant_octets ; i++) {
                                                        if (i > 0)
                                                                ND_PRINT(".");

-                                                       ND_PRINT("%d", EXTRACT_U_1(bp));
+                                                       ND_PRINT("%u", EXTRACT_U_1(bp));

                                                        bp++;
                                                }
                                                for (i = significant_octets ; i < 4 ; i++)
                                                        ND_PRINT(".0");
                                                        bp++;
                                                }
                                                for (i = significant_octets ; i < 4 ; i++)
                                                        ND_PRINT(".0");

-                                               ND_PRINT("/%d", mask_width);
+                                               ND_PRINT("/%u", mask_width);

                                        }
                                        }

-                                       memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-                                       ND_PRINT(":%s)", ipaddr_string(ndo, &ul));
-                                       bp += sizeof(ul);
+                                       ND_PRINT(":%s)", ipaddr_string(ndo, bp));
+                                       bp += 4;

                                        len -= (significant_octets + 4);
                                        first = 0;
                                }
                                        len -= (significant_octets + 4);
                                        first = 0;
                                }


@@ -1033,7 +1024,7 @@ rfc1048_print(netdissect_options *ndo,
                                                goto trunc;
                                        }
                                        ND_PRINT("\"");
                                                goto trunc;
                                        }
                                        ND_PRINT("\"");

-                                       ND_PRINT(", length %d", suboptlen);
+                                       ND_PRINT(", length %u", suboptlen);

                                        suboptnumber++;
                                        len -= suboptlen;
                                        bp += suboptlen;
                                        suboptnumber++;
                                        len -= suboptlen;
                                        bp += suboptlen;


@@ -1061,7 +1052,7 @@ trunc:
        ND_PRINT("|[rfc1048]");
 }
 
        ND_PRINT("|[rfc1048]");
 }
 

-#define PRINTCMUADDR(m, s) { ND_TCHECK(cmu->m); \
+#define PRINTCMUADDR(m, s) { ND_TCHECK_4(&cmu->m); \

     if (cmu->m.s_addr != 0) \
        ND_PRINT(" %s:%s", s, ipaddr_string(ndo, &cmu->m.s_addr)); }
 
     if (cmu->m.s_addr != 0) \
        ND_PRINT(" %s:%s", s, ipaddr_string(ndo, &cmu->m.s_addr)); }