Use inline functions

[dragonnet.git] / peer.c

diff --git a/peer.c b/peer.c
index 1329fc3488fe521640a0f7f3549c952eda095895..83e91226cbde496a59f2a0157cfde976d1da6765 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -1,16 +1,11 @@
 #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"
-#include "recv_thread.h"
-
-const struct timeval dragonnet_timeout = {
-       .tv_sec = 30,
-       .tv_usec = 0
-};
-
 static bool dragonnet_peer_init(DragonnetPeer *p, char *addr)
 {
        pthread_rwlock_init(&p->mu, NULL);
@@ -18,18 +13,7 @@ static bool dragonnet_peer_init(DragonnetPeer *p, char *addr)
 
        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");
-               return false;
-       }
-
-       if (setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, &dragonnet_timeout,
-                       sizeof dragonnet_timeout) < 0) {
-               perror("setsockopt");
-               return false;
-       }
+       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,
@@ -63,23 +47,42 @@ DragonnetPeer *dragonnet_connect(char *addr)
        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_t recv_thread;
-       pthread_create(&recv_thread, NULL, &dragonnet_peer_recv_thread, p);
-       pthread_join(recv_thread, NULL);
+       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);
 
-       if (p->state == DRAGONNET_PEER_ACTIVE) {
+       pthread_t recv_thread = p->recv_thread;
+       if (p->state == DRAGONNET_PEER_ACTIVE)
                shutdown(p->sock, SHUT_RDWR);
-               p->state++;
-       }
 
        pthread_rwlock_unlock(&p->mu);
+
+       pthread_cancel(recv_thread);
+       pthread_join(recv_thread, NULL);
 }
 
 void dragonnet_peer_delete(DragonnetPeer *p)