X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.cpp;h=87025d8718197f60e5b7511b1e989ad9c39f3ab0;hp=f0e573b3101e8c6e36133f10b5032116b1d2e29f;hb=9424729586fdb0aabb671d2f1266bdb07e0bed38;hpb=aa499d2034964a4c125794b7e8ea768cb7471411 diff --git a/src/socket_server.cpp b/src/socket_server.cpp index f0e573b..87025d8 100644 --- a/src/socket_server.cpp +++ b/src/socket_server.cpp @@ -43,17 +43,25 @@ using namespace std; namespace libt2n { -socket_server::socket_server(int port, const char* ip) - : server() +/** @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) { - socket_type=tcp_s; - + // TODO } -socket_server::socket_server(const char* path, mode_t filemode, const char* user, const char* group) - : server() +/** @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) { - socket_type=unix_s; unix_path=path; /* Create the socket. */ @@ -93,30 +101,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) + if (!user.empty() && !group.empty()) { - string err="error getting socket user: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + // TODO maybe use current user/group if one of them is empty - struct group *socket_group = getgrnam (group); - 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); + 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) @@ -132,72 +145,11 @@ 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) -{ - int i=1; - - /* 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); - } - - /* 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); - } - - /* 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) - { - string err="fcntl error on socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - - /* 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: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } -} - socket_server::~socket_server() { - close(sock); + socket_handler::close(); - if (socket_type==unix_s) + if (get_type()==unix_s) unlink(unix_path.c_str()); } @@ -224,61 +176,15 @@ void socket_server::new_connection() FD_SET (newsock, &connection_set); - int i=1; - - /* keepalive enable */ - if (setsockopt(newsock,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); - } - - /* close on exec */ - int fdflags; - fdflags=fcntl(newsock,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(newsock,F_SETFD,fdflags) < 0) - { - string err="fcntl error on socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } + socket_server_connection *nc=new socket_server_connection(newsock, get_type(), get_default_timeout()); + nc->set_socket_options(newsock); - /* non-blocking mode */ - int flflags; - flflags=fcntl(newsock,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(newsock,F_SETFL,flflags) < 0) - { - string err="fcntl error on socket: "; - err+=strerror(errno); - log(error, err); - throw t2n_server_error(err); - } - - add_connection(new socket_connection(newsock, get_default_timeout())); + add_connection(nc); return; } -void socket_server::fill_buffer(long long usec_timeout) +bool socket_server::fill_buffer(long long usec_timeout) { fd_set used_fdset=connection_set; @@ -326,152 +232,52 @@ 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() +bool socket_server::fill_connection_buffers() { - std::map::iterator ie=connections.end(); - for(std::map::iterator i=connections.begin(); i != ie; i++) - if (!i->second->is_closed()) - { - socket_connection* cp=dynamic_cast(i->second); - cp->fill_buffer(connection_set); - } -} + bool data_found; -socket_connection::socket_connection(int _sock, int _timeout) - : connection(_timeout) -{ - sock=_sock; + std::map::iterator ie=connections.end(); + for(std::map::iterator i=connections.begin(); i != ie; i++) + if (!i->second->server_connection::is_closed()) + if (i->second->fill_buffer(0)) + data_found=true; + + return data_found; } -void socket_connection::close() +void socket_server::remove_connection_socket(int sock) { - + FD_CLR(sock, &connection_set); } -void socket_connection::fill_buffer(fd_set &cur_fdset) +void socket_server_connection::log(log_level_values level, const char* message) { - bool try_again=false; - - if (is_closed() || !FD_ISSET (sock, &cur_fdset)) - return; // no data pending or connection closed - - // data pending -> go and get it - char socket_buffer[recv_buffer_size]; - - int nbytes = read (sock, socket_buffer, recv_buffer_size); - if (nbytes < 0) + if(my_server) { - if (errno == EAGAIN) - { - if (my_server) - my_server->log(server::error,"read error: no data (EAGAIN) for connection "+get_id_string()); - return; - } - else if (errno == EINTR) - { - // interrupted, try again - try_again=true; - } - else - { - if (my_server) - my_server->log(server::error,"error reading from socket of connection "+get_id_string()+": "+strerror(errno)); - return; - } - } - - // End-of-file - if (nbytes == 0 && !try_again) - { - close(); - return; - } - - // Data read -> store it - if (nbytes > 0) - buffer.assign(socket_buffer,nbytes); - - // more data waiting? - fd_set active_fd_set; - struct timeval tval; - - FD_ZERO (&active_fd_set); - FD_SET (sock, &active_fd_set); - - /* no waiting */ - tval.tv_sec=0; - tval.tv_usec=0; - - if (select (FD_SETSIZE, &active_fd_set, NULL, NULL, &tval) >0) - { - /* more data waiting -> recurse */ - fill_buffer(active_fd_set); + ostringstream msg; + msg << "connection id " << get_id() << ": " << message; + my_server->log(level,msg.str().c_str()); } - - reset_timeout(); - - return; } -void socket_connection::write(const std::string& data) +void socket_server_connection::close() { - static const unsigned int write_block_size=4096; - - if (is_closed()) - return; - - // prepend packet size to data - packet_size_indicator psize=data.size(); - string send_data(data); - send_data.insert(0,(char*)psize,sizeof(packet_size_indicator)); - - int offset = 0; - while (offset < send_data.size()) + if (!server_connection::is_closed()) { - unsigned int write_size=write_block_size; - - if (offset+write_size > send_data.size()) - write_size = send_data.size()-offset; - - int rtn; - while ((rtn=::write(sock, send_data.data()+offset, write_size)) && - rtn == -1 && (errno == EAGAIN || errno == EINTR)) - { - usleep (80000); - if (my_server) - my_server->log(server::debug,"resuming write() call after EAGAIN or EINTR for connection "+get_id_string()); - } - - if (rtn == -1) - { - if (my_server) - my_server->log(server::error,"write() error on connection "+get_id_string()+": "+strerror(errno)); - } - else if (rtn != write_size) - { - if (my_server) - { - ostringstream msg; - msg << "write() error on connection " << get_id() - << ": wrote " << rtn << " bytes, should have been " - << write_size << " (complete: " << send_data.size() << ")"; - - my_server->log(server::error,msg.str()); - } - } - - offset += write_size; + socket_handler::close(); + server_connection::close(); } - reset_timeout(); - - return; + if (my_server) + { + dynamic_cast(my_server)->remove_connection_socket(sock); + } } }