FCL/sf/mw/qtextensions: comparison qtmobility/src/bearer/qnetworksession_s60

equal deleted inserted replaced

-:71781823f776
+:06b8e2af4411
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Mobility Components.
 **
 #include <stdapis/net/if.h>
 QTM_BEGIN_NAMESPACE
 QNetworkSessionPrivate::QNetworkSessionPrivate()
-: CActive(CActive::EPriorityStandard), state(QNetworkSession::Invalid),
+: CActive(CActive::EPriorityUserInput), state(QNetworkSession::Invalid),
-isOpen(false), ipConnectionNotifier(0), iError(QNetworkSession::UnknownSessionError),
+isOpen(false), ipConnectionNotifier(0), iHandleStateNotificationsFromManager(false),
-iALREnabled(0), iConnectInBackground(false)
+iFirstSync(true), iStoppedByUser(false), iClosedByUser(false), iDeprecatedConnectionId(0),
+iError(QNetworkSession::UnknownSessionError), iALREnabled(0), iConnectInBackground(false)
 {
 CActiveScheduler::Add(this);
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
 iMobility = NULL;
 #endif
 TRAP_IGNORE(iConnectionMonitor.ConnectL());
 }
 QNetworkSessionPrivate::~QNetworkSessionPrivate()
 {
 iConnection.Close();
 iSocketServ.Close();
 // Close global 'Open C' RConnection
 setdefaultif(0);
-iConnectionMonitor.CancelNotifications();
 iConnectionMonitor.Close();
+}
+void QNetworkSessionPrivate::configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState)
+{
+if (iHandleStateNotificationsFromManager) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "configurationStateChanged from manager for IAP : " << QString::number(accessPointId)
+<< "configurationStateChanged connMon ID : " << QString::number(connMonId)
+<< " : to a state: " << newState
+<< " whereas my current state is: " << state;
+#endif
+if (connMonId == iDeprecatedConnectionId) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "however status update from manager ignored because it related to already closed connection.";
+#endif
+return;
+}
+this->newState(newState, accessPointId);
+}
+}
+void QNetworkSessionPrivate::configurationRemoved(const QNetworkConfiguration& config)
+{
+if (!publicConfig.d.data()) {
+return;
+}
+if (config.d.data()->numericId == publicConfig.d.data()->numericId) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "configurationRemoved IAP: " << QString::number(publicConfig.d.data()->numericId) << " : going to State: Invalid";
+#endif
+this->newState(QNetworkSession::Invalid, publicConfig.d.data()->numericId);
+}
 }
 void QNetworkSessionPrivate::syncStateWithInterface()
 {
 if (!publicConfig.d) {
 return;
 }
-// Start monitoring changes in IAP states
+if (iFirstSync && publicConfig.d.data()) {
-TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this));
+QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager), SIGNAL(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)),
+this, SLOT(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)));
+// Listen to configuration removals, so that in case the configuration
+// this session is based on is removed, session knows to enter Invalid -state.
+QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager),
+SIGNAL(configurationRemoved(QNetworkConfiguration)),
+this, SLOT(configurationRemoved(QNetworkConfiguration)));
+}
+// Start listening IAP state changes from QNetworkConfigurationManagerPrivate
+iHandleStateNotificationsFromManager = true;
 // Check open connections to see if there is already
 // an open connection to selected IAP or SNAP
 TUint count;
 TRequestStatus status;
 }
 }
 }
 if (state != QNetworkSession::Connected) {
-// There were no open connections to used IAP or SNAP
+if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) ==
-if (iError == QNetworkSession::InvalidConfigurationError) {
-newState(QNetworkSession::Invalid);
-}
-else if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) ==
 QNetworkConfiguration::Discovered) {
 newState(QNetworkSession::Disconnected);
 } else {
 newState(QNetworkSession::NotAvailable);
 }
 return iError;
 }
 void QNetworkSessionPrivate::open()
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "open() called, session state is: " << state << " and isOpen is: "
+<< isOpen;
+#endif
 if (isOpen || (state == QNetworkSession::Connecting)) {
 return;
 }
-// Cancel notifications from RConnectionMonitor
+// Stop handling IAP state change signals from QNetworkConfigurationManagerPrivate
 // => RConnection::ProgressNotification will be used for IAP/SNAP monitoring
-iConnectionMonitor.CancelNotifications();
+iHandleStateNotificationsFromManager = false;
 // Configuration may have been invalidated after session creation by platform
 // (e.g. configuration has been deleted).
 if (!publicConfig.isValid()) {
 newState(QNetworkSession::Invalid);
 iError = QNetworkSession::InvalidConfigurationError;
 emit q->error(iError);
-syncStateWithInterface();
 return;
 }
