IEEE 802.15.4: Remove trailing "_if" from a protocol name

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 264a016b1a20db7a5d9fbdfdafa055f8df3c6f09..4df86100d5c62fe0526e4562238ce11b55a8c80a 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -816,7 +816,7 @@ rfc1048_print(netdissect_options *ndo,
                        case TAG_NETBIOS_NODE:
                                /* this option should be at least 1 byte long */
                                if (len < 1) {
-                                       ND_PRINT("ERROR: length < 1 bytes");
+                                       ND_PRINT("[ERROR: length < 1 bytes]");
                                        break;
                                }
                                tag = GET_U_1(bp);
@@ -828,7 +828,7 @@ rfc1048_print(netdissect_options *ndo,
                        case TAG_OPT_OVERLOAD:
                                /* this option should be at least 1 byte long */
                                if (len < 1) {
-                                       ND_PRINT("ERROR: length < 1 bytes");
+                                       ND_PRINT("[ERROR: length < 1 bytes]");
                                        break;
                                }
                                tag = GET_U_1(bp);
@@ -840,12 +840,16 @@ rfc1048_print(netdissect_options *ndo,
                        case TAG_CLIENT_FQDN:
                                /* this option should be at least 3 bytes long */
                                if (len < 3) {
-                                       ND_PRINT("ERROR: length < 3 bytes");
+                                       ND_PRINT("[ERROR: length < 3 bytes]");
                                        bp += len;
                                        len = 0;
                                        break;
                                }
-                               if (GET_U_1(bp))
+                               if (GET_U_1(bp) & 0xf0) {
+                                       ND_PRINT("[ERROR: MBZ nibble 0x%x != 0] ",
+                                                (GET_U_1(bp) & 0xf0) >> 4);
+                               }
+                               if (GET_U_1(bp) & 0x0f)
                                        ND_PRINT("[%s] ",
                                                 client_fqdn_flags(GET_U_1(bp)));
                                bp++;
@@ -869,7 +873,7 @@ rfc1048_print(netdissect_options *ndo,
 
                                /* this option should be at least 1 byte long */
                                if (len < 1) {
-                                       ND_PRINT("ERROR: length < 1 bytes");
+                                       ND_PRINT("[ERROR: length < 1 bytes]");
                                        break;
                                }
                                type = GET_U_1(bp);
@@ -943,7 +947,7 @@ rfc1048_print(netdissect_options *ndo,
 
                                /* this option should be at least 5 bytes long */
                                if (len < 5) {
-                                       ND_PRINT("ERROR: length < 5 bytes");
+                                       ND_PRINT("[ERROR: length < 5 bytes]");
                                        bp += len;
                                        len = 0;
                                        break;
@@ -998,7 +1002,7 @@ rfc1048_print(netdissect_options *ndo,
 
                                first = 1;
                                if (len < 2) {
-                                       ND_PRINT("ERROR: length < 2 bytes");
+                                       ND_PRINT("[ERROR: length < 2 bytes]");
                                        bp += len;
                                        len = 0;
                                        break;
@@ -1010,13 +1014,13 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT("\n\t      ");
                                        ND_PRINT("instance#%u: ", suboptnumber);
                                        if (suboptlen == 0) {
-                                               ND_PRINT("ERROR: suboption length must be non-zero");
+                                               ND_PRINT("[ERROR: suboption length must be non-zero]");
                                                bp += len;
                                                len = 0;
                                                break;
                                        }
                                        if (len < suboptlen) {
-                                               ND_PRINT("ERROR: invalid option");
+                                               ND_PRINT("[ERROR: invalid option]");
                                                bp += len;
                                                len = 0;
                                                break;