libt2n: (gerd) fixes, new logging concept (not working yet)

[libt2n] / src / socket_server.cpp

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index 87025d8..38c2ea9 100644 (file)
--- a/src/socket_server.cpp
+++ b/src/socket_server.cpp
@@ -37,6 +37,7 @@
 
 #include "socket_server.hxx"
 #include "t2n_exception.hxx"
+#include "log.hxx"
 
 using namespace std;
 
@@ -50,7 +51,25 @@ namespace libt2n
 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();
 }
 
 /** @brief create a new unix-socked-based server
@@ -67,12 +86,7 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std
     /* 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);
 
@@ -85,21 +99,11 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std
     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())
     {
@@ -107,42 +111,17 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std
 
         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);
-        }
-    
-        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 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()
@@ -153,6 +132,18 @@ socket_server::~socket_server()
         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;
@@ -163,15 +154,12 @@ void socket_server::new_connection()
     {
         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);
@@ -213,12 +201,7 @@ bool socket_server::fill_buffer(long long usec_timeout)
             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)
@@ -238,6 +221,7 @@ bool socket_server::fill_buffer(long long usec_timeout)
     return false;
 }
 
+/// call fill_buffer() on all connections, called from fill_buffer()
 bool socket_server::fill_connection_buffers()
 {
     bool data_found;
@@ -251,21 +235,13 @@ bool socket_server::fill_connection_buffers()
     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 (!server_connection::is_closed())