X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fping.c;h=044b547ac601af85555daeea3a85b10d65002f91;hb=853c494efd7d4a3183918df69c21ceefc5ed7578;hp=0967999a9d68d2fec814736f7e047b86bd6eae17;hpb=c55b8d41c15640fa1637f919b3f6eca6e781047a;p=oweals%2Fbusybox.git

diff --git a/networking/ping.c b/networking/ping.c
index 0967999a9..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.41 2001/05/16 15:40:48 kraai 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 <tausq@debian.org>
@@ -174,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)
@@ -191,11 +190,7 @@ 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));
 
@@ -251,18 +246,19 @@ extern int ping_main(int argc, char **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 *);
@@ -275,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)
@@ -420,37 +416,19 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
 
 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?)");
-		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;
-	h = gethostbyname(host);
-	if (h->h_addrtype != AF_INET)
+	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;
@@ -463,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);
 
@@ -534,7 +512,7 @@ extern int ping_main(int argc, char **argv)
 	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.