commit 46b39a04341eb569456469acdce5fe40104cf8a2 Author: Mathieu Desnoyers Date: Thu Jul 11 09:40:01 2013 -0400 Implement timeout for connect ipv4/ipv6 Signed-off-by: Mathieu Desnoyers diff --git a/src/common/sessiond-comm/Makefile.am b/src/common/sessiond-comm/Makefile.am index 24063f8..72375c0 100644 --- a/src/common/sessiond-comm/Makefile.am +++ b/src/common/sessiond-comm/Makefile.am @@ -6,3 +6,4 @@ noinst_LTLIBRARIES = libsessiond-comm.la libsessiond_comm_la_SOURCES = sessiond-comm.c sessiond-comm.h \ unix.c unix.h inet.c inet.h inet6.c inet6.h \ relayd.h +libsessiond_comm_la_LIBADD = -lrt diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c index b2bd65d..7212001 100644 --- a/src/common/sessiond-comm/inet.c +++ b/src/common/sessiond-comm/inet.c @@ -25,11 +25,18 @@ #include #include #include +#include +#include +#include #include #include "inet.h" +#define MSEC_PER_SEC 1000 +#define NSEC_PER_MSEC 1000000 +#define RECONNECT_DELAY 200 /* ms */ + /* * INET protocol operations. */ @@ -91,6 +98,94 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock) return ret; } +static +int connect_no_timeout(struct lttcomm_sock *sock) +{ + return connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin, + sizeof(sock->sockaddr.addr.sin)); +} + +/* + * Return time_a - time_b in milliseconds. + */ +static +unsigned long time_diff_ms(struct timespec *time_a, + struct timespec *time_b) +{ + time_t sec_diff; + long nsec_diff; + unsigned long result_ms; + + sec_diff = time_a->tv_sec - time_b->tv_sec; + nsec_diff = time_a->tv_nsec - time_b->tv_nsec; + + result_ms = sec_diff * MSEC_PER_SEC; + result_ms += nsec_diff / NSEC_PER_MSEC; + return result_ms; +} + +static +int connect_with_timeout(struct lttcomm_sock *sock) +{ + unsigned long timeout = lttcomm_get_network_timeout(); + int ret, flags, connect_ret; + struct timespec orig_time, cur_time; + + ret = fcntl(sock->fd, F_GETFL, 0); + if (ret == -1) { + PERROR("fcntl"); + return -1; + } + flags = ret; + + /* Set socket to nonblock */ + ret = fcntl(sock->fd, F_SETFL, flags | O_NONBLOCK); + if (ret == -1) { + PERROR("fcntl"); + return -1; + } + + ret = clock_gettime(CLOCK_MONOTONIC, &orig_time); + if (ret == -1) { + PERROR("clock_gettime"); + return -1; + } + do { + connect_ret = connect(sock->fd, + (struct sockaddr *) &sock->sockaddr.addr.sin, + sizeof(sock->sockaddr.addr.sin)); + if (connect_ret == -1 && errno != EAGAIN + && errno != EWOULDBLOCK + && errno != EINPROGRESS) { + goto error; + } else if (!connect_ret) { + /* Connect succeeded */ + goto success; + } + + (void) poll(NULL, 0, RECONNECT_DELAY); + ret = clock_gettime(CLOCK_MONOTONIC, &cur_time); + if (ret == -1) { + PERROR("clock_gettime"); + return -1; + } + } while (time_diff_ms(&cur_time, &orig_time) < timeout); + + /* Timeout */ + errno = ETIMEDOUT; + connect_ret = -1; + +success: + /* Restore initial flags */ + ret = fcntl(sock->fd, F_SETFL, flags); + if (ret == -1) { + PERROR("fcntl"); + /* Continue anyway */ + } +error: + return connect_ret; +} + /* * Connect PF_INET socket. */ @@ -99,8 +194,11 @@ int lttcomm_connect_inet_sock(struct lttcomm_sock *sock) { int ret, closeret; - ret = connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin, - sizeof(sock->sockaddr.addr.sin)); + if (lttcomm_get_network_timeout()) { + ret = connect_with_timeout(sock); + } else { + ret = connect_no_timeout(sock); + } if (ret < 0) { PERROR("connect"); goto error_connect; diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c index 8d88374..3c1c970 100644 --- a/src/common/sessiond-comm/inet6.c +++ b/src/common/sessiond-comm/inet6.c @@ -25,11 +25,18 @@ #include #include #include +#include +#include +#include #include #include "inet6.h" +#define MSEC_PER_SEC 1000 +#define NSEC_PER_MSEC 1000000 +#define RECONNECT_DELAY 200 /* ms */ + /* * INET protocol operations. */ @@ -91,6 +98,95 @@ int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock) return ret; } +static +int connect_no_timeout(struct lttcomm_sock *sock) +{ + return connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin6, + sizeof(sock->sockaddr.addr.sin6)); +} + +/* + * Return time_a - time_b in milliseconds. + */ +static +unsigned long time_diff_ms(struct timespec *time_a, + struct timespec *time_b) +{ + time_t sec_diff; + long nsec_diff; + unsigned long result_ms; + + sec_diff = time_a->tv_sec - time_b->tv_sec; + nsec_diff = time_a->tv_nsec - time_b->tv_nsec; + + result_ms = sec_diff * MSEC_PER_SEC; + result_ms += nsec_diff / NSEC_PER_MSEC; + return result_ms; +} + +static +int connect_with_timeout(struct lttcomm_sock *sock) +{ + unsigned long timeout = lttcomm_get_network_timeout(); + int ret, flags, connect_ret; + struct timespec orig_time, cur_time; + + ret = fcntl(sock->fd, F_GETFL, 0); + if (ret == -1) { + PERROR("fcntl"); + return -1; + } + flags = ret; + + /* Set socket to nonblock */ + ret = fcntl(sock->fd, F_SETFL, flags | O_NONBLOCK); + if (ret == -1) { + PERROR("fcntl"); + return -1; + } + + ret = clock_gettime(CLOCK_MONOTONIC, &orig_time); + if (ret == -1) { + PERROR("clock_gettime"); + return -1; + } + do { + + connect_ret = connect(sock->fd, + (struct sockaddr *) &sock->sockaddr.addr.sin6, + sizeof(sock->sockaddr.addr.sin6)); + if (connect_ret == -1 && errno != EAGAIN + && errno != EWOULDBLOCK + && errno != EINPROGRESS) { + goto error; + } else if (!connect_ret) { + /* Connect succeeded */ + goto success; + } + + (void) poll(NULL, 0, RECONNECT_DELAY); + ret = clock_gettime(CLOCK_MONOTONIC, &cur_time); + if (ret == -1) { + PERROR("clock_gettime"); + return -1; + } + } while (time_diff_ms(&cur_time, &orig_time) < timeout); + + /* Timeout */ + errno = ETIMEDOUT; + connect_ret = -1; + +success: + /* Restore initial flags */ + ret = fcntl(sock->fd, F_SETFL, flags); + if (ret == -1) { + PERROR("fcntl"); + /* Continue anyway */ + } +error: + return connect_ret; +} + /* * Connect PF_INET socket. */ @@ -99,8 +195,11 @@ int lttcomm_connect_inet6_sock(struct lttcomm_sock *sock) { int ret, closeret; - ret = connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin6, - sizeof(sock->sockaddr.addr.sin6)); + if (lttcomm_get_network_timeout()) { + ret = connect_with_timeout(sock); + } else { + ret = connect_no_timeout(sock); + } if (ret < 0) { PERROR("connect inet6"); goto error_connect;