MCL/sf/mw/websrv: comparison webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp

equal deleted inserted replaced

-:48e9d43c1d7f
+:9e96e2676219
 * Contributors:
 *
 * Description:
 *
 */
 #include <uri8.h>
 #include <es_sock.h>
 #include <in_sock.h>
 #endif
 // Ask IAP from user
 void CSenHttpChannelImpl::ConstructL()
 {
-// Open connection to the file logger server
-TLSLOG_OPEN(KSenHttpChannelLogChannelBase, KSenHttpChannelLogLevel, KSenHttpChannelLogDir, KSenHttpChannelLogFile);
-TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL - Log file opened")));
 // Open the RHTTPSession
 TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("- Opening HTTP/TCP session.")));
 iSess.OpenL();
 //    RSocketServ server; // with "anon" (local) socket servers, should we keep array of open ones in case of pending txns?
 //    SetIapPrefsL(aIapId, iConnection, server);
 #ifndef __ENABLE_ALR__
 	IsOCCImplementedSDK();
 #endif
+	if(aIapId > 0)
-const TInt result = SetIapPrefsL(aIapId, ETrue, iConnection, iSockServ);
+		{
-User::LeaveIfError( result );
+	const TInt result = SetIapPrefsL(aIapId, ETrue, iConnection, iSockServ);
+	User::LeaveIfError( result );
+	}
 }
 CSenHttpChannelImpl::~CSenHttpChannelImpl()
 {
 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::~CSenHttpChannelImpl()");
 REComSession::DestroyedImplementation(KDeflateFilterUid);
 }
 iConnection.Close();
 iSockServ.Close();
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::~CSenHttpChannelImpl() Completed");
-// Close the log file and the connection to the server.
-TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("Log file closed.")));
-TLSLOG_CLOSE(KSenHttpChannelLogChannelBase);
 }
 TInt CSenHttpChannelImpl::SetIapPrefsL( TUint32 aIapId, TBool aDialogPref, RConnection& aConnection, RSocketServ& aSocketServer )
 	{
-	TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("- SetIapPrefsL	, IAP ID (%d)"), aIapId));
+	TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("- SetIapPrefsL	, aIapId (%d)"), aIapId));
+	TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("- SetIapPrefsL	, iIapId (%d)"), iIapId));
 // Check whether IAP ID is not equal with the one that is currently in effect:
-if(iExplicitIapDefined && iIapId == aIapId )
+if(iExplicitIapDefined || iIapId == aIapId && iIapId > 0)
 {
 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetIapPrefsL: Iap Id is same as currently in effect");
 return KErrNone;
 }
 	else
 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetIapPrefsL: Re-using existing RConnection => calling RConnection::Stop");
 aConnection.Stop();
 }
 else
 {
-// Connect to a socket server
+if(aConnection.SubSessionHandle())
-TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetIapPrefsL: Connecting to new socket server");
+	{
-User::LeaveIfError( aSocketServer.Connect() );
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Re-using existing RConnection => calling RConnection::Stop");
+	aConnection.Stop();
-// Open new connection
+	}
-TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetIapPrefsL: Opening new RConnection using the socket server.");
+else
-User::LeaveIfError( aConnection.Open(aSocketServer) );
+{
+// Connect to a socket server
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetIapPrefsL: Connecting to new socket server");
+User::LeaveIfError( aSocketServer.Connect() );
+// Open new connection
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetIapPrefsL: Opening new RConnection using the socket server.");
+User::LeaveIfError( aConnection.Open(aSocketServer) );
+}
 }
 // Set the IAP selection preferences (IAP ID, do not prompt)
 	TInt retVal = SetID(aIapId, aDialogPref, aConnection, aSocketServer);
 			TExtendedConnPref extPrefs;
 			//extPrefs.SetSnapPurpose( CMManager::ESnapPurposeUnknown);
 			//TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel, "- Setting up OCC Silent Connection");
 			//extPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent);
 			//extPrefs.SetBearerSet(TExtendedConnBearer::EExtendedConnBearerUnknown);
