pflog: Include <limits.h> for UINT_MAX

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 227ed41050704bd1f12fa14dc54e1a4257b7fcc0..b4cefd3d9ef59fcb839d68fad11c8d620aa97b23 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -21,9 +21,7 @@
 
 /* \summary: BOOTP and IPv4 DHCP printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -148,7 +146,7 @@ struct bootp {
 #define        TAG_NIS_P_DOMAIN        ((uint8_t)  64)
 #define        TAG_NIS_P_SERVERS       ((uint8_t)  65)
 #define        TAG_MOBILE_HOME         ((uint8_t)  68)
-#define        TAG_SMPT_SERVER         ((uint8_t)  69)
+#define        TAG_SMTP_SERVER         ((uint8_t)  69)
 #define        TAG_POP3_SERVER         ((uint8_t)  70)
 #define        TAG_NNTP_SERVER         ((uint8_t)  71)
 #define        TAG_WWW_SERVER          ((uint8_t)  72)
@@ -305,8 +303,8 @@ bootp_print(netdissect_options *ndo,
 
        bp_htype = GET_U_1(bp->bp_htype);
        bp_hlen = GET_U_1(bp->bp_hlen);
-       if (bp_htype == 1 && bp_hlen == MAC_ADDR_LEN && bp_op == BOOTPREQUEST) {
-               ND_PRINT(" from %s", GET_ETHERADDR_STRING(bp->bp_chaddr));
+       if (bp_htype == 1 && bp_hlen == MAC48_LEN && bp_op == BOOTPREQUEST) {
+               ND_PRINT(" from %s", GET_MAC48_STRING(bp->bp_chaddr));
        }
 
        ND_PRINT(", length %u", length);
@@ -321,7 +319,7 @@ bootp_print(netdissect_options *ndo,
                ND_PRINT(", htype %u", bp_htype);
 
        /* The usual length for 10Mb Ethernet address is 6 bytes */
-       if (bp_htype != 1 || bp_hlen != MAC_ADDR_LEN)
+       if (bp_htype != 1 || bp_hlen != MAC48_LEN)
                ND_PRINT(", hlen %u", bp_hlen);
 
        /* Only print interesting fields */
@@ -354,8 +352,8 @@ bootp_print(netdissect_options *ndo,
                ND_PRINT("\n\t  Gateway-IP %s", GET_IPADDR_STRING(bp->bp_giaddr));
 
        /* Client's Ethernet address */
-       if (bp_htype == 1 && bp_hlen == MAC_ADDR_LEN) {
-               ND_PRINT("\n\t  Client-Ethernet-Address %s", GET_ETHERADDR_STRING(bp->bp_chaddr));
+       if (bp_htype == 1 && bp_hlen == MAC48_LEN) {
+               ND_PRINT("\n\t  Client-Ethernet-Address %s", GET_MAC48_STRING(bp->bp_chaddr));
        }
 
        if (GET_U_1(bp->bp_sname)) {    /* get first char only */
@@ -470,7 +468,7 @@ static const struct tok tag2str[] = {
        { TAG_NIS_P_DOMAIN,     "sN+D" },
        { TAG_NIS_P_SERVERS,    "iN+S" },
        { TAG_MOBILE_HOME,      "iMH" },
-       { TAG_SMPT_SERVER,      "iSMTP" },
+       { TAG_SMTP_SERVER,      "iSMTP" },
        { TAG_POP3_SERVER,      "iPOP3" },
        { TAG_NNTP_SERVER,      "iNNTP" },
        { TAG_WWW_SERVER,       "iWWW" },
@@ -651,7 +649,7 @@ rfc1048_print(netdissect_options *ndo,
 
                if (tag == TAG_PARM_REQUEST) {
                        idx = 0;
-                       while (len > 0) {
+                       while (len != 0) {
                                uint8_t innertag = GET_U_1(bp);
                                bp++;
                                len--;
@@ -736,7 +734,7 @@ rfc1048_print(netdissect_options *ndo,
 
                case 'B':
                        /* boolean */
-                       while (len > 0) {
+                       while (len != 0) {
                                uint8_t bool_value;
                                if (!first)
                                        ND_PRINT(",");
@@ -762,7 +760,7 @@ rfc1048_print(netdissect_options *ndo,
                case 'x':
                default:
                        /* Bytes */
-                       while (len > 0) {
+                       while (len != 0) {
                                uint8_t byte_value;
                                if (!first)
                                        ND_PRINT(c == 'x' ? ":" : ".");
@@ -853,7 +851,7 @@ rfc1048_print(netdissect_options *ndo,
                                        break;
                                } else {
                                        ND_PRINT("%s ", tok2str(arp2str, "hardware-type %u,", type));
-                                       while (len > 0) {
+                                       while (len != 0) {
                                                if (!first)
                                                        ND_PRINT(":");
                                                ND_PRINT("%02x", GET_U_1(bp));
@@ -913,7 +911,7 @@ rfc1048_print(netdissect_options *ndo,
                                        len = 0;
                                        break;
                                }
-                               while (len > 0) {
+                               while (len != 0) {
                                        if (!first)
                                                ND_PRINT(",");
                                        mask_width = GET_U_1(bp);
@@ -968,7 +966,7 @@ rfc1048_print(netdissect_options *ndo,
                                        len = 0;
                                        break;
                                }
-                               while (len > 0) {
+                               while (len != 0) {
                                        suboptlen = GET_U_1(bp);
                                        bp++;
                                        len--;