dragonnet_addr_str: Use asprintf

[dragonnet.git] / listen.c

diff --git a/listen.c b/listen.c
index 440f889f944f0aecd8f12ae15aeccf4b5ae843b2..662958f0f1dc16e2dd9fb5e69783b311e92fee66 100644 (file)
--- a/listen.c
+++ b/listen.c
@@ -11,10 +11,9 @@
 // Peer
 // ----
 
-static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
-               DragonnetListener *l)
+static bool dragonnet_peer_init_accepted(DragonnetPeer *p, int sock,
+               struct sockaddr_in6 addr, DragonnetListener *l)
 {
-       DragonnetPeer *p = malloc(sizeof *p);
        p->mu = malloc(sizeof *p->mu);
        pthread_rwlock_init(p->mu, NULL);
        pthread_rwlock_wrlock(p->mu);
@@ -23,8 +22,30 @@ static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
        p->laddr = l->laddr;
        p->raddr = dragonnet_addr_parse_sock(addr);
 
-       if (p != NULL)
-               pthread_rwlock_unlock(p->mu);
+       if (setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, &dragonnet_timeout,
+                       sizeof dragonnet_timeout) < 0) {
+               perror("setsockopt");
+               return false;
+       }
+
+       if (setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, &dragonnet_timeout,
+                       sizeof dragonnet_timeout) < 0) {
+               perror("setsockopt");
+               return false;
+       }
+
+       pthread_rwlock_unlock(p->mu);
+       return true;
+}
+
+static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
+               DragonnetListener *l)
+{
+       DragonnetPeer *p = malloc(sizeof *p);
+       if (!dragonnet_peer_init_accepted(p, sock, addr, l)) {
+               dragonnet_peer_delete(p);
+               return NULL;
+       }
 
        return p;
 }
@@ -33,7 +54,8 @@ static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
 // Listener
 // --------
 
-DragonnetListener *dragonnet_listener_new(char *addr, void (*on_connect)(DragonnetPeer *p))
+DragonnetListener *dragonnet_listener_new(char *addr,
+               void (*on_connect)(DragonnetPeer *p))
 {
        DragonnetListener *l = malloc(sizeof *l);
        l->mu = malloc(sizeof *l->mu);
@@ -43,8 +65,9 @@ DragonnetListener *dragonnet_listener_new(char *addr, void (*on_connect)(Dragonn
        l->sock = socket(AF_INET6, SOCK_STREAM, 0);
        l->on_connect = on_connect;
 
-       int flag = 1;
-       if (setsockopt(l->sock, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof flag) < 0) {
+       int so_reuseaddr = 1;
+       if (setsockopt(l->sock, SOL_SOCKET, SO_REUSEADDR, &so_reuseaddr,
+                       sizeof so_reuseaddr) < 0) {
                perror("setsockopt");
                dragonnet_listener_delete(l);
                return NULL;
@@ -103,6 +126,7 @@ void dragonnet_listener_close(DragonnetListener *l)
 
        assert(l->state == DRAGONNET_LISTENER_ACTIVE);
        close(l->sock);
+       l->sock = 0;
        l->state++;
 
        pthread_rwlock_unlock(l->mu);