X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=c7b612c743e76d24ffd5d4adcb492cf881c63db3;hp=320c684ff52b344dca711578cea55f561fb1944e;hb=c2752b961c9262386b940c2c053b9909bee22859;hpb=e06415e3d9d08cd33c5983a2c49c4101377160c2

diff --git a/src/net.c b/src/net.c
index 320c684f..c7b612c7 100644
--- a/src/net.c
+++ b/src/net.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.c,v 1.35.4.148 2001/11/05 19:09:08 guus Exp $
+    $Id: net.c,v 1.35.4.151 2001/11/16 22:41:38 zarq Exp $
 */
 
 #include "config.h"
@@ -63,7 +63,6 @@
 #include "connection.h"
 #include "meta.h"
 #include "net.h"
-#include "netutl.h"
 #include "process.h"
 #include "protocol.h"
 #include "subnet.h"
@@ -86,6 +85,36 @@ int do_prune = 0;
 
 /* VPN packet I/O */
 
+char *hostlookup(struct sockaddr *addr, int numericonly)
+{
+  char *hostname;
+  int flags = 0;
+  int r;
+
+cp
+  if(numericonly
+     || (get_config_bool(lookup_config(config_tree, "ResolveDNS"), &r)
+	 || !r ))
+      flags |= NI_NUMERICHOST;
+
+  hostname = xmalloc(NI_MAXHOST);
+
+  if((r = getnameinfo(addr, sizeof(*addr), hostname, NI_MAXHOST, NULL, 0, flags)) != 0)
+    {
+      free(hostname);
+      if(flags & NI_NUMERICHOST)
+	{
+	  syslog(LOG_ERR, _("Address conversion failed: %s"),
+		 gai_strerror(r));
+	  return NULL;
+	}
+      else
+	return hostlookup(addr, 1);
+    }
+cp
+  return hostname;
+}
+
 void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 {
   vpn_packet_t outpkt;
@@ -130,8 +159,6 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
   vpn_packet_t outpkt;
   int outlen, outpad;
   EVP_CIPHER_CTX ctx;
-  struct sockaddr_in to;
-  socklen_t tolen = sizeof(to);
   vpn_packet_t *copy;
 cp
   if(!n->status.validkey)
@@ -161,12 +188,8 @@ cp
   EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt));
   EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad);
   outlen += outpad;
-
-  to.sin_family = AF_INET;
-  to.sin_addr.s_addr = htonl(n->address);
-  to.sin_port = htons(n->port);
-
-  if((sendto(udp_socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
+  
+  if((sendto(udp_socket, (char *) outpkt.salt, outlen, 0, n->address->ai_addr, n->address->ai_addrlen)) < 0)
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
              n->name, n->hostname);
@@ -246,118 +269,191 @@ cp
 
 /* Setup sockets */
 
-int setup_listen_socket(int port)
+int setup_listen_socket(node_t *n)
 {
   int nfd, flags;
-  struct sockaddr_in a;
   int option;
   char *address;
-  ip_mask_t *ipmask;
+  int r;
+  struct addrinfo hints, *ai, *aitop;
+  int ipv6preferred;
 #ifdef HAVE_LINUX
   char *interface;
 #endif
+
 cp
-  if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+
+  if(!get_config_string(lookup_config(config_tree, "BindToAddress"), &address))
     {
-      syslog(LOG_ERR, _("Creating metasocket failed: %m"));
-      return -1;
+      address = NULL;
     }
 
-  flags = fcntl(nfd, F_GETFL);
-  if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = IPPROTO_TCP;
+  hints.ai_family = AF_INET;
+  if(get_config_bool(lookup_config(config_tree, "IPv6Preferred"), &ipv6preferred))
     {
-      close(nfd);
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-	     "fcntl");
+      if(ipv6preferred)
+	hints.ai_family = PF_UNSPEC;
+    }
+  if((r = getaddrinfo(address, n->port, &hints, &aitop)) != 0)
+    {
+      syslog(LOG_ERR, _("Looking up `%s' failed: %s\n"),
+	     address, gai_strerror(r));
       return -1;
     }
 
-  /* Optimize TCP settings */
-
-  option = 1;
-  setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
-  setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+  /* Try to create a listening socket for all alternatives we got from
+     getaddrinfo. */
+  for(ai = aitop; ai != NULL; ai = ai->ai_next)
+    {
+      if((nfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol)) < 0)
+	{
+	  syslog(LOG_ERR, _("Creating metasocket failed: %m"));
+	  continue;
+	}
+      
+      flags = fcntl(nfd, F_GETFL);
+      if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
+	{
+	  close(nfd);
+	  syslog(LOG_ERR, _("System call `%s' failed: %m"),
+		 "fcntl");
+	  continue;
+	}
+      
+      /* Optimize TCP settings */
+      
+      option = 1;
+      setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+      setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
 #ifdef HAVE_LINUX
-  setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
-
-  option = IPTOS_LOWDELAY;
-  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: %m"), interface);
-        return -1;
-      }
+      setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+      
+      option = IPTOS_LOWDELAY;
+      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: %m"), interface);
+	    continue;
+	  }
 #endif
 
