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

equal deleted inserted replaced

-:e2d33e235f7e
+:885c2596c964
 QNetworkSessionPrivate::QNetworkSessionPrivate()
 : CActive(CActive::EPriorityUserInput), state(QNetworkSession::Invalid),
 isOpen(false), iDynamicUnSetdefaultif(0), ipConnectionNotifier(0),
 iHandleStateNotificationsFromManager(false), iFirstSync(true), iStoppedByUser(false),
-iClosedByUser(false), iDeprecatedConnectionId(0), iError(QNetworkSession::UnknownSessionError),
+iClosedByUser(false), iError(QNetworkSession::UnknownSessionError), iALREnabled(0),
-iALREnabled(0), iConnectInBackground(false)
+iConnectInBackground(false), isOpening(false)
 {
 CActiveScheduler::Add(this);
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
 iMobility = NULL;
 iDynamicUnSetdefaultif = (TOpenCUnSetdefaultifFunction)iOpenCLibrary.Lookup(597);
 }
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
 qDebug() << "QNS this : " << QString::number((uint)this) << " - ";
 if (iDynamicUnSetdefaultif)
-qDebug() << "dynamic setdefaultif() resolution succeeded. ";
+qDebug() << "dynamic unsetdefaultif() is present in PIPS library. ";
 else
-qDebug() << "dynamic setdefaultif() resolution failed. ";
+qDebug() << "dynamic unsetdefaultif() not present in PIPS library. ";
 #endif
 TRAP_IGNORE(iConnectionMonitor.ConnectL());
 }
 QNetworkSessionPrivate::~QNetworkSessionPrivate()
 {
 isOpen = false;
+isOpening = false;
 // Cancel Connection Progress Notifications first.
 // Note: ConnectionNotifier must be destroyed before Canceling RConnection::Start()
 //       => deleting ipConnectionNotifier results RConnection::CancelProgressNotification()
 delete ipConnectionNotifier;
 // Clears also possible unsetdefaultif() flags.
 setdefaultif(0);
 iConnectionMonitor.Close();
 iOpenCLibrary.Close();
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - destroyed (and setdefaultif(0))";
+#endif
 }
 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)
+<< "connMon ID : " << QString::number(connMonId) << " : to a state: " << newState
-<< " : to a state: " << newState
+<< "whereas my current state is: " << state;
-<< " whereas my current state is: " << state;
+#else
-#endif
+Q_UNUSED(connMonId);
-if (connMonId == iDeprecatedConnectionId) {
+#endif
-#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)
 #endif
 this->newState(QNetworkSession::Invalid, publicConfig.d.data()->numericId);
 }
 }
+void QNetworkSessionPrivate::configurationAdded(const QNetworkConfiguration& config)
+{
+Q_UNUSED(config);
+// If session is based on service network, some other app may create new access points
+// to the SNAP --> synchronize session's state with that of interface's.
+if (!publicConfig.d.data() || publicConfig.type() != QNetworkConfiguration::ServiceNetwork) {
+return;
+}
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "configurationAdded IAP: " << QString::number(config.d.data()->numericId);
+#endif
+syncStateWithInterface();
+}
+// Function sets the state of the session to match the state
+// of the underlying interface (the configuration this session is based on)
 void QNetworkSessionPrivate::syncStateWithInterface()
 {
-if (!publicConfig.d) {
+if (!publicConfig.d || !publicConfig.d.data()) {
 return;
 }
+if (iFirstSync) {
-if (iFirstSync && publicConfig.d.data()) {
 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)));
+// Connect to configuration additions, so that in case a configuration is added
+// in a SNAP this session is based on, the session knows to synch its state with its
+// interface.
+QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager),
+SIGNAL(configurationAdded(QNetworkConfiguration)),
+this, SLOT(configurationAdded(QNetworkConfiguration)));
 }
 // Start listening IAP state changes from QNetworkConfigurationManagerPrivate
 iHandleStateNotificationsFromManager = true;
