Refine error handling of connect()

This commit is contained in:
Max Lv
2016-05-23 12:07:36 +08:00
parent dd90af6651
commit fe22a6c90b
4 changed files with 88 additions and 26 deletions
+18 -4
View File
@@ -648,11 +648,25 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
remote->server = server;
server->destaddr = destaddr;
connect(remotefd, remote_addr, get_sockaddr_len(remote_addr));
// listen to remote connected event
ev_io_start(EV_A_ & remote->send_ctx->io);
int r = connect(remotefd, remote_addr, get_sockaddr_len(remote_addr));
if (r < 0 && errno != EINPROGRESS) {
ERROR("connect");
close_and_free_remote(EV_A_ remote);
close_and_free_server(EV_A_ server);
return;
}
if (r == 0) {
if (verbose) LOGI("connected immediately");
remote_send_cb(EV_A_ & remote->send_ctx->io, 0);
} else {
// listen to remote connected event
ev_io_start(EV_A_ & remote->send_ctx->io);
ev_timer_start(EV_A_ & remote->send_ctx->watcher);
}
ev_io_start(EV_A_ & server->recv_ctx->io);
ev_timer_start(EV_A_ & remote->send_ctx->watcher);
}
int main(int argc, char **argv)