POTD skeleton #6.

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

1 files changed, 26 insertions, 24 deletions

diff --git a/src/socket.c b/src/socket.c
index cf48661..4fe5e3a 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -10,25 +10,24 @@
 #include "socket.h"
 
 
-static int socket_nonblock(const psocket *psocket)
+static int socket_nonblock(const psocket *psock)
 {
     int flags;
 
-    flags = fcntl(psocket->fd, F_GETFL, 0);
+    flags = fcntl(psock->fd, F_GETFL, 0);
     if (flags < 0)
         return 1;
     flags |= O_NONBLOCK;
-    if (fcntl(psocket->fd, F_SETFL, flags) == -1)
+    if (fcntl(psock->fd, F_SETFL, flags) == -1)
         return 1;
     return 0;
 }
 
-int socket_init_in(psocket *psocket, const char *listen_addr,
+int socket_init_in(const char *listen_addr,
                    const char *listen_port, struct addrinfo **results)
 {
     struct addrinfo hints;
 
-    assert(psocket);
     assert(listen_addr || listen_port); /* getaddrinfo wants either node or service */
 
     memset(&hints, 0, sizeof(hints));
@@ -39,12 +38,12 @@ int socket_init_in(psocket *psocket, const char *listen_addr,
     return getaddrinfo(listen_addr, listen_port, &hints, results);
 }
 
-int socket_bind_in(psocket *psocket, struct addrinfo *results)
+int socket_bind_in(psocket *psock, struct addrinfo *results)
 {
     int fd = -1, rv, reuse_enable = 1;
     struct addrinfo *rp = NULL;
 
-    assert(psocket && results);
+    assert(psock && results);
 
     for (rp = results; rp != NULL; rp = rp->ai_next) {
         fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
@@ -61,45 +60,48 @@ int socket_bind_in(psocket *psocket, struct addrinfo *results)
 
     if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse_enable, sizeof(int)) < 0)
         return -2;
-    psocket->fd = fd;
-    psocket->addr = *rp;
+    psock->fd = fd;
+    psock->addr_len = rp->ai_addrlen;
+    psock->addr = *rp->ai_addr;
     freeaddrinfo(results);
-    return socket_nonblock(psocket);
+    return socket_nonblock(psock);
 }
 
-int socket_listen_in(psocket *psocket)
+int socket_listen_in(psocket *psock)
 {
-    assert(psocket);
+    assert(psock);
 
-    return listen(psocket->fd, POTD_BACKLOG);
+    return listen(psock->fd, POTD_BACKLOG);
 }
 
-int socket_accept_in(const psocket *psocket, struct sockaddr_in *clientaddr)
+int socket_accept_in(const psocket *psock, psocket *client_psock)
 {
     int fd;
-    socklen_t alen = {0};
 
-    assert(psocket && clientaddr);
+    assert(psock && client_psock);
 
-    fd = accept(psocket->fd, (struct sockaddr*) clientaddr, &alen);
+    client_psock->addr_len = psock->addr_len;
+    fd = accept(psock->fd, &client_psock->addr,
+                &client_psock->addr_len);
     if (fd < 0)
         return -1;
-    if (socket_nonblock(psocket))
+    if (socket_nonblock(psock))
         return -2;
+    client_psock->fd = fd;
 
-    return fd;
+    return 0;
 }
 
-int socket_addrtostr_in(const struct sockaddr_in *in_addr,
+int socket_addrtostr_in(const psocket *psock,
                         char hbuf[NI_MAXHOST], char sbuf[NI_MAXSERV])
 {
     int s;
 
-    assert(in_addr);
-    s = getnameinfo((const struct sockaddr *) in_addr,
-                    sizeof(struct sockaddr_in),
+    assert(psock);
+    s = getnameinfo(&psock->addr,
+                    psock->addr_len,
                     &hbuf[0], NI_MAXHOST,
-                    &sbuf[0],NI_MAXSERV,
+                    &sbuf[0], NI_MAXSERV,
                     NI_NUMERICHOST | NI_NUMERICSERV);
     return s;
 }