17 Jan
2012
17 Jan
'12
11:11 p.m.
Author: cgutman
Date: Tue Jan 17 23:11:28 2012
New Revision: 55000
URL: http://svn.reactos.org/svn/reactos?rev=55000&view=rev
Log:
- Merge the remaining portion of the wlan-bringup branch
- ReactOS now supports open and WEP encrypted networks (both ad-hoc and infrastructure)
(WPA(2) will be supported later)
- Use the wlanconf tool to configure the WLAN adapter (after installing the XP driver for
your WLAN adapter)
- "wlanconf -c <SSID>" connects to an infrastructure network. Adding the
"-a" option connects to (or creates) an ad-hoc network. Adding "-w
<WEP>" will enable WEP encryption using the supplied key.
- "wlanconf -s" will scan and display a list of the surrounding networks and
various attributes like signal strength, SSID, BSSID, network mode, and supported rates
- "wlanconf" will display the current WLAN configuration details if the adapter
is connected
- The DHCP service will detect network changes and refresh its state accordingly when
associating with a new wireless network
Added:
trunk/reactos/base/applications/network/wlanconf/
- copied from r54998, branches/wlan-bringup/base/applications/network/wlanconf/
trunk/reactos/drivers/network/ndisuio/
- copied from r54998, branches/wlan-bringup/drivers/network/ndisuio/
trunk/reactos/include/reactos/drivers/ndisuio/
- copied from r54998, branches/wlan-bringup/include/reactos/drivers/ndisuio/
Modified:
trunk/reactos/ (props changed)
trunk/reactos/base/applications/network/CMakeLists.txt
trunk/reactos/base/applications/network/network.rbuild
trunk/reactos/boot/bootdata/hivesys_i386.inf
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/drivers/network/CMakeLists.txt
trunk/reactos/drivers/network/directory.rbuild
trunk/reactos/include/psdk/ntddndis.h
Propchange: trunk/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 23:11:28 2012
@@ -10,4 +10,4 @@
/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
/branches/shell32_new-bringup:51893-53652,53661,53700
/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454
-/branches/wlan-bringup:54895-54896,54899,54912-54913,54915-54916,54929-54930,54932-54934,54939,54941-54942,54944-54947,54980
+/branches/wlan-bringup:54809-54998
Modified: trunk/reactos/base/applications/network/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Tue Jan 17
23:11:28 2012
@@ -14,3 +14,5 @@
endif()
add_subdirectory(tracert)
add_subdirectory(whois)
+add_subdirectory(wlanconf)
+
Modified: trunk/reactos/base/applications/network/network.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/network.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/network.rbuild [iso-8859-1] Tue Jan 17
23:11:28 2012
@@ -40,4 +40,7 @@
<directory name="whois">
<xi:include href="whois/whois.rbuild" />
</directory>
+ <directory name="wlanconf">
+ <xi:include href="wlanconf/wlanconf.rbuild" />
+ </directory>
</group>
Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Jan 17 23:11:28 2012
@@ -1398,6 +1398,13 @@
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ImagePath",0x00020000,"system32\drivers\nmidebug.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Type",0x00010001,0x00000001
+
+; NDIS User I/O driver (FIXME: Should be installed via INF and started on demand)
+HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Group",0x00000000,"NDIS"
+HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","ImagePath",0x00020000,"system32\drivers\ndisuio.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Type",0x00010001,0x00000001
; Packet driver
HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x00010001,0x00000001
@@ -1629,7 +1636,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Group",0x00000000,"TDI"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ImagePath",0x00020000,"%SystemRoot%\system32\wlansvc.exe"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ObjectName",0x00000000,"LocalSystem"
-HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000002
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Type",0x00010001,0x00000110
; Simple TCP services
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Jan 17 23:11:28
2012
@@ -76,6 +76,7 @@
base\applications\network\telnet\telnet.exe 1
base\applications\network\tracert\tracert.exe 1
base\applications\network\whois\whois.exe 1
+base\applications\network\wlanconf\wlanconf.exe 1
base\applications\notepad\notepad.exe 1
base\applications\rapps\rapps.exe 1
base\applications\regedit\regedit.exe 4
@@ -532,6 +533,7 @@
drivers\network\tdi\tdi.sys 2
drivers\network\dd\ne2000\ne2000.sys 2
drivers\network\dd\pcnet\pcnet.sys 2
+drivers\network\ndisuio\ndisuio.sys 2
drivers\serial\serenum\serenum.sys 2
drivers\serial\serial\serial.sys 2
Modified: trunk/reactos/drivers/network/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/CMakeLists…
==============================================================================
--- trunk/reactos/drivers/network/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/CMakeLists.txt [iso-8859-1] Tue Jan 17 23:11:28 2012
@@ -2,5 +2,6 @@
add_subdirectory(afd)
add_subdirectory(dd)
add_subdirectory(ndis)
+add_subdirectory(ndisuio)
add_subdirectory(tcpip)
add_subdirectory(tdi)
Modified: trunk/reactos/drivers/network/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/directory.…
==============================================================================
--- trunk/reactos/drivers/network/directory.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/directory.rbuild [iso-8859-1] Tue Jan 17 23:11:28 2012
@@ -10,6 +10,9 @@
<directory name="ndis">
<xi:include href="ndis/ndis.rbuild" />
</directory>
+<directory name="ndisuio">
+ <xi:include href="ndisuio/ndisuio.rbuild" />
+</directory>
<directory name="tcpip">
<xi:include href="tcpip/tcpip.rbuild" />
</directory>
Modified: trunk/reactos/include/psdk/ntddndis.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re…
==============================================================================
--- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Tue Jan 17 23:11:28 2012
@@ -41,6 +41,22 @@
NdisDeviceStateD3,
NdisDeviceStateMaximum
} NDIS_DEVICE_POWER_STATE, *PNDIS_DEVICE_POWER_STATE;
+
+typedef enum _NDIS_802_11_WEP_STATUS
+{
+ Ndis802_11WEPEnabled,
+ Ndis802_11WEPDisabled,
+ Ndis802_11WEPKeyAbsent,
+ Ndis802_11WEPNotSupported
+} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS;
+
+typedef enum _NDIS_802_11_AUTHENTICATION_MODE
+{
+ Ndis802_11AuthModeOpen,
+ Ndis802_11AuthModeShared,
+ Ndis802_11AuthModeAutoSwitch,
+ Ndis802_11AuthModeMax
+} NDIS_802_11_AUTHENTICATION_MODE, *PNDIS_802_11_AUTHENTICATION_MODE;
typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE
{
@@ -116,6 +132,14 @@
ULONG NumberOfItems;
NDIS_WLAN_BSSID Bssid[1];
} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST;
+
+typedef struct _NDIS_802_11_WEP
+{
+ ULONG Length;
+ ULONG KeyIndex;
+ ULONG KeyLength;
+ UCHAR KeyMaterial[1];
+} NDIS_802_11_WEP, *PNDIS_802_11_WEP;
typedef struct _NDIS_PM_WAKE_UP_CAPABILITIES {
NDIS_DEVICE_POWER_STATE MinMagicPacketWakeUp;
@@ -265,8 +289,34 @@
#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206
#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207
-#define OID_802_11_BSSID_LIST 0x0D010217
-#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A
+/* IEEE 802.11 (WLAN) OIDs */
+#define OID_802_11_BSSID 0x0D010101
+#define OID_802_11_SSID 0x0D010102
+#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0D010203
+#define OID_802_11_NETWORK_TYPE_IN_USE 0x0D010204
+#define OID_802_11_TX_POWER_LEVEL 0x0D010205
+#define OID_802_11_RSSI 0x0D010206
+#define OID_802_11_RSSI_TRIGGER 0x0D010207
+#define OID_802_11_INFRASTRUCTURE_MODE 0x0D010108
+#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0D010209
+#define OID_802_11_RTS_THRESHOLD 0x0D01020A
+#define OID_802_11_NUMBER_OF_ANTENNAS 0x0D01020B
+#define OID_802_11_RX_ANTENNA_SELECTED 0x0D01020C
+#define OID_802_11_TX_ANTENNA_SELECTED 0x0D01020D
+#define OID_802_11_SUPPORTED_RATES 0x0D01020E
+#define OID_802_11_DESIRED_RATES 0x0D010210
+#define OID_802_11_CONFIGURATION 0x0D010211
+#define OID_802_11_STATISTICS 0x0D020212
+#define OID_802_11_ADD_WEP 0x0D010113
+#define OID_802_11_REMOVE_WEP 0x0D010114
+#define OID_802_11_DISASSOCIATE 0x0D010115
+#define OID_802_11_POWER_MODE 0x0D010216
+#define OID_802_11_BSSID_LIST 0x0D010217
+#define OID_802_11_AUTHENTICATION_MODE 0x0D010118
+#define OID_802_11_PRIVACY_FILTER 0x0D010119
+#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A
+#define OID_802_11_WEP_STATUS 0x0D01011B
+#define OID_802_11_RELOAD_DEFAULTS 0x0D01011C
/* OID_GEN_MINIPORT_INFO constants */
#define NDIS_MINIPORT_BUS_MASTER 0x00000001