Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-dhcp6.c

diff --git a/print-dhcp6.c b/print-dhcp6.c
index e2caa58a466f78b9b25d6f09d852153afe8a349d..e6986da0089f897cbc49a22802eaad0c8abdbc4b 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -325,7 +325,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                            EXTRACT_BE_U_2(tp + 2),
                                            EXTRACT_BE_U_4(tp + 4)));
                                        for (i = 8; i < optlen; i++)
-                                               ND_PRINT((ndo, "%02x", tp[i]));
+                                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
                                        /*(*/
                                        ND_PRINT((ndo, ")"));
                                } else {
@@ -337,7 +337,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                if (optlen >= 2 + 8) {
                                        ND_PRINT((ndo, " vid "));
                                        for (i = 2; i < 2 + 8; i++)
-                                               ND_PRINT((ndo, "%02x", tp[i]));
+                                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
                                        /*(*/
                                        ND_PRINT((ndo, ")"));
                                } else {
@@ -350,7 +350,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                        ND_PRINT((ndo, " hwaddr type %u ",
                                            EXTRACT_BE_U_2(tp + 2)));
                                        for (i = 4; i < optlen; i++)
-                                               ND_PRINT((ndo, "%02x", tp[i]));
+                                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
                                        /*(*/
                                        ND_PRINT((ndo, ")"));
                                } else {
@@ -370,7 +370,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0])));
+                       ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp)));
                        ND_PRINT((ndo, " pltime:%u vltime:%u",
                            EXTRACT_BE_U_4(tp + 16),
                            EXTRACT_BE_U_4(tp + 20)));
@@ -521,7 +521,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        tp = (const u_char *)(dh6o + 1);
                        ND_PRINT((ndo, " "));
                        for (i = 0; i < optlen && i < 10; i++)
-                               ND_PRINT((ndo, "%02x", tp[i]));
+                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
                        ND_PRINT((ndo, "...)"));
                        break;
                case DH6OPT_RECONF_MSG:
@@ -560,7 +560,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        }
                        tp = (const u_char *)(dh6o + 1);
                        for (i = 0; i < optlen; i += 16)
-                               ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[i])));
+                               ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + i)));
                        ND_PRINT((ndo, ")"));
                        break;
                case DH6OPT_SIP_SERVER_D:
@@ -617,7 +617,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, &tp[9]), tp[8]));
+                       ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8)));
                        ND_PRINT((ndo, " pltime:%u vltime:%u",
                            EXTRACT_BE_U_4(tp),
                            EXTRACT_BE_U_4(tp + 4)));
@@ -647,7 +647,7 @@ dhcp6opt_print(netdissect_options *ndo,
                         * Print hex dump first 10 characters.
                         */
                        for (i = 4; i < optlen && i < 14; i++)
-                               ND_PRINT((ndo, "%02x", tp[i]));
+                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
                        ND_PRINT((ndo, "...)"));
                        break;
                case DH6OPT_LQ_QUERY:
@@ -668,7 +668,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                ND_PRINT((ndo, " type_%u", dh6_lq_query_type));
                                break;
                        }
-                       ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[1])));
+                       ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + 1)));
                        if (optlen > 17) {
                                /* there are query-options */
                                dhcp6opt_print(ndo, tp + 17, tp + optlen);
@@ -689,12 +689,12 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %s ", ip6addr_string(ndo, &tp[0])));
+                       ND_PRINT((ndo, " %s ", ip6addr_string(ndo, tp)));
                        /*
                         * Print hex dump first 10 characters.
                         */
                        for (i = 16; i < optlen && i < 26; i++)
-                               ND_PRINT((ndo, "%02x", tp[i]));
+                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
                        ND_PRINT((ndo, "...)"));
                        break;
                case DH6OPT_NTP_SERVER:
@@ -718,7 +718,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                                ND_PRINT((ndo, " ?"));
                                                break;
                                        }
-                                       ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0])));
+                                       ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp)));
                                        break;
                                case DH6OPT_NTP_SUBOPTION_SRV_FQDN:
                                        ND_PRINT((ndo, " "));