- Specify the interface index so the route won't get added to interface 0 (loopback)

 - Warn if something tries to add a route to the loopback adapter
 - Fixes routing issues some people were having

svn path=/trunk/; revision=43350

diff --git a/reactos/base/services/dhcp/adapter.c b/reactos/base/services/dhcp/adapter.c
index a7e56be..18d52d2 100644 (file)
--- a/reactos/base/services/dhcp/adapter.c
+++ b/reactos/base/services/dhcp/adapter.c
@@ -182,6 +182,7 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) {
             Adapter->RouterMib.dwForwardDest = 0;
             Adapter->RouterMib.dwForwardMask = 0;
             Adapter->RouterMib.dwForwardMetric1 = 1;
+            Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex;
             Adapter->RouterMib.dwForwardNextHop = inet_addr(DefaultGateway);
             Error = CreateIpForwardEntry( &Adapter->RouterMib );
             if( Error )

diff --git a/reactos/base/services/dhcp/dhclient.c b/reactos/base/services/dhcp/dhclient.c
index eee8e26..8b18010 100644 (file)
--- a/reactos/base/services/dhcp/dhclient.c
+++ b/reactos/base/services/dhcp/dhclient.c
@@ -519,6 +519,7 @@ void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
         Adapter->RouterMib.dwForwardDest = 0; /* Default route */
         Adapter->RouterMib.dwForwardMask = 0;
         Adapter->RouterMib.dwForwardMetric1 = 1;
+        Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex;
 
         if( Adapter->RouterMib.dwForwardNextHop ) {
             /* If we set a default route before, delete it before continuing */

diff --git a/reactos/drivers/network/tcpip/tcpip/ninfo.c b/reactos/drivers/network/tcpip/tcpip/ninfo.c
index 968fe5c..f312b83 100644 (file)
--- a/reactos/drivers/network/tcpip/tcpip/ninfo.c
+++ b/reactos/drivers/network/tcpip/tcpip/ninfo.c
@@ -181,6 +181,12 @@ TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, PIPROUTE_ENTRY Route)
     AddrInitIPv4( &Netmask, Route->Mask );
     AddrInitIPv4( &Router,  Route->Gw );
 
+    if (IF == Loopback)
+    {
+        DbgPrint("Failing attempt to add route to loopback adapter\n");
+        return TDI_INVALID_PARAMETER;
+    }
+
     if( Route->Type == IP_ROUTE_TYPE_ADD ) { /* Add the route */
         TI_DbgPrint(DEBUG_INFO,("Adding route (%s)\n", A2S(&Address)));
        if (!RouterCreateRoute( &Address, &Netmask, &Router,