X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=63760afb5e74b8ac454e0da1c6edc02645b09833;hp=fdeac79ae945ea1611284a9e6872a87bc20840a3;hb=14979f835df4214a7c2510852f7ffedc9e08c2c0;hpb=7f58ed7685f9fcd5271359a8c896670a835e1f95

diff --git a/src/net_socket.c b/src/net_socket.c
index fdeac79a..63760afb 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_socket.c,v 1.1.2.5 2002/03/01 11:18:34 guus Exp $
+    $Id: net_socket.c,v 1.1.2.7 2002/03/01 14:09:31 guus Exp $
 */
 
 #include "config.h"
@@ -72,8 +72,7 @@ int seconds_till_retry = 5;
 
 int tcp_socket[MAXSOCKETS];
 int udp_socket[MAXSOCKETS];
-int tcp_sockets = 0;
-int udp_sockets = 0;
+int listen_sockets = 0;
 
 /* Setup sockets */
 
@@ -205,7 +204,7 @@ cp
 
   event = new_event();
   event->handler = (event_handler_t)setup_outgoing_connection;
-  event->time = time(NULL) + outgoing->timeout;
+  event->time = now + outgoing->timeout;
   event->data = outgoing;
   event_add(event);
 
@@ -261,7 +260,7 @@ cp
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
-  c->last_ping_time = time(NULL);
+  c->last_ping_time = now;
 
   send_id(c);
 cp
@@ -408,7 +407,7 @@ cp
     }
   
   c->outgoing = outgoing;
-  c->last_ping_time = time(NULL);
+  c->last_ping_time = now;
 
   connection_add(c);
 
@@ -440,7 +439,7 @@ cp
   c->address = sa;
   c->hostname = sockaddr2hostname(&sa);
   c->socket = fd;
-  c->last_ping_time = time(NULL);
+  c->last_ping_time = now;
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection from %s"), c->hostname);