-// If opening a (un)defined configuration, session emits error and enters
+// If opening a undefined configuration, session emits error and enters
-// NotAvailable -state.
+// NotAvailable -state. Note that we will try ones in 'defined' state to avoid excessive
-if (publicConfig.state() == QNetworkConfiguration::Undefined ||
+// need for WLAN scans (via updateConfigurations()), because user may have walked
-publicConfig.state() == QNetworkConfiguration::Defined) {
+// into a WLAN range, but periodic background scan has not occurred yet -->
+// we don't want to force application to make frequent updateConfigurations() calls
+// to be able to try if e.g. home WLAN is available.
+if (publicConfig.state() == QNetworkConfiguration::Undefined) {
 newState(QNetworkSession::NotAvailable);
 iError = QNetworkSession::InvalidConfigurationError;
 emit q->error(iError);
 return;
 }
+// Clear possible previous states
+iStoppedByUser = false;
+iClosedByUser = false;
+iDeprecatedConnectionId = 0;
 TInt error = iSocketServ.Connect();
 if (error != KErrNone) {
 // Could not open RSocketServ
 newState(QNetworkSession::Invalid);
 iError = QNetworkSession::UnknownSessionError;
 return 0;
 }
 void QNetworkSessionPrivate::close(bool allowSignals)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "close() called, session state is: " << state << " and isOpen is : "
+<< isOpen;
+#endif
 if (!isOpen) {
 return;
 }
+// Mark this session as closed-by-user so that we are able to report
+// distinguish between stop() and close() state transitions
+// when reporting.
+iClosedByUser = true;
 TUint activeIap = activeConfig.d.data()->numericId;
 isOpen = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
 delete iMobility;
 iMobility = NULL;
 }
 #endif
-if (ipConnectionNotifier) {
+if (ipConnectionNotifier && !iHandleStateNotificationsFromManager) {
 ipConnectionNotifier->StopNotifications();
+// Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+iHandleStateNotificationsFromManager = true;
 }
 iConnection.Close();
 iSocketServ.Close();
 #endif
 (publicConfig.type() == QNetworkConfiguration::UserChoice)) {
 newState(QNetworkSession::Closing);
 }
-syncStateWithInterface();
 if (allowSignals) {
 if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
 newState(QNetworkSession::Disconnected);
 }
 emit q->closed();
 }
 }
 void QNetworkSessionPrivate::stop()
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "stop() called, session state is: " << state << " and isOpen is : "
+<< isOpen;
+#endif
 if (!isOpen &&
 publicConfig.isValid() &&
 publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "since session is not open, using RConnectionMonitor to stop() the interface";
+#endif
+iStoppedByUser = true;
 // If the publicConfig is type of IAP, enumerate through connections at
 // connection monitor. If publicConfig is active in that list, stop it.
 // Otherwise there is nothing to stop. Note: because this QNetworkSession is not open,
 // activeConfig is not usable.
 TUint count;
 0, // subConnectionId don't care
 KConnectionStop,
 ETrue);
 }
 }
+// Enter disconnected state right away since the session is not even open.
+// Symbian^3 connection monitor does not emit KLinkLayerClosed when
+// connection is stopped via connection monitor.
+newState(QNetworkSession::Disconnected);
 }
 } else if (isOpen) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "since session is open, using RConnection to stop() the interface";
+#endif
 // Since we are open, use RConnection to stop the interface
 isOpen = false;
+iStoppedByUser = true;
 newState(QNetworkSession::Closing);
+if (ipConnectionNotifier) {
+ipConnectionNotifier->StopNotifications();
+// Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+iHandleStateNotificationsFromManager = true;
+}
 iConnection.Stop(RConnection::EStopAuthoritative);
 isOpen = true;
 close(false);
 emit q->closed();
 }
 }
 }
 void QNetworkSessionPrivate::Error(TInt /*aError*/)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "roaming Error() occured";
+#endif
 if (isOpen) {
 isOpen = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
 iError = QNetworkSession::RoamingError;
 // syncStateWithInterface(); is called
 // => Following call makes sure that Session state
 //    changes immediately to Disconnected.
 newState(QNetworkSession::Disconnected);
 emit q->closed();
+} else if (iStoppedByUser) {
+// If the user of this session has called the stop() and
+// configuration is based on internet SNAP, this needs to be
+// done here because platform might roam.
+newState(QNetworkSession::Disconnected);
 }
 }
 #endif
 void QNetworkSessionPrivate::setALREnabled(bool enabled)
 case KErrAlreadyExists: // Connection already exists
 default:
 isOpen = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