-  memset(&a, 0, sizeof(a));
-  a.sin_family = AF_INET;
-  a.sin_addr.s_addr = htonl(INADDR_ANY);
-  a.sin_port = htons(port);
-
-  if(get_config_string(lookup_config(config_tree, "BindToAddress"), &address))
-    {
-      ipmask = strtoip(address);
-      if(ipmask)
-      {
-        a.sin_addr.s_addr = htonl(ipmask->address);
-        free(ipmask);
-      }
-    }
+      if(bind(nfd, ai->ai_addr, ai->ai_addrlen))
+	{
+	  close(nfd);
+	  syslog(LOG_ERR, _("Can't bind to %s port %s/tcp: %m"),
+		 ai->ai_canonname, n->port);
+	  continue;
+	}
+      
+      if(listen(nfd, 3))
+	{
+	  close(nfd);
+	  syslog(LOG_ERR, _("System call `%s' failed: %m"),
+		 "listen");
+	  continue;
+	}
 
-  if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
-    {
-      close(nfd);
-      syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port);
-      return -1;
+      break; /* We have successfully bound to a socket */
     }
 
-  if(listen(nfd, 3))
+  if(ai == NULL) /* None of the alternatives succeeded */
     {
-      close(nfd);
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-	     "listen");
+      syslog(LOG_ERR, _("Failed to open a listening socket."));
       return -1;
     }
 cp
   return nfd;
 }
 
-int setup_vpn_in_socket(int port)
+int setup_vpn_in_socket(node_t *n)
 {
-  int nfd, flags;
-  struct sockaddr_in a;
   const int one = 1;
+  int nfd, flags;
+  int option;
+  char *address;
+  int r;
+  struct addrinfo hints, *ai, *aitop;
+  int ipv6preferred;
+#ifdef HAVE_LINUX
+  char *interface;
+#endif
+
 cp
-  if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+
+  if(!get_config_string(lookup_config(config_tree, "BindToAddress"), &address))
+    {
+      address = NULL;
+    }
+
+  hints.ai_socktype = SOCK_DGRAM;
+  hints.ai_protocol = IPPROTO_UDP;
+  hints.ai_family = AF_INET;
+  if(get_config_bool(lookup_config(config_tree, "IPv6Preferred"), &ipv6preferred))
+    {
+      if(ipv6preferred)
+	hints.ai_family = PF_UNSPEC;
+    }
+  if((r = getaddrinfo(address, n->port, &hints, &aitop)) != 0)
     {
-      close(nfd);
-      syslog(LOG_ERR, _("Creating socket failed: %m"));
+      syslog(LOG_ERR, _("Looking up `%s' failed: %s\n"),
+	     address, gai_strerror(r));
       return -1;
     }
 
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
-  flags = fcntl(nfd, F_GETFL);
-  if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
+  /* Try to create a listening socket for all alternatives we got from
+     getaddrinfo. */
+  for(ai = aitop; ai != NULL; ai = ai->ai_next)
     {
-      close(nfd);
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-	     "fcntl");
-      return -1;
-    }
+      if((nfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol)) < 0)
+	{
+	  syslog(LOG_ERR, _("Creating metasocket failed: %m"));
+	  continue;
+	}
+      
+      flags = fcntl(nfd, F_GETFL);
+      if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
+	{
+	  close(nfd);
+	  syslog(LOG_ERR, _("System call `%s' failed: %m"),
+		 "fcntl");
+	  continue;
+	}
+      
+      /* Optimize UDP settings */
+      
+      option = 1;
+      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: %m"), interface);
+	    continue;
+	  }
+#endif
 
