X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fping.c;h=044b547ac601af85555daeea3a85b10d65002f91;hb=853c494efd7d4a3183918df69c21ceefc5ed7578;hp=a2f52ff387a8da65b884ec5a18e1df336066d544;hpb=24be980004598c2fa0a3e14ccdce0bc7b3039985;p=oweals%2Fbusybox.git diff --git a/networking/ping.c b/networking/ping.c index a2f52ff38..044b547ac 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * $Id: ping.c,v 1.33 2001/01/24 17:37:07 andersen Exp $ + * $Id: ping.c,v 1.53 2003/01/12 06:08:33 andersen Exp $ * Mini ping implementation for busybox * * Copyright (C) 1999 by Randolph Chung @@ -31,11 +31,6 @@ * Original copyright notice is retained at the end of this file. */ -#warning This applet has moved to netkit-tiny. After BusyBox 0.49, this -#warning applet will be removed from BusyBox. All maintenance efforts -#warning should be done in the netkit-tiny source tree. - -#include "busybox.h" #include #include #include @@ -51,13 +46,15 @@ #include #include #include +#include +#include +#include +#include "busybox.h" /* It turns out that libc5 doesn't have proper icmp support * built into it header files, so we have to supplement it */ -#if ! defined __GLIBC__ && ! defined __UCLIBC__ -typedef unsigned int socklen_t; - +#if __GNU_LIBRARY__ < 5 static const int ICMP_MINLEN = 8; /* abs minimum */ struct icmp_ra_addr @@ -177,13 +174,12 @@ static int in_cksum(unsigned short *buf, int sz) } /* simple version */ -#ifdef BB_FEATURE_SIMPLE_PING +#ifndef CONFIG_FEATURE_FANCY_PING static char *hostname = NULL; - static void noresp(int ign) { printf("No response from %s\n", hostname); - exit(0); + exit(EXIT_FAILURE); } static void ping(const char *host) @@ -194,19 +190,12 @@ static void ping(const char *host) int pingsock, c; char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; - if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) /* 1 == ICMP */ - perror_msg_and_die("creating a raw socket"); - - /* drop root privs if running setuid */ - setuid(getuid()); + pingsock = create_icmp_socket(); memset(&pingaddr, 0, sizeof(struct sockaddr_in)); pingaddr.sin_family = AF_INET; - if (!(h = gethostbyname(host))) { - error_msg("unknown host %s\n", host); - exit(1); - } + h = xgethostbyname(host); memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); hostname = h->h_name; @@ -252,23 +241,24 @@ extern int ping_main(int argc, char **argv) argc--; argv++; if (argc < 1) - usage(ping_usage); + show_usage(); ping(*argv); return EXIT_SUCCESS; } -#else /* ! BB_FEATURE_SIMPLE_PING */ +#else /* ! CONFIG_FEATURE_FANCY_PING */ /* full(er) version */ -static char *hostname = NULL; static struct sockaddr_in pingaddr; static int pingsock = -1; static int datalen; /* intentionally uninitialized to work around gcc bug */ -static long ntransmitted = 0, nreceived = 0, nrepeats = 0, pingcount = 0; -static int myid = 0, options = 0; -static unsigned long tmin = ULONG_MAX, tmax = 0, tsum = 0; +static long ntransmitted, nreceived, nrepeats, pingcount; +static int myid, options; +static unsigned long tmin = ULONG_MAX, tmax, tsum; static char rcvd_tbl[MAX_DUP_CHK / 8]; +struct hostent *hostent; + static void sendping(int); static void pingstats(int); static void unpack(char *, int, struct sockaddr_in *); @@ -281,7 +271,7 @@ static void pingstats(int junk) signal(SIGINT, SIG_IGN); - printf("\n--- %s ping statistics ---\n", hostname); + printf("\n--- %s ping statistics ---\n", hostent->h_name); printf("%ld packets transmitted, ", ntransmitted); printf("%ld packets received, ", nreceived); if (nrepeats) @@ -325,7 +315,7 @@ static void sendping(int junk) if (i < 0) perror_msg_and_die("sendto"); else if ((size_t)i != sizeof(packet)) - error_msg_and_die("ping wrote %d chars; %d expected\n", i, + error_msg_and_die("ping wrote %d chars; %d expected", i, (int)sizeof(packet)); signal(SIGALRM, sendping); @@ -420,49 +410,25 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from) printf("\n"); } else if (icmppkt->icmp_type != ICMP_ECHO) - error_msg("Warning: Got ICMP %d (%s)\n", + error_msg("Warning: Got ICMP %d (%s)", icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type)); } static void ping(const char *host) { - struct protoent *proto; - struct hostent *h; - char buf[MAXHOSTNAMELEN]; char packet[datalen + MAXIPLEN + MAXICMPLEN]; int sockopt; - proto = getprotobyname("icmp"); - /* if getprotobyname failed, just silently force - * proto->p_proto to have the correct value for "icmp" */ - if ((pingsock = socket(AF_INET, SOCK_RAW, - (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */ - if (errno == EPERM) - error_msg_and_die("permission denied. (are you root?)\n"); - else - perror_msg_and_die("creating a raw socket"); - } - - /* drop root privs if running setuid */ - setuid(getuid()); + pingsock = create_icmp_socket(); memset(&pingaddr, 0, sizeof(struct sockaddr_in)); pingaddr.sin_family = AF_INET; - if (!(h = gethostbyname(host))) { - error_msg("unknown host %s\n", host); - exit(1); - } - - if (h->h_addrtype != AF_INET) { - error_msg("unknown address type; only AF_INET is currently supported.\n"); - exit(1); - } + hostent = xgethostbyname(host); + if (hostent->h_addrtype != AF_INET) + error_msg_and_die("unknown address type; only AF_INET is currently supported."); - pingaddr.sin_family = AF_INET; /* h->h_addrtype */ - memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); - strncpy(buf, h->h_name, sizeof(buf) - 1); - hostname = buf; + memcpy(&pingaddr.sin_addr, hostent->h_addr, sizeof(pingaddr.sin_addr)); /* enable broadcast pings */ sockopt = 1; @@ -475,7 +441,7 @@ static void ping(const char *host) sizeof(sockopt)); printf("PING %s (%s): %d data bytes\n", - hostname, + hostent->h_name, inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr), datalen); @@ -523,30 +489,30 @@ extern int ping_main(int argc, char **argv) break; case 'c': if (--argc <= 0) - usage(ping_usage); + show_usage(); argv++; pingcount = atoi(*argv); break; case 's': if (--argc <= 0) - usage(ping_usage); + show_usage(); argv++; datalen = atoi(*argv); break; default: - usage(ping_usage); + show_usage(); } argc--; argv++; } if (argc < 1) - usage(ping_usage); + show_usage(); myid = getpid() & 0xFFFF; ping(*argv); return EXIT_SUCCESS; } -#endif /* ! BB_FEATURE_SIMPLE_PING */ +#endif /* ! CONFIG_FEATURE_FANCY_PING */ /* * Copyright (c) 1989 The Regents of the University of California.