X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.cpp;h=b807fdd0a0ccd40086faca47dc084bdb995c7b24;hp=df9da5dbb977bd5f8ea5f6a299bd417a1bb6b63f;hb=cc68aabb16ec32278df8b071c4c9efec7e9f0dce;hpb=a11e19b7adab2d5b937573701959562f06087ac5 diff --git a/src/socket_server.cpp b/src/socket_server.cpp index df9da5d..b807fdd 100644 --- a/src/socket_server.cpp +++ b/src/socket_server.cpp @@ -43,13 +43,56 @@ using namespace std; namespace libt2n { -socket_server::socket_server(int port, const char* ip) +/** @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) + { + string err="error opening socket: "; + err+=strerror(errno); + log(error, err); + throw t2n_server_error(err); + } + + 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) + { + string err="failed listening on invalid ip "; + err+=ip; + log(error, err); + throw t2n_server_error(err); + } + + if (bind (sock, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) < 0) + { + string err="error binding socket: "; + err+=strerror(errno); + log(error, err); + throw t2n_server_error(err); + } + + start_listening(); } -socket_server::socket_server(const char* path, mode_t filemode, const char* user, const char* group) +/** @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) { unix_path=path; @@ -91,32 +134,51 @@ 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); + 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 (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); - } + start_listening(); +} + +socket_server::~socket_server() +{ + socket_handler::close(); + if (get_type()==unix_s) + 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) { string err="error listening to socket: "; @@ -130,12 +192,7 @@ socket_server::socket_server(const char* path, mode_t filemode, const char* user FD_SET (sock, &connection_set); } -socket_server::~socket_server() -{ - if (get_type()==unix_s) - unlink(unix_path.c_str()); -} - +/// handle a new connection from a client void socket_server::new_connection() { struct sockaddr_un clientname; @@ -167,7 +224,7 @@ void socket_server::new_connection() 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; @@ -215,28 +272,46 @@ 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->is_closed()) - i->second->fill_buffer(); + if (!i->second->server_connection::is_closed()) + if (i->second->fill_buffer(0)) + data_found=true; + + 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 (!is_closed()) + if (!server_connection::is_closed()) { socket_handler::close(); server_connection::close();