-// Check open connections to see if there is already
+// Check what is the state of the configuration this session is based on
-// an open connection to selected IAP or SNAP
+// and set the session in appropriate state.
-TUint count;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
-TRequestStatus status;
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
-iConnectionMonitor.GetConnectionCount(count, status);
+<< "syncStateWithInterface() state of publicConfig is: " << publicConfig.d.data()->state;
-User::WaitForRequest(status);
+#endif
-if (status.Int() != KErrNone) {
+switch (publicConfig.d.data()->state) {
-return;
+case QNetworkConfiguration::Active:
-}
+newState(QNetworkSession::Connected);
+break;
-TUint numSubConnections;
+case QNetworkConfiguration::Discovered:
-TUint connectionId;
+newState(QNetworkSession::Disconnected);
-for (TUint i = 1; i <= count; i++) {
+break;
-TInt ret = iConnectionMonitor.GetConnectionInfo(i, connectionId, numSubConnections);
+case QNetworkConfiguration::Defined:
-if (ret == KErrNone) {
+newState(QNetworkSession::NotAvailable);
-TUint apId;
+break;
-iConnectionMonitor.GetUintAttribute(connectionId, 0, KIAPId, apId, status);
+case QNetworkConfiguration::Undefined:
-User::WaitForRequest(status);
+default:
-if (status.Int() == KErrNone) {
+newState(QNetworkSession::Invalid);
-TInt connectionStatus;
-iConnectionMonitor.GetIntAttribute(connectionId, 0, KConnectionStatus, connectionStatus, status);
-User::WaitForRequest(status);
-if (connectionStatus == KLinkLayerOpen) {
-if (state != QNetworkSession::Closing) {
-if (newState(QNetworkSession::Connected, apId)) {
-return;
-}
-}
-}
-}
-}
-}
-if (state != QNetworkSession::Connected) {
-if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) ==
-QNetworkConfiguration::Discovered) {
-newState(QNetworkSession::Disconnected);
-} else {
-newState(QNetworkSession::NotAvailable);
-}
 }
 }
 QNetworkInterface QNetworkSessionPrivate::interface(TUint iapId) const
 {
 return QNetworkInterface::interfaceFromName(interfaceName);
 }
 QNetworkInterface QNetworkSessionPrivate::currentInterface() const
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "currentInterface() requested, state: " << state
+<< "publicConfig validity: " << publicConfig.isValid();
+if (activeInterface.isValid())
+qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+<< "interface is: " << activeInterface.humanReadableName();
+#endif
 if (!publicConfig.isValid() || state != QNetworkSession::Connected) {
 return QNetworkInterface();
 }
 return activeInterface;
 #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)) {
+if (isOpen || isOpening)
 return;
-}
+isOpening = true;
 // Stop handling IAP state change signals from QNetworkConfigurationManagerPrivate
 // => RConnection::ProgressNotification will be used for IAP/SNAP monitoring
 iHandleStateNotificationsFromManager = false;
 // Configuration may have been invalidated after session creation by platform
 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);
 if (ipConnectionNotifier) {
 ipConnectionNotifier->StartNotifications();
 }
 if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-#ifdef OCC_FUNCTIONALITY_AVAILABLE
+#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE)
 // With One Click Connectivity (Symbian^3 onwards) it is possible
 // to connect silently, without any popups.
 TConnPrefList pref;
 TExtendedConnPref prefs;
 prefs.SetIapId(publicConfig.d.data()->numericId);
 #endif
 iConnection.Start(pref, iStatus);
 if (!IsActive()) {
 SetActive();
 }
-newState(QNetworkSession::Connecting);
+// Avoid flip flop of states if the configuration is already
+// active. IsOpen/opened() will indicate when ready.
+if (state != QNetworkSession::Connected) {
+newState(QNetworkSession::Connecting);
+}
 } else if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-#ifdef OCC_FUNCTIONALITY_AVAILABLE
