+#define _GNU_SOURCE
#include <assert.h>
+#include <dragonnet/listen.h>
+#include <dragonnet/recv.h>
+#include <errno.h>
+#include <features.h>
#include <netdb.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <unistd.h>
-#include "listen.h"
-
// ----
// Peer
// ----
static bool dragonnet_peer_init_accepted(DragonnetPeer *p, int sock,
struct sockaddr_in6 addr, DragonnetListener *l)
{
- p->mu = malloc(sizeof *p->mu);
- pthread_rwlock_init(p->mu, NULL);
- pthread_rwlock_wrlock(p->mu);
+ pthread_mutex_init(&p->mtx, NULL);
p->sock = sock;
p->laddr = l->laddr;
p->raddr = dragonnet_addr_parse_sock(addr);
+ p->on_disconnect = l->on_disconnect;
+ p->on_recv = l->on_recv;
+ p->on_recv_type = l->on_recv_type;
- 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;
- }
-
- pthread_rwlock_unlock(p->mu);
return true;
}
{
DragonnetPeer *p = malloc(sizeof *p);
if (!dragonnet_peer_init_accepted(p, sock, addr, l)) {
- dragonnet_peer_delete(p);
+ pthread_mutex_destroy(&p->mtx);
+ free(p);
return NULL;
}
// Listener
// --------
-DragonnetListener *dragonnet_listener_new(char *addr,
- void (*on_connect)(DragonnetPeer *p))
+DragonnetListener *dragonnet_listener_new(char *addr)
{
DragonnetListener *l = malloc(sizeof *l);
- l->mu = malloc(sizeof *l->mu);
- pthread_rwlock_init(l->mu, NULL);
- pthread_rwlock_wrlock(l->mu);
+ l->active = true;
l->sock = socket(AF_INET6, SOCK_STREAM, 0);
- l->on_connect = on_connect;
+ l->on_connect = NULL;
+ l->on_disconnect = NULL;
+ l->on_recv = NULL;
+ 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,
return NULL;
}
- pthread_rwlock_unlock(l->mu);
return l;
}
-void dragonnet_listener_run(DragonnetListener *l)
+static void *listener_main(void *g_listener)
{
- pthread_rwlock_wrlock(l->mu);
-
- assert(l->state == DRAGONNET_LISTENER_CREATED);
- l->state++;
+#ifdef __GLIBC__
+ pthread_setname_np(pthread_self(), "listen");
+#endif
- pthread_rwlock_unlock(l->mu);
+ DragonnetListener *l = (DragonnetListener *) g_listener;
- while (l->state == DRAGONNET_LISTENER_ACTIVE) {
+ while (l->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);
if (clt_sock < 0) {
- perror("accept");
+ if (errno != EINTR)
+ perror("accept");
continue;
}
if (p == NULL)
continue;
- if (l->on_connect != NULL)
- l->on_connect(p);
+ void (*on_connect)(DragonnetPeer *) = l->on_connect;
+
+ if (on_connect != NULL)
+ on_connect(p);
+
+ dragonnet_peer_run(p);
}
+
+ return NULL;
}
-void dragonnet_listener_close(DragonnetListener *l)
+void dragonnet_listener_run(DragonnetListener *l)
{
- pthread_rwlock_wrlock(l->mu);
+ pthread_create(&l->accept_thread, NULL, &listener_main, l);
+}
- assert(l->state == DRAGONNET_LISTENER_ACTIVE);
- close(l->sock);
- l->sock = 0;
- l->state++;
+void dragonnet_listener_close(DragonnetListener *l)
+{
+ l->active = false;
- pthread_rwlock_unlock(l->mu);
+ 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);
}