#include "socket_server.hxx"
#include "t2n_exception.hxx"
+#include "log.hxx"
using namespace std;
/* 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);
- }
+ EXCEPTIONSTREAM(error,t2n_server_error,"error opening socket: " << strerror(errno));
set_socket_options(sock);
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);
- }
+ EXCEPTIONSTREAM(error,t2n_server_error,"failed listening on invalid ip " << ip);
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);
- }
+ EXCEPTIONSTREAM(error,t2n_server_error,"error binding socket: " << strerror(errno));
start_listening();
}
/* 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));
if (!user.empty() && !group.empty())
{
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);
- }
-
+ EXCEPTIONSTREAM(error,t2n_server_error,"error getting socket group: " << 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);
- }
+ EXCEPTIONSTREAM(error,t2n_server_error,"error changing socket ownership: " << strerror(errno));
}
start_listening();
void socket_server::start_listening()
{
if (listen (sock, 5) < 0)
- {
- string err="error listening to socket: ";
- err+=strerror(errno);
- log(error, err);
- throw t2n_server_error(err);
- }
+ 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);
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);
return;
}
-bool 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)
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->server_connection::is_closed())
- if (i->second->fill_buffer(0))
- data_found=true;
+ {
+ // 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;
}
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()
{