[git commit] udhcpc[6]: remove superfluous "created raw socket" log message

Denys Vlasenko vda.linux at googlemail.com
Wed Jun 2 18:23:43 UTC 2021


commit: https://git.busybox.net/busybox/commit/?id=01daecca1d908c7f08421cff815d81bd8ec3009a
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
change_listen_mode                                   299     280     -19
.rodata                                           103272  103250     -22
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-41)             Total: -41 bytes

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/udhcp/d6_dhcpc.c | 3 ---
 networking/udhcp/dhcpc.c    | 4 +---
 networking/udhcp/socket.c   | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index ef555bc8a..555446602 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1063,9 +1063,6 @@ static int d6_raw_socket(int ifindex)
 			log1("attached filter to raw socket fd %d", fd); // log?
 	}
 #endif
-
-	log1s("created raw socket");
-
 	return fd;
 }
 
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index a30632d86..f441976dd 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1093,8 +1093,6 @@ static int udhcp_raw_socket(int ifindex)
 			log1s("can't set PACKET_AUXDATA on raw socket");
 	}
 
-	log1s("created raw socket");
-
 	return fd;
 }
 
@@ -1701,7 +1699,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 				}
 				/*xid = packet.xid; - already is */
 				temp_addr.s_addr = requested_ip = packet.yiaddr;
-				log1("received an offer of %s",	inet_ntoa(temp_addr));
+				log1("received offer of %s", inet_ntoa(temp_addr));
 
 				/* enter requesting state */
 				client_data.state = REQUESTING;
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 65a1a8ead..35e10688b 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -82,7 +82,7 @@ int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
 	struct sockaddr_in addr;
 	char *colon;
 
-	log1("opening listen socket on *:%d %s", port, inf);
+	log2("opening listen socket on *:%d %s", port, inf);
 	fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
 	setsockopt_reuseaddr(fd);


More information about the busybox-cvs mailing list