-iError = QNetworkSession::UnknownSessionError;
+if (publicConfig.state() == QNetworkConfiguration::Undefined ||
+publicConfig.state() == QNetworkConfiguration::Defined) {
+iError = QNetworkSession::InvalidConfigurationError;
+} else {
+iError = QNetworkSession::UnknownSessionError;
+}
 emit q->error(iError);
 Cancel();
 if (ipConnectionNotifier) {
 ipConnectionNotifier->StopNotifications();
 }
 void QNetworkSessionPrivate::DoCancel()
 {
 iConnection.Close();
 }
+// Enters newState if feasible according to current state.
+// AccessPointId may be given as parameter. If it is zero, state-change is assumed to
+// concern this session's configuration. If non-zero, the configuration is looked up
+// and checked if it matches the configuration this session is based on.
 bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint accessPointId)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "NEW STATE, IAP ID : " << QString::number(accessPointId) << " , newState : " << QString::number(newState);
+#endif
 // Make sure that activeConfig is always updated when SNAP is signaled to be
 // connected.
 if (isOpen && publicConfig.type() == QNetworkConfiguration::ServiceNetwork &&
 newState == QNetworkSession::Connected) {
 activeConfig = activeConfiguration(accessPointId);
 // Make sure that Connecting state does not overwrite Roaming state
 if (state == QNetworkSession::Roaming && newState == QNetworkSession::Connecting) {
 return false;
 }
+// Make sure that Connected state is not reported when Connection is
+// already Closing.
+// Note: Stopping connection results sometimes KLinkLayerOpen
+//       to be reported first (just before KLinkLayerClosed).
+if (state == QNetworkSession::Closing && newState == QNetworkSession::Connected) {
+return false;
+}
+// Make sure that some lagging 'closing' state-changes do not overwrite
+// if we are already disconnected or closed.
+if (state == QNetworkSession::Disconnected && newState == QNetworkSession::Closing) {
+return false;
+}
 bool emitSessionClosed = false;
-if (isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) {
+// If we abruptly go down and user hasn't closed the session, we've been aborted.
+// Note that session may be in 'closing' state and not in 'connected' state, because
+// depending on platform the platform may report KConfigDaemonStartingDeregistration
+// event before KLinkLayerClosed
+if ((isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) ||
+(isOpen && !iClosedByUser && newState == QNetworkSession::Disconnected)) {
 // Active & Connected state should change directly to Disconnected state
 // only when something forces connection to close (eg. when another
 // application or session stops connection or when network drops
 // unexpectedly).
 isOpen = false;
 emit q->error(iError);
 Cancel();
 if (ipConnectionNotifier) {
 ipConnectionNotifier->StopNotifications();
 }
-// Start monitoring changes in IAP states
+// Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
-TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this));
+iHandleStateNotificationsFromManager = true;
 emitSessionClosed = true; // Emit SessionClosed after state change has been reported
 }
 bool retVal = false;
 if (accessPointId == 0) {
 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed A to: " << state;
+#endif
 emit q->stateChanged(state);
 retVal = true;
 } else {
 if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
 if (publicConfig.d.data()->numericId == accessPointId) {
 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed B to: " << state;
+#endif
 emit q->stateChanged(state);
 retVal = true;
 }
 } else if (publicConfig.type() == QNetworkConfiguration::UserChoice && isOpen) {
 if (activeConfig.d.data()->numericId == accessPointId) {
 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed C to: " << state;
+#endif
 emit q->stateChanged(state);
 retVal = true;
 }
 } else if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
 QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
 for (int i = 0; i < subConfigurations.count(); i++) {
 if (subConfigurations[i].d.data()->numericId == accessPointId) {
 if (newState == QNetworkSession::Connected) {
-// Make sure that when AccessPoint is reported to be Connected
-// also state of the related configuration changes to Active.
-subConfigurations[i].d.data()->state = QNetworkConfiguration::Active;
 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed D  to: " << state;
+#endif
 emit q->stateChanged(state);
 retVal = true;
 } else {
-if (newState == QNetworkSession::Disconnected) {
-// Make sure that when AccessPoint is reported to be disconnected
-// also state of the related configuration changes from Active to Defined.
-subConfigurations[i].d.data()->state = QNetworkConfiguration::Defined;
-}
 QNetworkConfiguration config = bestConfigFromSNAP(publicConfig);
 if ((config.state() == QNetworkConfiguration::Defined) ||
 (config.state() == QNetworkConfiguration::Discovered)) {
 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed E  to: " << state;
+#endif
 emit q->stateChanged(state);
 retVal = true;
 }
 }
 }
 }
 if (emitSessionClosed) {
 emit q->closed();
 }
+if (state == QNetworkSession::Disconnected) {
+// The connection has gone down, and processing of status updates must be
+// stopped. Depending on platform, there may come 'connecting/connected' states
+// considerably later (almost a second). Connection id is an increasing
+// number, so this does not affect next _real_ 'conneting/connected' states.
+iDeprecatedConnectionId = publicConfig.d.data()->connectionId;
+}
 return retVal;
 }
 void QNetworkSessionPrivate::handleSymbianConnectionStatusChange(TInt aConnectionStatus,
 TInt aError,
 TUint accessPointId)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << QString::number(accessPointId) << " , status : " << QString::number(aConnectionStatus);