+#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE)
 // On Symbian^3 if service network is not reachable, it triggers a UI (aka EasyWLAN) where
 // user can create new IAPs. To detect this, we need to store the number of IAPs
 // there was before connection was started.
 iKnownConfigsBeforeConnectionStart = ((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->accessPointConfigurations.keys();
 TConnPrefList snapPref;
 #endif
 iConnection.Start(snapPref, iStatus);
 if (!IsActive()) {
 SetActive();
 }
-newState(QNetworkSession::Connecting);
+// Avoid flip flop of states if the configuration is already
+// active. IsOpen/opened() will indicate when ready.
+if (state != QNetworkSession::Connected) {
+newState(QNetworkSession::Connecting);
+}
 } else if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
 iKnownConfigsBeforeConnectionStart = ((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->accessPointConfigurations.keys();
 iConnection.Start(iStatus);
 if (!IsActive()) {
 SetActive();
 newState(QNetworkSession::Connecting);
 }
 if (error != KErrNone) {
 isOpen = false;
+isOpening = false;
 iError = QNetworkSession::UnknownSessionError;
 emit q->error(iError);
 if (ipConnectionNotifier) {
 ipConnectionNotifier->StopNotifications();
 }
 // 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;
 isOpen = false;
+isOpening = false;
-#ifndef OCC_FUNCTIONALITY_AVAILABLE
-// On Symbian^3 we need to keep track of active configuration longer
-// in case of empty-SNAP-triggered EasyWLAN.
-activeConfig = QNetworkConfiguration();
-#endif
 serviceConfig = QNetworkConfiguration();
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
 if (iMobility) {
 delete iMobility;
 // KFinishedSelection event, and hence reports only after that event, but
 // that does not seem to be trusted on all Symbian versions --> safest
 // to go down.
 if (publicConfig.type() == QNetworkConfiguration::UserChoice || state == QNetworkSession::Connecting) {
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
 qDebug() << "QNS this : " << QString::number((uint)this) << " - "
-<< "going Disconnected right away. Deprecating connection monitor ID: " << publicConfig.d.data()->connectionId;
+<< "going disconnected right away, since either UserChoice or Connecting";
 #endif
-// 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;
 newState(QNetworkSession::Closing);
 newState(QNetworkSession::Disconnected);
 }
 if (allowSignals) {
 emit q->closed();
 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;
+isOpening = 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;
+isOpening = false;
 close(false);
 emit q->closed();
 }
 }
 qDebug() << "QNS this : " << QString::number((uint)this) << " - "
 << "roaming Error() occured, isOpen is: " << isOpen;
 #endif
 if (isOpen) {
 isOpen = false;
+isOpening = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
 iError = QNetworkSession::RoamingError;
 emit q->error(iError);
 Cancel();
 QNetworkConfiguration QNetworkSessionPrivate::activeConfiguration(TUint32 iapId) const
 {
 if (iapId == 0) {
 _LIT(KSetting, "IAP\\Id");
 iConnection.GetIntSetting(KSetting, iapId);
+#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE)
+// Check if this is an Easy WLAN configuration. On Symbian^3 RConnection may report
+// the used configuration as 'EasyWLAN' IAP ID if someone has just opened the configuration
+// from WLAN Scan dialog, _and_ that connection is still up. We need to find the
+// real matching configuration. Function alters the Easy WLAN ID to real IAP ID (only if easy WLAN):
+((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->easyWlanTrueIapId(iapId);
+#endif
 }
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
 if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
 // Try to search IAP from the used SNAP using IAP Id
 if (children[i].d.data()->mappingName == pt.d.data()->mappingName) {
 return children[i];
 }
 }
 } else {
-#ifdef OCC_FUNCTIONALITY_AVAILABLE
+#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE)
 // On Symbian^3 (only, not earlier or Symbian^4) if the SNAP was not reachable, it triggers
 // user choice type of activity (EasyWLAN). As a result, a new IAP may be created, and
 // hence if was not found yet. Therefore update configurations and see if there is something new.
 // 1. Update knowledge from the databases.
 ((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->updateConfigurations();
 }
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
 qDebug() << "QNS this : " << QString::number((uint)this) << " - "
 << "configuration was not found, returning invalid.";
 #endif
-#endif // OCC_FUNCTIONALITY_AVAILABLE
+#endif
 // Given IAP Id was not found from known IAPs array
 return QNetworkConfiguration();
 }
 // Matching IAP was not found from used SNAP
 // => IAP from another SNAP is returned
 case KErrNone: // Connection created successfully
 {
 TInt error = KErrNone;
 QNetworkConfiguration newActiveConfig = activeConfiguration();
 if (!newActiveConfig.isValid()) {
+// RConnection startup was successfull but no configuration
+// was found. That indicates that user has chosen to create a
+// new WLAN configuration (from scan results), but that new
+// configuration does not have access to Internet (Internet
+// Connectivity Test, ICT, failed).
 error = KErrGeneral;
 } else {
 // Use name of the IAP to open global 'Open C' RConnection
 ifreq ifr;
 memset(&ifr, 0, sizeof(struct ifreq));
 QByteArray nameAsByteArray = newActiveConfig.name().toUtf8();
 strcpy(ifr.ifr_name, nameAsByteArray.constData());
 error = setdefaultif(&ifr);
 }
 if (error != KErrNone) {
 isOpen = false;
+isOpening = false;
 iError = QNetworkSession::UnknownSessionError;
 QT_TRYCATCH_LEAVING(emit q->error(iError));
-Cancel();
 if (ipConnectionNotifier) {
 ipConnectionNotifier->StopNotifications();
+}
+if (!newActiveConfig.isValid()) {
+// No valid configuration, bail out.
+// Status updates from QNCM won't be received correctly
+// because there is no configuration to associate them with so transit here.
+iConnection.Close();
+newState(QNetworkSession::Closing);
+newState(QNetworkSession::Disconnected);
+} else {
+Cancel();
 }
 QT_TRYCATCH_LEAVING(syncStateWithInterface());
 return;
 }
 // Activate ALR monitoring
 iMobility = CActiveCommsMobilityApiExt::NewL(iConnection, *this);
 }
 #endif
 isOpen = true;
+isOpening = false;
 activeConfig = newActiveConfig;
 activeInterface = interface(activeConfig.d.data()->numericId);
 if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
 QNetworkConfiguration pt;
 pt.d = activeConfig.d.data()->serviceNetworkPtr;
 });
 }
 break;
 case KErrNotFound: // Connection failed
 isOpen = false;
+isOpening = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
 iError = QNetworkSession::InvalidConfigurationError;
 QT_TRYCATCH_LEAVING(emit q->error(iError));
 Cancel();
 break;
 case KErrCancel: // Connection attempt cancelled
 case KErrAlreadyExists: // Connection already exists
 default:
 isOpen = false;
+isOpening = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
-if (publicConfig.state() == QNetworkConfiguration::Undefined ||
+if (statusCode == KErrCancel) {
+iError = QNetworkSession::SessionAbortedError;
+} else if (publicConfig.state() == QNetworkConfiguration::Undefined ||
 publicConfig.state() == QNetworkConfiguration::Defined) {
 iError = QNetworkSession::InvalidConfigurationError;
 } else {
 iError = QNetworkSession::UnknownSessionError;
 }
 }
 // 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;
+}
+// Make sure that some lagging 'connecting' state-changes do not overwrite
+// if we are already connected (may righfully still happen with roaming though).
+if (state == QNetworkSession::Connected && newState == QNetworkSession::Connecting) {
 return false;
 }
 bool emitSessionClosed = false;
 // 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;
+isOpening = false;
 activeConfig = QNetworkConfiguration();
 serviceConfig = QNetworkConfiguration();
 iError = QNetworkSession::SessionAbortedError;
 emit q->error(iError);
 Cancel();
 #endif
 }
 }
 }
 }
-#ifdef OCC_FUNCTIONALITY_AVAILABLE
+#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE)
 // If the retVal is not true here, it means that the status update may apply to an IAP outside of
 // SNAP (session is based on SNAP but follows IAP outside of it), which may occur on Symbian^3 EasyWlan.
 if (retVal == false && activeConfig.d.data() && activeConfig.d.data()->numericId == accessPointId) {
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
 qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed G  to: " << state;
 retVal = true;
 }
 #endif
 }
 }
 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;
-#ifdef OCC_FUNCTIONALITY_AVAILABLE
 // Just in case clear activeConfiguration.
 activeConfig = QNetworkConfiguration();
-#endif
 }
 return retVal;
 }
 void QNetworkSessionPrivate::handleSymbianConnectionStatusChange(TInt aConnectionStatus,

branch	RCL_3
changeset 21	885c2596c964
parent 13	4203353e74ea