Require ExperimentalProtocol = yes for new features, update documentation.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 9c18895..f3de53a 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -3,6 +3,7 @@
     Copyright (C) 1998-2005 Ivo Timmermans,
                   2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
+                  2010      Brandon Black <blblack@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,6 +29,7 @@
 #include "control.h"
 #include "device.h"
 #include "digest.h"
+#include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
@@ -43,6 +45,43 @@
 char *myport;
 static struct event device_ev;
 
+bool read_ecdsa_public_key(connection_t *c) {
+       FILE *fp;
+       char *fname;
+       char *p;
+       bool result;
+
+       /* First, check for simple ECDSAPublicKey statement */
+
+       if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
+               result = ecdsa_set_base64_public_key(&c->ecdsa, p);
+               free(p);
+               return result;
+       }
+
+       /* Else, check for ECDSAPublicKeyFile statement and read it */
+
+       if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
+               xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+
+       fp = fopen(fname, "r");
+
+       if(!fp) {
+               logger(LOG_ERR, "Error reading ECDSA public key file `%s': %s",
+                          fname, strerror(errno));
+               free(fname);
+               return false;
+       }
+
+       result = ecdsa_read_pem_public_key(&c->ecdsa, fp);
+       fclose(fp);
+
+       if(!result) 
+               logger(LOG_ERR, "Reading ECDSA public key file `%s' failed: %s", fname, strerror(errno));
+       free(fname);
+       return result;
+}
+
 bool read_rsa_public_key(connection_t *c) {
        FILE *fp;
        char *fname;
@@ -80,7 +119,48 @@ bool read_rsa_public_key(connection_t *c) {
        return result;
 }
 
-bool read_rsa_private_key() {
+static bool read_ecdsa_private_key(void) {
+       FILE *fp;
+       char *fname;
+       bool result;
+
+       /* Check for PrivateKeyFile statement and read it */
+
+       if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
+               xasprintf(&fname, "%s/ecdsa_key.priv", confbase);
+
+       fp = fopen(fname, "r");
+
+       if(!fp) {
+               logger(LOG_ERR, "Error reading ECDSA private key file `%s': %s",
+                          fname, strerror(errno));
+               free(fname);
+               return false;
+       }
+
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+       struct stat s;
+
+       if(fstat(fileno(fp), &s)) {
+               logger(LOG_ERR, "Could not stat ECDSA private key file `%s': %s'", fname, strerror(errno));
+               free(fname);
+               return false;
+       }
+
+       if(s.st_mode & ~0100700)
+               logger(LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
+#endif
+
+       result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
+       fclose(fp);
+
+       if(!result) 
+               logger(LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+       free(fname);
+       return result;
+}
+
+static bool read_rsa_private_key(void) {
        FILE *fp;
        char *fname;
        char *n, *d;
@@ -142,11 +222,11 @@ static void keyexpire_handler(int fd, short events, void *data) {
        regenerate_key();
 }
 
-void regenerate_key() {
+void regenerate_key(void) {
        if(timeout_initialized(&keyexpire_event)) {
                ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
                event_del(&keyexpire_event);
-               send_key_changed(broadcast, myself);
+               send_key_changed();
        } else {
                timeout_set(&keyexpire_event, keyexpire_handler, NULL);
        }
@@ -219,7 +299,7 @@ void load_all_subnets(void) {
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
-bool setup_myself(void) {
+static bool setup_myself(void) {
        config_t *cfg;
        subnet_t *subnet;
        char *name, *hostname, *mode, *afname, *cipher, *digest;
@@ -229,6 +309,7 @@ bool setup_myself(void) {
        struct addrinfo *ai, *aip, hint = {0};
        bool choice;
        int i, err;
+       int replaywin_int;
 
        myself = new_node();
        myself->connection = new_connection();
@@ -237,7 +318,8 @@ bool setup_myself(void) {
        myself->connection->hostname = xstrdup("MYSELF");
 
        myself->connection->options = 0;
-       myself->connection->protocol_version = PROT_CURRENT;
+       myself->connection->protocol_major = PROT_MAJOR;
+       myself->connection->protocol_minor = PROT_MINOR;
 
        if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {     /* Not acceptable */
                logger(LOG_ERR, "Name for tinc daemon required!");
@@ -257,6 +339,11 @@ bool setup_myself(void) {
        read_config_file(config_tree, fname);
        free(fname);
 
+       get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
+
+       if(experimental && !read_ecdsa_private_key())
+               return false;
+
        if(!read_rsa_private_key())
                return false;
 
@@ -358,6 +445,28 @@ bool setup_myself(void) {
        } else
                maxtimeout = 900;
 
+       if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
+               if(udp_rcvbuf <= 0) {
+                       logger(LOG_ERR, "UDPRcvBuf cannot be negative!");
+                       return false;
+               }
+       }
+
+       if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
+               if(udp_sndbuf <= 0) {
+                       logger(LOG_ERR, "UDPSndBuf cannot be negative!");
+                       return false;
+               }
+       }
+
+       if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
+               if(replaywin_int < 0) {
+                       logger(LOG_ERR, "ReplayWindow cannot be negative!");
+                       return false;
+               }
+               replaywin = (unsigned)replaywin_int;
+       }
+
        if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
                if(!strcasecmp(afname, "IPv4"))
                        addressfamily = AF_INET;
@@ -391,7 +500,7 @@ bool setup_myself(void) {
 
        /* Check if we want to use message authentication codes... */
 
-       if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
+       if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
                digest = xstrdup("sha1");
 
        int maclength = 4;
@@ -584,7 +693,7 @@ void close_network_connections(void) {
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
                c = node->data;
-               c->outgoing = false;
+               c->outgoing = NULL;
                terminate_connection(c, false);
        }