-			extPrefs.SetIapId(aId);
+			if(aId != 0)
-			extPrefs.SetSnapId(0);
+				{
+				extPrefs.SetIapId(aId);
+				extPrefs.SetSnapId(0);
+				}
+			else
+				{
+				extPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet);
+				extPrefs.SetConnSelectionDialog(ETrue);
+				}
 			prefList.AppendL(&extPrefs);
 			retVal = aConnection.Start(prefList);
 			if(retVal == KErrNone)
 			    {
-			    iIapId = aId;
+			    if(aId == 0)
+			    	{
+aConnection.GetIntSetting( _L("IAP\\Id"), iIapId);
+TName name;
+retVal = aConnection.Name(name);
+if(retVal == KErrNone)
+{
+TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("IAP Name [%S]"), &name));
+}
+TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("GetIntSetting returned IAP [%d]"), iIapId));
+			    	}
+			    else
+			    	{
+			    	iIapId = aId;
+			    	}
 			    }
 			 else
 			    {
-				TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("IAP ->Start retVal [%d]"), retVal));
+TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("IAP ->Start retVal [%d]"), retVal));
 			    }
 		    }
 		else
 		    {
 		    /**
 			if(aId == 0)
 				{
 				TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel, "- Setting SnapPurpose Internet");
 				if(aDialogPref) //If it fails because of unavailibility of access points
 					{
+					TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel, "- Fails because of unavailibility of access points");
 					extPrefs.SetSnapPurpose(CMManager::ESnapPurposeUnknown);
 					extPrefs.SetConnSelectionDialog(ETrue);
 					}
 				else
 					{
 				extPrefs.SetIapId(0);
 				extPrefs.SetSnapPurpose(CMManager::ESnapPurposeUnknown);
 				extPrefs.SetConnSelectionDialog(EFalse);
 				}
 			prefList.AppendL(&extPrefs);
+			TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel, "SetID: RConnection Start");
 			retVal = aConnection.Start(prefList);
 			TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("RConnection Start retval[%d]"), retVal));
 			if(retVal == KErrNone)
 				{
 				aConnection.GetIntSetting( _L("IAP\\Id"), iIapId);
 				TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("SNAP ->Start retVal [%d]"), retVal));
 			    }
 		    }
 		}
 #endif
-if (!retVal)
+if (!retVal && !aSNAP)
 {
 iExplicitIapDefined = ETrue;
 }
 	return retVal;
 }
 TInt CSenHttpChannelImpl::SetSnapPrefsL( TUint32 aSnapId, TBool aDialogPref, RConnection& aConnection, RSocketServ& aSocketServer )
 {
 TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("- CSenHttpChannelImpl::SetSnapPrefsL, SNAP ID (%d)"), aSnapId));
 		// Check whether SNAP ID is not equal with the one that is currently in effect:
-if(iExplicitIapDefined && iSnapId == aSnapId )
+if(iExplicitIapDefined && iSnapId == aSnapId)
 {
 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Sanp is same as currently in effect");
 return KErrNone;
 }
 	else
 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Re-using existing RConnection => calling RConnection::Stop");
 aConnection.Stop();
 }
 else
 {
-// Connect to a socket server
+if(aConnection.SubSessionHandle())
-TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Connecting to new socket server");
+	{
-User::LeaveIfError( aSocketServer.Connect() );
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Re-using existing RConnection => calling RConnection::Stop");
+	aConnection.Stop();
-// Open new connection
+	}
-TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Opening new RConnection using the socket server.");
+else
-User::LeaveIfError( aConnection.Open(aSocketServer) );
+{
+// Connect to a socket server
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Connecting to new socket server");
+User::LeaveIfError( aSocketServer.Connect() );
+// Open new connection
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"- SetSnapPrefsL: Opening new RConnection using the socket server.");
+User::LeaveIfError( aConnection.Open(aSocketServer) );
+}
 }
 	// Set the SNAP selection preferences (SNAP ID, do not prompt)
 	TInt retVal = SetID(aSnapId, aDialogPref, aConnection, aSocketServer, ETrue);
 // Remember the SNAP id that is being set, because *at the moment*,
 // there is NO direct API to query effective SNAP ID from CommsDB.
 if (!retVal)
 {
-iExplicitIapDefined = ETrue;
+//iExplicitIapDefined = ETrue;
 iSnapId = aSnapId;
 }
 return retVal;
 }
 {
 // by default, do not prompt (even if property does not exist!)
 // => only if property is set, and has value "FALSE", show PROMPT
 prompt = ETrue;
 }
+	TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::InvokeHttpMethodL - iIapId [%d]"), iIapId));
 #ifndef __ENABLE_ALR__
+		TInt propRetVal = aProps.IapIdL(id);
 // Independent of dialog preference (property's existance), if IAP was predefined, it must be set
-if(((aProps.IapIdL(id)) == KErrNone))
+if(propRetVal == KErrNone)
 {
+TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::InvokeHttpMethodL SetIapPrefs - id [%d]"), id));
 retVal = SetIapPrefsL(id, prompt, iConnection, iSockServ);
+}
+else if(iIapId > 0)
+{
+TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::InvokeHttpMethodL SetIapPrefs - iIapId [%d]"), iIapId));
+retVal = SetIapPrefsL(iIapId, prompt, iConnection, iSockServ);
 }
 else if(((aProps.SnapIdL(id)) == KErrNone))
 {
 retVal = SetSnapPrefsL(id, prompt, iConnection, iSockServ);
 }
 }
 }
 TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("Set Snap/IAP prefs retVal [%d]"), retVal));
 User::LeaveIfError(retVal);
 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::InvokeHttpMethodL After User::Leave");
-TInt ret= iConnection.GetIntSetting(_L("IAP\\Id"), iUsedIapId);
+//TInt ret= iConnection.GetIntSetting(_L("IAP\\Id"), iUsedIapId);
+iUsedIapId = iIapId;
 // Check transport properties
 TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("IAP/SNAP %d"), id));
 #else
 	retVal = SetIapPrefsL(id, prompt, iConnection, iSockServ);
 	TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("IAP/SNAP %d"), id));
 }
 void CSenHttpChannelImpl::HandleRunErrorL(RHTTPTransaction aTransaction,
 TInt aError)
 {
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMaxLogLevel,"CSenHttpChannelImpl::HandleRunErrorL()");
 TInt txnId = aTransaction.Id();
 TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::HandleRunErrorL( %d ): %d"),txnId, aError));
 CSenTxnState* pTxnState = FindTxnState(txnId);
 __ASSERT_ALWAYS(pTxnState != NULL,
 User::Panic(KTxnStateNullPanicText,
 CSenHttpChannel::ETxnStateNull));
 pTxnState->ResponseErrorL(aError);
 DeleteTxnState(txnId);
 aTransaction.Close();
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMaxLogLevel,"CSenHttpChannelImpl::HandleRunErrorL() Completed");
 }
 void CSenHttpChannelImpl::HandleRedirectRequiresConfirmationL(
 RHTTPTransaction aTransaction)
 {
 }
 TBool CSenHttpChannelImpl::EffectiveIapId( TUint32 &aIapId )
 {
-	TInt handle = iConnection.SubSessionHandle();
+/*
+		TInt handle = iConnection.SubSessionHandle();
 		if (handle>0)
 		    {
-			TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::EffectiveIapId(): Current RConnection's subsession handle(%d)"), handle ));
+				TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::EffectiveIapId(): Current RConnection's subsession handle(%d)"), handle ));
-	        TUint connEnum(0);
+TUint connEnum(0);
-	        TInt err = iConnection.EnumerateConnections(connEnum);
+TInt err = iConnection.EnumerateConnections(connEnum);
-	        if (!err && !connEnum)
+TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::EffectiveIapId -  EnumerateConnections retVal [%d]"), err ));
-	            {
+if (!err && !connEnum)
-	            return EFalse;
+{
-	            }
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::EffectiveIapId returns");
+return EFalse;
+}
 		    }
 	    else
 		    {
 		    TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel," -> RConnection has not been initialized.");
 		    }
+		*/
 	if( iExplicitIapDefined )
 		{
 		TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8(" - IAP ID is known: %d"), iIapId ));
 		}
 	else
 		{
 		TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel," - IAP ID is not known.");
 		}
