vpnengine/ikev1lib/src/ikev1dialog.cpp
branchRCL_3
changeset 49 5960d2d03390
parent 46 29c8f9bc68e1
equal deleted inserted replaced
46:29c8f9bc68e1 49:5960d2d03390
   187     }
   187     }
   188 
   188 
   189     if ( iCallback )
   189     if ( iCallback )
   190 	{
   190 	{
   191 		TInt err;
   191 		TInt err;
   192 		TRAP(err, delete_obj = iCallback->DialogCompleteL(
   192 		TRAP(err, delete_obj = iCallback->DialogCompleteL(this, iUserInfo,
   193 		    iUserInfo, un_bfr, pw_bfr));
   193 								                          un_bfr,               //User name
   194 	    
   194 			                                              pw_bfr,               //Password
       
   195 			                                              NULL));               //domain
       
   196 	    delete un_bfr; 
       
   197 	    delete pw_bfr;
   195 	    if ( err != KErrNone )
   198 	    if ( err != KErrNone )
   196 		  delete_obj = 1;
   199 		  delete_obj = 1;
   197     }
   200     }
   198     
   201     
   199     if ( delete_obj )
   202     if ( delete_obj )
   268        LaunchDialogL();   //launch the dialog
   271        LaunchDialogL();   //launch the dialog
   269 }
   272 }
   270 
   273 
   271 /*--------------------------------------------------------------------
   274 /*--------------------------------------------------------------------
   272  *
   275  *
   273  *  Get user name and Secure ID code data for Legacy authentication
   276  *  Get user name and Secure ID pin data for Legacy authentication
   274  *
   277  *
   275  *---------------------------------------------------------------------*/
   278  *---------------------------------------------------------------------*/
   276 void CIkev1Dialog::GetAsyncSecureidDialogL(TAny *aUserInfo, MIkeDialogComplete*  aCallback)
   279 void CIkev1Dialog::GetAsyncSecureidDialogL(TAny *aUserInfo, MIkeDialogComplete*  aCallback)
   277 {
   280 {
   278 	DEBUG_LOG2(_L("CIkev1Dialog::GetAsyncSecureidDialogL(), aUserInfo =  %x, aCallback = %x"), aUserInfo, aCallback);
   281 	DEBUG_LOG2(_L("CIkev1Dialog::GetAsyncSecureidDialogL(), aUserInfo =  %x, aCallback = %x"), aUserInfo, aCallback);
   279 	
   282 	
   280     iDialogType = TKMDDialog::ESecurIdCode;
   283     iDialogType = TKMDDialog::ESecurIdPin;
   281     iUserInfo   = aUserInfo;
   284     iUserInfo   = aUserInfo;
   282     iCallback   = aCallback; // For asynchronous dialog RunL
   285     iCallback   = aCallback; // For asynchronous dialog RunL
   283 
   286 
   284 	TIPSecDialogInfo dialog_input(TKMDDialog::ESecurIdCode, 0);		
   287 	TIPSecDialogInfo dialog_input(TKMDDialog::ESecurIdPin, 0);		
   285 	iInputData = CreateDialogInput(dialog_input, ETrue);// TRUE = Use user name cache    	
   288 	iInputData = CreateDialogInput(dialog_input, ETrue);// TRUE = Use user name cache    	
   286     if ( iInputData )
   289     if ( iInputData )
   287        LaunchDialogL();   //launch the dialog
   290        LaunchDialogL();   //launch the dialog
   288 }
   291 }
   289 
       
   290 /*--------------------------------------------------------------------
       
   291  *
       
   292  *  Get user name and Secure ID pin data for Legacy authentication
       
   293  *
       
   294  *---------------------------------------------------------------------*/
       
   295 void CIkev1Dialog::GetAsyncSecureidPinDialogL(TAny *aUserInfo, MIkeDialogComplete*  aCallback)
       
   296 {
       
   297     DEBUG_LOG2(_L("CIkev1Dialog::GetAsyncSecureidPinDialogL(), aUserInfo =  %x, aCallback = %x"), aUserInfo, aCallback);
       
   298     
       
   299     iDialogType = TKMDDialog::ESecurIdPin;
       
   300     iUserInfo   = aUserInfo;
       
   301     iCallback   = aCallback; // For asynchronous dialog RunL
       
   302 
       
   303     TIPSecDialogInfo dialog_input(TKMDDialog::ESecurIdPin, 0);      
       
   304     iInputData = CreateDialogInput(dialog_input, ETrue);// TRUE = Use user name cache       
       
   305     if ( iInputData )
       
   306        LaunchDialogL();   //launch the dialog
       
   307 }
       
   308 
       
   309 
   292 
   310 /*--------------------------------------------------------------------
   293 /*--------------------------------------------------------------------
   311  *
   294  *
   312  *  Get user name and Secure ID next pin data for Legacy authentication
   295  *  Get user name and Secure ID next pin data for Legacy authentication
   313  *
   296  *
   622     
   605     
   623     if ( Callback ) 
   606     if ( Callback ) 
   624     {
   607     {
   625 		TInt err;
   608 		TInt err;
   626 		DEBUG_LOG2(_L("Calling DialogCompleteL(), UserInfo = %x, Callback = %x"), (TUint32)iDialog->UserInfo(), (TUint32)Callback);					
   609 		DEBUG_LOG2(_L("Calling DialogCompleteL(), UserInfo = %x, Callback = %x"), (TUint32)iDialog->UserInfo(), (TUint32)Callback);					
   627         TRAP(err, delete_dialog = Callback->DialogCompleteL(
   610         TRAP(err, delete_dialog = Callback->DialogCompleteL(iDialog,
   628             iDialog->UserInfo(), NULL, NULL));
   611                                                             iDialog->UserInfo(),
   629 
   612                                                             NULL,               //User name
       
   613                                                             NULL,               //Password
       
   614                                                             NULL));             //domain
   630 		DEBUG_LOG2(_L("DialogCompleteL() completed, err = %d, delete_dialog = %d"), err, delete_dialog);			
   615 		DEBUG_LOG2(_L("DialogCompleteL() completed, err = %d, delete_dialog = %d"), err, delete_dialog);			
   631 		if ( err != KErrNone )
   616 		if ( err != KErrNone )
   632 			delete_dialog = 1;
   617 			delete_dialog = 1;
   633     }  
   618     }  
   634     if ( delete_dialog )
   619     if ( delete_dialog )