diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-12-17 14:46:04 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-12-17 14:46:04 -0800 |
| commit | 3c706445968eb3c53e8a6f11742b62b4f70e8a1f (patch) | |
| tree | 1f6729306d1c9fb9396569b521762850231d1379 /print-dhcp6.c | |
| parent | 1f30eeb06a3e6b10389a99ca5657a25f3d367017 (diff) | |
| download | tcpdump-3c706445968eb3c53e8a6f11742b62b4f70e8a1f.tar.gz | |
Use nd_ipv6 for IPV6 addresses.
Diffstat (limited to 'print-dhcp6.c')
| -rw-r--r-- | print-dhcp6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-dhcp6.c b/print-dhcp6.c index 5558660a..be70dc62 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -118,8 +118,8 @@ struct dhcp6 { struct dhcp6_relay { nd_uint8_t dh6relay_msgtype; nd_uint8_t dh6relay_hcnt; - nd_uint8_t dh6relay_linkaddr[16]; /* XXX: badly aligned */ - nd_uint8_t dh6relay_peeraddr[16]; + nd_ipv6 dh6relay_linkaddr; /* XXX: badly aligned */ + nd_ipv6 dh6relay_peeraddr; /* options follow */ }; @@ -826,10 +826,10 @@ dhcp6_print(netdissect_options *ndo, ND_TCHECK(dh6relay->dh6relay_peeraddr); - memcpy(&addr6, dh6relay->dh6relay_linkaddr, sizeof (addr6)); + memcpy(&addr6, &dh6relay->dh6relay_linkaddr, sizeof (addr6)); ND_PRINT((ndo, "linkaddr=%s", ip6addr_string(ndo, &addr6))); - memcpy(&addr6, dh6relay->dh6relay_peeraddr, sizeof (addr6)); + memcpy(&addr6, &dh6relay->dh6relay_peeraddr, sizeof (addr6)); ND_PRINT((ndo, " peeraddr=%s", ip6addr_string(ndo, &addr6))); dhcp6opt_print(ndo, (const u_char *)(dh6relay + 1), ep); |