aboutsummaryrefslogtreecommitdiff
path: root/src/DirectConnection.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-11-25 00:22:29 +0100
committerdec05eba <dec05eba@protonmail.com>2020-08-18 22:56:48 +0200
commit168fa4889c230de9016e1371e65da49a8d36e16c (patch)
treecee123ead84fdfd666af932ccedc66c68b2082d0 /src/DirectConnection.cpp
parent213ab157a6e696ea76feb581977ebef2e2fad217 (diff)
Remove duplicate user add if same pubsub key, do not add user until connected
Diffstat (limited to 'src/DirectConnection.cpp')
-rw-r--r--src/DirectConnection.cpp6
1 files changed, 2 insertions, 4 deletions
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)