Really make tinc default to any addressfamily.

[oweals/tinc.git] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index fcbc8c5ddacaee12d86009543cf889d18aff727a..e279d3741491e403a20c54825d8cf478c80afb5d 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.30 2003/03/28 13:41:49 guus Exp $
+    $Id: net_setup.c,v 1.1.2.32 2003/06/25 20:52:59 guus Exp $
 */
 
 #include "config.h"
@@ -368,8 +368,7 @@ int setup_myself(void)
                        return -1;
                }
                free(afname);
-       } else
-               addressfamily = AF_INET;
+       }
 
        get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
 
@@ -406,6 +405,7 @@ int setup_myself(void)
        keyexpires = now + keylifetime;
        
        EVP_CIPHER_CTX_init(&packet_ctx);
+       EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
 
        /* Check if we want to use message authentication codes... */
 
@@ -448,7 +448,7 @@ int setup_myself(void)
        if(get_config_int
           (lookup_config(myself->connection->config_tree, "Compression"),
                &myself->compression)) {
-               if(myself->compression < 0 || myself->compression > 9) {
+               if(myself->compression < 0 || myself->compression > 11) {
                        syslog(LOG_ERR, _("Bogus compression level!"));
                        return -1;
                }