diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-23 03:30:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-23 03:30:50 +0000 |
| commit | dcb3f9699c79f342817318188038e017d2bac8c4 (patch) | |
| tree | 234d4be8757a1c86fbe6ce7dd658c26e6a04b4a1 /sbin | |
| parent | 14df9660d93f53a5a7a760470154acfb6986ad39 (diff) | |
sloppy style to cast the sockaddrs backwards, and then potentially wrong size; ok cloder
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ping/ping.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index a235fcb605b..caae637633e 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.74 2006/03/06 10:45:56 djm Exp $ */ +/* $OpenBSD: ping.c,v 1.75 2006/03/23 03:30:49 deraadt Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: ping.c,v 1.74 2006/03/06 10:45:56 djm Exp $"; +static const char rcsid[] = "$OpenBSD: ping.c,v 1.75 2006/03/23 03:30:49 deraadt Exp $"; #endif #endif /* not lint */ @@ -136,7 +136,7 @@ int moptions; int mx_dup_ck = MAX_DUP_CHK; char rcvd_tbl[MAX_DUP_CHK / 8]; -struct sockaddr whereto; /* who to ping */ +struct sockaddr_in whereto; /* who to ping */ struct sockaddr_in whence; /* Which interface we come from */ unsigned int datalen = DEFDATALEN; int s; /* socket file descriptor */ @@ -334,8 +334,8 @@ main(int argc, char *argv[]) target = *argv; - memset(&whereto, 0, sizeof(struct sockaddr)); - to = (struct sockaddr_in *)&whereto; + memset(&whereto, 0, sizeof(whereto)); + to = &whereto; to->sin_len = sizeof(struct sockaddr_in); to->sin_family = AF_INET; if (inet_aton(target, &to->sin_addr) != 0) @@ -633,8 +633,8 @@ pinger(void) ip->ip_sum = in_cksum((u_short *)outpackhdr, cc); } - i = sendto(s, (char *)packet, cc, 0, &whereto, - sizeof(struct sockaddr)); + i = sendto(s, (char *)packet, cc, 0, (struct sockaddr *)&whereto, + sizeof(whereto)); if (i < 0 || i != cc) { if (i < 0) |