default RConnection for sockets

Bearer pushes RConnection into QtCore.
QSocket can pull this RConnection back out when it needs to open an RSocket

(potentially this can be removed again later if QSocket is made
QNetworkSession aware)

Reviewed-by: Markus Goetz

3 files changed, 36 insertions, 2 deletions

diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp
index b6688f7..ede8464 100644
--- a/src/corelib/kernel/qcore_symbian_p.cpp
+++ b/src/corelib/kernel/qcore_symbian_p.cpp
@@ -217,7 +217,7 @@ Q_CORE_EXPORT RFs& qt_s60GetRFs()
 }
 
 QSymbianSocketManager::QSymbianSocketManager() :
-    iNextSocket(0)
+    iNextSocket(0), iDefaultConnection(0)
 {
     TSessionPref preferences;
     // ### In future this could be changed to KAfInet6 when that is more common than IPv4
@@ -290,6 +290,16 @@ bool QSymbianSocketManager::lookupSocket(int fd, RSocket& socket) const {
     return true;
 }
 
+void QSymbianSocketManager::setDefaultConnection(RConnection* con)
+{
+    iDefaultConnection = con;
+}
+
+RConnection* QSymbianSocketManager::defaultConnection() const
+{
+    return iDefaultConnection;
+}
+
 Q_GLOBAL_STATIC(QSymbianSocketManager, qt_symbianSocketManager);
 
 QSymbianSocketManager& QSymbianSocketManager::instance()
diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h
index 8ffa247..d5d10ef 100644
--- a/src/corelib/kernel/qcore_symbian_p.h
+++ b/src/corelib/kernel/qcore_symbian_p.h
@@ -172,7 +172,7 @@ public:
     }
     bool operator<(const QHashableSocket &other) const
     {
-        if(Session().Handle() == other.Session().Handle())
+        if (Session().Handle() == other.Session().Handle())
             return SubSessionHandle() < other.SubSessionHandle();
         return Session().Handle() < other.Session().Handle();
     }
@@ -230,6 +230,19 @@ public:
 
     /*!
       \internal
+      Set the default connection to use for new sockets
+      \param an open connection
+    */
+    void setDefaultConnection(RConnection* con);
+    /*!
+      \internal
+      Get the default connection to use for new sockets
+      \return the connection, or null pointer if there is none set
+    */
+    RConnection *defaultConnection() const;
+
+    /*!
+      \internal
       Gets a reference to the singleton socket manager
     */
     static QSymbianSocketManager& instance();
@@ -243,6 +256,7 @@ private:
     QHash<int, RSocket> reverseSocketMap;
     mutable QMutex iMutex;
     RSocketServ iSocketServ;
+    RConnection *iDefaultConnection;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index cfb55bf..759c86a 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -114,6 +114,7 @@ QNetworkSessionPrivateImpl::~QNetworkSessionPrivateImpl()
     // Close global 'Open C' RConnection
     // Clears also possible unsetdefaultif() flags.
     setdefaultif(0);
+    QSymbianSocketManager::instance().setDefaultConnection(0);
 
     iConnectionMonitor.Close();
     iOpenCLibrary.Close();
@@ -533,6 +534,7 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
         setdefaultif(0);
     }
 
+    QSymbianSocketManager::instance().setDefaultConnection(0);
     // If UserChoice, go down immediately. If some other configuration,
     // go down immediately if there is no reports expected from the platform;
     // in practice Connection Monitor is aware of connections only after
@@ -634,6 +636,7 @@ void QNetworkSessionPrivateImpl::migrate()
         } else {
             setdefaultif(0);
         }
+        QSymbianSocketManager::instance().setDefaultConnection(0);
         // Start migrating to new IAP
         iMobility->MigrateToPreferredCarrier();
     }
@@ -670,6 +673,8 @@ void QNetworkSessionPrivateImpl::accept()
         strcpy(ifr.ifr_name, nameAsByteArray.constData());
         setdefaultif(&ifr);
 
+        QSymbianSocketManager::instance().setDefaultConnection(&iConnection);
+
         newState(QNetworkSession::Connected, iNewRoamingIap);
     }
 #endif
@@ -693,6 +698,8 @@ void QNetworkSessionPrivateImpl::reject()
             strcpy(ifr.ifr_name, nameAsByteArray.constData());
             setdefaultif(&ifr);
 
+            QSymbianSocketManager::instance().setDefaultConnection(&iConnection);
+
             newState(QNetworkSession::Connected, iOldRoamingIap);
         }
     }
@@ -1079,6 +1086,7 @@ void QNetworkSessionPrivateImpl::RunL()
                 QByteArray nameAsByteArray = newActiveConfig.name().toUtf8();
                 strcpy(ifr.ifr_name, nameAsByteArray.constData());
                 error = setdefaultif(&ifr);
+                QSymbianSocketManager::instance().setDefaultConnection(&iConnection);
             }
             if (error != KErrNone) {
                 isOpen = false;
@@ -1092,6 +1100,7 @@ void QNetworkSessionPrivateImpl::RunL()
                     // 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.
+                    QSymbianSocketManager::instance().setDefaultConnection(0);
                     iConnection.Close();
                     newState(QNetworkSession::Closing);
                     newState(QNetworkSession::Disconnected);
@@ -1205,6 +1214,7 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
         strcpy(ifr.ifr_name, nameAsByteArray.constData());
 
         setdefaultif(&ifr);
+        QSymbianSocketManager::instance().setDefaultConnection(&iConnection);
 #endif
     }