diff options
| author | Determinant <ted.sybil@gmail.com> | 2020-02-22 14:42:46 -0500 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2020-02-22 14:42:46 -0500 |
| commit | d6885c510e1c3f142d00cbd8bf65bbc4dc44b195 (patch) | |
| tree | a1263fd185cc394dd0115e3e24777f456b136107 | |
| parent | c4ce16649f3eccd2e02a918a34251cd9f0f1a437 (diff) | |
| parent | c6081c9fdb833f56864f99b87c4254a1f2896e94 (diff) | |
Merge branch 'master' of github.com:Determinant/salticidaev0.2.1a
| -rw-r--r-- | include/salticidae/network.h | 2 | ||||
| -rw-r--r-- | src/conn.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/salticidae/network.h b/include/salticidae/network.h index 5fd5283..6a9b8cf 100644 --- a/include/salticidae/network.h +++ b/include/salticidae/network.h @@ -1166,7 +1166,7 @@ int32_t PeerNetwork<O, _, __>::conn_peer(const PeerId &pid, int32_t ntry, double /* has to terminate established connection *before* making the next * attempt */ if (p->state == Peer::State::DISCONNECTED && ntry) - start_active_conn(p.get()); + p->ev_retry_timer.add(0); else if (p->state == Peer::State::CONNECTED) { p->state = Peer::State::RESET; diff --git a/src/conn.cpp b/src/conn.cpp index 85f9530..667cd4b 100644 --- a/src/conn.cpp +++ b/src/conn.cpp @@ -247,7 +247,7 @@ void ConnPool::Conn::_recv_data_tls_handshake(const conn_t &conn, int, int) { /* do not start receiving data immediately */ conn->recv_data_func = _recv_data_dummy; conn->ev_socket.del(); - conn->ev_socket.add(FdEvent::WRITE); + //conn->ev_socket.add(FdEvent::WRITE); conn->peer_cert = new X509(conn->tls->get_peer_cert()); conn->worker->enable_send_buffer(conn, conn->fd); auto cpool = conn->cpool; |