+#endif
 switch (aConnectionStatus)
 {
 // Connection unitialised
 case KConnectionUninitialised:
 break;
 case KCsdScanningScript:
 case KCsdGettingLoginInfo:
 case KCsdGotLoginInfo:
 break;
+case KConfigDaemonStartingRegistration:
 // Creating connection (e.g. GPRS activation)
 case KCsdStartingConnect:
 case KCsdFinishedConnect:
 newState(QNetworkSession::Connecting,accessPointId);
 break;
 // Connection blocked or suspended
 case KDataTransferTemporarilyBlocked:
 break;
+case KConfigDaemonStartingDeregistration:
 // Hangup or GRPS deactivation
 case KConnectionStartingClose:
 newState(QNetworkSession::Closing,accessPointId);
 break;
 // Connection closed
 case KConnectionClosed:
-break;
 case KLinkLayerClosed:
 newState(QNetworkSession::Disconnected,accessPointId);
-break;
+// Report manager about this to make sure this event
+// is received by all interseted parties (mediated by
+// manager because it does always receive all events from
+// connection monitor).
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "reporting disconnection to manager.";
+#endif
+if (publicConfig.d.data()) {
+((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->configurationStateChangeReport(publicConfig.d.data()->numericId, QNetworkSession::Disconnected);
+}
+break;
 // Unhandled state
 default:
 break;
 }
 }
-void QNetworkSessionPrivate::EventL(const CConnMonEventBase& aEvent)
-{
-switch (aEvent.EventType())
-{
-case EConnMonConnectionStatusChange:
-{
-CConnMonConnectionStatusChange* realEvent;
-realEvent = (CConnMonConnectionStatusChange*) &aEvent;
-TUint connectionId = realEvent->ConnectionId();
-TInt connectionStatus = realEvent->ConnectionStatus();
-// Try to Find IAP Id using connection Id
-TUint apId = 0;
-if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
-for (int i = 0; i < subConfigurations.count(); i++ ) {
-if (subConfigurations[i].d.data()->connectionId == connectionId) {
-apId = subConfigurations[i].d.data()->numericId;
-break;
-}
-}
-} else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-if (publicConfig.d.data()->connectionId == connectionId) {
-apId = publicConfig.d.data()->numericId;
-}
-}
-if (apId > 0) {
-handleSymbianConnectionStatusChange(connectionStatus, KErrNone, apId);
-}
-}
-break;
-case EConnMonCreateConnection:
-{
-CConnMonCreateConnection* realEvent;
-realEvent = (CConnMonCreateConnection*) &aEvent;
-TUint apId;
-TUint connectionId = realEvent->ConnectionId();
-TRequestStatus status;
-iConnectionMonitor.GetUintAttribute(connectionId, 0, KIAPId, apId, status);
-User::WaitForRequest(status);
-if (status.Int() == KErrNone) {
-// Store connection id to related AccessPoint Configuration
-if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
-for (int i = 0; i < subConfigurations.count(); i++ ) {
-if (subConfigurations[i].d.data()->numericId == apId) {
-subConfigurations[i].d.data()->connectionId = connectionId;
-break;
-}
-}
-} else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-if (publicConfig.d.data()->numericId == apId) {
-publicConfig.d.data()->connectionId = connectionId;
-}
-}
-}
-}
-break;
-case EConnMonDeleteConnection:
-{
-CConnMonDeleteConnection* realEvent;
-realEvent = (CConnMonDeleteConnection*) &aEvent;
-TUint connectionId = realEvent->ConnectionId();
-// Remove connection id from related AccessPoint Configuration
-if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
-for (int i = 0; i < subConfigurations.count(); i++ ) {
-if (subConfigurations[i].d.data()->connectionId == connectionId) {
-subConfigurations[i].d.data()->connectionId = 0;
-break;
-}
-}
-} else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-if (publicConfig.d.data()->connectionId == connectionId) {
-publicConfig.d.data()->connectionId = 0;
-}
-}
-}
-break;
-default:
-// For unrecognized events
-break;
-}
-}
 ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivate& owner, RConnection& connection)
-: CActive(CActive::EPriorityStandard), iOwner(owner), iConnection(connection)
+: CActive(CActive::EPriorityUserInput), iOwner(owner), iConnection(connection)
 {
 CActiveScheduler::Add(this);
 }
 ConnectionProgressNotifier::~ConnectionProgressNotifier()

changeset 11	06b8e2af4411
parent 5	453da2cfceef
child 14	6fbed849b4f4