Introducing the Big Tinc Lock.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 7c4463e..3c79cee 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -55,20 +55,6 @@ list_t *outgoing_list = NULL;
 static void configure_tcp(connection_t *c) {
        int option;
 
-#ifdef O_NONBLOCK
-       int flags = fcntl(c->socket, F_GETFL);
-
-       if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
-               logger(LOG_ERR, "fcntl for %s: %s", c->hostname, strerror(errno));
-       }
-#elif defined(WIN32)
-       unsigned long arg = 1;
-
-       if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
-               logger(LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno));
-       }
-#endif
-
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
        option = 1;
        setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
@@ -299,7 +285,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
        return nfd;
 } /* int setup_vpn_in_socket */
 
-static void retry_outgoing_handler(int fd, short events, void *data) {
+static void retry_outgoing_handler(void *data) {
        setup_outgoing_connection(data);
 }
 
@@ -309,8 +295,9 @@ void retry_outgoing(outgoing_t *outgoing) {
        if(outgoing->timeout > maxtimeout)
                outgoing->timeout = maxtimeout;
 
-       timeout_set(&outgoing->ev, retry_outgoing_handler, outgoing);
-       event_add(&outgoing->ev, &(struct timeval){outgoing->timeout, 0});
+       outgoing->ev.handler = retry_outgoing_handler;
+       outgoing->ev.time = time(NULL) + outgoing->timeout;
+       event_add(&outgoing->ev);
 
        ifdebug(CONNECTIONS) logger(LOG_NOTICE,
                           "Trying to re-establish outgoing connection in %d seconds",
@@ -427,21 +414,6 @@ begin:
        return;
 }
 
-void handle_meta_read(struct bufferevent *event, void *data) {
-       logger(LOG_ERR, "handle_meta_read() called");
-       abort();
-}
-
-void handle_meta_write(struct bufferevent *event, void *data) {
-       ifdebug(META) logger(LOG_DEBUG, "handle_meta_write() called");
-}
-
-void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
-       connection_t *c = data;
-       logger(LOG_ERR, "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;
@@ -483,64 +455,61 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
        do_outgoing_connection(c);
 
-       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_read, handle_meta_write, handle_meta_connection_error, c);
-       if(!c->buffer) {
-               logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
+       if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+               logger(LOG_ERR, "create_thread() 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(void *data) {
+       listen_socket_t *l = data;
        connection_t *c;
        sockaddr_t sa;
        int fd;
        socklen_t len = sizeof sa;
 
-       fd = accept(sock, &sa.sa, &len);
+       while(true) {
+               fd = accept(l->tcp, &sa.sa, &len);
 
-       if(fd < 0) {
-               logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
-               return;
-       }
+               if(fd < 0) {
+                       logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+                       return;
+               }
 
-       sockaddrunmap(&sa);
+               sockaddrunmap(&sa);
 
-       c = new_connection();
-       c->name = xstrdup("<unknown>");
-       c->outcipher = myself->connection->outcipher;
-       c->outdigest = myself->connection->outdigest;
-       c->outmaclength = myself->connection->outmaclength;
-       c->outcompression = myself->connection->outcompression;
+               c = new_connection();
+               c->name = xstrdup("<unknown>");
+               c->outcipher = myself->connection->outcipher;
+               c->outdigest = myself->connection->outdigest;
+               c->outmaclength = myself->connection->outmaclength;
+               c->outcompression = myself->connection->outcompression;
 
-       c->address = sa;
-       c->hostname = sockaddr2hostname(&sa);
-       c->socket = fd;
-       c->last_ping_time = time(NULL);
+               c->address = sa;
+               c->hostname = sockaddr2hostname(&sa);
+               c->socket = fd;
+               c->last_ping_time = time(NULL);
 
-       ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
+               ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
 
-       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_ERR, "bufferevent_new() failed: %s", strerror(errno));
-               abort();
-       }
-       bufferevent_disable(c->buffer, EV_READ);
-               
-       configure_tcp(c);
+               configure_tcp(c);
 
-       connection_add(c);
+               mutex_lock(&mutex);
+               connection_add(c);
 
-       c->allow_request = ID;
-       send_id(c);
+               c->allow_request = ID;
+               send_id(c);
+
+               if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+                       logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
+                       abort();
+               }
+               mutex_unlock(&mutex);
+       }
 }
 
 void free_outgoing(outgoing_t *outgoing) {