[git commit] udhcp: cosmetics in arpping.c, no code changes

Denys Vlasenko vda.linux at googlemail.com
Wed Jun 17 11:56:50 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=dc36a72ac0c1af3d973cd36849e6cac5cb7aa514
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master


Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/udhcp/arpping.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 89400e2..48158fc 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -7,14 +7,12 @@
  *
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
-
 #include <netinet/if_ether.h>
 #include <net/if_arp.h>
 
 #include "common.h"
 #include "dhcpd.h"
 
-
 struct arpMsg {
 	/* Ethernet header */
 	uint8_t  h_dest[6];     /* 00 destination ether addr */
@@ -38,9 +36,7 @@ enum {
 	ARP_MSG_SIZE = 0x2a
 };
 
-
 /* Returns 1 if no reply received */
-
 int FAST_FUNC arpping(uint32_t test_nip,
 		const uint8_t *safe_mac,
 		uint32_t from_ip,
@@ -103,7 +99,7 @@ int FAST_FUNC arpping(uint32_t test_nip,
 			if (r < 0)
 				break;
 
-			//bb_error_msg("sHaddr %02x:%02x:%02x:%02x:%02x:%02x",
+			//log3("sHaddr %02x:%02x:%02x:%02x:%02x:%02x",
 			//	arp.sHaddr[0], arp.sHaddr[1], arp.sHaddr[2],
 			//	arp.sHaddr[3], arp.sHaddr[4], arp.sHaddr[5]);
 
@@ -113,13 +109,13 @@ int FAST_FUNC arpping(uint32_t test_nip,
 			 /* && memcmp(arp.tHaddr, from_mac, 6) == 0 */
 			 && *((uint32_t *) arp.sInaddr) == test_nip
 			) {
-				 /* if ARP source MAC matches safe_mac
-				  * (which is client's MAC), then it's not a conflict
-				  * (client simply already has this IP and replies to ARPs!)
-				  */
+				/* if ARP source MAC matches safe_mac
+				 * (which is client's MAC), then it's not a conflict
+				 * (client simply already has this IP and replies to ARPs!)
+				 */
 				if (!safe_mac || memcmp(safe_mac, arp.sHaddr, 6) != 0)
 					rv = 0;
-				//else bb_error_msg("sHaddr == safe_mac");
+				//else log2("sHaddr == safe_mac");
 				break;
 			}
 		}
-- 
1.6.0.6


More information about the busybox-cvs mailing list