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

diff --git a/src/net_socket.c b/src/net_socket.c
index 757199d6..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.4 2002/02/26 23:26:41 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 */
 
@@ -84,6 +83,7 @@ int setup_listen_socket(sockaddr_t *sa)
   int option;
 #ifdef HAVE_LINUX
   char *interface;
+  struct ifreq ifr;
 #endif
 cp
   if((nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0)
@@ -111,12 +111,16 @@ cp
   setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
 
   if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
-    if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
-      {
-        close(nfd);
-        syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
-        return -1;
-      }
+    {
+      memset(&ifr, 0, sizeof(ifr));
+      strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+      if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
+	{
+          close(nfd);
+          syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
+          return -1;
+	}
+    }
 #endif
 
   if(bind(nfd, &sa->sa, SALEN(sa->sa)))
@@ -145,6 +149,7 @@ int setup_vpn_in_socket(sockaddr_t *sa)
   int option;
 #ifdef HAVE_LINUX
   char *interface;
+  struct ifreq ifr;
 #endif
 cp
   if((nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP)) < 0)
@@ -165,12 +170,16 @@ cp
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 #ifdef HAVE_LINUX
   if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
-    if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
-      {
-        close(nfd);
-        syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
-        return -1;
-      }
+    {
+      memset(&ifr, 0, sizeof(ifr));
+      strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+      if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
+	{
+          close(nfd);
+          syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
+          return -1;
+	}
+    }
 #endif
 
   if(bind(nfd, &sa->sa, SALEN(sa->sa)))
@@ -195,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);
 
@@ -251,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
@@ -398,7 +407,7 @@ cp
     }
   
   c->outgoing = outgoing;
-  c->last_ping_time = time(NULL);
+  c->last_ping_time = now;
 
   connection_add(c);
 
@@ -430,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);