Make peer initialisation error handling less reptitive

diff --git a/listen.c b/listen.c
index 60644dd2b24830daef55c510ef4da316db98588e..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);
@@ -26,18 +25,28 @@ static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
        if (setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, &dragonnet_timeout,
                        sizeof dragonnet_timeout) < 0) {
                perror("setsockopt");
-               dragonnet_peer_delete(p);
-               return NULL;
+               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;
        }
 
-       pthread_rwlock_unlock(p->mu);
        return p;
 }
 

diff --git a/peer.c b/peer.c
index 3dfa03af57944023db25acc699f487c409820701..ab73641f07c14df5b4597878e8f03b22e76f0f95 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -10,9 +11,8 @@ const struct timeval dragonnet_timeout = {
        .tv_usec = 0
 };
 
-DragonnetPeer *dragonnet_connect(char *addr)
+static bool dragonnet_peer_init(DragonnetPeer *p, char *addr)
 {
-       DragonnetPeer *p = malloc(sizeof *p);
        p->mu = malloc(sizeof *p->mu);
        pthread_rwlock_init(p->mu, NULL);
        pthread_rwlock_wrlock(p->mu);
@@ -23,23 +23,20 @@ DragonnetPeer *dragonnet_connect(char *addr)
        if (setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, &dragonnet_timeout,
                        sizeof dragonnet_timeout) < 0) {
                perror("setsockopt");
-               dragonnet_peer_delete(p);
-               return NULL;
+               return false;
        }
 
        if (setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, &dragonnet_timeout,
                        sizeof dragonnet_timeout) < 0) {
                perror("setsockopt");
-               dragonnet_peer_delete(p);
-               return NULL;
+               return false;
        }
 
        struct sockaddr_in6 sock_addr = dragonnet_addr_sock(p->raddr);
        if (connect(p->sock, (const struct sockaddr *) &sock_addr,
                        sizeof sock_addr) < 0) {
                perror("connect");
-               dragonnet_peer_delete(p);
-               return NULL;
+               return false;
        }
 
        struct sockaddr_in6 sock_name;
@@ -47,13 +44,23 @@ DragonnetPeer *dragonnet_connect(char *addr)
 
        if (getsockname(p->sock, (struct sockaddr *) &sock_name, &sock_namelen) < 0) {
                perror("getsockname");
-               dragonnet_peer_delete(p);
-               return NULL;
+               return false;
        }
 
        p->laddr = dragonnet_addr_parse_sock(sock_name);
 
        pthread_rwlock_unlock(p->mu);
+       return true;
+}
+
+DragonnetPeer *dragonnet_connect(char *addr)
+{
+       DragonnetPeer *p = malloc(sizeof *p);
+       if (!dragonnet_peer_init(p, addr)) {
+               dragonnet_peer_delete(p);
+               return NULL;
+       }
+
        return p;
 }