svn commit: trunk/busybox/networking/udhcp

[vda at busybox.net]

Author: vda
Date: 2008-09-26 02:34:15 -0700 (Fri, 26 Sep 2008)
New Revision: 23512

Log:
dhcpc: treat "discover...select...discover..." loop the same way
 as "discover...discover...discover..."



Modified:
   trunk/busybox/networking/udhcp/dhcpc.c


Changeset:
Modified: trunk/busybox/networking/udhcp/dhcpc.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpc.c	2008-09-26 08:05:23 UTC (rev 23511)
+++ trunk/busybox/networking/udhcp/dhcpc.c	2008-09-26 09:34:15 UTC (rev 23512)
@@ -363,6 +363,7 @@
 					packet_num++;
 					continue;
 				}
+ leasefail:
 				udhcp_run_script(NULL, "leasefail");
 #if BB_MMU /* -b is not supported on NOMMU */
 				if (opt & OPT_b) { /* background if no lease */
@@ -399,6 +400,11 @@
 					udhcp_run_script(NULL, "deconfig");
 				change_listen_mode(LISTEN_RAW);
 				state = INIT_SELECTING;
+				/* "discover...select...discover..." loops
+				 * were seen in the wild. Treat then similarly
+				 * to "no response to discover" case */
+				if (state == REQUESTING)
+					goto leasefail;
 				timeout = 0;
 				packet_num = 0;
 				continue;