From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 21 Apr 2016 16:54:36 +0000 (+0200)
Subject: udhcp: add setup_common_bufsiz() as needed
X-Git-Tag: 1_25_0~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df70a43af281f7e653b1c95ff17201669fdcfca3;p=oweals%2Fbusybox.git

udhcp: add setup_common_bufsiz() as needed

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 422254d62..c77669a31 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -930,6 +930,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
 	int retval;
 	fd_set rfds;
 
+	setup_common_bufsiz();
+
 	/* Default options */
 	IF_FEATURE_UDHCP_PORT(SERVER_PORT6 = 547;)
 	IF_FEATURE_UDHCP_PORT(CLIENT_PORT6 = 546;)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 660b943ce..8f5a03f2e 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1268,6 +1268,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 	int retval;
 	fd_set rfds;
 
+	setup_common_bufsiz();
+
 	/* Default options */
 	IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
 	IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 2671ea3e2..e93a9f1da 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -310,10 +310,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 	unsigned arpping_ms;
 	IF_FEATURE_UDHCP_PORT(char *str_P;)
 
-#if ENABLE_FEATURE_UDHCP_PORT
-	SERVER_PORT = 67;
-	CLIENT_PORT = 68;
-#endif
+	setup_common_bufsiz();
+
+	IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
+	IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
 	opt_complementary = "vv";