-  memset(&a, 0, sizeof(a));
-  a.sin_family = AF_INET;
-  a.sin_port = htons(port);
-  a.sin_addr.s_addr = htonl(INADDR_ANY);
+      if(bind(nfd, ai->ai_addr, ai->ai_addrlen))
+	{
+	  close(nfd);
+	  syslog(LOG_ERR, _("Can't bind to %s port %s/tcp: %m"),
+		 ai->ai_canonname, n->port);
+	  continue;
+	}
+      
+      break; /* We have successfully bound to a socket */
+    }
 
-  if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
+  if(ai == NULL) /* None of the alternatives succeeded */
     {
-      close(nfd);
-      syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
+      syslog(LOG_ERR, _("Failed to open a listening socket."));
       return -1;
     }
 cp
@@ -367,7 +463,6 @@ cp
 int setup_outgoing_socket(connection_t *c)
 {
   int flags;
-  struct sockaddr_in a;
 cp
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
@@ -376,7 +471,7 @@ cp
 
   if(c->socket == -1)
     {
-      syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
+      syslog(LOG_ERR, _("Creating socket for %s port %s failed: %m"),
              c->hostname, c->port);
       return -1;
     }
@@ -411,14 +506,10 @@ cp
 
   /* Connect */
 
-  a.sin_family = AF_INET;
-  a.sin_port = htons(c->port);
-  a.sin_addr.s_addr = htonl(c->address);
-
-  if(connect(c->socket, (struct sockaddr *)&a, sizeof(a)) == -1)
+  if(connect(c->socket, c->address->ai_addr, c->address->ai_addrlen) == -1)
     {
       close(c->socket);
-      syslog(LOG_ERR, _("%s port %hd: %m"), c->hostname, c->port);
+      syslog(LOG_ERR, _("%s port %s: %m"), c->hostname, c->port);
       return -1;
     }
 
@@ -427,13 +518,13 @@ cp
   if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
     {
       close(c->socket);
-      syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
+      syslog(LOG_ERR, _("fcntl for %s port %s: %m"),
              c->hostname, c->port);
       return -1;
     }
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Connected to %s port %hd"),
+    syslog(LOG_INFO, _("Connected to %s port %s"),
          c->hostname, c->port);
 cp
   return 0;
@@ -443,7 +534,9 @@ int setup_outgoing_connection(char *name)
 {
   connection_t *c;
   node_t *n;
-  struct hostent *h;
+  struct addrinfo *ai, *aitop, hints;
+  int r, ipv6preferred;
+
 cp
   n = lookup_node(name);
   
@@ -468,27 +561,37 @@ cp
       return -1;
     }
 
-  if(!get_config_port(lookup_config(c->config_tree, "Port"), &c->port))
+  if(!get_config_string(lookup_config(c->config_tree, "Port"), &c->port))
     {
       syslog(LOG_ERR, _("No port specified for %s"), c->name);
       free_connection(c);
       return -1;
     }
 
-  if(!(h = gethostbyname(c->hostname)))
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_family = AF_INET;
+  if(get_config_bool(lookup_config(c->config_tree, "IPv6Preferred"), &ipv6preferred))
     {
-      syslog(LOG_ERR, _("Error looking up `%s': %m"), c->hostname);
-      free_connection(c);
+      if(ipv6preferred)
+	hints.ai_family = PF_UNSPEC;
+    }
+
+  if((r = getaddrinfo(c->hostname, c->port, &hints, &aitop)) != 0)
+    {
+      syslog(LOG_ERR, _("Looking up %s failed: %s\n"),
+	     c->hostname, gai_strerror(r));
       return -1;
     }
 
-  c->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
-  c->hostname = hostlookup(htonl(c->address));
+  for(ai = aitop; ai != NULL; ai = ai->ai_next)
+    {
+      if(setup_outgoing_socket(c) < 0)
+	continue;
+    }
 
-  if(setup_outgoing_socket(c) < 0)
+  if(ai == NULL)
     {
-      syslog(LOG_ERR, _("Could not set up a meta connection to %s (%s)"),
-             c->name, c->hostname);
+      /* No connection alternative succeeded */
       free_connection(c);
       return -1;
     }
@@ -661,8 +764,8 @@ cp
       return -1;
     }
 */
