Module: sip-router Branch: ser_core_cvs Commit: 30745c9ddee5506dc09f7c1f57a05114e9cff257 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30745c9… Author: Andrei Pelinescu-Onciul &lt;andrei(a)iptel.org&gt; Committer: Andrei Pelinescu-Onciul &lt;andrei(a)iptel.org&gt; Date: Fri Apr 10 10:23:14 2009 +0000 tcp: minor stats fixes Author: Andrei Pelinescu-Onciul &lt;andrei(a)iptel.org&gt; --- tcp_main.c | 94 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 28c5242..5e08810 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -506,49 +506,7 @@ again: else goto error_timeout; } if (errno!=EINPROGRESS && errno!=EALREADY){ - switch(errno){ - case ENETUNREACH: - case EHOSTUNREACH: -#ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_su(BLST_ERR_CONNECT, type, - (union sockaddr_union*)servaddr, 0); -#endif /* USE_DST_BLACKLIST */ - TCP_EV_CONNECT_UNREACHABLE(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - case ETIMEDOUT: -#ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_su(BLST_ERR_CONNECT, type, - (union sockaddr_union*)servaddr, 0); -#endif /* USE_DST_BLACKLIST */ - TCP_EV_CONNECT_TIMEOUT(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - case ECONNREFUSED: - case ECONNRESET: -#ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_su(BLST_ERR_CONNECT, type, - (union sockaddr_union*)servaddr, 0); -#endif /* USE_DST_BLACKLIST */ - TCP_EV_CONNECT_RST(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - case EAGAIN: /* not posix, but supported on linux and bsd */ - TCP_EV_CONNECT_NO_MORE_PORTS(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - default: - TCP_EV_CONNECT_ERR(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - } - TCP_STATS_CONNECT_FAILED(); - LOG(L_ERR, "ERROR: tcp_blocking_connect %s: (%d) %s\n", - su2a((union sockaddr_union*)servaddr, addrlen), - errno, strerror(errno)); - goto error; + goto error_errno; } }else goto end; @@ -602,10 +560,54 @@ again: "%s\n", su2a((union sockaddr_union*)servaddr, addrlen), err, strerror(err)); - goto error; + errno=err; + goto error_errno; } } } +error_errno: + switch(errno){ + case ENETUNREACH: + case EHOSTUNREACH: +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, type, + (union sockaddr_union*)servaddr, 0); +#endif /* USE_DST_BLACKLIST */ + TCP_EV_CONNECT_UNREACHABLE(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + case ETIMEDOUT: +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, type, + (union sockaddr_union*)servaddr, 0); +#endif /* USE_DST_BLACKLIST */ + TCP_EV_CONNECT_TIMEOUT(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + case ECONNREFUSED: + case ECONNRESET: +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, type, + (union sockaddr_union*)servaddr, 0); +#endif /* USE_DST_BLACKLIST */ + TCP_EV_CONNECT_RST(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + case EAGAIN: /* not posix, but supported on linux and bsd */ + TCP_EV_CONNECT_NO_MORE_PORTS(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + default: + TCP_EV_CONNECT_ERR(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + } + LOG(L_ERR, "ERROR: tcp_blocking_connect %s: (%d) %s\n", + su2a((union sockaddr_union*)servaddr, addrlen), + errno, strerror(errno)); + goto error; error_timeout: /* timeout */ #ifdef USE_DST_BLACKLIST @@ -614,11 +616,11 @@ error_timeout: (union sockaddr_union*)servaddr, 0); #endif /* USE_DST_BLACKLIST */ TCP_EV_CONNECT_TIMEOUT(0, 0, 0, (union sockaddr_union*)servaddr, type); - TCP_STATS_CONNECT_FAILED(); LOG(L_ERR, "ERROR: tcp_blocking_connect %s: timeout %d s elapsed " "from %d s\n", su2a((union sockaddr_union*)servaddr, addrlen), elapsed, cfg_get(tcp, tcp_cfg, connect_timeout_s)); error: + TCP_STATS_CONNECT_FAILED(); return -1; end: return 0; @@ -963,6 +965,8 @@ again: else if (errno!=EAGAIN && errno!=EWOULDBLOCK){ LOG(L_ERR, "tcp_blocking_write: failed to send: (%d) %s\n", errno, strerror(errno)); + TCP_EV_SEND_TIMEOUT(errno, &c->rcv); + TCP_STATS_SEND_TIMEOUT(); goto error; } }else if (n<len){