POTD skeleton #5.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

3 files changed, 37 insertions, 6 deletions

diff --git a/src/server.c b/src/server.c
index f4e49aa..60925b6 100644
--- a/src/server.c
+++ b/src/server.c
@@ -13,6 +13,7 @@ typedef struct client_thread_args {
     pthread_t self;
     int client_fd;
     struct sockaddr_in clientaddr;
+    char host_buf[NI_MAXHOST], service_buf[NI_MAXSERV];
     const server_ctx *server_ctx;
 } client_thread_args;
 
@@ -103,7 +104,7 @@ int server_mainloop_epoll(int epoll_fd, const server_ctx ctx[], size_t siz)
                     /* new client connection, accept succeeded */
                     continue;
                 }
-                D2("FD: %d/%lu , %d", events[i].data.fd, siz, n);
+                W2("Server accept client failed: [fd: %d , npoll: %d]", events[i].data.fd, n);
             }
         }
     }
@@ -116,7 +117,7 @@ static int server_accept_client(const server_ctx ctx[],
                                 size_t siz, struct epoll_event *event)
 {
     size_t i;
-    int client_fd;
+    int s, client_fd;
     struct sockaddr_in clientaddr;
 
     for (i = 0; i < siz; ++i) {
@@ -132,15 +133,27 @@ static int server_accept_client(const server_ctx ctx[],
             args->client_fd = client_fd;
             args->clientaddr = clientaddr;
             args->server_ctx = &ctx[i];
+            s = socket_addrtostr_in(&clientaddr,
+                                    args->host_buf, args->service_buf);
+            if (s) {
+                E_GAIERR(s, "Convert socket address to string");
+                goto error;
+            }
+            N("New client connection from %s:%s",
+              args->host_buf, args->service_buf);
+
             if (pthread_create(&args->self, NULL,
                                client_mainloop_epoll, args))
             {
                 E_STRERR("Thread creation");
-                free(args);
-                return 0;
+                goto error;
             }
 
             return 1;
+error:
+            close(client_fd);
+            free(args);
+            return 0;
         }
     }
 
@@ -157,6 +170,7 @@ client_mainloop_epoll(void *arg)
 
     assert(arg);
     args = (client_thread_args *) arg;
+    pthread_detach(args->self);
     events = (struct epoll_event *) calloc(POTD_MAXEVENTS, sizeof(*events));
     assert(events);
 
diff --git a/src/socket.c b/src/socket.c
index e7a4e2d..cf48661 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -77,11 +77,11 @@ int socket_listen_in(psocket *psocket)
 int socket_accept_in(const psocket *psocket, struct sockaddr_in *clientaddr)
 {
     int fd;
-    socklen_t addr_len = {0};
+    socklen_t alen = {0};
 
     assert(psocket && clientaddr);
 
-    fd = accept(psocket->fd, (struct sockaddr*) clientaddr, &addr_len);
+    fd = accept(psocket->fd, (struct sockaddr*) clientaddr, &alen);
     if (fd < 0)
         return -1;
     if (socket_nonblock(psocket))
@@ -89,3 +89,17 @@ int socket_accept_in(const psocket *psocket, struct sockaddr_in *clientaddr)
 
     return fd;
 }
+
+int socket_addrtostr_in(const struct sockaddr_in *in_addr,
+                        char hbuf[NI_MAXHOST], char sbuf[NI_MAXSERV])
+{
+    int s;
+
+    assert(in_addr);
+    s = getnameinfo((const struct sockaddr *) in_addr,
+                    sizeof(struct sockaddr_in),
+                    &hbuf[0], NI_MAXHOST,
+                    &sbuf[0],NI_MAXSERV,
+                    NI_NUMERICHOST | NI_NUMERICSERV);
+    return s;
+}
diff --git a/src/socket.h b/src/socket.h
index b523744..c0ef15b 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -20,4 +20,7 @@ int socket_listen_in(psocket *psocket);
 
 int socket_accept_in(const psocket *psocket, struct sockaddr_in *clientaddr);
 
+int socket_addrtostr_in(const struct sockaddr_in *in_addr,
+                        char hbuf[NI_MAXHOST], char sbuf[NI_MAXSERV]);
+
 #endif