Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-15 07:05:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Store the static default gateway forward entry in DHCP_ADAPTER

Browse source 
- Loop the adapter list backward so DhclientInfo gets linked properly

svn path=/trunk/; revision=41907
This commit is contained in:
Cameron Gutman 2009-07-12 05:21:52 +00:00
parent 172daf63c3
commit 47ac65adaa
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/base/services/dhcp/adapter.c
View file

@ -149,7 +149,6 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) {
PCHAR IPAddress = NULL, Netmask = NULL, DefaultGateway = NULL; PCHAR IPAddress = NULL, Netmask = NULL, DefaultGateway = NULL;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DWORD Error = ERROR_SUCCESS; DWORD Error = ERROR_SUCCESS;
MIB_IPFORWARDROW DefGatewayRow;
Adapter->DhclientState.config = &Adapter->DhclientConfig; Adapter->DhclientState.config = &Adapter->DhclientConfig;
strncpy(Adapter->DhclientInfo.name, (char*)Adapter->IfMib.bDescr, strncpy(Adapter->DhclientInfo.name, (char*)Adapter->IfMib.bDescr,
@ -181,11 +180,11 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) {
DefaultGateway = RegReadString( AdapterKey, NULL, "DefaultGateway" ); DefaultGateway = RegReadString( AdapterKey, NULL, "DefaultGateway" );
if( DefaultGateway ) { if( DefaultGateway ) {
DefGatewayRow.dwForwardDest = 0; Adapter->RouterMib.dwForwardDest = 0;
DefGatewayRow.dwForwardMask = 0; Adapter->RouterMib.dwForwardMask = 0;
DefGatewayRow.dwForwardMetric1 = 1; Adapter->RouterMib.dwForwardMetric1 = 1;
DefGatewayRow.dwForwardNextHop = inet_addr(DefaultGateway); Adapter->RouterMib.dwForwardNextHop = inet_addr(DefaultGateway);
Error = CreateIpForwardEntry( &DefGatewayRow ); Error = CreateIpForwardEntry( &Adapter->RouterMib );
if( Error ) if( Error )
warning("Failed to set default gateway %s: %ld\n", warning("Failed to set default gateway %s: %ld\n",
DefaultGateway, Error); DefaultGateway, Error);
@ -212,9 +211,10 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) {
void AdapterInit() { void AdapterInit() {
PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE));
DWORD Error, Size = sizeof(MIB_IFTABLE), i; DWORD Error, Size = sizeof(MIB_IFTABLE);
PDHCP_ADAPTER Adapter = NULL; PDHCP_ADAPTER Adapter = NULL;
struct interface_info *ifi = NULL; struct interface_info *ifi = NULL;
int i;
WSAStartup(0x0101,&wsd); WSAStartup(0x0101,&wsd);
@ -233,7 +233,7 @@ void AdapterInit() {
DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries)); DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries));
for( i = 0; i < Table->dwNumEntries; i++ ) { for( i = Table->dwNumEntries - 1; i >= 0; i-- ) {
DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n",
Table->table[i].dwIndex)); Table->table[i].dwIndex));
Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 );