X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_client.cpp;h=1f5dccf63904251f2c273287d40bd16355c5864d;hp=067b033eca8504feeb96a1ba6522f325bb3d1b97;hb=1758a7fbd1e36bc9d729a69ebae3ae8c70b48433;hpb=91730468439e21dcf8d275d0f70d803c20ccaa7c diff --git a/src/socket_client.cpp b/src/socket_client.cpp index 067b033..1f5dccf 100644 --- a/src/socket_client.cpp +++ b/src/socket_client.cpp @@ -37,80 +37,174 @@ #include "socket_client.hxx" #include "t2n_exception.hxx" +#include "log.hxx" using namespace std; namespace libt2n { -socket_client_connection::socket_client_connection(const std::string& _server, int _port, int _max_retries) +socket_client_connection::socket_client_connection(int _port, const std::string& _server, + long long _connect_timeout_usec, int _max_retries, + std::ostream *_logstream, log_level_values _log_level) : client_connection(), socket_handler(0,tcp_s) { max_retries=_max_retries; + connect_timeout_usec=_connect_timeout_usec; server=_server; port=_port; - connect(); + set_logging(_logstream,_log_level); + + tcp_connect(max_retries); + + do_callbacks(new_connection); } -socket_client_connection::socket_client_connection(const std::string& _path, int _max_retries) +socket_client_connection::socket_client_connection(const std::string& _path, + long long _connect_timeout_usec, int _max_retries, + std::ostream *_logstream, log_level_values _log_level) : client_connection(), socket_handler(0,unix_s) { max_retries=_max_retries; + connect_timeout_usec=_connect_timeout_usec; path=_path; - connect(); + set_logging(_logstream,_log_level); + + unix_connect(max_retries); + + do_callbacks(new_connection); } -void socket_client_connection::connect() +void socket_client_connection::tcp_connect(int max_retries) { - if (get_type() == unix_s) + struct sockaddr_in sock_addr; + + sock_addr.sin_family = AF_INET; + sock_addr.sin_port = htons(port); + + // find the target ip + if (inet_aton(server.c_str(),&sock_addr.sin_addr)==0) { - struct sockaddr_un unix_addr; + struct hostent *server_hent; + server_hent=gethostbyname(server.c_str()); + if (server_hent == NULL) + throw t2n_connect_error(string("can't find server ")+server); - unix_addr.sun_family = AF_UNIX; - strcpy (unix_addr.sun_path, path.c_str()); + memcpy(&sock_addr.sin_addr,server_hent->h_addr_list[0],sizeof(sock_addr.sin_addr)); + } - sock = socket(PF_UNIX, SOCK_STREAM, 0); - if (!sock) - throw t2n_connect_error(string("socket() error: ")+strerror(errno)); + sock = socket(PF_INET, SOCK_STREAM, 0); + if (!sock) + throw t2n_connect_error(string("socket() error: ")+strerror(errno)); - if (::connect(sock,(struct sockaddr *) &unix_addr, sizeof(unix_addr))) - throw t2n_connect_error(string("connect() error: ")+strerror(errno)); + try + { + connect_with_timeout((struct sockaddr *) &sock_addr,sizeof(sock_addr)); } - else if (get_type() == tcp_s) + catch (t2n_connect_error &e) { - struct sockaddr_in sock_addr; + // recurse if retries left + if (max_retries > 0) + { + LOGSTREAM(debug,"retrying connect after connect error"); + tcp_connect(max_retries-1); + } + else + LOGSTREAM(debug,"no more retries left after connect error"); + } +} - sock_addr.sin_family = AF_INET; - sock_addr.sin_port = htons(port); +void socket_client_connection::unix_connect(int max_retries) +{ + struct sockaddr_un unix_addr; - // find the target ip - if (inet_aton(server.c_str(),&sock_addr.sin_addr)==0) - { - struct hostent *server_hent; - server_hent=gethostbyname(server.c_str()); - if (server_hent == NULL) - throw t2n_connect_error(string("can't find server ")+server); + unix_addr.sun_family = AF_UNIX; + strcpy (unix_addr.sun_path, path.c_str()); + + sock = socket(PF_UNIX, SOCK_STREAM, 0); + if (!sock) + throw t2n_connect_error(string("socket() error: ")+strerror(errno)); - memcpy(&sock_addr.sin_addr,server_hent->h_addr_list[0],sizeof(sock_addr.sin_addr)); + try + { + connect_with_timeout((struct sockaddr *) &unix_addr, sizeof(unix_addr)); + } + catch (t2n_connect_error &e) + { + // recurse if retries left + if (max_retries > 0) + { + LOGSTREAM(debug,"retrying connect after connect error"); + unix_connect(max_retries-1); } + else + LOGSTREAM(debug,"no more retries left after connect error"); + } +} + +void socket_client_connection::connect_with_timeout(struct sockaddr *sock_addr,unsigned int sockaddr_size) +{ + set_socket_options(sock); - sock = socket(PF_INET, SOCK_STREAM, 0); - if (!sock) - throw t2n_connect_error(string("socket() error: ")+strerror(errno)); + LOGSTREAM(debug,"connect_with_timeout()"); + int ret=::connect(sock,sock_addr, sockaddr_size); - if (::connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr))) + if (ret < 0) + { + if (errno==EINPROGRESS) + { + LOGSTREAM(debug,"connect_with_timeout(): EINPROGRESS"); + + /* set timeout */ + struct timeval tval; + struct timeval *timeout_ptr; + + if (connect_timeout_usec == -1) + timeout_ptr = NULL; + else + { + timeout_ptr = &tval; + + // convert timeout from long long usec to int sec + int usec + tval.tv_sec = connect_timeout_usec / 1000000; + tval.tv_usec = connect_timeout_usec % 1000000; + } + + fd_set connect_socket_set; + FD_ZERO(&connect_socket_set); + FD_SET(sock,&connect_socket_set); + + int ret; + while ((ret=select(FD_SETSIZE, NULL, &connect_socket_set, NULL, timeout_ptr)) && + ret < 0 && errno==EINTR); + + if (ret < 0) + { + LOGSTREAM(debug,"connect_with_timeout(): select error: " << strerror(errno)); + throw t2n_connect_error(string("connect() error (select): ")+strerror(errno)); + } + + socklen_t sopt=sizeof(int); + int valopt; + ret=getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*)(&valopt), &sopt); + if (ret < 0 || valopt) + { + LOGSTREAM(debug,"connect_with_timeout(): getsockopt error: " << strerror(errno)); + throw t2n_connect_error(string("connect() error (getsockopt): ")+strerror(errno)); + } + } + else + { + LOGSTREAM(debug,"connect_with_timeout(): error: " << strerror(errno)); throw t2n_connect_error(string("connect() error: ")+strerror(errno)); + } } - else - throw t2n_connect_error(string("invalid connection type")); - - set_socket_options(sock); - do_callbacks(new_connection); + LOGSTREAM(debug,"connect_with_timeout(): success"); } void socket_client_connection::close() @@ -122,4 +216,28 @@ void socket_client_connection::close() } } +/** @brief try to reconnect the current connection with the same connection credentials (host and port or path) +*/ +void socket_client_connection::reconnect() +{ + LOGSTREAM(debug,"reconnect()"); + + // close the current connection if still open + close(); + + socket_type_value type=get_type(); + + if (type == tcp_s) + tcp_connect(max_retries); + else if (type == unix_s) + unix_connect(max_retries); + + LOGSTREAM(debug,"reconnect(): basic connection established"); + + reopen(); + + LOGSTREAM(debug,"reconnect() done, client_connection::is_closed() now " << client_connection::is_closed()); + +} + }