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

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index df9da5d..87025d8 100644
--- a/src/socket_server.cpp
+++ b/src/socket_server.cpp
@@ -43,13 +43,23 @@ 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
 }
 
-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;
@@ -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) 
+    if (!user.empty() && !group.empty())
     {
-        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) 
-    {
-        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)
@@ -132,6 +147,8 @@ socket_server::socket_server(const char* path, mode_t filemode, const char* user
 
 socket_server::~socket_server()
 {
+    socket_handler::close();
+
     if (get_type()==unix_s)
         unlink(unix_path.c_str());
 }
@@ -167,7 +184,7 @@ void socket_server::new_connection()
     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;
 
@@ -215,18 +232,23 @@ 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;
 }
 
-void socket_server::fill_connection_buffers()
+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;
 }
 
 void socket_server::remove_connection_socket(int sock)
@@ -234,9 +256,19 @@ 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_server_connection::close()
 {
-    if (!is_closed())
+    if (!server_connection::is_closed())
     {
         socket_handler::close();
         server_connection::close();