libdeng2: LegacyNetwork can relinquish control of a socket

doomsday/libdeng2/include/de/legacy/legacynetwork.h

@@ -28,6 +28,7 @@ namespace de {
 class Address;
 class Block;
 class IByteArray;
+class Socket;
 
 /**
  * Network communications for the legacy engine implementation. Implements
@@ -66,6 +67,16 @@ class LegacyNetwork
      */
     bool incomingForSocket(int socket);
 
+    /**
+     * Relinquishes ownership of a socket. The socket is removed from any
+     * socket sets, and loses its LegacyNetwork-specific id.
+     *
+     * @param socket  Socket id.
+     *
+     * @return de::Socket instance. Caller gets ownership.
+     */
+    Socket *takeSocket(int socket);
+
 private:
     struct Instance;
     Instance *d;

doomsday/libdeng2/src/legacy/legacynetwork.cpp

@@ -46,21 +46,41 @@ struct LegacyNetwork::Instance
     SocketSets sets;
 
     Instance() : idGen(0) {}
-    ~Instance() {
+
+    ~Instance()
+    {
         // Cleanup time! Delete all existing sockets.
-        foreach(Socket *s, sockets.values()) {
+        foreach(Socket *s, sockets.values())
+        {
             delete s;
         }
-        foreach(ListenSocket *s, serverSockets.values()) {
+        foreach(ListenSocket *s, serverSockets.values())
+        {
             delete s;
         }
     }
-    int nextId() {
+
+    int nextId()
+    {
         /** @todo This will fail after 2.1 billion sockets have been opened.
          * That might take a while, though...
          */
         return ++idGen;
     }
+
+    Socket *take(int id)
+    {
+        Socket *sock = sockets[id];
+        sockets.remove(id);
+
+        // Remove from any sets.
+        DENG2_FOR_EACH(SocketSets, i, sets)
+        {
+            i->members.removeAll(sock);
+        }
+
+        return sock;
+    }
 };
 
 LegacyNetwork::LegacyNetwork()
@@ -240,4 +260,9 @@ bool LegacyNetwork::incomingForSocket(int socket)
     return d->sockets[socket]->hasIncoming();
 }
 
+Socket *LegacyNetwork::takeSocket(int socket)
+{
+    return d->take(socket);
+}
+
 } // namespace de