-if( handle && !iExplicitIapDefined )
+if(/* handle && */!iExplicitIapDefined )
 	{
 		// Eventhough IAP was not explicitely set (through Serene API), this
 		// code can check what IAP end-user provided via IAP selection dialog:
 		TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::EffectiveIapId: about to call RConnection::GetIntSetting()");
-		_LIT( KIapIdKey, "IAP\\Id" );
+	//_LIT( KIapIdKey, "IAP\\Id" );
-	    iConnection.GetIntSetting( KIapIdKey, iIapId);
+//iConnection.GetIntSetting( KIapIdKey, iIapId);
-	    if ( iIapId > 0 )
+if ( iIapId > 0 )
-	    	{
+	{
 			TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("---- GetIntSetting(): retuens IAP(%d)"), iIapId ));
-	    	// Treat the end-user selection as "explicit" definition as well(!):
+	// Treat the end-user selection as "explicit" definition as well(!):
-	    	iExplicitIapDefined = ETrue;
+	iExplicitIapDefined = ETrue;
-	    	}
+	}
-	    }
+}
 if( iExplicitIapDefined )
 {
 aIapId = iIapId;
 }
+	TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::EffectiveIapId() returns(%d)"), iExplicitIapDefined ));
 return iExplicitIapDefined;
 }
 void CSenHttpChannelImpl::EnableTimeOutL(TInt aTxnId, TInt aTimeOutSec)
 {
 TInt32 CSenHttpChannelImpl::UsedIap()
 {
 return iUsedIapId;
 }
+void CSenHttpChannelImpl::ResetIapId()
+{
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::ResetIapId()");
+iIapId = 0; //Reset to Zero in case of errors to enable other IAP
+}
+void CSenHttpChannelImpl::ResetUsedIapId()
+{
+TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::ResetUsedIapId()");
+iUsedIapId = 0; //Reset to Zero in case of errors to enable other IAP
+}
 // END OF FILE

branch	RCL_3
changeset 14	9e96e2676219
parent 10	bf3935de63a1
child 15	32ab7ae9ec94