--- a/wlan_bearer/wlanagent/src/wlanagtstates.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanagent/src/wlanagtstates.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 35 %
+* %version: 36 %
*/
#include <connectprog.h>
@@ -577,7 +577,8 @@
// -----------------------------------------------------------------------------
//
CWlanDisconnectState::CWlanDisconnectState(CWlanSM* aWlanSM, RWLMServer& aWLMServer) :
- CWlanStateBase(aWlanSM, aWLMServer)
+ CWlanStateBase(aWlanSM, aWLMServer),
+ iAgtHotSpotClient( NULL )
{
DEBUG( "CWlanDisconnectState constructor" );
}
@@ -604,29 +605,23 @@
{
DEBUG( "CWlanDisconnectState::StartState()" );
// check if plug-in is available
- TRAPD( ret, iAgtHotSpotClient = CWlanAgtHotSpotClient::NewL() );
-
- if( ret == KErrNone )
- {
- DEBUG( "CWlanDisconnectState::StartState(), AgtHotSpot plugin is available" );
+ if ( iWlanSM->IsHotSpotAP() )
+ {
+ TRAPD( ret, iAgtHotSpotClient = CWlanAgtHotSpotClient::NewL() );
+ if( ret == KErrNone )
+ {
+ DEBUG( "CWlanDisconnectState::StartState(), AgtHotSpot plugin is available" );
- if ( iWlanSM->IsHotSpotAP() )
- {
- // talk to hospot server
- DEBUG( "CWlanDisconnectState::StartState(), Sending CloseConnection message to HotSpot Server" );
- iAgtHotSpotClient->HotSpotCloseConnection( iWlanSM->IapId(), iStatus );
- SetActive();
- return;
+ // talk to hospot server
+ DEBUG( "CWlanDisconnectState::StartState(), Sending CloseConnection message to HotSpot Server" );
+ iAgtHotSpotClient->HotSpotCloseConnection( iWlanSM->IapId(), iStatus );
+ SetActive();
+ return;
+ }
}
- }
- else
- {
- iAgtHotSpotClient = NULL;
- }
JumpToRunl( KErrNone );
}
-
// -----------------------------------------------------------------------------
// CWlanDisconnectState::NextStateL
// -----------------------------------------------------------------------------
--- a/wlan_bearer/wlandbif_cd/src/wdbifwlansettings.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlandbif_cd/src/wdbifwlansettings.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 14 %
+* %version: 12.1.1 %
*/
// INCLUDE FILES
@@ -167,13 +167,7 @@
ReadWepKeysL(aSettings);
TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL, Wep keys succesfully read")));
}
- else if( aSettings.SecurityMode == Wlan8021x )
- {
- aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
- TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),
- aSettings.WPAKeyLength));
- }
- else if( aSettings.SecurityMode > Wlan8021x )
+ else if( aSettings.SecurityMode > Wep)
{
aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_types.h Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_types.h Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 100 %
+* %version: 99 %
*/
#ifndef CORE_TYPES_H
@@ -189,9 +189,7 @@
/** Use Wi-Fi Protected Setup, keys are negotiated by EAPOL. */
core_security_mode_protected_setup,
/** Use WAPI, keys are negotiated by EAPOL. */
- core_security_mode_wapi,
- /** Use EAP authentication without encryption. */
- core_security_mode_802dot1x_unencrypted
+ core_security_mode_wapi
} core_security_mode_e;
/**
@@ -2026,8 +2024,7 @@
wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam,
wlan_eapol_if_eapol_key_authentication_type_wfa_sc,
wlan_eapol_if_eapol_key_authentication_type_wapi_psk,
- wlan_eapol_if_eapol_key_authentication_type_wapi,
- wlan_eapol_if_eapol_key_authentication_type_802_1x_unencrypted
+ wlan_eapol_if_eapol_key_authentication_type_wapi
} wlan_eapol_if_eapol_key_authentication_type_e;
typedef enum _wlan_eapol_if_eapol_key_type_e
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_iap_data.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_iap_data.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 16 %
+* %version: 14.1.1 %
*/
#include "core_iap_data.h"
@@ -193,8 +193,7 @@
if ( iap_data_m.security_mode == core_security_mode_802dot1x ||
iap_data_m.security_mode == core_security_mode_wpa ||
iap_data_m.security_mode == core_security_mode_wpa2only ||
- iap_data_m.security_mode == core_security_mode_protected_setup ||
- iap_data_m.security_mode == core_security_mode_802dot1x_unencrypted )
+ iap_data_m.security_mode == core_security_mode_protected_setup )
{
return true_t;
}
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_roam.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_roam.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 78 %
+* %version: 76.1.5 %
*/
#include "core_operation_roam.h"
@@ -855,9 +855,7 @@
case core_security_mode_allow_unsecure:
{
break;
- }
- case core_security_mode_802dot1x_unencrypted:
- /** Falls through on purpose. */
+ }
case core_security_mode_802dot1x:
{
if ( request_status == core_error_eapol_total_failure ||
@@ -1022,8 +1020,7 @@
eap_error );
core_connect_status_e status( core_connect_wpa_eap_failure );
- if ( security_mode == core_security_mode_802dot1x ||
- security_mode == core_security_mode_802dot1x_unencrypted )
+ if ( security_mode == core_security_mode_802dot1x )
{
status = core_connect_802_1x_failure;
}
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_sub_operation_wpa_connect.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_sub_operation_wpa_connect.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 61.1.1 %
+* %version: 59 %
*/
#include "core_sub_operation_wpa_connect.h"
@@ -311,14 +311,6 @@
encryption_mode = core_encryption_mode_wpi;
break;
}
- case wlan_eapol_if_eapol_key_authentication_type_802_1x_unencrypted:
- {
- DEBUG( "core_sub_operation_wpa_connect_c::next_state() - using key management core_key_management_none" );
- DEBUG( "core_sub_operation_wpa_connect_c::next_state() - using encryption mode core_encryption_mode_disabled" );
- key_management = core_key_management_none;
- encryption_mode = core_encryption_mode_disabled;
- break;
- }
default:
{
DEBUG( "core_sub_operation_wpa_connect_c::next_state() - unknown authentication type" );
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_tools.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_tools.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -484,8 +484,8 @@
DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x" );
return wlan_eapol_if_eapol_key_authentication_type_802_1x;
}
- else if( (mode == core_security_mode_802dot1x || core_security_mode_802dot1x_unencrypted) &&
- (ap_data.key_management_suites() & core_key_management_wpx_fast_roam) )
+ else if( mode == core_security_mode_802dot1x &&
+ ap_data.key_management_suites() & core_key_management_wpx_fast_roam )
{
DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam" );
return wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam;
@@ -495,21 +495,6 @@
DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_wfa_sc" );
return wlan_eapol_if_eapol_key_authentication_type_wfa_sc;
}
- if( mode == core_security_mode_802dot1x_unencrypted &&
- !ap_data.is_rsn_ie_present() &&
- !ap_data.is_wpa_ie_present() )
- {
- if( !ap_data.is_privacy_enabled() )
- {
- DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x_unencrypted" );
- return wlan_eapol_if_eapol_key_authentication_type_802_1x_unencrypted;
- }
- else
- {
- DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x" );
- return wlan_eapol_if_eapol_key_authentication_type_802_1x;
- }
- }
else if( iap_data.is_eap_used() )
{
if( ap_data.is_rsn_ie_present() )
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_tools_parser.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_tools_parser.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 37 %
+* %version: 35 %
*/
#include "core_tools_parser.h"
@@ -146,8 +146,6 @@
}
break;
- case core_security_mode_802dot1x_unencrypted:
- /** Falls through on purpose. */
case core_security_mode_802dot1x:
/**
* Check WPX requirements.
@@ -375,7 +373,6 @@
break;
}
-
}
DEBUG( "core_tools_parser_c::is_ap_compatible_with_iap() - OK" );
--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanconversionutil.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanconversionutil.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 86.1.2 %
+* %version: 86.1.1 %
*/
#include <in_sock.h>
@@ -770,14 +770,7 @@
aCoreSettings.security_mode = core_security_mode_wep;
break;
case Wlan8021x:
- if( aAmSettings.WPAKeyLength == 1 )
- {
- aCoreSettings.security_mode = core_security_mode_802dot1x_unencrypted;
- }
- else
- {
- aCoreSettings.security_mode = core_security_mode_802dot1x;
- }
+ aCoreSettings.security_mode = core_security_mode_802dot1x;
break;
case Wpa:
aCoreSettings.security_mode = core_security_mode_wpa;
--- a/wlan_bearer/wlanldd/wlan_common/umac_common/src/UmacDot11State.cpp Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanldd/wlan_common/umac_common/src/UmacDot11State.cpp Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 86.1.3 %
+* %version: 86.1.4 %
*/
#include "config.h"
@@ -4999,6 +4999,10 @@
TBool status ( ETrue );
if ( ( aCtxImpl.PairwiseCipher() == EWlanCipherSuiteTkip ) ||
+ ( aCtxImpl.PairwiseCipher() == EWlanCipherSuiteWep ) ||
+ ( aCtxImpl.EncryptionStatus() == EEncryption802dot1xMixed ) ||
+ ( aCtxImpl.EncryptionStatus() == EEncryptionWep ) ||
+ ( aCtxImpl.EncryptionStatus() == EEncryptionWepMixed ) ||
!( aCtxImpl.QosEnabled() ) ||
!( aCtxImpl.FeaturesAllowed() & KWlanHtOperation ) )
{
@@ -5006,6 +5010,8 @@
// - the WLAN vendor implementation
// supports HT AND EITHER
// - TKIP will be used as the pairwise cipher OR
+ // - WEP will be used as the pairwise cipher OR
+ // - WEP will be used as the only cipher OR
// - the target nw doesn't support WMM OR
// - HT use has been denied by WLAN Mgmt client
// In these cases we must not use HT functionality, even if the target
@@ -5017,8 +5023,9 @@
aCtxImpl.RemoveBssMembershipFeature( E802Dot11HtPhy );
OsTracePrint( KInfoLevel, (TUint8*)
- ("UMAC: WlanDot11State::HandleDot11n: TKIP as pairwise cipher "
- "OR WMM not supported OR HT use denied => HT disabled") );
+ ("UMAC: WlanDot11State::HandleDot11n: TKIP as pairwise cipher OR "
+ "WEP as cipher OR WMM not supported OR HT use denied => HT "
+ "disabled") );
}
else
{
--- a/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/inc/RWlanLogicalChannel.inl Wed Sep 01 12:41:05 2010 +0100
+++ b/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/inc/RWlanLogicalChannel.inl Wed Oct 13 16:35:50 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 17.1.1 %
+* %version: 17.1.2 %
*/
// -----------------------------------------------------------------------------
@@ -63,14 +63,19 @@
//
inline void RWlanLogicalChannel::CloseChannel()
{
- // request WLAN system resources to be released
- //
- TRequestStatus status;
- DoRequest( EWlanFinitSystem, status );
- User::WaitForRequest(status);
+ if ( Handle() > KNullHandle )
+ {
+ // we have a valid handle to the kernel side object
- // internally call close
- Close();
+ // request WLAN system resources to be released
+ //
+ TRequestStatus status;
+ DoRequest( EWlanFinitSystem, status );
+ User::WaitForRequest(status);
+
+ // internally call close
+ Close();
+ }
}
// -----------------------------------------------------------------------------