-  if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port))
-    myself->port = 655;
+  if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myself->port))
+    myself->port = "655";
 
   myself->connection->port = myself->port;
 
@@ -722,13 +825,13 @@ cp
 cp
   /* Open sockets */
   
-  if((tcp_socket = setup_listen_socket(myself->port)) < 0)
+  if((tcp_socket = setup_listen_socket(myself)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
       return -1;
     }
 
-  if((udp_socket = setup_vpn_in_socket(myself->port)) < 0)
+  if((udp_socket = setup_vpn_in_socket(myself)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
       return -1;
@@ -755,7 +858,7 @@ cp
   myself->status.active = 1;
   node_add(myself);
 
-  syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
+  syslog(LOG_NOTICE, _("Ready: listening on port %s"), myself->port);
 cp
   return 0;
 }
@@ -849,14 +952,21 @@ cp
       return NULL;
     }
 
-  c->address = ntohl(ci.sin_addr.s_addr);
-  c->hostname = hostlookup(ci.sin_addr.s_addr);
-  c->port = htons(ci.sin_port);
+  c->address = sockaddr_to_addrinfo(ci);
+
+  c->hostname = xmalloc(INET6_ADDRSTRLEN);
+  if((inet_ntop(ci.sin_family, &(ci.sin_addr), c->hostname, INET6_ADDRSTRLEN)) == NULL)
+    {
+      syslog(LOG_ERR, _("Couldn't convert address to string: %m"));
+      free(c->hostname);
+      return NULL;
+    }
+  asprintf(&(c->port), "%d", htons(ci.sin_port));
   c->socket = sfd;
   c->last_ping_time = time(NULL);
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_NOTICE, _("Connection from %s port %d"),
+    syslog(LOG_NOTICE, _("Connection from %s port %s"),
          c->hostname, c->port);
 
   c->allow_request = ID;
@@ -917,11 +1027,11 @@ cp
       return;
     }
 
-  n = lookup_node_udp(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+  n = lookup_node_udp(sockaddr_to_addrinfo(&from));
 
   if(!n)
     {
-      syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+      syslog(LOG_WARNING, _("Received UDP packet on port %s from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
       return;
     }
 /*
@@ -1103,7 +1213,6 @@ cp
   while(cfg)
     {
       get_config_string(cfg, &name);
-      cfg = lookup_config_next(config_tree, cfg);  /* Next time skip to next ConnectTo line */
 
       if(check_id(name))
         {
@@ -1114,6 +1223,7 @@ cp
       if(setup_outgoing_connection(name))   /* function returns 0 when there are no problems */
         retry = 1;
 
+      cfg = lookup_config_next(config_tree, cfg); /* Next time skip to next ConnectTo line */
     }
 
   get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout);
@@ -1124,7 +1234,7 @@ cp
       if(seconds_till_retry > maxtimeout)    /* Don't wait more than MAXTIMEOUT seconds. */
         seconds_till_retry = maxtimeout;
 
-      syslog(LOG_ERR, _("Failed to setup all outgoing connections, will retry in %d seconds"),
+      syslog(LOG_ERR, _("Failed to setup any outgoing connection, will retry in %d seconds"),
         seconds_till_retry);
   
       /* Randomize timeout to avoid global synchronisation effects */