j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Convert to libevent.

Browse source 
This is a quick initial conversion that doesn't yet show much advantage:
- We roll our own timeouts.
- We roll our own signal handling.
- We build up the meta connection fd events on each loop rather than
  on state changes.
This commit is contained in:
Scott Lamb 2007-02-27 01:57:01 +00:00
parent 834290b00f
commit 38c25d62c2
9 changed files with 129 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/net_setup.c
View file

@ -45,6 +45,7 @@
#include "xalloc.h"
char *myport;
static struct event device_ev;
bool read_rsa_public_key(connection_t *c)
{
@ -447,6 +448,14 @@ bool setup_myself(void)
if(!setup_device())
return false;
event_set(&device_ev, device_fd, EV_READ|EV_PERSIST,
handle_device_data, NULL);
if (event_add(&device_ev, NULL) < 0) {
logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
close_device();
return false;
}
/* Run tinc-up script to further initialize the tap interface */
asprintf(&envp[0], "NETNAME=%s", netname ? : "");
asprintf(&envp[1], "DEVICE=%s", device ? : "");
@ -492,8 +501,33 @@ bool setup_myself(void)
listen_socket[listen_sockets].udp =
setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
if(listen_socket[listen_sockets].udp < 0)
if(listen_socket[listen_sockets].udp < 0) {
close(listen_socket[listen_sockets].tcp);
continue;
}
event_set(&listen_socket[listen_sockets].ev_tcp,
listen_socket[listen_sockets].tcp,
EV_READ|EV_PERSIST,
handle_new_meta_connection, NULL);
if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
close(listen_socket[listen_sockets].tcp);
close(listen_socket[listen_sockets].udp);
continue;
}
event_set(&listen_socket[listen_sockets].ev_udp,
listen_socket[listen_sockets].udp,
EV_READ|EV_PERSIST,
handle_incoming_vpn_data, NULL);
if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
close(listen_socket[listen_sockets].tcp);
close(listen_socket[listen_sockets].udp);
event_del(&listen_socket[listen_sockets].ev_tcp);
continue;
}
ifdebug(CONNECTIONS) {
hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);