Mercurial Mercurial > oss > FCL > sf > mw > vpnclient / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vpnengine/ikev1lib/src/ikev1trans.cpp
branchRCL_3
changeset 46 29c8f9bc68e1
parent 41 e06095241a65
child 49 5960d2d03390
equal deleted inserted replaced
44:735de8341ce4 46:29c8f9bc68e1 
   828             //
 
   828             //
 
   829             //  User name/Secure ID authentication required
 
   829             //  User name/Secure ID authentication required
 
   830             //
 
   830             //
 
   831             iDialog     = CIkev1Dialog::NewL(iPluginSession, iPluginSession->DialogAnchor(), iDebug);
 
   831             iDialog     = CIkev1Dialog::NewL(iPluginSession, iPluginSession->DialogAnchor(), iDebug);
 
   832             iDialogInfo = new(ELeave) CAuthDialogInfo(iPluginSession, XAUTH_DIALOG_ID, iNegotiation->SAId(), iCurrExchange->iMessageId);
 
   832             iDialogInfo = new(ELeave) CAuthDialogInfo(iPluginSession, XAUTH_DIALOG_ID, iNegotiation->SAId(), iCurrExchange->iMessageId);
 
   833             iDialog->GetAsyncSecureidDialogL(iDialogInfo, (MIkeDialogComplete*)this);          
   833             iDialog->GetAsyncSecureidDialogL(iDialogInfo, static_cast<MIkeDialogComplete*>(this));          
   834             break;
 
   834             break;
 
   835 
   835 
   836         case ( (1 << (ATTR_USER_NAME - ATTR_XAUTH_TYPE)) | (1 << (ATTR_NEXT_PIN - ATTR_XAUTH_TYPE))):
 
   836         case ( (1 << (ATTR_USER_NAME - ATTR_XAUTH_TYPE)) | (1 << (ATTR_NEXT_PIN - ATTR_XAUTH_TYPE))):
 
   837             //
 
   837             //
 
   838             //  User name/Secure ID next pin required
 
   838             //  User name/Secure ID next pin required
 
   839             //
 
   839             //
 
   840 			iDialog     = CIkev1Dialog::NewL(iPluginSession, iPluginSession->DialogAnchor(), iDebug);			
   840 			iDialog     = CIkev1Dialog::NewL(iPluginSession, iPluginSession->DialogAnchor(), iDebug);			
   841 			iDialogInfo = new(ELeave) CAuthDialogInfo(iPluginSession, XAUTH_DIALOG_ID, iNegotiation->SAId(), iCurrExchange->iMessageId);
 
   841 			iDialogInfo = new(ELeave) CAuthDialogInfo(iPluginSession, XAUTH_DIALOG_ID, iNegotiation->SAId(), iCurrExchange->iMessageId);
 
   842             iDialog->GetAsyncSecureNextPinDialogL(iDialogInfo, (MIkeDialogComplete*)this);
 
   842             iDialog->GetAsyncSecureNextPinDialogL(iDialogInfo, static_cast<MIkeDialogComplete*>(this));
 
   843             break;
 
   843             break;
 
   844 
   844 
   845         case ( (1 << (ATTR_CHALLENGE - ATTR_XAUTH_TYPE)) ):
 
   845         case ( (1 << (ATTR_CHALLENGE - ATTR_XAUTH_TYPE)) ):
 
   846             //
 
   846             //
 
   847             //  User Challenge response dialog
 
   847             //  User Challenge response dialog
 
   848             //
 
   848             //
 
   849             if ( xauth_type == ATTR_XAUTH_RADIUS_CHAP )
 
   849             if ( xauth_type == ATTR_XAUTH_RADIUS_CHAP )
 
   850 			{
 
   850 			{
 
   851 				iDialog     = CIkev1Dialog::NewL(iPluginSession, iPluginSession->DialogAnchor(), iDebug);			
   851 				iDialog     = CIkev1Dialog::NewL(iPluginSession, iPluginSession->DialogAnchor(), iDebug);			
   852 				iDialogInfo = new(ELeave) CAuthDialogInfo(iPluginSession, XAUTH_DIALOG_ID, iNegotiation->SAId(), iCurrExchange->iMessageId);
 
   852 				iDialogInfo = new(ELeave) CAuthDialogInfo(iPluginSession, XAUTH_DIALOG_ID, iNegotiation->SAId(), iCurrExchange->iMessageId);
 
   853                 iDialog->GetAsyncRespDialog(challenge, iDialogInfo, (MIkeDialogComplete*)this);
 
   853                 iDialog->GetAsyncRespDialog(challenge, iDialogInfo, static_cast<MIkeDialogComplete*>(this));
 
   854             }   
   854             }   
   855             break;
 
   855             break;
 
   856 
   856 
   857         default:
 
   857         default:
 
   858             break;
 
   858             break;
 
  1156 	DEBUG_LOG1(_L("CTransNegotiation::DialogCompleteL(), aUserInfo=%x"), aUserInfo);
 
  1156 	DEBUG_LOG1(_L("CTransNegotiation::DialogCompleteL(), aUserInfo=%x"), aUserInfo);
 
  1157 
  1157 
  1158 	if ( info )
 
  1158 	if ( info )
 
  1159 	{
 
  1159 	{
 
  1160 		obj_id = info->GetObjId();
 
  1160 		obj_id = info->GetObjId();
 
       
  1161 		info->iNegotiation = iNegotiation;
 
  1161 		DEBUG_LOG1(_L("Preparing to call AuthDialogCompletedL(), ObjId = %x"), obj_id);
 
  1162 		DEBUG_LOG1(_L("Preparing to call AuthDialogCompletedL(), ObjId = %x"), obj_id);
 
  1162 		if ( obj_id == XAUTH_DIALOG_ID )
 
  1163 		if ( obj_id == XAUTH_DIALOG_ID )
 
  1163 		{
 
  1164 		{
 
  1164 			info->SetUserName( aUsername );
 
  1165 			info->SetUserName( aUsername );
 
  1165 			info->SetSecret( aSecret );
 
  1166 			info->SetSecret( aSecret );
 
  1195     }
 
  1196     }
 
  1196 
  1197 
  1197     if( KErrNone == ret )
 
  1198     if( KErrNone == ret )
 
  1198     {
 
  1199     {
 
  1199         iCredentialType = KCredentialTypeCached;
 
  1200         iCredentialType = KCredentialTypeCached;
 
       
  1201         iDialogInfo->iNegotiation = iNegotiation;
 
  1200         TUint32 id = iPluginSession->AuthDialogCompletedL( iDialogInfo );
 
  1202         TUint32 id = iPluginSession->AuthDialogCompletedL( iDialogInfo );
 
  1201     }
 
  1203     }
 
  1202     else
 
  1204     else
 
  1203     {
 
  1205     {
 
  1204         iCredentialType = KCredentialTypeNew;
 
  1206         iCredentialType = KCredentialTypeNew;
 
  1206         delete iDialog;  iDialog = NULL;
 
  1208         delete iDialog;  iDialog = NULL;
 
  1207 
  1209 
  1208         iDialog = CIkev1Dialog::NewL(
 
  1210         iDialog = CIkev1Dialog::NewL(
 
  1209             iPluginSession, iPluginSession->DialogAnchor(), iDebug );
 
  1211             iPluginSession, iPluginSession->DialogAnchor(), iDebug );
 
  1210 
  1212 
  1211         iDialog->GetAsyncUNPWDialogL( iDialogInfo, (MIkeDialogComplete*)this );
 
  1213         iDialog->GetAsyncUNPWDialogL( iDialogInfo, static_cast<MIkeDialogComplete*>(this) );
 
  1212     }
 
  1214     }
 
  1213 }
 
  1215 }
 
  1214 
  1216 
  1215 
  1217 
  1216 /***/
 
  1218 /***/
FCL/sf/mw/vpnclient