diff options
author | Matt Kraai <kraai@debian.org> | 2001-05-16 15:40:51 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2001-05-16 15:40:51 +0000 |
commit | c55b8d41c15640fa1637f919b3f6eca6e781047a (patch) | |
tree | 03c1fca61c1b577b7c527d2b8482c5b7f6972bcd /networking/ping.c | |
parent | 59df6f73988b103f0dcfffeaec10642527336c5e (diff) | |
download | busybox-w32-c55b8d41c15640fa1637f919b3f6eca6e781047a.tar.gz busybox-w32-c55b8d41c15640fa1637f919b3f6eca6e781047a.tar.bz2 busybox-w32-c55b8d41c15640fa1637f919b3f6eca6e781047a.zip |
Add xgethostbyname and herror_msg* functions.
Diffstat (limited to 'networking/ping.c')
-rw-r--r-- | networking/ping.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/networking/ping.c b/networking/ping.c index 8b82dcaac..0967999a9 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * $Id: ping.c,v 1.40 2001/04/09 23:52:18 andersen Exp $ | 3 | * $Id: ping.c,v 1.41 2001/05/16 15:40:48 kraai Exp $ |
4 | * Mini ping implementation for busybox | 4 | * Mini ping implementation for busybox |
5 | * | 5 | * |
6 | * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> | 6 | * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> |
@@ -200,10 +200,7 @@ static void ping(const char *host) | |||
200 | memset(&pingaddr, 0, sizeof(struct sockaddr_in)); | 200 | memset(&pingaddr, 0, sizeof(struct sockaddr_in)); |
201 | 201 | ||
202 | pingaddr.sin_family = AF_INET; | 202 | pingaddr.sin_family = AF_INET; |
203 | if (!(h = gethostbyname(host))) { | 203 | h = xgethostbyname(host); |
204 | error_msg("unknown host %s", host); | ||
205 | exit(1); | ||
206 | } | ||
207 | memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); | 204 | memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); |
208 | hostname = h->h_name; | 205 | hostname = h->h_name; |
209 | 206 | ||
@@ -446,15 +443,9 @@ static void ping(const char *host) | |||
446 | memset(&pingaddr, 0, sizeof(struct sockaddr_in)); | 443 | memset(&pingaddr, 0, sizeof(struct sockaddr_in)); |
447 | 444 | ||
448 | pingaddr.sin_family = AF_INET; | 445 | pingaddr.sin_family = AF_INET; |
449 | if (!(h = gethostbyname(host))) { | 446 | h = gethostbyname(host); |
450 | error_msg("unknown host %s", host); | 447 | if (h->h_addrtype != AF_INET) |
451 | exit(1); | 448 | error_msg_and_die("unknown address type; only AF_INET is currently supported."); |
452 | } | ||
453 | |||
454 | if (h->h_addrtype != AF_INET) { | ||
455 | error_msg("unknown address type; only AF_INET is currently supported."); | ||
456 | exit(1); | ||
457 | } | ||
458 | 449 | ||
459 | pingaddr.sin_family = AF_INET; /* h->h_addrtype */ | 450 | pingaddr.sin_family = AF_INET; /* h->h_addrtype */ |
460 | memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); | 451 | memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); |