Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use FindOnLinkInterface to get the interface

Browse source 
- Return NULL if TCPContext is NULL (which means we don't have a valid IP address)
 - Should fix a crash when using multiple NICs but they still won't work (DHCP bug?)

svn path=/trunk/; revision=40909
This commit is contained in:
Cameron Gutman 2009-05-13 01:16:30 +00:00
parent 452903fdb7
commit 0931b86d7c
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/lib/drivers/ip/transport/tcp/if.c
View file

@ -74,7 +74,7 @@ POSK_IFADDR TCPFindInterface( void *ClientData,
OSK_UINT FindType, OSK_UINT FindType,
OSK_SOCKADDR *ReqAddr, OSK_SOCKADDR *ReqAddr,
OSK_IFADDR *Interface ) { OSK_IFADDR *Interface ) {
PNEIGHBOR_CACHE_ENTRY NCE; PIP_INTERFACE IF;
IP_ADDRESS Destination; IP_ADDRESS Destination;
struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr; struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr;
@ -90,23 +90,20 @@ POSK_IFADDR TCPFindInterface( void *ClientData,
TI_DbgPrint(DEBUG_TCPIF,("Address is %x\n", addr_in->sin_addr.s_addr)); TI_DbgPrint(DEBUG_TCPIF,("Address is %x\n", addr_in->sin_addr.s_addr));
NCE = RouteGetRouteToDestination(&Destination); IF = FindOnLinkInterface(&Destination);
if( !NCE || !NCE->Interface ) { if (!IF || !IF->TCPContext) {
TI_DbgPrint(DEBUG_TCPIF,("no neighbor cache or no interface (%x %x)\n", /* TCPContext can be NULL if we don't have an IP address yet */
NCE, NCE ? NCE->Interface : 0)); TI_DbgPrint(DEBUG_TCPIF, ("No interface or TCP context (%x) (%x)\n",
return NULL; IF, IF ? IF->TCPContext : 0));
return NULL;
} }
TI_DbgPrint(DEBUG_TCPIF,("NCE: %x\n", NCE));
TI_DbgPrint(DEBUG_TCPIF,("NCE->Interface: %x\n", NCE->Interface));
TI_DbgPrint(DEBUG_TCPIF,("NCE->Interface->TCPContext: %x\n",
NCE->Interface->TCPContext));
addr_in = (struct sockaddr_in *) addr_in = (struct sockaddr_in *)
((POSK_IFADDR)NCE->Interface->TCPContext)->ifa_addr; ((POSK_IFADDR)IF->TCPContext)->ifa_addr;
TI_DbgPrint(DEBUG_TCPIF,("returning addr %x\n", addr_in->sin_addr.s_addr)); TI_DbgPrint(DEBUG_TCPIF,("returning addr %x\n", addr_in->sin_addr.s_addr));
return NCE->Interface->TCPContext; return IF->TCPContext;
} }