#include "socket_server.hxx"
#include "t2n_exception.hxx"
+#include "log.hxx"
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)
+ 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();
}
-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;
/* 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);
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));
- 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)
+ EXCEPTIONSTREAM(error,t2n_server_error,"error getting socket user: " << strerror(errno));
- 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 group *socket_group = getgrnam (group.c_str());
+ if (socket_group == NULL)
+ 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()
{
+ 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)
+ 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;
{
if (errno == EAGAIN)
{
- log(error, "accept error (EAGAIN): no connection waiting");
+ LOGSTREAM(error,"accept error (EAGAIN): no connection waiting");
return;
}
/* default: break */
- string err="error accepting connection: ";
- err+=strerror(errno);
- log(error, err);
- throw t2n_server_error(err);
+ EXCEPTIONSTREAM(error,t2n_server_error,"error accepting connection: " << strerror(errno));
}
FD_SET (newsock, &connection_set);
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;
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)
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)
}
// 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<unsigned int, server_connection*>::iterator ie=connections.end();
for(std::map<unsigned int, server_connection*>::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);
}
+/// 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();
git://developer.intra2net.com / libt2n / blobdiff