X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=listen.c;h=21d6ee56454199548d1c4173c4ed5da384fac42e;hb=a5143708dcc4e88a6d1b8c3ca946b97c72ba970d;hp=9f25eedc732046ae99fe2564dbf3d1217116f94e;hpb=d9e507892700f2bbe570c0a1de6a4c9ae74786c3;p=dragonnet.git

diff --git a/listen.c b/listen.c
index 9f25eed..21d6ee5 100644
--- a/listen.c
+++ b/listen.c
@@ -1,45 +1,42 @@
-#include <arpa/inet.h>
 #include <assert.h>
+#include <dragonnet/listen.h>
+#include <dragonnet/recv.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "addr.h"
-#include "listen.h"
-
 // ----
 // Peer
 // ----
 
-static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
-		DragonnetListener *l)
+static bool dragonnet_peer_init_accepted(DragonnetPeer *p, int sock,
+		struct sockaddr_in6 addr, DragonnetListener *l)
 {
-	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);
 
+	pthread_rwlock_rdlock(&l->mu);
 	p->sock = sock;
 	p->laddr = l->laddr;
+	p->raddr = dragonnet_addr_parse_sock(addr);
+	p->on_recv_type = l->on_recv_type;
+	pthread_rwlock_unlock(&l->mu);
 
-	char ip_addr[INET6_ADDRSTRLEN] = {0};
-	inet_ntop(AF_INET6, &addr.sin6_addr, ip_addr, INET6_ADDRSTRLEN);
-
-	char port[6] = {0};
-	sprintf(port, "%d", ntohs(addr.sin6_port));
+	pthread_rwlock_unlock(&p->mu);
+	return true;
+}
 
-	int err = getaddrinfo(ip_addr, port, NULL, &p->raddr);
-	if (err != 0) {
-		fprintf(stderr, "invalid network address %s:%s\n", ip_addr, port);
+static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
+		DragonnetListener *l)
+{
+	DragonnetPeer *p = malloc(sizeof *p);
+	if (!dragonnet_peer_init_accepted(p, sock, addr, l)) {
 		dragonnet_peer_delete(p);
-		p = NULL;
+		return NULL;
 	}
 
-	if (p != NULL)
-		pthread_rwlock_unlock(p->mu);
-
 	return p;
 }
 
@@ -47,32 +44,29 @@ static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
 // Listener
 // --------
 
-DragonnetListener *dragonnet_listener_new(char *addr, void (*on_connect)(DragonnetPeer *p))
+DragonnetListener *dragonnet_listener_new(char *addr,
+		void (*on_connect)(DragonnetPeer *p))
 {
 	DragonnetListener *l = malloc(sizeof *l);
-	l->mu = malloc(sizeof *l->mu);
-	pthread_rwlock_init(l->mu, NULL);
-	pthread_rwlock_wrlock(l->mu);
+	pthread_rwlock_init(&l->mu, NULL);
+	pthread_rwlock_wrlock(&l->mu);
 
 	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 flag = 1;
-	if (setsockopt(l->sock, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof flag) < 0) {
+	int so_reuseaddr = 1;
+	if (setsockopt(l->sock, SOL_SOCKET, SO_REUSEADDR, &so_reuseaddr,
+			sizeof so_reuseaddr) < 0) {
 		perror("setsockopt");
 		dragonnet_listener_delete(l);
 		return NULL;
 	}
 
-	DragonnetAddr net_addr = dragonnet_addr_parse(addr);
-	int err = getaddrinfo(net_addr.ip, net_addr.port, NULL, &l->laddr);
-	if (err != 0) {
-		fprintf(stderr, "invalid network address %s\n", addr);
-		dragonnet_listener_delete(l);
-		return NULL;
-	}
+	l->laddr = dragonnet_addr_parse_str(addr);
+	struct sockaddr_in6 ai_addr = dragonnet_addr_sock(l->laddr);
 
-	if (bind(l->sock, l->laddr->ai_addr, l->laddr->ai_addrlen) < 0) {
+	if (bind(l->sock, (const struct sockaddr *) &ai_addr, sizeof ai_addr) < 0) {
 		perror("bind");
 		dragonnet_listener_delete(l);
 		return NULL;
@@ -84,24 +78,43 @@ DragonnetListener *dragonnet_listener_new(char *addr, void (*on_connect)(Dragonn
 		return NULL;
 	}
 
-	pthread_rwlock_unlock(l->mu);
+	pthread_rwlock_unlock(&l->mu);
 	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_wrlock(l->mu);
+	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);
+	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;
@@ -111,30 +124,42 @@ 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_rwlock_wrlock(&l->mu);
 
+	pthread_t accept_thread = l->accept_thread;
 	assert(l->state == DRAGONNET_LISTENER_ACTIVE);
 	close(l->sock);
+	l->sock = -1;
 	l->state++;
 
-	pthread_rwlock_unlock(l->mu);
+	pthread_rwlock_unlock(&l->mu);
+
+	pthread_cancel(accept_thread);
+	pthread_join(accept_thread, NULL);
 }
 
 void dragonnet_listener_delete(DragonnetListener *l)
 {
-	pthread_rwlock_wrlock(l->mu);
-
-	if (l->laddr != NULL)
-		freeaddrinfo(l->laddr);
-
-	pthread_rwlock_unlock(l->mu);
-	pthread_rwlock_destroy(l->mu);
+	pthread_rwlock_destroy(&l->mu);
 	free(l);
 }