+#define _GNU_SOURCE
#include <assert.h>
-#include <dragonnet/recv.h>
+#include <dragonnet/addr.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>
// ----
static bool dragonnet_peer_init_accepted(DragonnetPeer *p, int sock,
- struct sockaddr_in6 addr, DragonnetListener *l)
+ char *addr, DragonnetListener *l)
{
- pthread_rwlock_init(&p->mu, NULL);
- pthread_rwlock_wrlock(&p->mu);
+ pthread_mutex_init(&p->mtx, NULL);
- pthread_rwlock_rdlock(&l->mu);
p->sock = sock;
- p->laddr = l->laddr;
- p->raddr = dragonnet_addr_parse_sock(addr);
+ p->address = addr;
+ p->on_disconnect = l->on_disconnect;
+ p->on_recv = l->on_recv;
p->on_recv_type = l->on_recv_type;
- pthread_rwlock_unlock(&l->mu);
- pthread_rwlock_unlock(&p->mu);
return true;
}
-static DragonnetPeer *dragonnet_peer_accept(int sock, struct sockaddr_in6 addr,
+static DragonnetPeer *dragonnet_peer_accept(int sock, char *addr,
DragonnetListener *l)
{
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);
+ free(addr);
return NULL;
}
// Listener
// --------
-DragonnetListener *dragonnet_listener_new(char *addr,
- void (*on_connect)(DragonnetPeer *p))
+DragonnetListener *dragonnet_listener_new(char *addr)
{
+ struct addrinfo *info = dragonnet_str2addr(addr);
+ if (!info)
+ return NULL;
+
DragonnetListener *l = malloc(sizeof *l);
- 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->active = true;
+ l->sock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
+ l->address = dragonnet_addr2str(info->ai_addr, info->ai_addrlen);
+ 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,
sizeof so_reuseaddr) < 0) {
perror("setsockopt");
+ freeaddrinfo(info);
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, (const struct sockaddr *) &ai_addr, sizeof ai_addr) < 0) {
+ if (bind(l->sock, info->ai_addr, info->ai_addrlen) < 0) {
perror("bind");
+ freeaddrinfo(info);
dragonnet_listener_delete(l);
return NULL;
}
+ freeaddrinfo(info);
+
if (listen(l->sock, 10) < 0) {
perror("listen");
dragonnet_listener_delete(l);
return NULL;
}
- pthread_rwlock_unlock(&l->mu);
return 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;
+#ifdef __GLIBC__
+ pthread_setname_np(pthread_self(), "listen");
+#endif
- pthread_rwlock_wrlock(&l->mu);
- assert(l->state == DRAGONNET_LISTENER_CREATED);
- l->state++;
- pthread_rwlock_unlock(&l->mu);
+ DragonnetListener *l = (DragonnetListener *) g_listener;
- while (l->state == DRAGONNET_LISTENER_ACTIVE) {
- struct sockaddr_in6 clt_addr;
+ while (l->active) {
+ struct sockaddr_storage 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;
}
- DragonnetPeer *p = dragonnet_peer_accept(clt_sock, clt_addr, l);
+ char *clt_addstr = dragonnet_addr2str((struct sockaddr *) &clt_addr, clt_addrlen);
+ DragonnetPeer *p = dragonnet_peer_accept(clt_sock, clt_addstr, l);
if (p == NULL)
continue;
- 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);
+
+ dragonnet_peer_run(p);
}
return NULL;
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 = -1;
- l->state++;
-
- pthread_rwlock_unlock(&l->mu);
+ l->active = false;
- pthread_cancel(accept_thread);
- pthread_join(accept_thread, NULL);
+ 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->address);
free(l);
}
projects / dragonnet.git / blobdiff