aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-13 20:26:02 +0200
committerdec05eba <dec05eba@protonmail.com>2020-08-18 22:56:48 +0200
commit10b5eab3e2ba705b73ce3d8b7d8c623ba09bfc82 (patch)
treed691f7e9dd1029c95f55c5c0fb52ba39a365deb6 /src
parente22adde24fb3dd1147948afb99519110c359063e (diff)
remove test code
Diffstat (limited to 'src')
-rw-r--r--src/BootstrapConnection.cpp2
-rw-r--r--src/DirectConnection.cpp32
2 files changed, 2 insertions, 32 deletions
diff --git a/src/BootstrapConnection.cpp b/src/BootstrapConnection.cpp
index 924fcff..9a19943 100644
--- a/src/BootstrapConnection.cpp
+++ b/src/BootstrapConnection.cpp
@@ -61,7 +61,7 @@ namespace sibs
newPeerAddress.address.sin_addr.s_addr = ipv4Address;
newPeerAddress.address.sin_port = port;
memset(newPeerAddress.address.sin_zero, 0, sizeof(newPeerAddress.address.sin_zero));
- connections.connect(newPeerAddress, peer, [this, pubsubKey](std::shared_ptr<DirectConnectionPeer> newPeer, PubSubResult result, const std::string &resultStr)
+ connections.connect(newPeerAddress, [this, pubsubKey](std::shared_ptr<DirectConnectionPeer> newPeer, PubSubResult result, const std::string &resultStr)
{
if(result == PubSubResult::OK)
{
diff --git a/src/DirectConnection.cpp b/src/DirectConnection.cpp
index c19fa63..4a2c829 100644
--- a/src/DirectConnection.cpp
+++ b/src/DirectConnection.cpp
@@ -75,43 +75,13 @@ namespace sibs
void DirectConnections::connectServer(const Ipv4 &address, PubSubConnectCallback connectCallbackFunc, PubSubReceiveDataCallback receiveDataCallbackFunc)
{
- connect(address, true, true, connectCallbackFunc, receiveDataCallbackFunc, true);
+ connect(address, false, true, connectCallbackFunc, receiveDataCallbackFunc, true);
}
void DirectConnections::connect(const Ipv4 &address, PubSubConnectCallback connectCallbackFunc, PubSubReceiveDataCallback receiveDataCallbackFunc)
{
connect(address, true, true, connectCallbackFunc, receiveDataCallbackFunc, true);
}
-
- void DirectConnections::connect(const Ipv4 &address, std::shared_ptr<DirectConnectionPeer> serverPeer, PubSubConnectCallback connectCallbackFunc, PubSubReceiveDataCallback receiveDataCallbackFunc)
- {
- std::thread([this, address, connectCallbackFunc, receiveDataCallbackFunc, serverPeer]()
- {
- if(UDT::bind(serverPeer->socket, (sockaddr*)&address.address, sizeof(address.address)) == UDT::ERROR)
- {
- std::string errMsg = "UDT: Failed to bind, error: ";
- errMsg += UDT::getlasterror_desc();
- throw SocketCreateException(errMsg);
- }
-
- Log::debug("DirectConnections: Connecting to peer (ip: %s, port: %d, rendezvous: yes)", address.getAddress().c_str(), address.getPort());
- if(UDT::connect(serverPeer->socket, (sockaddr*)&address.address, sizeof(address.address)) == UDT::ERROR)
- {
- if(connectCallbackFunc)
- connectCallbackFunc(serverPeer, PubSubResult::ERROR, UDT::getlasterror_desc());
- return;
- }
-
- serverPeer->address = address;
- serverPeer->receiveDataCallbackFunc = receiveDataCallbackFunc;
- peersMutex.lock();
- peers[serverPeer->socket] = serverPeer;
- peersMutex.unlock();
-
- if(connectCallbackFunc)
- connectCallbackFunc(serverPeer, PubSubResult::OK, "");
- }).detach();
- }
void DirectConnections::connect(const Ipv4 &address, bool rendezvous, bool reuseAddr, PubSubConnectCallback connectCallbackFunc, PubSubReceiveDataCallback receiveDataCallbackFunc, bool bind)
{