# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1263842474 -7200 # Node ID 272b002df977242a8541b0080b213f01b349117c # Parent 62f9d29f72117b259757d0787e415389cd7b1988 Revision: 201001 Kit: 201003 diff -r 62f9d29f7211 -r 272b002df977 webservices/wsconnection/src/senserviceconnectionimpl.cpp --- a/webservices/wsconnection/src/senserviceconnectionimpl.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsconnection/src/senserviceconnectionimpl.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -2037,8 +2037,10 @@ } TInt cancelLeaveCode(KErrNone); - CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); - TRAP(cancelLeaveCode, iConnection.CancelSession(pSenAO->iStatus)); + TRAP(cancelLeaveCode, + CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); + iConnection.CancelSession(pSenAO->iStatus); + ); #ifdef _SENDEBUG if(cancelLeaveCode!=KErrNone) { @@ -2402,8 +2404,10 @@ } TInt cancelLeaveCode(KErrNone); TInt retVal(KErrNone); - CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); - TRAP( cancelLeaveCode, iConnection.CancelSession(pSenAO->iStatus); ) + TRAP( cancelLeaveCode, + CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); + iConnection.CancelSession(pSenAO->iStatus); + ); if(cancelLeaveCode!=KErrNone) { @@ -2477,6 +2481,7 @@ TInt CSenServiceConnectionImpl::CancelTransaction(TInt aTransactionID) { + TInt retVal(0); if ( iDispatcherEnabled ) // DISPATCHER IS ENABLED { TInt actualTransID = ipSenServiceDispatcher->GetActualTransactionID(&aTransactionID); @@ -2503,7 +2508,11 @@ pAsyncOp = NULL; } ipSenServiceDispatcher->RemoveFromQueue(aTransactionID); - DeliverResponseL(KErrSenCancelled,NULL); + TRAP(retVal, DeliverResponseL(KErrSenCancelled,NULL)); + if( retVal != KErrNone) + { + return retVal; + } } } else // DISPATCHER IS DISABLED diff -r 62f9d29f7211 -r 272b002df977 webservices/wscore/src/senclientsession.cpp --- a/webservices/wscore/src/senclientsession.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wscore/src/senclientsession.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -1228,6 +1228,7 @@ } else { + CSLOG_L(iConnectionID,KMinLogLevel ,"Still we need to handle KErrSenAuthenticationFault"); retVal = KErrSenSoapFault; } } @@ -1236,7 +1237,7 @@ // Complete. Either init was ok, or some error occurred; client now knows the result iAuthenticationRetries = 0; aMessage.Complete(ESenServInitialized); - CSLOG_L(iConnectionID,KMinLogLevel ,"Completed with ESenServInitialized"); + CSLOG_FORMAT((iConnectionID,KMinLogLevel ,_L8("Completed with ESenServInitialized errrcode written [%d]"), retVal)); } } @@ -5619,7 +5620,7 @@ { autoSignInEl->SetContentL( KSenPropertyTrue ); } - TRAPD(retVal, + TRAP(retVal, HBufC8* encPassword = SenXmlUtils::EncodeHttpCharactersLC(password); pIdps[i]->SetUserInfoL( pIdps[i]->AuthzID(), pIdps[i]->AdvisoryAuthnID(), diff -r 62f9d29f7211 -r 272b002df977 webservices/wscore/src/sencoreservicemanager.cpp --- a/webservices/wscore/src/sencoreservicemanager.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wscore/src/sencoreservicemanager.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -634,8 +634,7 @@ if ( contract.Length() == 0 && endpoint.Length() == 0 ) { - delete apServiceDescription; - apServiceDescription = NULL; + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()"); TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel," - No endpoint & no contract: invalid SD NOT added!"); return KErrSenNoContractNoEndPoint; @@ -665,8 +664,7 @@ TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8(" - error code: %d"),retVal)); // delete the new instance and return error (to framework) - delete apServiceDescription; - apServiceDescription = NULL; + return retVal; } #ifdef _SENDEBUG @@ -685,8 +683,7 @@ TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel," - Remove duplicate SD failed. Returning error."); // delete the new instance and return error (to framework) - delete apServiceDescription; - apServiceDescription = NULL; + return KErrGeneral; } diff -r 62f9d29f7211 -r 272b002df977 webservices/wscredentialmanager/src/seninternalcredential.cpp --- a/webservices/wscredentialmanager/src/seninternalcredential.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wscredentialmanager/src/seninternalcredential.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -337,7 +337,8 @@ } EXPORT_C void CSenInternalCredential::SetAuthInfo(TDesC8& aUserId, TDesC8& aPassword) { - TRAPD(retVal, + TInt retVal(KErrNone); + TRAP(retVal, IdentifierL().SetPropertyL(KUserName, aUserId); IdentifierL().SetPropertyL(KPassword, aPassword); ); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsdescription/src/senxmlservicedescription.cpp --- a/webservices/wsdescription/src/senxmlservicedescription.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsdescription/src/senxmlservicedescription.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -277,7 +277,8 @@ TBool match(ETrue); - TRAPD(retVal, + TInt retVal(KErrNone); + TRAP(retVal, RFacetArray otherFacets; CleanupClosePushL(otherFacets); aOtherServiceDescription.FacetsL(otherFacets); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsdescription/src/servicepolicy.cpp --- a/webservices/wsdescription/src/servicepolicy.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsdescription/src/servicepolicy.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -131,7 +131,7 @@ //Adding client policy to SD TInt CServicePolicy::AddClientPolicyL(CSenElement* aTemplate) { - CSenElement* pServicePolicyElement = AsElement().Element(KServicePolicyLocalName); + /*CSenElement* pServicePolicyElement = AsElement().Element(KServicePolicyLocalName);*/ CSenElement* pClientPolicyElement = AsElement().Element(KClientServicePolicyLocalName); if(!pClientPolicyElement) diff -r 62f9d29f7211 -r 272b002df977 webservices/wsfragment/src/wslibxml2utils.cpp --- a/webservices/wsfragment/src/wslibxml2utils.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsfragment/src/wslibxml2utils.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -67,4 +67,10 @@ TXmlEngNamespace ns = aElement.FindOrCreateNsDeclL(aNamespaceUri, aPrefix); element->ns = INTERNAL_NSPTR(ns); } - } \ No newline at end of file + } + + +// End of File + + + diff -r 62f9d29f7211 -r 272b002df977 webservices/wsframework/src/senservicesession.cpp --- a/webservices/wsframework/src/senservicesession.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsframework/src/senservicesession.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -568,7 +568,8 @@ TBool match(ETrue); - TRAPD(retVal, + TInt retVal(KErrNone); + TRAP(retVal, RFacetArray otherFacets; CleanupClosePushL(otherFacets); aOtherServiceDescription.FacetsL(otherFacets); diff -r 62f9d29f7211 -r 272b002df977 webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp --- a/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -419,9 +419,9 @@ // Set the IAP selection preferences (IAP ID, do not prompt) /* - /*Single click connectivity feature has been implemented by CSock (RConnection class). - /*According to this client no need to set the IAP ID. - /*Automatically RConnection will use the suitable IAP + *Single click connectivity feature has been implemented by CSock (RConnection class). + *According to this client no need to set the IAP ID. + *Automatically RConnection will use the suitable IAP */ @@ -468,8 +468,15 @@ // there is NO direct API to query effective IAP ID from CommsDB. if (!retVal) { - iExplicitIapDefined = ETrue; - iIapId = aIapId; + #ifdef __SINGLE_CLICK_CONNECTIVITY_ENABLED__ + //Since we are using by default setIapId "0". + //There won't be any explicitly defined Iap Id + iExplicitIapDefined = EFalse; + iIapId = 0; + #else + iExplicitIapDefined = ETrue; + iIapId = aIapId; + #endif //__SINGLE_CLICK_CONNECTIVITY_ENABLED__ } return retVal; } diff -r 62f9d29f7211 -r 272b002df977 webservices/wshttpchanneltransportplugin/src/senhttpsyncrequester.cpp --- a/webservices/wshttpchanneltransportplugin/src/senhttpsyncrequester.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wshttpchanneltransportplugin/src/senhttpsyncrequester.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -196,9 +196,8 @@ if (iParentObserver) { - //iContent = NULL; To fix EPSK-76XFAN + iContent = apErrorBody; // To fix EPSK-76XFAN iParentObserver->ResponseErrorL( aId, aError, apErrorBody, aHttpProperties); - iContent = apErrorBody; // To fix EPSK-76XFAN } else { diff -r 62f9d29f7211 -r 272b002df977 webservices/wshttpchanneltransportplugin/src/senrfiletxnstate.cpp --- a/webservices/wshttpchanneltransportplugin/src/senrfiletxnstate.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wshttpchanneltransportplugin/src/senrfiletxnstate.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -124,12 +124,12 @@ { TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenRfileTxnState::GetNextDataPart"))); TBool noMoreData = ETrue; // No more data - + TInt retVal(KErrNone); if ( iFile.SubSessionHandle() ) // Send in a chunked mode from file { if ( !iReadData ) { - TRAPD(retVal, + TRAP(retVal, iReadData = HBufC8::NewL( KDataPartLength ); TPtr8 ptr = iReadData->Des(); User::LeaveIfError( iFile.Read( ptr, KDataPartLength ) ); diff -r 62f9d29f7211 -r 272b002df977 webservices/wshttpchanneltransportplugin/src/sentxnstate.cpp --- a/webservices/wshttpchanneltransportplugin/src/sentxnstate.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wshttpchanneltransportplugin/src/sentxnstate.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -284,7 +284,6 @@ TInt headersize(0); TBuf8<1024> buf; TPtrC8 fieldValue(buf.Ptr()); - TInt err(0); _LIT8(KColon,": "); _LIT8(KNewLine,"\r\n"); @@ -302,7 +301,7 @@ headersize += KColon().Size(); - err = aHeaders.GetRawField(str, fieldValue); + aHeaders.GetRawField(str, fieldValue); headersize += fieldValue.Size(); headersize += KNewLine().Size(); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsibasicplugin/src/senwsiplugin.cpp --- a/webservices/wsibasicplugin/src/senwsiplugin.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsibasicplugin/src/senwsiplugin.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -234,6 +234,8 @@ #ifdef _SENDEBUG if(retVal!=KErrNone) { + delete pNewSession; + pNewSession = NULL; TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenBasicWsiPlugin::CreateServiceSessionL"); TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KNormalLogLevel, _L8(" - CoreServiceMngr::AddServiceDescriptionL returned: %d"), retVal)); } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsmessages/eabi/SenMessagesu.DEF --- a/webservices/wsmessages/eabi/SenMessagesu.DEF Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsmessages/eabi/SenMessagesu.DEF Mon Jan 18 21:21:14 2010 +0200 @@ -291,4 +291,8 @@ _ZNK15CSenAtomMessage5TitleEv @ 290 NONAME _ZNK15CSenAtomMessage7UpdatedEv @ 291 NONAME _ZNK15CSenAtomMessage9PublishedEv @ 292 NONAME + _ZN12CSenAtomFeedC1Ev @ 293 NONAME + _ZN12CSenAtomFeedC2Ev @ 294 NONAME + _ZN13CSenAtomEntryC1Ev @ 295 NONAME + _ZN13CSenAtomEntryC2Ev @ 296 NONAME diff -r 62f9d29f7211 -r 272b002df977 webservices/wsmessages/src/senatomentry.cpp --- a/webservices/wsmessages/src/senatomentry.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsmessages/src/senatomentry.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -53,7 +53,7 @@ return pNew; } -CSenAtomEntry::CSenAtomEntry () : +EXPORT_C CSenAtomEntry::CSenAtomEntry () : CSenAtomMessage(),localState(KSenStateSave) { } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsmessages/src/senatomfeed.cpp --- a/webservices/wsmessages/src/senatomfeed.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsmessages/src/senatomfeed.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -54,7 +54,7 @@ return self; } -CSenAtomFeed::CSenAtomFeed(): CSenAtomMessage() +EXPORT_C CSenAtomFeed::CSenAtomFeed(): CSenAtomMessage() { TLSLOG_L(KSenMessagesLogChannel, KSenMessagesLogLevel, "CSenAtomFeed()"); } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsoviplugin/src/wsovidevicehandler.cpp --- a/webservices/wsoviplugin/src/wsovidevicehandler.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsoviplugin/src/wsovidevicehandler.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -60,12 +60,12 @@ TInt CWSOviDeviceHandler::InvokeL(MSenMessageContext& aCtx) { - TInt error(KErrNone); + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviDeviceHandler::InvokeL(MSenMessageContext& aCtx)"))); CSenTransportProperties* tp = ((CWSOviMessageContext&)aCtx).TP(); if (!tp) return KErrNotFound; TPtrC8 consumerKey; - error = tp->PropertyL(KNCIMConsumerKeyId, consumerKey); + tp->PropertyL(KNCIMConsumerKeyId, consumerKey); const TDesC8* nAuthVersion = iHandlerContext.GetDesC8L(HandlerContextKey::KVersion); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsoviplugin/src/wsovioauthclient.cpp --- a/webservices/wsoviplugin/src/wsovioauthclient.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsoviplugin/src/wsovioauthclient.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -223,7 +223,7 @@ { retry = EFalse; //building body - CWSOviPlugin& frmWSOvi = (CWSOviPlugin&)Framework(); + //CWSOviPlugin& frmWSOvi = (CWSOviPlugin&)Framework(); const TDesC8* version = iHndCtx->GetDesC8L(HandlerContextKey::KVersion); TTime time; time.UniversalTime(); @@ -241,7 +241,7 @@ password.Set(iIdentityProvider->Password()); } HBufC8* created(NULL); - CWSOviSessionContext* sessioncontext = iWSOviServiceSession->SessionContext(); + //CWSOviSessionContext* sessioncontext = iWSOviServiceSession->SessionContext(); const TInt* diffHandlerContext = iHndCtx->GetIntL(HandlerContextKey::KDiff); if( diffHandlerContext && *diffHandlerContext > 0 ) { @@ -403,33 +403,33 @@ { TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviOAuthClient::ValidateL - Consumer does not have AuthenticationCallback"); - const TDesC8* pValue = iIdentityProvider->AsElement().AttrValue( KSenAttrPromptUserInfo ); - -#ifdef _RD_SEN_WS_STAR_DO_NOT_PROMPT_AUTHINFO_BY_DEFAULT + const TDesC8* pValue = iIdentityProvider->AsElement().AttrValue( KSenAttrPromptUserInfo ); +/* #ifdef _RD_SEN_WS_STAR_DO_NOT_PROMPT_AUTHINFO_BY_DEFAULT */ // For OVI no Notifier Plugin is popped up if ( pValue && *pValue != _L8("false") ) // attribute has to exist, otherwise logic defaults to: DO NOT PROMPT -#else - if ( !pValue || *pValue != _L8("false") ) +//#else +// if ( !pValue || *pValue != _L8("false") ) // even when attribute does NOT exist, or when it does and has any other value but "false", default to: PROMPT -#endif +//#endif { const TBool* renewingPtr = NAUTHSsnContext->GetIntL(WSOviContextKeys::KReAuthNeeded); if ( renewingPtr && *renewingPtr ) { - TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KNormalLogLevel,"- Prompt is used to get AuthenticationInfo"); - TInt ret = (Framework().Manager()).AuthenticationForL(*iIdentityProvider, - authInfo); - if ( ret == KErrNone ) - { - retryCounter++; - retry = ETrue; - authenticationInfoPromptedFromUser = ETrue; - } + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KNormalLogLevel,"- Prompt is used to get AuthenticationInfo"); + TInt ret = (Framework().Manager()).AuthenticationForL(*iIdentityProvider, + authInfo); + if ( ret == KErrNone ) + { + retryCounter++; + retry = ETrue; + authenticationInfoPromptedFromUser = ETrue; + } } } else - { - TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KNormalLogLevel,"CWSOviOAuthClient::ValidateL - promptUserInfo = false"); + { + //Special Case handled for OVI Frameworks + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KNormalLogLevel,"------- Notifier plugin will not be used for OVI What about UI Less SignIn !!!"); TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KNormalLogLevel," => prompt is not used."); } } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsoviplugin/src/wsoviplugin.cpp --- a/webservices/wsoviplugin/src/wsoviplugin.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsoviplugin/src/wsoviplugin.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -322,7 +322,7 @@ //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- // -TInt CWSOviPlugin::OnEvent( const TInt aEvent, TAny* apArgument ) +TInt CWSOviPlugin::OnEvent( const TInt aEvent, TAny* /*apArgument*/ ) { TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviPlugin::OnEvent"); TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KNormalLogLevel, _L8(" -event code: %d"), aEvent)); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsoviplugin/src/wsoviregisterhandler.cpp --- a/webservices/wsoviplugin/src/wsoviregisterhandler.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsoviplugin/src/wsoviregisterhandler.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -243,9 +243,10 @@ retval = iHandlerContext.GetSenCoreServiceManager()->AddServiceDescriptionL(pAuthClient); if(retval != KErrNone) { - delete pAuthClient; + CleanupStack::PopAndDestroy(1);//pAuthClient } - CleanupStack::Pop(pAuthClient); + else + CleanupStack::Pop(pAuthClient); pAuthClient = NULL; } return retval; diff -r 62f9d29f7211 -r 272b002df977 webservices/wsoviplugin/src/wsoviservicesession.cpp --- a/webservices/wsoviplugin/src/wsoviservicesession.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsoviplugin/src/wsoviservicesession.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -817,7 +817,7 @@ iTrustAnchor = pElement->Content().AllocL(); } - CSenXmlReader* reader = XmlReader(); + // CSenXmlReader* reader = XmlReader(); if (!iSessionContext) { TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::InitializeFromL"); @@ -1098,7 +1098,7 @@ { iClientTime.UniversalTime(); - CSenXmlReader* reader = XmlReader(); + //CSenXmlReader* reader = XmlReader(); if (iOutContext) { delete iOutContext; diff -r 62f9d29f7211 -r 272b002df977 webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp --- a/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -82,11 +82,13 @@ { if (*errorCode == EHttp_401_Unauthorized-KHttpPluginStatusBase) { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("*errorCode == EHttp_401_Unauthorized-KHttpPluginStatusBase"))); CWSOviErrorResponse* errFragment = CWSOviErrorResponse::NewLC(); errFragment->SetReader(*iHandlerContext.GetSenCoreServiceManager()->XMLReader()); errFragment->BuildFrom(*message); if (! errFragment->Code().Compare(WSOviResponse::KErrorCodeInvalidAccessToken())) { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L(" ---- WSOviResponse::KErrorCodeInvalidAccessToken()"))); if (!pCtx.GetSenRemoteServiceSessionL(WSOviContextKeys::KServiceSession)) { pCtx.Add(WSOviContextKeys::KServiceSession, *(MSenRemoteServiceSession*)remoteServiceSession); @@ -97,9 +99,11 @@ } else if(! errFragment->Code().Compare(WSOviResponse::KErrorCodeUnauthorized())) { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("----- WSOviResponse::KErrorCodeUnauthorized()"))); MSenProperties* tp = (MSenProperties*)pCtx.GetAnyL(WSOviContextKeys::KTP()); if (tp) { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("----- WSOviContextKeys::KTP() Found"))); switch (tp->PropertiesClassType()) { case MSenProperties::ESenHttpTransportProperties: @@ -122,6 +126,36 @@ } CleanupStack::PopAndDestroy(errFragment); } + else if(*errorCode == 403) //Handling 403 resource not found error + { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("*errorCode == 403 "))); + CWSOviErrorResponse* errFragment = CWSOviErrorResponse::NewLC(); + errFragment->SetReader(*iHandlerContext.GetSenCoreServiceManager()->XMLReader()); + errFragment->BuildFrom(*message); + if(! errFragment->Code().Compare(WSOviResponse::KErrorCodeUnauthorized())) + { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("----- if WSOviResponse::KErrorCodeUnauthorized()"))); + if (!pCtx.GetSenRemoteServiceSessionL(WSOviContextKeys::KServiceSession)) + { + pCtx.Add(WSOviContextKeys::KServiceSession, *(MSenRemoteServiceSession*)remoteServiceSession); + } + pCtx.Update(WSOviContextKeys::KReAuthNeeded, ETrue); + oviServiceSession->ClearCredentialL(); + oviServiceSession->SetStatusL();//in order to compute state + } + else + { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("-----else WSOviResponse::KErrorCodeUnauthorized()"))); + if (!pCtx.GetSenRemoteServiceSessionL(WSOviContextKeys::KServiceSession)) + { + pCtx.Add(WSOviContextKeys::KServiceSession, *(MSenRemoteServiceSession*)remoteServiceSession); + } + pCtx.Update(WSOviContextKeys::KReAuthNeeded, ETrue); + oviServiceSession->ClearCredentialL(); + oviServiceSession->SetStatusL();//in order to compute state + } + CleanupStack::PopAndDestroy(errFragment); + } //positive scenario, for example: signup proces already returns token else if (*errorCode == KErrNone) { @@ -191,6 +225,10 @@ CleanupStack::PopAndDestroy(responseFragment); pCtx.Update(WSOviContextKeys::KRetryNeeded, 0); } + else + { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"---- Neither 401 nor KErrNone !!"); + } } return KErrNone; } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsrestplugin/src/senrestplugin.cpp --- a/webservices/wsrestplugin/src/senrestplugin.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsrestplugin/src/senrestplugin.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -275,6 +275,8 @@ #ifdef _SENDEBUG if(retVal!=KErrNone) { + delete pNewSession; + pNewSession = NULL; TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenRestPlugin::CreateServiceSessionL:"); TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8(" - CoreServiceMngr::AddServiceDescriptionL returned: %d"), retVal)); } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp --- a/webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -220,7 +220,7 @@ _LIT8(Kpp, "pp"); _LIT8(KCredProperties, "credProperties"); _LIT8(KCredProperty, "credProperty"); - _LIT8(KName, "Name"); + //_LIT8(KName, "Name"); CWSStarMessageUtils::RArraySenElements credPropertiesElements; CSenElement* ppElem = CWSStarMessageUtils::FindElementL(Kpp, header); if(ppElem) @@ -283,7 +283,7 @@ // CleanupStack::PopAndDestroy(buf); // CleanupStack::PopAndDestroy(inbound); - CSenElement& body = aMessage->BodyL(); + //CSenElement& body = aMessage->BodyL(); ShareMyLiterals(aCtx); if (aMessage->IsFault()) { diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarmessagehandlers/src/wsstarpassportheaderinbound.cpp --- a/webservices/wsstar/wsstarmessagehandlers/src/wsstarpassportheaderinbound.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarmessagehandlers/src/wsstarpassportheaderinbound.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -83,7 +83,7 @@ void CWSStarPassportHeaderInbound::EndElementL(const TDesC8& aNsUri, const TDesC8& aLocalName, - const TDesC8& aQName) + const TDesC8& /*aQName*/) { TPtrC8 content = Content(); switch (iState) diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstarcobrandingclient.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstarcobrandingclient.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstarcobrandingclient.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -168,7 +168,7 @@ { //Create a Fetch SCt body and update - CWSStarPlugin& frmWSStar = (CWSStarPlugin&)Framework(); + // CWSStarPlugin& frmWSStar = (CWSStarPlugin&)Framework(); CSenElement* pBody = CreateFSTL(); if(pBody) diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstarplugin.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstarplugin.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstarplugin.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -246,7 +246,7 @@ CSLOG_FORMAT((aRemoteConsumer.ConnectionId(), KMinLogLevel , _L8("CWSStarPlugin::AddServiceDescriptionL - ProcessOutboundValidation returned: %d"), error)); if ( !error ) { - CWSStarSessionContext* pSessionRegisterCtx = pNewSession->SessionContext(); + //CWSStarSessionContext* pSessionRegisterCtx = pNewSession->SessionContext(); TPtrC8 cont = aPattern.Contract(); TInt policyLeaveCode(KErrNone); TRAP( policyLeaveCode, error = policyHandler->InvokeL(cont); ) diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstarproxy.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstarproxy.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstarproxy.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -53,7 +53,7 @@ const TInt32 KWSStarServiceUpdateHandler = 0x101F971B; const TInt32 KWSStarPolicyHandler = 0x101F9796; #ifdef RD_SEN_VTCP_SUPPORT - const TInt32 KWSStarVtcpHandler = 0x101F9722; + //const TInt32 KWSStarVtcpHandler = 0x101F9722; const TInt32 KWSStarCoBrandingHandler = 0x101F9798; #endif//RD_SEN_VTCP_SUPPORT #else diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstarregisterhandler.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstarregisterhandler.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstarregisterhandler.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -226,8 +226,9 @@ retval = iHandlerContext.GetSenCoreServiceManager()->AddServiceDescriptionL(pSTSClient); if(retval != KErrNone) { - delete pSTSClient; + CleanupStack::PopAndDestroy(1);//pSTSClient } + else CleanupStack::Pop(pSTSClient); pSTSClient = NULL; } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstarservicesession.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstarservicesession.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstarservicesession.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -286,7 +286,7 @@ //-----SCHarF ------- 7.5.3.3 Inbound messageflow - CSenXmlReader* reader = XmlReader(); + //CSenXmlReader* reader = XmlReader(); CSenSoapMessage* soapMessage = &aSOAPMessage; ((CWSStarPlugin&)iFramework).ProcessInboundDispatchL(this, soapMessage); ((CWSStarPlugin&)iFramework).ProcessInboundMessageL(iInContext, soapMessage); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstartrustclient.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstartrustclient.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstartrustclient.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -243,7 +243,7 @@ iSTSSession->SetContractL(KWSStarSTSContract); iSTSSession->AddConsumerL(*this); } - CSenXmlReader* reader = Framework().Manager().XMLReader(); + //CSenXmlReader* reader = Framework().Manager().XMLReader(); CWSStarSessionContext* stsSsnContext = iSTSSession->SessionContext(); iPassportMode = CWSStarPolicy::CheckPolicyValueL(KPassportExtensions, iSTSSession); if (iPassportMode) @@ -292,7 +292,7 @@ } //building body - CWSStarPlugin& frmWSStar = (CWSStarPlugin&)Framework(); + //CWSStarPlugin& frmWSStar = (CWSStarPlugin&)Framework(); CSenElement* pBody = CreateBodyL(); stsSsnContext->Update(WSStarContextKeys::KBodyElement, pBody); pBodyXML = pBody->AsXmlL(); diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarplugin/src/wsstarvalidatehandler.cpp --- a/webservices/wsstar/wsstarplugin/src/wsstarvalidatehandler.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarplugin/src/wsstarvalidatehandler.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -132,13 +132,14 @@ CWSStarTrustClient* pSTSClient = STSClientL(pIdentityProvider); if (pSTSClient) { + TInt lerror(KErrNone); TInt error(KErrNone); pSTSClient->SetHandlerCtx(&iHandlerContext); pSTSClient->SetVersion(iVersion); //validate session of concrete WebService HBufC8* errorMessage = NULL; // fix for compiler warning #550-D reverted back - TRAPD(lerror,error = pSTSClient->ValidateL(*pNewSession, renewing, errorMessage, onlySharing);) + TRAP(lerror,error = pSTSClient->ValidateL(*pNewSession, renewing, errorMessage, onlySharing);) lerror = 0; // not used in release builds ((MSenContext&)aCtx).Update(WSStarContextKeys::KReAuthNeeded, EFalse); if (errorMessage) diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarpolicy/src/senwspolicymanager.cpp --- a/webservices/wsstar/wsstarpolicy/src/senwspolicymanager.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarpolicy/src/senwspolicymanager.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -835,7 +835,7 @@ { if ( ipPolicyContainer ) { - CSenElement* element = ipPolicyContainer->ExtractElement(); + // CSenElement* element = ipPolicyContainer->ExtractElement(); delete ipPolicyContainer; ipPolicyContainer = NULL; } @@ -870,7 +870,7 @@ { if ( ipPolicyIdentifier ) { - CSenElement* element = ipPolicyIdentifier->ExtractElement(); + //CSenElement* element = ipPolicyIdentifier->ExtractElement(); delete ipPolicyIdentifier; ipPolicyIdentifier = NULL; } @@ -1010,13 +1010,13 @@ { if ( ipPolicyIdentifier ) { - CSenElement* element = ipPolicyIdentifier->ExtractElement(); + // CSenElement* element = ipPolicyIdentifier->ExtractElement(); delete ipPolicyIdentifier; ipPolicyIdentifier = NULL; } if ( ipWSpolicy ) { - CSenElement* element = ipWSpolicy->ExtractElement(); + // CSenElement* element = ipWSpolicy->ExtractElement(); delete ipWSpolicy; ipWSpolicy = NULL; } diff -r 62f9d29f7211 -r 272b002df977 webservices/wsstar/wsstarpolicy/src/wspolicy.cpp --- a/webservices/wsstar/wsstarpolicy/src/wspolicy.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsstar/wsstarpolicy/src/wspolicy.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -117,7 +117,6 @@ iNormPolicy = NULL; count = 0; - TTime now; iExpiry.UniversalTime(); TTimeIntervalDays interval(KValidityTime); iExpiry+=interval; diff -r 62f9d29f7211 -r 272b002df977 webservices/wsutils/eabi/SENUTILSu.DEF --- a/webservices/wsutils/eabi/SENUTILSu.DEF Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsutils/eabi/SENUTILSu.DEF Mon Jan 18 21:21:14 2010 +0200 @@ -324,4 +324,17 @@ _ZN23CSenTransportProperties7SnapIdLERm @ 323 NONAME _ZN9CSenChunk17RequestFileHandleER5RFile @ 324 NONAME _ZN9CSenChunk17RequestFileHandleEv @ 325 NONAME + _ZN23CSenTransportProperties14BaseConstructLERK6TDesC8S2_S2_S2_P13CSenXmlReader @ 326 NONAME + _ZN27CSenVtcpTransportProperties12MaxRetryTTLLERi @ 327 NONAME + _ZN27CSenVtcpTransportProperties12MinRetryTTLLERi @ 328 NONAME + _ZN27CSenVtcpTransportProperties14MaxTimeToLiveLERi @ 329 NONAME + _ZN27CSenVtcpTransportProperties14MinTimeToLiveLERi @ 330 NONAME + _ZN27CSenVtcpTransportProperties15SetMaxRetryTTLLEi @ 331 NONAME + _ZN27CSenVtcpTransportProperties15SetMinRetryTTLLEi @ 332 NONAME + _ZN27CSenVtcpTransportProperties17SetMaxTimeToLiveLEi @ 333 NONAME + _ZN27CSenVtcpTransportProperties17SetMinTimeToLiveLEi @ 334 NONAME + _ZN27CSenVtcpTransportProperties18RetryDeltaTimeoutLERi @ 335 NONAME + _ZN27CSenVtcpTransportProperties19OnewayMessageOnOffLERi @ 336 NONAME + _ZN27CSenVtcpTransportProperties21SetRetryDeltaTimeoutLEi @ 337 NONAME + _ZN27CSenVtcpTransportProperties22SetOnewayMessageOnOffLEi @ 338 NONAME diff -r 62f9d29f7211 -r 272b002df977 webservices/wsutils/src/sentransportproperties.cpp --- a/webservices/wsutils/src/sentransportproperties.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsutils/src/sentransportproperties.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -205,7 +205,7 @@ CSenXmlProperties::BaseConstructL(aNamespace, aLocalname, aXml, aParser); } -void CSenTransportProperties::BaseConstructL(const TDesC8& aNamespace, +EXPORT_C void CSenTransportProperties::BaseConstructL(const TDesC8& aNamespace, const TDesC8& aLocalname, const TDesC8& aQualifiedName, const TDesC8& aXml, diff -r 62f9d29f7211 -r 272b002df977 webservices/wsutils/src/senvtcptransportproperties.cpp --- a/webservices/wsutils/src/senvtcptransportproperties.cpp Thu Jan 07 16:19:19 2010 +0200 +++ b/webservices/wsutils/src/senvtcptransportproperties.cpp Mon Jan 18 21:21:14 2010 +0200 @@ -378,12 +378,12 @@ CSenTransportProperties::SetMessageIdL( aMessageId ); } -TInt CSenVtcpTransportProperties::OnewayMessageOnOffL( TBool& aOnewayMessageOnOff ) +EXPORT_C TInt CSenVtcpTransportProperties::OnewayMessageOnOffL( TBool& aOnewayMessageOnOff ) { return CSenTransportProperties::OnewayMessageOnOffL( aOnewayMessageOnOff ); } -void CSenVtcpTransportProperties::SetOnewayMessageOnOffL( TBool aOnewayMessageOnOff ) +EXPORT_C void CSenVtcpTransportProperties::SetOnewayMessageOnOffL( TBool aOnewayMessageOnOff ) { CSenTransportProperties::SetOnewayMessageOnOffL( aOnewayMessageOnOff ); } @@ -398,52 +398,52 @@ return CSenTransportProperties::SetHeartbeatL( aHeartbeat ); } -TInt CSenVtcpTransportProperties::SetMaxTimeToLiveL(TInt aMaxTTL) +EXPORT_C TInt CSenVtcpTransportProperties::SetMaxTimeToLiveL(TInt aMaxTTL) { return CSenTransportProperties::SetMaxTimeToLiveL( aMaxTTL ); } -TInt CSenVtcpTransportProperties::MaxTimeToLiveL(TInt& aMaxTTL) +EXPORT_C TInt CSenVtcpTransportProperties::MaxTimeToLiveL(TInt& aMaxTTL) { return CSenTransportProperties::MaxTimeToLiveL( aMaxTTL ); } -TInt CSenVtcpTransportProperties::SetMinTimeToLiveL(TInt aMinTTL) +EXPORT_C TInt CSenVtcpTransportProperties::SetMinTimeToLiveL(TInt aMinTTL) { return CSenTransportProperties::SetMinTimeToLiveL( aMinTTL ); } -TInt CSenVtcpTransportProperties::MinTimeToLiveL(TInt& aMinTTL) +EXPORT_C TInt CSenVtcpTransportProperties::MinTimeToLiveL(TInt& aMinTTL) { return CSenTransportProperties::MinTimeToLiveL( aMinTTL ); } -TInt CSenVtcpTransportProperties::SetMaxRetryTTLL(TInt aMaxRetryTTL) +EXPORT_C TInt CSenVtcpTransportProperties::SetMaxRetryTTLL(TInt aMaxRetryTTL) { return SetIntPropertyL( KSenConnectionRetryMaxTTL, aMaxRetryTTL ); } -TInt CSenVtcpTransportProperties::MaxRetryTTLL(TInt& aMaxRetryTTL) +EXPORT_C TInt CSenVtcpTransportProperties::MaxRetryTTLL(TInt& aMaxRetryTTL) { return IntPropertyL( KSenConnectionRetryMaxTTL, aMaxRetryTTL ); } -TInt CSenVtcpTransportProperties::SetMinRetryTTLL(TInt aMinRetryTTL) +EXPORT_C TInt CSenVtcpTransportProperties::SetMinRetryTTLL(TInt aMinRetryTTL) { return SetIntPropertyL( KSenConnectionRetryMinTTL, aMinRetryTTL ); } -TInt CSenVtcpTransportProperties:: MinRetryTTLL(TInt& aMinRetryTTL) +EXPORT_C TInt CSenVtcpTransportProperties:: MinRetryTTLL(TInt& aMinRetryTTL) { return IntPropertyL( KSenConnectionRetryMinTTL, aMinRetryTTL ); } -TInt CSenVtcpTransportProperties::SetRetryDeltaTimeoutL(TInt aTimeout) +EXPORT_C TInt CSenVtcpTransportProperties::SetRetryDeltaTimeoutL(TInt aTimeout) { return SetIntPropertyL( KSenConnectionRetryDelta, aTimeout ); } -TInt CSenVtcpTransportProperties::RetryDeltaTimeoutL(TInt& aTimeout) +EXPORT_C TInt CSenVtcpTransportProperties::RetryDeltaTimeoutL(TInt& aTimeout) { return IntPropertyL( KSenConnectionRetryDelta, aTimeout ); }