/*
* XXX Figure out the way to bind a specific adapter to a socket.
*/
-DWORD WINAPI AdapterDiscoveryThread(LPVOID Unused) {
+DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) {
PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE));
DWORD Error, Size = sizeof(MIB_IFTABLE);
PDHCP_ADAPTER Adapter = NULL;
+ HANDLE AdapterStateChangedEvent = (HANDLE)Context;
struct interface_info *ifi = NULL;
int i;
ApiLock();
InsertTailList( &AdapterList, &Adapter->ListEntry );
+ DbgPrint("DHCPCSVC: Discovered new adapter [%s]\n", Adapter->DhclientInfo.name);
+ SetEvent(AdapterStateChangedEvent);
ApiUnlock();
} else { free( Adapter ); Adapter = 0; }
} else { free( Adapter ); Adapter = 0; }
return Error;
}
-BOOLEAN StartAdapterDiscovery(VOID) {
- HANDLE ThreadHandle;
+HANDLE StartAdapterDiscovery(VOID) {
+ HANDLE ThreadHandle, EventHandle;
+
+ EventHandle = CreateEvent(NULL,
+ FALSE,
+ FALSE,
+ NULL);
ThreadHandle = CreateThread(NULL,
0,
AdapterDiscoveryThread,
- NULL,
+ (LPVOID)EventHandle,
0,
NULL);
if (ThreadHandle == NULL)
- return FALSE;
+ return NULL;
CloseHandle(ThreadHandle);
- return TRUE;
+ return EventHandle;
}
void AdapterStop() {
fd_set fds;
time_t howlong, cur_time;
struct timeval timeval;
+ HANDLE AdapterStateChangedEvent;
- if (!StartAdapterDiscovery())
+ AdapterStateChangedEvent = StartAdapterDiscovery();
+ if (!AdapterStateChangedEvent)
return;
ApiLock();
if (howlong > INT_MAX / 1000)
howlong = INT_MAX / 1000;
to_msec = howlong * 1000;
- } else
- to_msec = 5000;
- /* Set up the descriptors to be polled. */
- FD_ZERO(&fds);
+ /* Set up the descriptors to be polled. */
+ FD_ZERO(&fds);
- for (l = protocols; l; l = l->next)
- FD_SET(l->fd, &fds);
+ for (l = protocols; l; l = l->next)
+ FD_SET(l->fd, &fds);
- /* Wait for a packet or a timeout... XXX */
- timeval.tv_sec = to_msec / 1000;
- timeval.tv_usec = to_msec % 1000;
+ /* Wait for a packet or a timeout... XXX */
+ timeval.tv_sec = to_msec / 1000;
+ timeval.tv_usec = to_msec % 1000;
- ApiUnlock();
+ ApiUnlock();
- if (protocols)
count = select(0, &fds, NULL, NULL, &timeval);
- else {
- Sleep(to_msec);
- count = 0;
+
+ ApiLock();
}
+ else
+ {
+ ApiUnlock();
+ WaitForSingleObject(AdapterStateChangedEvent, INFINITE);
+ ApiLock();
- ApiLock();
+ continue;
+ }
DH_DbgPrint(MID_TRACE,("Select: %d\n", count));
}
} while (1);
+ CloseHandle(AdapterStateChangedEvent);
+
ApiUnlock();
}
#define srandom srand
void AdapterInit(VOID);
-BOOLEAN StartAdapterDiscovery(VOID);
+HANDLE StartAdapterDiscovery(VOID);
void AdapterStop(VOID);
extern PDHCP_ADAPTER AdapterGetFirst();
extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER);