diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2014-07-09 15:24:20 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2014-07-09 15:24:20 +0000 |
| commit | ce4cfe3eed842a022ceb8fee515a8ed7ff44d5d9 (patch) | |
| tree | d9b3b06cd4dc4fdb854739f5f596c86053a886db /sbin | |
| parent | eefc7ca0884fb101ff10ceb59a2cc71cee814307 (diff) | |
We do have icmp_data; no obj change.
OK benno@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ping/ping.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 6aa4a4e737c..7e669fec9de 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.107 2014/07/09 15:23:29 florian Exp $ */ +/* $OpenBSD: ping.c,v 1.108 2014/07/09 15:24:19 florian Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -699,11 +699,7 @@ pr_pack(char *buf, int cc, struct sockaddr_in *from) if (timing) { struct tv32 tv32; -#ifndef icmp_data - pkttime = (char *)&icp->icmp_ip; -#else pkttime = (char *)icp->icmp_data; -#endif memcpy(&tv32, pkttime, sizeof tv32); tp.tv_sec = ntohl(tv32.tv32_sec); tp.tv_usec = ntohl(tv32.tv32_usec); @@ -1077,19 +1073,11 @@ pr_icmph(struct icmp *icp) break; } /* Print returned IP header information */ -#ifndef icmp_data - pr_retip(&icp->icmp_ip); -#else pr_retip((struct ip *)icp->icmp_data); -#endif break; case ICMP_SOURCEQUENCH: (void)printf("Source Quench\n"); -#ifndef icmp_data - pr_retip(&icp->icmp_ip); -#else pr_retip((struct ip *)icp->icmp_data); -#endif break; case ICMP_REDIRECT: switch(icp->icmp_code) { @@ -1111,11 +1099,7 @@ pr_icmph(struct icmp *icp) } (void)printf("(New addr: %s)\n", inet_ntoa(icp->icmp_gwaddr)); -#ifndef icmp_data - pr_retip(&icp->icmp_ip); -#else pr_retip((struct ip *)icp->icmp_data); -#endif break; case ICMP_ECHO: (void)printf("Echo Request\n"); @@ -1144,11 +1128,7 @@ pr_icmph(struct icmp *icp) icp->icmp_code); break; } -#ifndef icmp_data - pr_retip(&icp->icmp_ip); -#else pr_retip((struct ip *)icp->icmp_data); -#endif break; case ICMP_PARAMPROB: switch(icp->icmp_code) { @@ -1162,11 +1142,7 @@ pr_icmph(struct icmp *icp) ntohs(icp->icmp_hun.ih_pptr)); break; } -#ifndef icmp_data - pr_retip(&icp->icmp_ip); -#else pr_retip((struct ip *)icp->icmp_data); -#endif break; case ICMP_TSTAMP: (void)printf("Timestamp\n"); |