diff options
Diffstat (limited to 'lib/tcp.c')
| -rw-r--r-- | lib/tcp.c | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -154,24 +154,32 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data) { struct rs_packet *pkt = (struct rs_packet *) user_data; struct rs_connection *conn = NULL; - struct rs_peer *p = NULL; int sockerr = 0; #if defined (RS_ENABLE_TLS) unsigned long tlserr = 0; #endif +#if defined (DEBUG) + struct rs_peer *p = NULL; +#endif assert (pkt); assert (pkt->conn); - assert (pkt->conn->active_peer); conn = pkt->conn; +#if defined (DEBUG) + assert (pkt->conn->active_peer); p = conn->active_peer; +#endif conn->is_connecting = 0; if (events & BEV_EVENT_CONNECTED) { if (conn->tev) evtimer_del (conn->tev); /* Cancel connect timer. */ - event_on_connect (conn, pkt); + if (event_on_connect (conn, pkt)) + { + event_on_disconnect (conn); + event_loopbreak (conn); + } } else if (events & BEV_EVENT_EOF) { @@ -181,7 +189,7 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data) { rs_debug (("%s: %p times out on %s\n", __func__, p, (events & BEV_EVENT_READING) ? "read" : "write")); - rs_err_conn_push_fl (pkt->conn, RSE_TIMEOUT_IO, __FILE__, __LINE__, NULL); + rs_err_conn_push_fl (conn, RSE_TIMEOUT_IO, __FILE__, __LINE__, NULL); } else if (events & BEV_EVENT_ERROR) { @@ -189,13 +197,13 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data) if (sockerr == 0) /* FIXME: True that errno == 0 means closed? */ { event_on_disconnect (conn); - rs_err_conn_push_fl (pkt->conn, RSE_DISCO, __FILE__, __LINE__, NULL); + rs_err_conn_push_fl (conn, RSE_DISCO, __FILE__, __LINE__, NULL); } else { rs_debug (("%s: %d: %d (%s)\n", __func__, conn->fd, sockerr, evutil_socket_error_to_string (sockerr))); - rs_err_conn_push_fl (pkt->conn, RSE_SOCKERR, __FILE__, __LINE__, + rs_err_conn_push_fl (conn, RSE_SOCKERR, __FILE__, __LINE__, "%d: %d (%s)", conn->fd, sockerr, evutil_socket_error_to_string (sockerr)); } @@ -208,7 +216,7 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data) { rs_debug (("%s: openssl error: %s\n", __func__, ERR_error_string (tlserr, NULL))); - rs_err_conn_push_fl (pkt->conn, RSE_SSLERR, __FILE__, __LINE__, + rs_err_conn_push_fl (conn, RSE_SSLERR, __FILE__, __LINE__, ERR_error_string (tlserr, NULL)); } } |