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

[tcpdump] / print-mobility.c

diff --git a/print-mobility.c b/print-mobility.c
index 8b93df17286c7c9b10582c3e9bf576385c70daf8..6d33ebd94fb3fb76929bbd3bb9272baee730c00f 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -160,7 +160,7 @@ mobility_opt_print(netdissect_options *ndo,
                                goto trunc;
                        }
                        ND_TCHECK_16(bp + i + 2);
-                       ND_PRINT((ndo, "(alt-CoA: %s)", ip6addr_string(ndo, &bp[i+2])));
+                       ND_PRINT((ndo, "(alt-CoA: %s)", ip6addr_string(ndo, bp + i + 2)));
                        break;
                case IP6MOPT_NONCEID:
                        if (len - i < IP6MOPT_NONCEID_MINLEN) {
@@ -182,10 +182,10 @@ mobility_opt_print(netdissect_options *ndo,
                        break;
                default:
                        if (len - i < IP6MOPT_MINLEN) {
-                               ND_PRINT((ndo, "(sopt_type %u: trunc)", bp[i]));
+                               ND_PRINT((ndo, "(sopt_type %u: trunc)", EXTRACT_U_1(bp + i)));
                                goto trunc;
                        }
-                       ND_PRINT((ndo, "(type-0x%02x: len=%u)", bp[i], bp[i + 1]));
+                       ND_PRINT((ndo, "(type-0x%02x: len=%u)", EXTRACT_U_1(bp + i), EXTRACT_U_1(bp + i + 1)));
                        break;
                }
        }
@@ -324,7 +324,7 @@ mobility_print(netdissect_options *ndo,
                /* Reserved */
                hlen = IP6M_MINLEN;
                ND_TCHECK_16(bp + hlen);
-               ND_PRINT((ndo, " homeaddr %s", ip6addr_string(ndo, &bp[hlen])));
+               ND_PRINT((ndo, " homeaddr %s", ip6addr_string(ndo, bp + hlen)));
                hlen += 16;
                break;
        default: