- Use gai_strerror() where appropriate

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 1c5ff15..9393954 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.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_setup.c,v 1.1.2.1 2002/02/18 16:25:16 guus Exp $
+    $Id: net_setup.c,v 1.1.2.4 2002/02/20 22:15:32 guus Exp $
 */
 
 #include "config.h"
@@ -221,7 +221,7 @@ int setup_myself(void)
   subnet_t *subnet;
   char *name, *mode, *afname, *cipher, *digest;
   struct addrinfo hint, *ai;
-  int choice;
+  int choice, err;
 cp
   myself = new_node();
   myself->connection = new_connection();
@@ -382,6 +382,8 @@ cp
   else
     myself->keylength = 1;
 
+  myself->connection->outcipher = EVP_bf_ofb();
+
   myself->key = (char *)xmalloc(myself->keylength);
   RAND_pseudo_bytes(myself->key, myself->keylength);
 
@@ -410,6 +412,8 @@ cp
   else
     myself->digest = EVP_sha1();
 
+  myself->connection->outdigest = EVP_sha1();
+
   if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->maclength))
     {
       if(myself->digest)
@@ -429,6 +433,8 @@ cp
   else
     myself->maclength = 4;
 
+  myself->connection->outmaclength = 0;
+
   /* Compression */
 
   if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->compression))
@@ -441,6 +447,8 @@ cp
     }
   else
     myself->compression = 0;
+
+  myself->connection->outcompression = 0;
 cp
   /* Done */
 
@@ -454,14 +462,16 @@ cp
 cp
   /* Open sockets */
   
-  hint.ai_family = (addressfamily == AF_UNSPEC)?AF_INET6:addressfamily;
+  memset(&hint, 0, sizeof(hint));
+  
+  hint.ai_family = addressfamily;
   hint.ai_socktype = SOCK_STREAM;
   hint.ai_protocol = IPPROTO_TCP;
   hint.ai_flags = AI_PASSIVE;
 
-  if(getaddrinfo(NULL, myport, &hint, &ai) || !ai)
+  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
     {
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", strerror(errno));
+      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
       return -1;
     }
 
@@ -471,6 +481,17 @@ cp
       return -1;
     }
 
+  freeaddrinfo(ai);
+
+  hint.ai_socktype = SOCK_DGRAM;
+  hint.ai_protocol = IPPROTO_UDP;
+
+  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
+    {
+      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
+      return -1;
+    }
+
   if((udp_socket = setup_vpn_in_socket((sockaddr_t *)ai->ai_addr)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));