Refactor type hooks

[dragonnet.git] / listen.c

diff --git a/listen.c b/listen.c
index e2dcb29f74611b7e173e94bf02a9ba330c190ca1..e040efacfa332788d780f9ee05b36467de9ebb5b 100644 (file)
--- a/listen.c
+++ b/listen.c
@@ -1,12 +1,12 @@
 #include <assert.h>
+#include <dragonnet/recv.h>
+#include <dragonnet/listen.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "listen.h"
-
 // ----
 // Peer
 // ----
@@ -17,21 +17,12 @@ static bool dragonnet_peer_init_accepted(DragonnetPeer *p, int sock,
        pthread_rwlock_init(&p->mu, NULL);
        pthread_rwlock_wrlock(&p->mu);
 
+       pthread_rwlock_rdlock(&l->mu);
        p->sock = sock;
        p->laddr = l->laddr;
        p->raddr = dragonnet_addr_parse_sock(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 = l->on_recv_type;
+       pthread_rwlock_unlock(&l->mu);
 
        pthread_rwlock_unlock(&p->mu);
        return true;
@@ -62,6 +53,7 @@ DragonnetListener *dragonnet_listener_new(char *addr,
 
        l->sock = socket(AF_INET6, SOCK_STREAM, 0);
        l->on_connect = on_connect;
+       l->on_recv_type = calloc(sizeof *l->on_recv_type, dragonnet_num_types);
 
        int so_reuseaddr = 1;
        if (setsockopt(l->sock, SOL_SOCKET, SO_REUSEADDR, &so_reuseaddr,
@@ -90,20 +82,39 @@ DragonnetListener *dragonnet_listener_new(char *addr,
        return l;
 }
 
-void dragonnet_listener_run(DragonnetListener *l)
+void dragonnet_listener_set_recv_hook(DragonnetListener *l, u16 type_id,
+               void (*on_recv)(struct dragonnet_peer *, void *))
 {
+       pthread_rwlock_rdlock(&l->mu);
+       DragonnetListenerState state = l->state;
+       pthread_rwlock_unlock(&l->mu);
+
+       if (state >= DRAGONNET_LISTENER_ACTIVE)
+               return;
+
        pthread_rwlock_wrlock(&l->mu);
+       l->on_recv_type[type_id] = on_recv;
+       pthread_rwlock_unlock(&l->mu);
+}
 
+static void *listener_main(void *g_listener)
+{
+       DragonnetListener *l = (DragonnetListener *) g_listener;
+
+       pthread_rwlock_wrlock(&l->mu);
        assert(l->state == DRAGONNET_LISTENER_CREATED);
        l->state++;
-
        pthread_rwlock_unlock(&l->mu);
 
        while (l->state == DRAGONNET_LISTENER_ACTIVE) {
                struct sockaddr_in6 clt_addr;
                socklen_t clt_addrlen = sizeof clt_addr;
 
-               int clt_sock = accept(l->sock, (struct sockaddr *) &clt_addr, &clt_addrlen);
+               pthread_rwlock_rdlock(&l->mu);
+               int sock = l->sock;
+               pthread_rwlock_unlock(&l->mu);
+
+               int clt_sock = accept(sock, (struct sockaddr *) &clt_addr, &clt_addrlen);
                if (clt_sock < 0) {
                        perror("accept");
                        continue;
@@ -113,21 +124,38 @@ void dragonnet_listener_run(DragonnetListener *l)
                if (p == NULL)
                        continue;
 
-               if (l->on_connect != NULL)
-                       l->on_connect(p);
+               dragonnet_peer_run(p);
+
+               pthread_rwlock_rdlock(&l->mu);
+               void (*on_connect)(DragonnetPeer *) = l->on_connect;
+               pthread_rwlock_unlock(&l->mu);
+
+               if (on_connect != NULL)
+                       on_connect(p);
        }
+
+       return NULL;
+}
+
+void dragonnet_listener_run(DragonnetListener *l)
+{
+       pthread_create(&l->accept_thread, NULL, &listener_main, l);
 }
 
 void dragonnet_listener_close(DragonnetListener *l)
 {
        pthread_rwlock_wrlock(&l->mu);
 
+       pthread_t accept_thread = l->accept_thread;
        assert(l->state == DRAGONNET_LISTENER_ACTIVE);
        close(l->sock);
-       l->sock = 0;
+       l->sock = -1;
        l->state++;
 
        pthread_rwlock_unlock(&l->mu);
+
+       pthread_cancel(accept_thread);
+       pthread_join(accept_thread, NULL);
 }
 
 void dragonnet_listener_delete(DragonnetListener *l)