X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.cpp;h=87025d8718197f60e5b7511b1e989ad9c39f3ab0;hp=e9bdde001affb3f0cfef867e9892bea7c901d077;hb=9424729586fdb0aabb671d2f1266bdb07e0bed38;hpb=04e6b2712bf0fdfdb6a74cf6d26f02e6a8d37ae2

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index e9bdde0..87025d8 100644
--- 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"
 
@@ -41,17 +43,25 @@ using namespace std;
 namespace libt2n
 {
 
-socket_server::socket_server(int port, const char* ip)
-    : server()
+/** @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)
 {
-    socket_type=tcp_s;
-
+    // TODO
 }
 
-socket_server::socket_server(const char* path, mode_t filemode, const char* user, const char* group)
-    : server()
+/** @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)
 {
-    socket_type=unix_s;
     unix_path=path;
 
     /* Create the socket. */
@@ -91,30 +101,35 @@ 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) 
-    {
-        string err="error getting socket user: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_server_error(err);
-    }
-
-    struct group *socket_group = getgrnam (group);
-    if (socket_group == NULL) 
+    if (!user.empty() && !group.empty())
     {
-        string err="error getting socket group: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_server_error(err);
-    }
+        // TODO maybe use current user/group if one of them is empty
 
-    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 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 (listen (sock, 5) < 0)
@@ -130,72 +145,11 @@ 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)
-{
-    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);
-    }
-
-    /* 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);
-    }
-
-    /* close on exec */
-    int fdflags;
-    fdflags=fcntl(sock,F_GETFD, 0);
-    if (fdflags < 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);
-    }
-
-    /* non-blocking mode */
-    int flflags;
-    flflags=fcntl(sock,F_GETFL,0);
-    if (flflags < 0)
-    {
-        string err="fcntl error on socket: ";
-        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);
+    socket_handler::close();
 
-    if (socket_type==unix_s)
+    if (get_type()==unix_s)
         unlink(unix_path.c_str());
 }
 
@@ -222,61 +176,15 @@ void socket_server::new_connection()
 
     FD_SET (newsock, &connection_set);
 
-    int i=1;
+    socket_server_connection *nc=new socket_server_connection(newsock, get_type(), get_default_timeout());
+    nc->set_socket_options(newsock);
 
-    /* keepalive enable */
-    if (setsockopt(newsock,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);
-    }
-
-    /* close on exec */
-    int fdflags;
-    fdflags=fcntl(newsock,F_GETFD, 0);
-    if (fdflags < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_server_error(err);
-    }
-    fdflags |= FD_CLOEXEC;
-    if (fcntl(newsock,F_SETFD,fdflags) < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_server_error(err);
-    }
-
-    /* non-blocking mode */
-    int flflags;
-    flflags=fcntl(newsock,F_GETFL,0);
-    if (flflags < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_server_error(err);
-    }
-    flflags |= O_NONBLOCK;
-    if (fcntl(newsock,F_SETFL,flflags) < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_server_error(err);
-    }
-
-    add_connection(new socket_connection(newsock, get_default_timeout()));
+    add_connection(nc);
 
     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;
 
@@ -324,31 +232,52 @@ 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;
 }
 
-socket_connection::socket_connection(int _sock, int _timeout)
-    : connection(_timeout)
+bool socket_server::fill_connection_buffers()
 {
-    sock=_sock;
-}
+    bool data_found;
 
-void socket_connection::close()
-{
+    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;
 
+    return data_found;
 }
 
-void socket_connection::fill_buffer(void)
+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());
+    }
 }
 
-void socket_connection::write(const std::string& data)
+void socket_server_connection::close()
 {
+    if (!server_connection::is_closed())
+    {
+        socket_handler::close();
+        server_connection::close();
+    }
 
+    if (my_server)
+    {
+        dynamic_cast<socket_server*>(my_server)->remove_connection_socket(sock);
+    }
 }
 
 }