X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Farpping.c;h=587339f9b1c1137942d9d2763ded1782c9b43545;hb=e40c04b82695c1cde8ad9ed1e2aa1756463d73a7;hp=ab4c6d20ce0fdb0e78748eb6dd2b8731d5fe7bb4;hpb=c7bda1ce659294d6e22c06e087f6f265983c7578;p=oweals%2Fbusybox.git

diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index ab4c6d20c..587339f9b 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * arpping.c
  *
@@ -5,7 +6,6 @@
  * by Yoichi Hariguchi <yoichi@fore.com>
  */
 
-#include <sys/time.h>
 #include <time.h>
 #include <sys/socket.h>
 #include <netinet/if_ether.h>
@@ -23,7 +23,7 @@
  *		ip - our ip
  *		mac - our arp address
  *		interface - interface to use
- * retn: 	1 addr free
+ * retn:	1 addr free
  *		0 addr used
  *		-1 error
  */
@@ -33,7 +33,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface)
 {
 
 	int	timeout = 2;
-	int 	optval = 1;
+	int	optval = 1;
 	int	s;			/* socket */
 	int	rv = 1;			/* return value */
 	struct sockaddr addr;		/* for interface name */
@@ -43,17 +43,13 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface)
 	time_t		prevTime;
 
 
-	if ((s = socket (PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) == -1) {
-#ifdef IN_BUSYBOX
-		LOG(LOG_ERR, bb_msg_can_not_create_raw_socket);
-#else
-		LOG(LOG_ERR, "Could not open raw socket");
-#endif
+	if ((s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) == -1) {
+		bb_perror_msg(bb_msg_can_not_create_raw_socket);
 		return -1;
 	}
 
 	if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) == -1) {
-		LOG(LOG_ERR, "Could not setsocketopt on raw socket");
+		bb_perror_msg("Could not setsocketopt on raw socket");
 		close(s);
 		return -1;
 	}
@@ -79,28 +75,28 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface)
 
 	/* wait arp reply, and check it */
 	tm.tv_usec = 0;
-	time(&prevTime);
+	prevTime = uptime();
 	while (timeout > 0) {
 		FD_ZERO(&fdset);
 		FD_SET(s, &fdset);
 		tm.tv_sec = timeout;
 		if (select(s + 1, &fdset, (fd_set *) NULL, (fd_set *) NULL, &tm) < 0) {
-			DEBUG(LOG_ERR, "Error on ARPING request: %m");
+			bb_perror_msg("Error on ARPING request");
 			if (errno != EINTR) rv = 0;
 		} else if (FD_ISSET(s, &fdset)) {
 			if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0;
 			if (arp.operation == htons(ARPOP_REPLY) &&
-			    bcmp(arp.tHaddr, mac, 6) == 0 &&
+			    memcmp(arp.tHaddr, mac, 6) == 0 &&
 			    *((uint32_t *) arp.sInaddr) == yiaddr) {
-				DEBUG(LOG_INFO, "Valid arp reply receved for this address");
+				DEBUG("Valid arp reply received for this address");
 				rv = 0;
 				break;
 			}
 		}
-		timeout -= time(NULL) - prevTime;
-		time(&prevTime);
+		timeout -= uptime() - prevTime;
+		prevTime = uptime();
 	}
 	close(s);
-	DEBUG(LOG_INFO, "%salid arp replies for this address", rv ? "No v" : "V");	
+	DEBUG("%salid arp replies for this address", rv ? "No v" : "V");
 	return rv;
 }