libt2n: (gerd) refactored connection classes

[libt2n] / src / socket_server.cpp

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index 6ef9317..df9da5d 100644 (file)
--- a/src/socket_server.cpp
+++ b/src/socket_server.cpp
@@ -33,6 +33,8 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include <sstream>
+
 #include "socket_server.hxx"
 #include "t2n_exception.hxx"
 
@@ -42,16 +44,14 @@ namespace libt2n
 {
 
 socket_server::socket_server(int port, const char* ip)
-    : server()
+    : 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()
+    : server(), socket_handler(0,unix_s)
 {
-    socket_type=unix_s;
     unix_path=path;
 
     /* Create the socket. */
@@ -130,78 +130,41 @@ 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)
+socket_server::~socket_server()
 {
-    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);
-    }
+    if (get_type()==unix_s)
+        unlink(unix_path.c_str());
+}
 
-    /* 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);
-    }
+void socket_server::new_connection()
+{
+    struct sockaddr_un clientname;
 
-    /* close on exec */
-    int fdflags;
-    fdflags=fcntl(sock,F_GETFD, 0);
-    if (fdflags < 0)
+    unsigned int size = sizeof (clientname);
+    int newsock = accept (sock,(struct sockaddr *) &clientname,&size);
+    if (newsock < 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);
-    }
+        if (errno == EAGAIN)
+        {
+            log(error, "accept error (EAGAIN): no connection waiting");
+            return;
+        }
 
-    /* non-blocking mode */
-    int flflags;
-    flflags=fcntl(sock,F_GETFL,0);
-    if (flflags < 0)
-    {
-        string err="fcntl error on socket: ";
+        /* default: break */
+        string err="error accepting connection: ";
         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);
+    FD_SET (newsock, &connection_set);
 
-    if (socket_type==unix_s)
-        unlink(unix_path.c_str());
-}
+    socket_server_connection *nc=new socket_server_connection(newsock, get_type(), get_default_timeout());
+    nc->set_socket_options(newsock);
 
-void socket_server::new_connection()
-{
+    add_connection(nc);
 
+    return;
 }
 
 void socket_server::fill_buffer(long long usec_timeout)
@@ -258,25 +221,31 @@ void socket_server::fill_buffer(long long usec_timeout)
     return;
 }
 
-socket_connection::socket_connection(int _socket, int _timeout)
-    : connection(_timeout)
+void socket_server::fill_connection_buffers()
 {
-
+    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();
 }
 
-void socket_connection::close()
+void socket_server::remove_connection_socket(int sock)
 {
-
+    FD_CLR(sock, &connection_set);
 }
 
-void socket_connection::fill_buffer(void)
-{
-
-}
-
-void socket_connection::write(const std::string& data)
+void socket_server_connection::close()
 {
+    if (!is_closed())
+    {
+        socket_handler::close();
+        server_connection::close();
+    }
 
+    if (my_server)
+    {
+        dynamic_cast<socket_server*>(my_server)->remove_connection_socket(sock);
+    }
 }
 
 }