MCL/sf/mw/wirelessacc: comparison hotspotfw/internetconnectivitytestservice/src/ictshttphandler.cpp

equal deleted inserted replaced

-:024ee8b21fe2
+:aaabc7526ded
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description:   HTTP class for HTTP::HEAD testing
+* Description:   Class for HTTP GET testing
 *
 */
 const TInt KMovedPermanently = 301;
 const TInt KFound = 302;
 const TInt KSeeOther = 303;
 const TInt KTemporaryRedirect = 307;
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // CIctsHttpHandler::CIctsHttpHandler
 // C++ default constructor can NOT contain any code, that
 // might leave.
 //
 CIctsHttpHandler* CIctsHttpHandler::NewL( CIctsEngine& aOwner,
 TInt aHttpResponseTime )
 {
 DEBUG("CIctsHttpHandler::NewL()");
-CIctsHttpHandler* self = new( ELeave ) CIctsHttpHandler( aOwner, aHttpResponseTime );
+CIctsHttpHandler* self = new( ELeave ) CIctsHttpHandler( aOwner,
+aHttpResponseTime );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop( self );
 return self;
 }
 // Remove first session properties just in case.
 RHTTPConnectionInfo connInfo = iHttpSession.ConnectionInfo();
 // Clear RConnection and Socket Server instances
-connInfo.RemoveProperty(strPool.StringF(HTTP::EHttpSocketServ,RHTTPSession::GetTable()));
+connInfo.RemoveProperty( strPool.StringF( HTTP::EHttpSocketServ,
-connInfo.RemoveProperty(strPool.StringF(HTTP::EHttpSocketConnection,RHTTPSession::GetTable()));
+RHTTPSession::GetTable() ) );
+connInfo.RemoveProperty( strPool.StringF( HTTP::EHttpSocketConnection,
+RHTTPSession::GetTable() ) );
 // Clear the proxy settings
-THTTPHdrVal proxyUsage(strPool.StringF(HTTP::EUseProxy,RHTTPSession::GetTable()));
+THTTPHdrVal proxyUsage( strPool.StringF( HTTP::EUseProxy,
-connInfo.RemoveProperty(strPool.StringF(HTTP::EProxyUsage,RHTTPSession::GetTable()));
+RHTTPSession::GetTable() ) );
-connInfo.RemoveProperty(strPool.StringF(HTTP::EProxyAddress,RHTTPSession::GetTable()));
+connInfo.RemoveProperty( strPool.StringF( HTTP::EProxyUsage,
+RHTTPSession::GetTable() ) );
+connInfo.RemoveProperty( strPool.StringF( HTTP::EProxyAddress,
+RHTTPSession::GetTable() ) );
 // RConnection has been started, set proxy (if defined) and RConnection and
 // Socket Server session properties.
 // Proxy
-result = aConnection.EnumerateConnections(connCount);
+result = aConnection.EnumerateConnections( connCount );
-User::LeaveIfError(result);
+User::LeaveIfError( result) ;
 // Get service and service type for this connection
 //
 _LIT(string, "%s\\%s");
