Use inline functions

[dragonnet.git] / peer.c

diff --git a/peer.c b/peer.c
index 9a6d57b318339d074c81ceaec37422470c60c78c..83e91226cbde496a59f2a0157cfde976d1da6765 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -1,24 +1,25 @@
 #include <assert.h>
+#include <dragonnet/peer.h>
+#include <dragonnet/recv.h>
+#include <dragonnet/recv_thread.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "peer.h"
-
-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);
+       p->on_recv_type = calloc(sizeof *p->on_recv_type, dragonnet_num_types);
 
        struct sockaddr_in6 sock_addr = dragonnet_addr_sock(p->raddr);
-       if (connect(p->sock, (const struct sockaddr *) &sock_addr, sizeof sock_addr) < 0) {
+       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;
@@ -26,29 +27,66 @@ 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;
 }
 
+void dragonnet_peer_set_recv_hook(DragonnetPeer *p, u16 type_id,
+               void (*on_recv)(struct dragonnet_peer *, void *))
+{
+       pthread_rwlock_rdlock(&p->mu);
+       DragonnetPeerState state = p->state;
+       pthread_rwlock_unlock(&p->mu);
+
+       if (state >= DRAGONNET_PEER_ACTIVE)
+               return;
+
+       pthread_rwlock_wrlock(&p->mu);
+       p->on_recv_type[type_id] = on_recv;
+       pthread_rwlock_unlock(&p->mu);
+}
+
+void dragonnet_peer_run(DragonnetPeer *p)
+{
+       pthread_rwlock_wrlock(&p->mu);
+       pthread_create(&p->recv_thread, NULL, &dragonnet_peer_recv_thread, p);
+       pthread_rwlock_unlock(&p->mu);
+
+       while (p->state < DRAGONNET_PEER_ACTIVE);
+}
+
 void dragonnet_peer_close(DragonnetPeer *p)
 {
-       pthread_rwlock_wrlock(p->mu);
+       pthread_rwlock_wrlock(&p->mu);
+
+       pthread_t recv_thread = p->recv_thread;
+       if (p->state == DRAGONNET_PEER_ACTIVE)
+               shutdown(p->sock, SHUT_RDWR);
 
-       assert(p->state == DRAGONNET_PEER_ACTIVE);
-       shutdown(p->sock, SHUT_RDWR);
-       p->state++;
+       pthread_rwlock_unlock(&p->mu);
 
-       pthread_rwlock_unlock(p->mu);
+       pthread_cancel(recv_thread);
+       pthread_join(recv_thread, NULL);
 }
 
 void dragonnet_peer_delete(DragonnetPeer *p)
 {
-       pthread_rwlock_destroy(p->mu);
+       pthread_rwlock_destroy(&p->mu);
        free(p);
 }