X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=c727d7b2086da9a12aebba6df2651cab5281164a;hb=38c25d62c2bc76908bd95fb21c8f5e39ad269884;hp=fb776f89fc649edd94bd73dceecdbd64b34152b5;hpb=228e7a5c8f0e517dcede50f886965a44fca39853;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index fb776f89..c727d7b2 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "event.h"
+#include "tevent.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -220,7 +220,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 
 void retry_outgoing(outgoing_t *outgoing)
 {
-	event_t *event;
+	tevent_t *event;
 
 	cp();
 
@@ -229,11 +229,11 @@ void retry_outgoing(outgoing_t *outgoing)
 	if(outgoing->timeout > maxtimeout)
 		outgoing->timeout = maxtimeout;
 
-	event = new_event();
+	event = new_tevent();
 	event->handler = (event_handler_t) setup_outgoing_connection;
 	event->time = now + outgoing->timeout;
 	event->data = outgoing;
-	event_add(event);
+	tevent_add(event);
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE,
 			   _("Trying to re-establish outgoing connection in %d seconds"),
@@ -242,8 +242,6 @@ void retry_outgoing(outgoing_t *outgoing)
 
 void finish_connecting(connection_t *c)
 {
-	int option;
-
 	cp();
 
 	ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
@@ -258,7 +256,7 @@ void finish_connecting(connection_t *c)
 void do_outgoing_connection(connection_t *c)
 {
 	char *address, *port;
-	int option, result, flags;
+	int result;
 
 	cp();
 
@@ -386,12 +384,12 @@ void setup_outgoing_connection(outgoing_t *outgoing)
   accept a new tcp connect and create a
   new connection
 */
-bool handle_new_meta_connection(int sock)
+void handle_new_meta_connection(int sock, short events, void *data)
 {
-	int option;
 	connection_t *c;
 	sockaddr_t sa;
-	int fd, len = sizeof(sa);
+	int fd;
+	socklen_t len = sizeof(sa);
 
 	cp();
 
@@ -400,7 +398,6 @@ bool handle_new_meta_connection(int sock)
 	if(fd < 0) {
 		logger(LOG_ERR, _("Accepting a new connection failed: %s"),
 			   strerror(errno));
-		return false;
 	}
 
 	sockaddrunmap(&sa);
@@ -425,8 +422,6 @@ bool handle_new_meta_connection(int sock)
 
 	c->allow_request = ID;
 	send_id(c);
-
-	return true;
 }
 
 void try_outgoing_connections(void)