Tidy address string parser

[dragonnet.git] / peer.c

diff --git a/peer.c b/peer.c
index 3dfa03af57944023db25acc699f487c409820701..d508f740866f04f605ba727bfd7095c56e615b38 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -1,45 +1,24 @@
 #include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "peer.h"
 #include "recv_thread.h"
 
-const struct timeval dragonnet_timeout = {
-       .tv_sec = 30,
-       .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);
+       pthread_rwlock_init(&p->mu, NULL);
+       pthread_rwlock_wrlock(&p->mu);
 
        p->sock = socket(AF_INET6, SOCK_STREAM, 0);
        p->raddr = dragonnet_addr_parse_str(addr);
 
-       if (setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, &dragonnet_timeout,
-                       sizeof dragonnet_timeout) < 0) {
-               perror("setsockopt");
-               dragonnet_peer_delete(p);
-               return NULL;
-       }
-
-       if (setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, &dragonnet_timeout,
-                       sizeof dragonnet_timeout) < 0) {
-               perror("setsockopt");
-               dragonnet_peer_delete(p);
-               return NULL;
-       }
-
        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 +26,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);
+       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;
 }
 
@@ -66,18 +55,18 @@ void dragonnet_peer_run(DragonnetPeer *p)
 
 void dragonnet_peer_close(DragonnetPeer *p)
 {
-       pthread_rwlock_wrlock(p->mu);
+       pthread_rwlock_wrlock(&p->mu);
 
        if (p->state == DRAGONNET_PEER_ACTIVE) {
                shutdown(p->sock, SHUT_RDWR);
                p->state++;
        }
 
-       pthread_rwlock_unlock(p->mu);
+       pthread_rwlock_unlock(&p->mu);
 }
 
 void dragonnet_peer_delete(DragonnetPeer *p)
 {
-       pthread_rwlock_destroy(p->mu);
+       pthread_rwlock_destroy(&p->mu);
        free(p);
 }