[DHCPCSVC]

- Delete the existing default gateway when releasing DHCP IP or transitioning to static IP
- Fixes bug #6205

svn path=/branches/wlan-bringup/; revision=54913

diff --git a/dll/win32/dhcpcsvc/dhcp/api.c b/dll/win32/dhcpcsvc/dhcp/api.c
index 02add50..26723f9 100644 (file)
--- a/dll/win32/dhcpcsvc/dhcp/api.c
+++ b/dll/win32/dhcpcsvc/dhcp/api.c
@@ -102,6 +102,8 @@ DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) {
     if( Adapter ) {
         if (Adapter->NteContext)
             DeleteIPAddress( Adapter->NteContext );
+        if (Adapter->RouterMib.dwForwardNextHop)
+            DeleteIpForwardEntry( &Adapter->RouterMib );
 
         proto = find_protocol_by_adapter( &Adapter->DhclientInfo );
         if (proto)
@@ -170,6 +172,9 @@ DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ) {
     if( Adapter ) {
         if (Adapter->NteContext)
             DeleteIPAddress( Adapter->NteContext );
+        if (Adapter->RouterMib.dwForwardNextHop)
+            DeleteIpForwardEntry( &Adapter->RouterMib );
+        
         Adapter->DhclientState.state = S_STATIC;
         proto = find_protocol_by_adapter( &Adapter->DhclientInfo );
         if (proto)