[cgutman] 43678: - Send DHCP discover after loading the configuration so we have valid options - Fixes erratic behavior with certain DHCP servers

Author: cgutman
Date: Thu Oct 22 02:55:45 2009
New Revision: 43678

URL: http://svn.reactos.org/svn/reactos?rev=43678&view=rev
Log:
 - Send DHCP discover after loading the configuration so we have valid options
 - Fixes erratic behavior with certain DHCP servers

Modified:
    trunk/reactos/base/services/dhcp/adapter.c

Modified: trunk/reactos/base/services/dhcp/adapter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter…
==============================================================================
--- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Thu Oct 22 02:55:45 2009
@@ -199,9 +199,7 @@
                         Adapter->DhclientInfo.name,
                         Adapter->BindStatus));
 
-        add_protocol(Adapter->DhclientInfo.name, Adapter->DhclientInfo.rfdesc,
got_one, &Adapter->DhclientInfo);
 	Adapter->DhclientInfo.client->state = S_INIT;
-	state_reboot(&Adapter->DhclientInfo);
     }
 
     if( IPAddress ) free( IPAddress );
@@ -331,6 +329,15 @@
 
                 read_client_conf(&Adapter->DhclientInfo);
 
+                if (Adapter->DhclientInfo.client->state == S_INIT)
+                {
+                    add_protocol(Adapter->DhclientInfo.name,
+                                 Adapter->DhclientInfo.rfdesc,
+                                 got_one, &Adapter->DhclientInfo);
+
+	            state_init(&Adapter->DhclientInfo);
+                }
+
                 InsertTailList( &AdapterList, &Adapter->ListEntry );
             } else { free( Adapter ); Adapter = 0; }
         } else { free( Adapter ); Adapter = 0; }