From 168fa4889c230de9016e1371e65da49a8d36e16c Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 25 Nov 2018 00:22:29 +0100
Subject: Remove duplicate user add if same pubsub key, do not add user until
 connected

---
 src/DirectConnection.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/DirectConnection.cpp')

diff --git a/src/DirectConnection.cpp b/src/DirectConnection.cpp
index 175dae3..d92c972 100644
--- a/src/DirectConnection.cpp
+++ b/src/DirectConnection.cpp
@@ -160,8 +160,6 @@ namespace sibs
                 int socketId = socket->udtSocket;
                 if(!server)
                 {
-                    UDT::epoll_add_usock(eid, socketId);
-                    socket->eid = eid;
                     peersMutex.lock();
                     peers[socketId] = peer;
                     peer->socket = std::move(socket);
@@ -184,8 +182,6 @@ namespace sibs
 
                 if(server)
                 {
-                    UDT::epoll_add_usock(eid, socketId);
-                    socket->eid = eid;
                     peersMutex.lock();
                     peers[socketId] = peer;
                     peer->socket = std::move(socket);
@@ -195,6 +191,8 @@ namespace sibs
                     peer->sharedKeys = 1;
                     peersMutex.unlock();
                 }
+                UDT::epoll_add_usock(eid, socketId);
+                peer->socket->eid = eid;
                 peer->routed = false;
                 
                 if(connectCallbackFunc)
-- 
cgit v1.2.3