listener: cleanly shutdown accept thread, free on_recv_type

diff --git a/listen.c b/listen.c
index 5571806ed9893f75b403312f8807b9ce6e186553..760365ecd050809932b9bbe2e038fe06a62e2db9 100644 (file)
--- a/listen.c
+++ b/listen.c
@@ -1,7 +1,9 @@
 #include <assert.h>
 #include <dragonnet/listen.h>
 #include <dragonnet/recv.h>
+#include <errno.h>
 #include <netdb.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
@@ -46,7 +48,6 @@ static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
 DragonnetListener *dragonnet_listener_new(char *addr)
 {
        DragonnetListener *l = malloc(sizeof *l);
-       pthread_rwlock_init(&l->mu, NULL);
 
        l->active = true;
        l->sock = socket(AF_INET6, SOCK_STREAM, 0);
@@ -89,13 +90,10 @@ static void *listener_main(void *g_listener)
                struct sockaddr_in6 clt_addr;
                socklen_t clt_addrlen = sizeof clt_addr;
 
-               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);
+               int clt_sock = accept(l->sock, (struct sockaddr *) &clt_addr, &clt_addrlen);
                if (clt_sock < 0) {
-                       perror("accept");
+                       if (errno != EINTR)
+                               perror("accept");
                        continue;
                }
 
@@ -103,9 +101,7 @@ static void *listener_main(void *g_listener)
                if (p == NULL)
                        continue;
 
-               pthread_rwlock_rdlock(&l->mu);
                void (*on_connect)(DragonnetPeer *) = l->on_connect;
-               pthread_rwlock_unlock(&l->mu);
 
                if (on_connect != NULL)
                        on_connect(p);
@@ -124,12 +120,13 @@ void dragonnet_listener_run(DragonnetListener *l)
 void dragonnet_listener_close(DragonnetListener *l)
 {
        l->active = false;
-       pthread_cancel(l->accept_thread);
+
+       pthread_kill(l->accept_thread, SIGINT);
        pthread_join(l->accept_thread, NULL);
 }
 
 void dragonnet_listener_delete(DragonnetListener *l)
 {
-       pthread_rwlock_destroy(&l->mu);
+       free(l->on_recv_type);
        free(l);
 }

diff --git a/listen.h b/listen.h
index ea76162207e76b4e09aae8434c8d72e3cd365b74..8346cccd063fafe5d24863a2ee055fa954254f9b 100644 (file)
--- a/listen.h
+++ b/listen.h
@@ -14,8 +14,6 @@ typedef struct {
        void (*on_disconnect)(DragonnetPeer *);
        bool (*on_recv)(DragonnetPeer *, DragonnetTypeId, void *);
        void (**on_recv_type)(DragonnetPeer *, void *);
-
-       pthread_rwlock_t mu;
 } DragonnetListener;
 
 DragonnetListener *dragonnet_listener_new(char *addr);