X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.cpp;h=1fc99d83e0e1e612c8a5e6fcc1a8d1f48db4736a;hp=372960a4273428a9a867e60ddc93e597cbde44ab;hb=c7857475c8b0f02cac3ce29a617a4d542fa59f37;hpb=644c4d262aab14ee4ec1cfade83a2e99568098d3 diff --git a/src/socket_server.cpp b/src/socket_server.cpp index 372960a..1fc99d8 100644 --- a/src/socket_server.cpp +++ b/src/socket_server.cpp @@ -37,18 +37,47 @@ #include "socket_server.hxx" #include "t2n_exception.hxx" +#include "log.hxx" using namespace std; namespace libt2n { +/** @brief create a new tcp-based server + @param port tcp port you want to listen on + @param ip the local ip you want to listen on. "0.0.0.0" means all local ips (default). +*/ socket_server::socket_server(int port, const std::string& ip) : server(), socket_handler(0,tcp_s) { - // TODO + /* Create the socket. */ + sock = socket (PF_INET, SOCK_STREAM, 0); + if (sock < 0) + EXCEPTIONSTREAM(error,t2n_server_error,"error opening socket: " << strerror(errno)); + + set_socket_options(sock); + + /* Give the socket a name. */ + struct sockaddr_in sockaddr; + sockaddr.sin_family = AF_INET; + sockaddr.sin_port = htons(port); + + if (inet_aton(ip.c_str(),&sockaddr.sin_addr) == 0) + EXCEPTIONSTREAM(error,t2n_server_error,"failed listening on invalid ip " << ip); + + if (bind (sock, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) < 0) + EXCEPTIONSTREAM(error,t2n_server_error,"error binding socket: " << strerror(errno)); + + start_listening(); } +/** @brief create a new unix-socked-based server + @param path path of the socket + @param filemode permissions you want to open the socket with + @param user local username for the socket + @param group local groupname for the socket +*/ socket_server::socket_server(const std::string& path, mode_t filemode, const std::string& user, const std::string& group) : server(), socket_handler(0,unix_s) { @@ -57,12 +86,7 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std /* Create the socket. */ sock = socket (PF_UNIX, SOCK_STREAM, 0); if (sock < 0) - { - string err="error opening socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + EXCEPTIONSTREAM(error,t2n_server_error,"error opening socket: " << strerror(errno)); set_socket_options(sock); @@ -75,21 +99,11 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std unlink (unix_name.sun_path); if (bind (sock, (struct sockaddr *) &unix_name, sizeof (unix_name)) < 0) - { - string err="error binding socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + EXCEPTIONSTREAM(error,t2n_server_error,"error binding socket: " << strerror(errno)); /* change permissions */ if (chmod (unix_name.sun_path, filemode) != 0) - { - string err="error changing permission: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + EXCEPTIONSTREAM(error,t2n_server_error,"error changing permission: " << strerror(errno)); if (!user.empty() && !group.empty()) { @@ -97,42 +111,17 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std struct passwd *socket_user = getpwnam (user.c_str()); if (socket_user == NULL) - { - string err="error getting socket user: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - + EXCEPTIONSTREAM(error,t2n_server_error,"error getting socket user: " << strerror(errno)); + struct group *socket_group = getgrnam (group.c_str()); if (socket_group == NULL) - { - string err="error getting socket group: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - - if (chown (unix_name.sun_path, socket_user->pw_uid, socket_group->gr_gid) != 0) - { - string err="error changing socket ownership: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - } + EXCEPTIONSTREAM(error,t2n_server_error,"error getting socket group: " << strerror(errno)); - if (listen (sock, 5) < 0) - { - string err="error listening to socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); + if (chown (unix_name.sun_path, socket_user->pw_uid, socket_group->gr_gid) != 0) + EXCEPTIONSTREAM(error,t2n_server_error,"error changing socket ownership: " << strerror(errno)); } - /* clear & insert server sock into the fd_tab to prepare select */ - FD_ZERO(&connection_set); - FD_SET (sock, &connection_set); + start_listening(); } socket_server::~socket_server() @@ -143,6 +132,18 @@ socket_server::~socket_server() unlink(unix_path.c_str()); } +/// start listening on a new server socket (called by the constructors) +void socket_server::start_listening() +{ + if (listen (sock, 5) < 0) + EXCEPTIONSTREAM(error,t2n_server_error,"error listening to socket: " << strerror(errno)); + + /* clear & insert server sock into the fd_tab to prepare select */ + FD_ZERO(&connection_set); + FD_SET (sock, &connection_set); +} + +/// handle a new connection from a client void socket_server::new_connection() { struct sockaddr_un clientname; @@ -151,17 +152,17 @@ void socket_server::new_connection() int newsock = accept (sock,(struct sockaddr *) &clientname,&size); if (newsock < 0) { - if (errno == EAGAIN) + // return on non-fatal errors (list taken from man-page) + if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EINTR || + errno == EMFILE || errno == ENFILE || errno == ENOBUFS || errno == ENOMEM || + errno == EPROTO || errno == EPERM || errno == ETIMEDOUT) { - log(error, "accept error (EAGAIN): no connection waiting"); + LOGSTREAM(error,"non-fatal accept error: " << strerror(errno)); return; } - /* default: break */ - string err="error accepting connection: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); + /* fatal error: will usually kill or restart the server */ + EXCEPTIONSTREAM(error,t2n_server_error,"fatal error accepting connection: " << strerror(errno)); } FD_SET (newsock, &connection_set); @@ -174,7 +175,16 @@ void socket_server::new_connection() return; } -void socket_server::fill_buffer(long long usec_timeout) +/** @brief look for new connections and new data in any of the existing connections + @param usec_timeout wait until new data is found, max timeout usecs. + -1: wait endless + 0: return instantly + @param usec_timeout_remaining if non-NULL the function will write the + not used time to the given target + @retval true if new data was found (does not mean that the received data + is a complete packet though) +*/ +bool socket_server::fill_buffer(long long usec_timeout,long long* usec_timeout_remaining) { fd_set used_fdset=connection_set; @@ -195,6 +205,10 @@ void socket_server::fill_buffer(long long usec_timeout) int ret=select (FD_SETSIZE, &used_fdset, NULL, NULL, timeout_ptr); + // return the timeout we did not use + if (usec_timeout > 0 && usec_timeout_remaining != NULL) + *usec_timeout_remaining=(tval.tv_sec*1000000)+tval.tv_usec; + if (ret < 0) { if (errno == EINTR) @@ -203,12 +217,7 @@ void socket_server::fill_buffer(long long usec_timeout) ret=0; } else - { - string err="select error: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + EXCEPTIONSTREAM(error,t2n_server_error,"select error: " << strerror(errno)); } if (ret > 0) @@ -222,35 +231,43 @@ void socket_server::fill_buffer(long long usec_timeout) } // check all connections for pending data - fill_connection_buffers(); + return fill_connection_buffers(); } - return; + return false; } -void socket_server::fill_connection_buffers() +/// call fill_buffer() on all connections, called from fill_buffer() +bool socket_server::fill_connection_buffers() { + bool data_found; + std::map::iterator ie=connections.end(); for(std::map::iterator i=connections.begin(); i != ie; i++) if (!i->second->server_connection::is_closed()) - i->second->fill_buffer(); + { + // shutdown all connections which throw exceptions to protect the server + try + { + if (i->second->fill_buffer(0)) + data_found=true; + } + catch (t2n_transfer_error &e) + { i->second->close(); } + catch(...) + { throw; } + } + + return data_found; } +/// remove the socket of a connection after the connection has been closed void socket_server::remove_connection_socket(int sock) { FD_CLR(sock, &connection_set); } -void socket_server_connection::log(log_level_values level, const char* message) -{ - if(my_server) - { - ostringstream msg; - msg << "connection id " << get_id() << ": " << message; - my_server->log(level,msg.str().c_str()); - } -} - +/// close this connection. complete data waiting in the buffer can still be retrieved. void socket_server_connection::close() { if (!server_connection::is_closed())