Add a minor number to the protocol version.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index c51c133..7ceba36 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -81,7 +81,7 @@ bool read_rsa_public_key(connection_t *c) {
        return result;
 }
 
-bool read_rsa_private_key() {
+static bool read_rsa_private_key(void) {
        FILE *fp;
        char *fname;
        char *n, *d;
@@ -143,11 +143,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);
        }
@@ -220,7 +220,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;
@@ -239,7 +239,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!");
@@ -415,7 +416,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;
@@ -608,7 +609,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);
        }