wsd: SessionId -> ConnectionId

"Session" is too generic and can be misleading. This is really a connection ID, or a connection-session ID, so it's more sensible to call it ConnectionId to signify that it's a connection-specific ID. Change-Id: I0f12b1cf80d4853a27535101093ef6b7a3e0d438 Reviewed-on: https://gerrit.libreoffice.org/79326 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]>
yuuolo · Sep 22, 2019 · 477d671 · 477d671
1 parent fd5581e
commit 477d671
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
@@ -274,15 +274,15 @@ AdminSocketHandler::AdminSocketHandler(Admin* adminManager,
       _isAuthenticated(false)
 {
     // Different session id pool for admin sessions (?)
-    _sessionId = Util::decodeId(LOOLWSD::GenSessionId());
+    _sessionId = Util::decodeId(LOOLWSD::GetConnectionId());
 }
 
 AdminSocketHandler::AdminSocketHandler(Admin* adminManager)
     : WebSocketHandler(true),
       _admin(adminManager),
       _isAuthenticated(true)
 {
-    _sessionId = Util::decodeId(LOOLWSD::GenSessionId());
+    _sessionId = Util::decodeId(LOOLWSD::GetConnectionId());
 }
 
 void AdminSocketHandler::sendTextFrame(const std::string& message)

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
@@ -688,7 +688,7 @@ inline std::string getAdminURI(const Poco::Util::LayeredConfiguration &config)
 
 #endif // MOBILEAPP
 
-std::atomic<uint64_t> LOOLWSD::NextSessionId;
+std::atomic<uint64_t> LOOLWSD::NextConnectionId(1);
 
 #ifndef KIT_IN_PROCESS
 std::atomic<int> LOOLWSD::ForKitWritePipe(-1);
@@ -2077,7 +2077,7 @@ class ClientRequestDispatcher : public SocketHandlerInterface
     /// Set the socket associated with this ResponseClient.
     void onConnect(const std::shared_ptr<StreamSocket>& socket) override
     {
-        _id = LOOLWSD::GenSessionId();
+        _id = LOOLWSD::GetConnectionId();
         _socket = socket;
         LOG_TRC("#" << socket->getFD() << " Connected to ClientRequestDispatcher.");
     }

diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
@@ -46,7 +46,7 @@ class LOOLWSD : public Poco::Util::ServerApplication
 
     // An Application is a singleton anyway,
     // so just keep these as statics.
-    static std::atomic<uint64_t> NextSessionId;
+    static std::atomic<uint64_t> NextConnectionId;
     static unsigned int NumPreSpawnedChildren;
     static bool NoCapsForKit;
     static bool NoSeccomp;
@@ -85,9 +85,9 @@ class LOOLWSD : public Poco::Util::ServerApplication
     /// For testing only [!] DocumentBrokers are mostly single-threaded with their own thread
     static std::vector<std::shared_ptr<DocumentBroker>> getBrokersTestOnly();
 
-    static std::string GenSessionId()
+    static std::string GetConnectionId()
     {
-        return Util::encodeId(++NextSessionId, 4);
+        return Util::encodeId(NextConnectionId++, 3);
     }
 
     static bool isSSLEnabled()