-query.Format(string, IAP, IAP_SERVICE);
+query.Format( string, IAP, IAP_SERVICE );
-result = aConnection.GetIntSetting(query, serviceId);
+result = aConnection.GetIntSetting( query, serviceId );
-query.Format(string, IAP, IAP_SERVICE_TYPE);
+query.Format( string, IAP, IAP_SERVICE_TYPE );
-result = aConnection.GetDesSetting(query, serviceType);
+result = aConnection.GetDesSetting( query, serviceType );
-User::LeaveIfError(result);
+User::LeaveIfError( result );
 // RConnection and Socket Server
 // Now bind the HTTP session with the socket server connection
 connInfo.SetPropertyL (
-strPool.StringF(HTTP::EHttpSocketServ, RHTTPSession::GetTable()),
+strPool.StringF( HTTP::EHttpSocketServ, RHTTPSession::GetTable() ),
-THTTPHdrVal (aSocketServ.Handle()) );
+THTTPHdrVal (aSocketServ.Handle() ) );
-TInt connPtr1 = reinterpret_cast<TInt>(&aConnection);
+TInt connPtr1 = reinterpret_cast<TInt>( &aConnection) ;
 connInfo.SetPropertyL (
-strPool.StringF(HTTP::EHttpSocketConnection,
+strPool.StringF( HTTP::EHttpSocketConnection,
-RHTTPSession::GetTable() ), THTTPHdrVal (connPtr1) );
+RHTTPSession::GetTable() ), THTTPHdrVal ( connPtr1 ) );
 }
 // ---------------------------------------------------------------------------
 // CIctsHttpHandler::SendHttpRequestL
 TInt err( KErrNone );
 if ( !iAttachDone )
 {
-err = iConnection.Attach( pckgInfo, RConnection::EAttachTypeMonitor);
+err = iConnection.Attach( pckgInfo, RConnection::EAttachTypeMonitor );
 DEBUG1("CIctsHttpHandler::SendHttpRequestL attach: %d", err);
 }
 if ( KErrNone == err )
 {
 iAttachDone = ETrue;
 SetHttpConnectionInfoL( iConnection, iSocketServ );
 // Remove redirect filter
 RStringPool stringPool = iHttpSession.StringPool();
-RStringF filterName = stringPool.StringF(HTTP::ERedirect, RHTTPSession::GetTable());
+RStringF filterName =
-iHttpSession.FilterCollection().RemoveFilter(filterName);
+stringPool.StringF( HTTP::ERedirect, RHTTPSession::GetTable() );
+iHttpSession.FilterCollection().RemoveFilter( filterName );
 RStringPool strPool = iHttpSession.StringPool();
-RStringF method = strPool.StringF(HTTP::EHEAD,RHTTPSession::GetTable());
+RStringF method =
+strPool.StringF( HTTP::EGET, RHTTPSession::GetTable() );
 TBuf8<KMaxIpLength> ip;
 TBool httpExists = CheckHttp( aIPAddress );
 if ( !httpExists )
 ip.Append( aIPAddress );
 // Parse string to URI
 TUriParser8 uri;
 uri.Parse(ip);
-iHttpTransaction = iHttpSession.OpenTransactionL(uri, *this, method);
+iHttpTransaction = iHttpSession.OpenTransactionL( uri, *this, method );
 RHTTPHeaders hdr = iHttpTransaction.Request().GetHeaderCollection();
 RStringF headerStrName = strPool.OpenFStringL( KHeaderName() );
 CleanupClosePushL( headerStrName );
 //
 // Inherited from MHTTPTransactionCallback
 // Called by framework to pass transaction events.
 // ---------------------------------------------------------------------------
 //
-void CIctsHttpHandler::MHFRunL(RHTTPTransaction aTransaction,
+void CIctsHttpHandler::MHFRunL( RHTTPTransaction aTransaction,
-const THTTPEvent& aEvent)
+const THTTPEvent& aEvent )
 {
-DEBUG("CIctsHttpHandler::MHFRunL");
+DEBUG1("CIctsHttpHandler::MHFRunL aEvent.iStatus: %d",
+aEvent.iStatus);
+// See HTTP event statuses. Only ESucceeded and EFailed are needed.
 switch (aEvent.iStatus)
 {
 case THTTPEvent::EGotResponseHeaders:
 {
 DEBUG("CIctsHttpHandler::THTTPEvent::EGotResponseHeaders");
+if ( CheckStatusCodeL( aTransaction ) )
+{
+// Redirection found. Transaction can be canceled.
+aTransaction.Cancel();
+}
 }
 break;
-case THTTPEvent::EGotResponseBodyData:
-{
-DEBUG("CIctsHttpHandler::THTTPEvent::EGotResponseBodyData");
-}
-break;
-case THTTPEvent::EResponseComplete:
-{
-DEBUG("CIctsHttpHandler::THTTPEvent::EResponseComplete");
-}
-break;
 case THTTPEvent::ESucceeded:
 {
-DEBUG("CIctsHttpHandler::THTTPEvent::ESucceeded");
+DEBUG("CIctsHttpHandler::MHFRunL Succeeded");
 CTimer::Cancel();
 iOwner.HttpEventL( EConnectionOk, iString );
 iString = KNullDesC;
 }
 break;
 case THTTPEvent::EFailed:
 {
+DEBUG("CIctsHttpHandler::MHFRunL Failed");
 CTimer::Cancel();
-DEBUG("CIctsHttpHandler::THTTPEvent::EFailed");
+iOwner.HttpEventL( EConnectionNotOk, iString );
+iString = KNullDesC;
-RHTTPResponse resp = aTransaction.Response();
-TInt status = resp.StatusCode();
-// Check if redirect was cause of EFailed
-if( status == KMovedPermanently || status == KFound ||
-status == KSeeOther || status == KTemporaryRedirect )
-{
-// Inform the hotspot server that authentication is needed
-RHTTPHeaders hdr =aTransaction.Response().GetHeaderCollection();
-RStringPool strP = aTransaction.Session().StringPool();
-RStringF location = strP.StringF(HTTP::ELocation,RHTTPSession::GetTable());
-//parse the headers and look for location header
-THTTPHdrVal hVal;
-if(hdr.GetField(location,0,hVal)== KErrNone)
-{
-DEBUG("CIctsHttpHandler::THTTPEvent::GetField");
-// Location header is present
-RStringF fieldValStr = strP.StringF(hVal.StrF());
-const TDesC8& fieldValDesC = fieldValStr.DesC();
-iString.Copy(fieldValDesC);
-iOwner.HttpEventL( EHttpAuthenticationNeeded, iString );
-}
-else
-{
-// No location header. Can't use authentication -> redirect.
-iOwner.HttpEventL( EConnectionNotOk, iString );
-}
-}
-else
-{
-// Failed for other reason than redirect
-iOwner.HttpEventL( EConnectionNotOk, iString );
-}
-iString = KNullDesC;
 }
 break;
-case THTTPEvent::ERedirectedPermanently:
-{
-// Nothing here
-DEBUG("CIctsHttpHandler::THTTPEvent::ERedirectedPermanently");
-}
-break;
-case THTTPEvent::ERedirectedTemporarily:
-{
-// Nothing here
-DEBUG("CIctsHttpHandler::THTTPEvent::ERedirectedTemporarily");
-}
-break;
 default:
 {
-DEBUG1( "CIctsHttpHandler::MHFRunL::default iStatus: %d", aEvent.iStatus );
+DEBUG1( "CIctsHttpHandler::MHFRunL default: %d", aEvent.iStatus );
-CTimer::Cancel();
+// Do nothing. Timer will take care of error situations.
-if ( aEvent.iStatus < 0 )
-{
-_LIT(string, "Unknown error");
-iString = string;
-iOwner.HttpEventL( EConnectionNotOk, iString );
-}
-else
-{
-_LIT(string, "Default");
-iString = string;
-iOwner.HttpEventL( EConnectionNotOk, iString );
-}
 }
 break;
 }
 }
 {
 // The "http://" prefix is expected to be at the beginning of the URI.
 return ( 0 == aIPAddress.Find( KHttpPrefix ) );
 }
+// ----------------------------------------------------------------------------
+// CIctsHttpHandler::CheckStatusCodeL
+// ----------------------------------------------------------------------------
+TBool CIctsHttpHandler::CheckStatusCodeL( RHTTPTransaction aTransaction )
+{
+DEBUG1("CIctsHttpHandler::CheckStatusCodeL response statuscode: %d",
+aTransaction.Response().StatusCode());
+TBool ret ( EFalse );
+switch ( aTransaction.Response().StatusCode() )
+{
+case KMovedPermanently:
+case KFound:
+case KSeeOther:
+case KTemporaryRedirect:
+{
+DEBUG("CIctsHttpHandler::CheckStatusCodeL Redirect");
+CTimer::Cancel();
+ret = ETrue;
+//parse the headers and look for location header
+RHTTPHeaders hdr =aTransaction.Response().GetHeaderCollection();
+RStringPool strP = aTransaction.Session().StringPool();
+RStringF location =
+strP.StringF( HTTP::ELocation,RHTTPSession::GetTable() );
+THTTPHdrVal hVal;
+if( hdr.GetField( location, 0, hVal ) == KErrNone )
+{
+DEBUG("CIctsHttpHandler::CheckStatusCodeL location header");
+// Location header is present
+RStringF fieldValStr = strP.StringF(hVal.StrF());
+const TDesC8& fieldValDesC = fieldValStr.DesC();
+iString.Copy( fieldValDesC );
+iOwner.HttpEventL( EHttpAuthenticationNeeded, iString );
+}
+else
+{
+DEBUG("CIctsHttpHandler::CheckStatusCodeL no location header");
+// No location header. Can't redirect.
+iOwner.HttpEventL( EConnectionNotOk, iString );
+iString = KNullDesC;
+}
+}
+break;
+default:
+// Do nothing
+break;
+}
+return ret;
+}
 //  End of File

branch	RCL_3
changeset 18	aaabc7526ded
parent 10	dff6ebfd236f