diff -r 9fc0ed567871 -r 5db1ac3b4374 vpnengine/vpnconnagt/src/vpnconnagt.cpp --- a/vpnengine/vpnconnagt/src/vpnconnagt.cpp Wed Apr 14 17:02:54 2010 +0300 +++ b/vpnengine/vpnconnagt/src/vpnconnagt.cpp Tue Apr 27 17:41:51 2010 +0300 @@ -15,8 +15,6 @@ * */ - - #include #include #include @@ -315,7 +313,9 @@ name.AppendFormat(_L("[0x%08x]"), this); Log::Printf(_L("%s Error %d in reading configuration\n"),name.PtrZ(), iLastErrorCode)); + iNotify->AgentProgress(EVPNConnAgtDisconnected, iLastErrorCode); iNotify->ConnectComplete(iLastErrorCode); + aError = iLastErrorCode; return; } @@ -769,7 +769,11 @@ RCmConnectionMethod vpnConnection = cmManager.ConnectionMethodL( iSettings.iIAPId ); CleanupClosePushL(vpnConnection); - ASSERT( vpnConnection.GetBoolAttributeL(ECmVirtual) ); + + if ( EFalse == vpnConnection.GetBoolAttributeL(ECmVirtual) ) + { + User::Leave( KErrNotSupported ); + } // Read VPN Network Id const TUint32 vpnNetworkId(vpnConnection.GetIntAttributeL(ECmNetworkId)); @@ -805,7 +809,11 @@ RCmConnectionMethod realConnection = cmManager.ConnectionMethodL( realIap ); CleanupClosePushL(realConnection); - ASSERT( !realConnection.GetBoolAttributeL(ECmVirtual) ); + + if ( EFalse != realConnection.GetBoolAttributeL(ECmVirtual) ) + { + User::Leave( KErrNotSupported ); + } // real iap id const TUint32 realIapId( realConnection.GetIntAttributeL(ECmIapId) );