Compile with '-Wsign-compare' in devel mode if supported

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index c62785b00f2a10af52cc4569ff188d35fcdbe44a..41c82889761c8df55e8eb7c6b6e8ab9da8032f08 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -33,7 +33,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|bootp]";
 
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
@@ -72,7 +71,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 +246,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 */
@@ -288,6 +287,7 @@ bootp_print(netdissect_options *ndo,
        static const u_char vm_rfc1048[4] = VM_RFC1048;
        uint8_t bp_op, bp_htype, bp_hlen;
 
+       ndo->ndo_protocol = "bootp";
        bp = (const struct bootp *)cp;
        ND_TCHECK_1(bp->bp_op);
        bp_op = EXTRACT_U_1(bp->bp_op);
@@ -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,17 +353,17 @@ 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),
-                   ndo->ndo_snapend)) {
+               if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
+                               ndo->ndo_snapend) == 0) {
                        ND_PRINT("\"");
-                       ND_PRINT("%s", tstr + 1);
+                       nd_print_trunc(ndo);
                        return;
                }
                ND_PRINT("\"");
@@ -371,17 +371,17 @@ 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),
-                   ndo->ndo_snapend)) {
+               if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
+                               ndo->ndo_snapend) == 0) {
                        ND_PRINT("\"");
-                       ND_PRINT("%s", tstr + 1);
+                       nd_print_trunc(ndo);
                        return;
                }
                ND_PRINT("\"");
        }
 
        /* 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);
@@ -398,7 +398,7 @@ bootp_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -408,8 +408,8 @@ trunc:
  *     l - long (32 bits)
  *     L - unsigned long (32 bits)
  *     s - short (16 bits)
- *     b - period-seperated decimal bytes (variable length)
- *     x - colon-seperated hex bytes (variable length)
+ *     b - period-separated decimal bytes (variable length)
+ *     x - colon-separated hex bytes (variable length)
  *     a - ASCII string (variable length)
  *     B - on/off (8 bits)
  *     $ - special (explicit code to handle)
@@ -654,10 +654,7 @@ rfc1048_print(netdissect_options *ndo,
                                ND_PRINT(", occurs %u", ntag);
                }
 
-               if (!ND_TTEST_LEN(bp, len)) {
-                       ND_PRINT("[|rfc1048 %u]", len);
-                       return;
-               }
+               ND_TCHECK_LEN(bp, len);
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {
                        ND_PRINT("%s", tok2str(dhcp_msg_values, "Unknown (%u)", EXTRACT_U_1(bp)));
@@ -711,7 +708,7 @@ rfc1048_print(netdissect_options *ndo,
                case 'a':
                        /* ASCII strings */
                        ND_PRINT("\"");
-                       if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
+                       if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
                                ND_PRINT("\"");
                                goto trunc;
                        }
@@ -852,7 +849,7 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT("%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(bp + 1));
                                bp += 2;
                                ND_PRINT("\"");
-                               if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
+                               if (nd_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
                                        ND_PRINT("\"");
                                        goto trunc;
                                }
@@ -875,7 +872,7 @@ rfc1048_print(netdissect_options *ndo,
                                len--;
                                if (type == 0) {
                                        ND_PRINT("\"");
-                                       if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
+                                       if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
                                                ND_PRINT("\"");
                                                goto trunc;
                                        }
@@ -921,7 +918,7 @@ rfc1048_print(netdissect_options *ndo,
                                        case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
                                        case AGENT_SUBOPTION_REMOTE_ID:
                                        case AGENT_SUBOPTION_SUBSCRIBER_ID:
-                                               if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
+                                               if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
                                                        goto trunc;
                                                break;
 
@@ -1019,7 +1016,7 @@ rfc1048_print(netdissect_options *ndo,
                                                break;
                                        }
                                        ND_PRINT("\"");
-                                       if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
+                                       if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
                                                ND_PRINT("\"");
                                                goto trunc;
                                        }
@@ -1049,7 +1046,7 @@ rfc1048_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT("|[rfc1048]");
+       nd_print_trunc(ndo);
 }
 
 #define PRINTCMUADDR(m, s) { ND_TCHECK_4(&cmu->m); \
@@ -1082,7 +1079,7 @@ cmu_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 #undef PRINTCMUADDR