[ros-diffs] [cgutman] 54914: [WLANCONF] - Release the current IP address before disconnecting from an AP - Refresh the IP information after connecting to an AP
cgutman at svn.reactos.org
cgutman at svn.reactos.org
Thu Jan 12 01:46:18 UTC 2012
Author: cgutman
Date: Thu Jan 12 01:46:15 2012
New Revision: 54914
URL: http://svn.reactos.org/svn/reactos?rev=54914&view=rev
Log:
[WLANCONF]
- Release the current IP address before disconnecting from an AP
- Refresh the IP information after connecting to an AP
Modified:
branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt
branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c
branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild
Modified: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt?rev=54914&r1=54913&r2=54914&view=diff
==============================================================================
--- branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original)
+++ branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Thu Jan 12 01:46:15 2012
@@ -4,5 +4,5 @@
${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio)
add_executable(wlanconf wlanconf.c wlanconf.rc)
set_module_type(wlanconf win32cui)
-add_importlibs(wlanconf msvcrt kernel32)
+add_importlibs(wlanconf msvcrt iphlpapi kernel32)
add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all)
Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c
URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c?rev=54914&r1=54913&r2=54914&view=diff
==============================================================================
--- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original)
+++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Thu Jan 12 01:46:15 2012
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <ntddndis.h>
#include <nuiouser.h>
+#include <iphlpapi.h>
BOOL bScan = FALSE;
@@ -110,26 +111,28 @@
return TRUE;
}
-HANDLE
-OpenAdapterHandle(DWORD Index)
+BOOL
+OpenAdapterHandle(DWORD Index, HANDLE *hAdapter, IP_ADAPTER_INDEX_MAP *IpInfo)
{
HANDLE hDriver;
BOOL bSuccess;
DWORD dwBytesReturned;
DWORD QueryBindingSize = sizeof(NDISUIO_QUERY_BINDING) + (1024 * sizeof(WCHAR));
PNDISUIO_QUERY_BINDING QueryBinding;
+ DWORD dwStatus, dwSize, i;
+ PIP_INTERFACE_INFO InterfaceInfo = NULL;
/* Open the driver handle */
hDriver = OpenDriverHandle();
if (hDriver == INVALID_HANDLE_VALUE)
- return INVALID_HANDLE_VALUE;
+ return FALSE;
/* Allocate the binding struct */
QueryBinding = HeapAlloc(GetProcessHeap(), 0, QueryBindingSize);
if (!QueryBinding)
{
CloseHandle(hDriver);
- return INVALID_HANDLE_VALUE;
+ return FALSE;
}
/* Query the adapter binding information */
@@ -147,7 +150,7 @@
{
HeapFree(GetProcessHeap(), 0, QueryBinding);
CloseHandle(hDriver);
- return INVALID_HANDLE_VALUE;
+ return FALSE;
}
/* Bind to the adapter */
@@ -159,48 +162,89 @@
0,
&dwBytesReturned,
NULL);
+
+ if (!bSuccess)
+ {
+ HeapFree(GetProcessHeap(), 0, QueryBinding);
+ CloseHandle(hDriver);
+ return FALSE;
+ }
+
+ /* Get interface info from the IP helper */
+ dwSize = sizeof(IP_INTERFACE_INFO);
+ do {
+ if (InterfaceInfo) HeapFree(GetProcessHeap(), 0, InterfaceInfo);
+ InterfaceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_INTERFACE_INFO));
+ if (!InterfaceInfo)
+ {
+ HeapFree(GetProcessHeap(), 0, QueryBinding);
+ CloseHandle(hDriver);
+ return FALSE;
+ }
+ dwStatus = GetInterfaceInfo(InterfaceInfo, &dwSize);
+ } while (dwStatus == ERROR_INSUFFICIENT_BUFFER);
+
+ if (dwStatus != NO_ERROR)
+ {
+ HeapFree(GetProcessHeap(), 0, QueryBinding);
+ HeapFree(GetProcessHeap(), 0, InterfaceInfo);
+ return FALSE;
+ }
+
+ for (i = 0; i < InterfaceInfo->NumAdapters; i++)
+ {
+ if (wcsstr((PWCHAR)((PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset),
+ InterfaceInfo->Adapter[i].Name))
+ {
+ *IpInfo = InterfaceInfo->Adapter[i];
+ *hAdapter = hDriver;
+
+ HeapFree(GetProcessHeap(), 0, QueryBinding);
+ HeapFree(GetProcessHeap(), 0, InterfaceInfo);
+
+ return TRUE;
+ }
+ }
+
HeapFree(GetProcessHeap(), 0, QueryBinding);
-
- if (!bSuccess)
- {
- CloseHandle(hDriver);
- return INVALID_HANDLE_VALUE;
- }
-
- return hDriver;
+ HeapFree(GetProcessHeap(), 0, InterfaceInfo);
+ CloseHandle(hDriver);
+
+ return FALSE;
}
/* Only works with the first adapter for now */
-HANDLE
-OpenWlanAdapter(VOID)
+BOOL
+OpenWlanAdapter(HANDLE *hAdapter, IP_ADAPTER_INDEX_MAP *IpInfo)
{
DWORD dwCurrentIndex;
- HANDLE hCurrentAdapter;
for (dwCurrentIndex = 0; ; dwCurrentIndex++)
{
- hCurrentAdapter = OpenAdapterHandle(dwCurrentIndex);
- if (hCurrentAdapter == INVALID_HANDLE_VALUE)
+ if (!OpenAdapterHandle(dwCurrentIndex, hAdapter, IpInfo))
break;
- if (IsWlanAdapter(hCurrentAdapter))
- return hCurrentAdapter;
+ if (IsWlanAdapter(*hAdapter))
+ return TRUE;
else
- CloseHandle(hCurrentAdapter);
- }
-
- return INVALID_HANDLE_VALUE;
+ CloseHandle(*hAdapter);
+ }
+
+ return FALSE;
}
BOOL
-WlanDisconnect(HANDLE hAdapter)
+WlanDisconnect(HANDLE hAdapter, PIP_ADAPTER_INDEX_MAP IpInfo)
{
BOOL bSuccess;
DWORD dwBytesReturned;
NDISUIO_SET_OID SetOid;
+ /* Release this IP address */
+ IpReleaseAddress(IpInfo);
+
+ /* Disassociate from the AP */
SetOid.Oid = OID_802_11_DISASSOCIATE;
-
bSuccess = DeviceIoControl(hAdapter,
IOCTL_NDISUIO_SET_OID_VALUE,
&SetOid,
@@ -519,7 +563,7 @@
}
BOOL
-WlanConnect(HANDLE hAdapter)
+WlanConnect(HANDLE hAdapter, PIP_ADAPTER_INDEX_MAP IpInfo)
{
BOOL bSuccess;
DWORD dwBytesReturned, SetOidSize;
@@ -681,6 +725,10 @@
if (!bSuccess)
return FALSE;
+
+ /* Update our IP address */
+ IpReleaseAddress(IpInfo);
+ IpRenewAddress(IpInfo);
_tprintf(_T("The operation completed successfully.\n"));
return TRUE;
@@ -864,12 +912,12 @@
int main(int argc, char* argv[])
{
HANDLE hAdapter;
+ IP_ADAPTER_INDEX_MAP IpInfo;
if (!ParseCmdline(argc, argv))
return -1;
- hAdapter = OpenWlanAdapter();
- if (hAdapter == INVALID_HANDLE_VALUE)
+ if (!OpenWlanAdapter(&hAdapter, &IpInfo))
{
DoFormatMessage(GetLastError());
return -1;
@@ -886,7 +934,7 @@
}
else if (bDisconnect)
{
- if (!WlanDisconnect(hAdapter))
+ if (!WlanDisconnect(hAdapter, &IpInfo))
{
DoFormatMessage(GetLastError());
CloseHandle(hAdapter);
@@ -895,7 +943,7 @@
}
else if (bConnect)
{
- if (!WlanConnect(hAdapter))
+ if (!WlanConnect(hAdapter, &IpInfo))
{
DoFormatMessage(GetLastError());
CloseHandle(hAdapter);
Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild?rev=54914&r1=54913&r2=54914&view=diff
==============================================================================
--- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild [iso-8859-1] (original)
+++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild [iso-8859-1] Thu Jan 12 01:46:15 2012
@@ -3,6 +3,7 @@
<module name="wlanconf" type="win32cui" installbase="system32" installname="wlanconf.exe">
<include base="wlanconf">.</include>
<include base="ReactOS">include/reactos/drivers/ndisuio</include>
+ <library>iphlpapi</library>
<file>wlanconf.c</file>
<file>wlanconf.rc</file>
</module>
More information about the Ros-diffs
mailing list