diff options
| author |   florian <florian@openbsd.org> | 2014-06-04 12:20:31 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2014-06-04 12:20:31 +0000 |
| commit | 1421fa329f1eed0dff8a239736857cfb1f10e064 (patch) | |
| tree | 72d16d8a9a68788b706ddc0052f189d68d0a8d7f /usr.sbin/traceroute | |
| parent | Stop using a global variable to do address lookups. (diff) | |
| download | wireguard-openbsd-1421fa329f1eed0dff8a239736857cfb1f10e064.tar.xz wireguard-openbsd-1421fa329f1eed0dff8a239736857cfb1f10e064.zip | |
Replace ICMP6ECHOLEN define with sizeof()
OK benno@
Diffstat (limited to 'usr.sbin/traceroute')
| -rw-r--r-- | usr.sbin/traceroute/traceroute.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index fe775e36112..5e58485dfb5 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traceroute.c,v 1.129 2014/05/28 10:29:24 daniel Exp $ */ +/* $OpenBSD: traceroute.c,v 1.130 2014/06/04 12:20:31 florian Exp $ */ /* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */ /* @@ -326,8 +326,6 @@ struct in6_pktinfo *rcvpktinfo; int datalen; /* How much data */ int headerlen; /* How long packet's header is */ -#define ICMP6ECHOLEN 8 - char *source = 0; char *hostname; @@ -724,7 +722,8 @@ main(int argc, char *argv[]) break; case AF_INET6: if (proto == IPPROTO_ICMP) - minlen = ICMP6ECHOLEN + sizeof(struct packetdata); + minlen = sizeof(struct icmp6_hdr) + + sizeof(struct packetdata); else minlen = sizeof(struct packetdata); if (datalen < minlen) @@ -1168,7 +1167,8 @@ build_probe6(int seq, u_int8_t hops, int iflag, struct sockaddr *to) icp->icmp6_cksum = 0; icp->icmp6_id = ident; icp->icmp6_seq = htons(seq); - op = (struct packetdata *)(outpacket + ICMP6ECHOLEN); + op = (struct packetdata *)(outpacket + + sizeof(struct icmp6_hdr)); } else op = (struct packetdata *)outpacket; op->seq = seq; |