X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/39c8c55aa9ff84244cf558b9a957b78933babf0a..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-mobility.c diff --git a/print-mobility.c b/print-mobility.c index 8b93df17..6d33ebd9 100644 --- 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: