Use libevent for meta socket input/output buffering.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 287d688..1686c60 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "logger.h"
@@ -51,8 +51,7 @@ int listen_sockets;
 
 /* Setup sockets */
 
-static void configure_tcp(connection_t *c)
-{
+static void configure_tcp(connection_t *c) {
        int option;
 
 #ifdef O_NONBLOCK
@@ -80,8 +79,7 @@ static void configure_tcp(connection_t *c)
 #endif
 }
 
-int setup_listen_socket(const sockaddr_t *sa)
-{
+int setup_listen_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
        int option;
@@ -139,8 +137,7 @@ int setup_listen_socket(const sockaddr_t *sa)
        return nfd;
 }
 
-int setup_vpn_in_socket(const sockaddr_t *sa)
-{
+int setup_vpn_in_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
        int option;
@@ -234,7 +231,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 }
 
 static void retry_outgoing_handler(int fd, short events, void *data) {
-       do_outgoing_connection(data);
+       setup_outgoing_connection(data);
 }
 
 void retry_outgoing(outgoing_t *outgoing) {
@@ -253,8 +250,7 @@ void retry_outgoing(outgoing_t *outgoing) {
                           outgoing->timeout);
 }
 
-void finish_connecting(connection_t *c)
-{
+void finish_connecting(connection_t *c) {
        cp();
 
        ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
@@ -267,8 +263,7 @@ void finish_connecting(connection_t *c)
        send_id(c);
 }
 
-void do_outgoing_connection(connection_t *c)
-{
+void do_outgoing_connection(connection_t *c) {
        char *address, *port;
        int result;
 
@@ -279,8 +274,9 @@ begin:
                if(!c->outgoing->cfg) {
                        ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
                                           c->name);
-                       c->status.remove = true;
                        retry_outgoing(c->outgoing);
+                       c->outgoing = NULL;
+                       connection_del(c);
                        return;
                }
 
@@ -353,8 +349,17 @@ begin:
        return;
 }
 
-void setup_outgoing_connection(outgoing_t *outgoing)
-{
+void handle_meta_write(struct bufferevent *event, void *data) {
+       logger(LOG_EMERG, _("handle_meta_write() called"));
+}
+
+void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
+       connection_t *c = data;
+       logger(LOG_EMERG, _("handle_meta_connection_error() called: %d: %s"), what, strerror(errno));
+       terminate_connection(c, c->status.active);
+}
+
+void setup_outgoing_connection(outgoing_t *outgoing) {
        connection_t *c;
        node_t *n;
 
@@ -397,20 +402,21 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 
        do_outgoing_connection(c);
 
-       event_set(&c->ev, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
-       event_set(&c->outev, c->socket, EV_WRITE | EV_PERSIST, flush_meta, c);
-       if(event_add(&c->ev, NULL) < 0) {
-               logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+       event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+       event_add(&c->inevent, NULL);
+       c->buffer = bufferevent_new(c->socket, handle_meta_connection_data, handle_meta_write, handle_meta_connection_error, c);
+       if(!c->buffer) {
+               logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
                abort();
        }
+       bufferevent_disable(c->buffer, EV_READ);
 }
 
 /*
   accept a new tcp connect and create a
   new connection
 */
-void handle_new_meta_connection(int sock, short events, void *data)
-{
+void handle_new_meta_connection(int sock, short events, void *data) {
        connection_t *c;
        sockaddr_t sa;
        int fd;
@@ -441,13 +447,14 @@ void handle_new_meta_connection(int sock, short events, void *data)
 
        ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname);
 
-       event_set(&c->ev, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
-       event_set(&c->outev, c->socket, EV_WRITE | EV_PERSIST, flush_meta, c);
-       if(event_add(&c->ev, NULL) < 0) {
-               logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
-               connection_del(c);
-               return;
+       event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+       event_add(&c->inevent, NULL);
+       c->buffer = bufferevent_new(c->socket, NULL, handle_meta_write, handle_meta_connection_error, c);
+       if(!c->buffer) {
+               logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
+               abort();
        }
+       bufferevent_disable(c->buffer, EV_READ);
                
        configure_tcp(c);
 
@@ -457,8 +464,7 @@ void handle_new_meta_connection(int sock, short events, void *data)
        send_id(c);
 }
 
-void try_outgoing_connections(void)
-{
+void try_outgoing_connections(void) {
        static config_t *cfg = NULL;
        char *name;
        outgoing_t *outgoing;