X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.cpp;h=372960a4273428a9a867e60ddc93e597cbde44ab;hp=6ef93177413fa0d5324eaf35eeaffb71002bab34;hb=644c4d262aab14ee4ec1cfade83a2e99568098d3;hpb=0cf4dc9bf7fa527751fd7dc425f882fc86888132 diff --git a/src/socket_server.cpp b/src/socket_server.cpp index 6ef9317..372960a 100644 --- a/src/socket_server.cpp +++ b/src/socket_server.cpp @@ -33,6 +33,8 @@ #include #include +#include + #include "socket_server.hxx" #include "t2n_exception.hxx" @@ -41,17 +43,15 @@ using namespace std; namespace libt2n { -socket_server::socket_server(int port, const char* ip) - : server() +socket_server::socket_server(int port, const std::string& ip) + : server(), socket_handler(0,tcp_s) { - socket_type=tcp_s; - + // TODO } -socket_server::socket_server(const char* path, mode_t filemode, const char* user, const char* group) - : server() +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) { - socket_type=unix_s; unix_path=path; /* Create the socket. */ @@ -91,30 +91,35 @@ socket_server::socket_server(const char* path, mode_t filemode, const char* user throw t2n_server_error(err); } - struct passwd *socket_user = getpwnam (user); - if (socket_user == NULL) - { - string err="error getting socket user: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - - struct group *socket_group = getgrnam (group); - if (socket_group == NULL) + if (!user.empty() && !group.empty()) { - string err="error getting socket group: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + // TODO maybe use current user/group if one of them is empty - 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); + 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); + } + + 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); + } } if (listen (sock, 5) < 0) @@ -130,78 +135,43 @@ socket_server::socket_server(const char* path, mode_t filemode, const char* user FD_SET (sock, &connection_set); } -void socket_server::set_socket_options(int sock) +socket_server::~socket_server() { - int i=1; + socket_handler::close(); - /* fast reuse enable */ - if (setsockopt(sock,SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)) < 0) - { - string err="error setting socket option: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + if (get_type()==unix_s) + unlink(unix_path.c_str()); +} - /* keepalive enable */ - if (setsockopt(sock,SOL_SOCKET, SO_KEEPALIVE, &i, sizeof(i)) < 0) - { - string err="error setting socket option: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } +void socket_server::new_connection() +{ + struct sockaddr_un clientname; - /* close on exec */ - int fdflags; - fdflags=fcntl(sock,F_GETFD, 0); - if (fdflags < 0) - { - string err="fcntl error on socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - fdflags |= FD_CLOEXEC; - if (fcntl(sock,F_SETFD,fdflags) < 0) + unsigned int size = sizeof (clientname); + int newsock = accept (sock,(struct sockaddr *) &clientname,&size); + if (newsock < 0) { - string err="fcntl error on socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + if (errno == EAGAIN) + { + log(error, "accept error (EAGAIN): no connection waiting"); + return; + } - /* non-blocking mode */ - int flflags; - flflags=fcntl(sock,F_GETFL,0); - if (flflags < 0) - { - string err="fcntl error on socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - flflags |= O_NONBLOCK; - if (fcntl(sock,F_SETFL,flflags) < 0) - { - string err="fcntl error on socket: "; + /* default: break */ + string err="error accepting connection: "; err+=strerror(errno); log(error, err); throw t2n_server_error(err); } -} -socket_server::~socket_server() -{ - close(sock); + FD_SET (newsock, &connection_set); - if (socket_type==unix_s) - unlink(unix_path.c_str()); -} + socket_server_connection *nc=new socket_server_connection(newsock, get_type(), get_default_timeout()); + nc->set_socket_options(newsock); -void socket_server::new_connection() -{ + add_connection(nc); + return; } void socket_server::fill_buffer(long long usec_timeout) @@ -258,25 +228,41 @@ void socket_server::fill_buffer(long long usec_timeout) return; } -socket_connection::socket_connection(int _socket, int _timeout) - : connection(_timeout) +void socket_server::fill_connection_buffers() { - + 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(); } -void socket_connection::close() +void socket_server::remove_connection_socket(int sock) { - + FD_CLR(sock, &connection_set); } -void socket_connection::fill_buffer(void) +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()); + } } -void socket_connection::write(const std::string& data) +void socket_server_connection::close() { + if (!server_connection::is_closed()) + { + socket_handler::close(); + server_connection::close(); + } + if (my_server) + { + dynamic_cast(my_server)->remove_connection_socket(sock); + } } }