--- a/hotspotfw/hsserver/src/hssiapsettingshandler.cpp Tue Jan 26 13:04:04 2010 +0200
+++ b/hotspotfw/hsserver/src/hssiapsettingshandler.cpp Fri Apr 16 16:07:56 2010 +0300
@@ -77,8 +77,8 @@
// -----------------------------------------------------------------------------
//
void CHssIapSettingsHandler::CreateClientIapL( const TDesC& aIapName,
- TUint32& aIapId,
- const TUid aUid )
+ TUint32& aIapId,
+ const TDesC& aUid )
{
DEBUG("CHssIapSettingsHandler::CreateClientIapL");
@@ -106,7 +106,7 @@
plugin.SetStringAttributeL( ECmName, aIapName );
plugin.SetStringAttributeL( EWlanSSID, aIapName );
- plugin.SetStringAttributeL( EWlanServiceExtensionTableName, aUid.Name() );
+ plugin.SetStringAttributeL( EWlanServiceExtensionTableName, aUid );
plugin.SetStringAttributeL( ECmConfigDaemonManagerName, KHotSpotPlugin );
plugin.SetBoolAttributeL( ECmProtected, ETrue );
@@ -164,8 +164,7 @@
HBufC* ssid( NULL );
TWlanSsid ssidConn;
- wlanMgmtClient->GetConnectionSsid( ssidConn );
-
+ User::LeaveIfError( wlanMgmtClient->GetConnectionSsid( ssidConn ) );
ssid = HBufC::NewLC( ssidConn.Length() );
ssid->Des().Copy( ssidConn );
@@ -235,60 +234,11 @@
CleanupClosePushL( plugin );
cmManager.RemoveAllReferencesL( plugin );
- CleanupStack::Pop( &plugin );
-
TBool result = plugin.DeleteL();
- DEBUG1("CHssIapSettingsHandler:::DeleteIapL result = %d ", result);
-
- CleanupStack::PopAndDestroy( &cmManager );
- }
-// -----------------------------------------------------------------------------
-// FindClientL
-// -----------------------------------------------------------------------------
-//
-TInt CHssIapSettingsHandler::FindClientL( const TUint aIapId, TUid& aUid, TDes8& aUidText )
- {
- DEBUG("CHssIapSettingsHandler::FindClientL");
- TInt ret( KErrNone );
- aUid = TUid::Null();
- RCmManagerExt cmManager;
- cmManager.OpenL();
- CleanupClosePushL( cmManager );
-
- RCmConnectionMethodExt plugin = cmManager.ConnectionMethodL( aIapId );
- CleanupClosePushL( plugin );
-
- HBufC* uid = plugin.GetStringAttributeL( EWlanServiceExtensionTableName );
-
- TBuf8<KExtensionAPILength> buffer;
- buffer.Copy( *uid );
- delete uid;
- // Find and remove [ and ].
- // If found [ it's known that buffer contains UID
- TInt indx = buffer.Find( KMark1 );
- if ( KErrNotFound != indx )
- {
- DEBUG("CHssIapSettingsHandler::FindClientL Client is found");
- buffer.Delete( indx, 1 );
- indx = buffer.Find( KMark2 );
- if ( KErrNotFound != indx )
- {
- buffer.Delete( indx, 1 );
- }
- // Convert TBuf to TUid
- TLex8 lex( buffer );
- TUint value( 0 );
- User::LeaveIfError( lex.Val( value, EHex ) );
- aUid.iUid = value;
- aUidText = buffer;
- }
-
- CleanupStack::PopAndDestroy( &plugin ); // Close() called on "plugin"
+ DEBUG1("CHssIapSettingsHandler:::DeleteIapL result = %d ", result);
+ CleanupStack::PopAndDestroy( &plugin );
CleanupStack::PopAndDestroy( &cmManager );
- DEBUG("CHssIapSettingsHandler::FindClientL");
-
- return ret;
}
// ---------------------------------------------------------