Replace Opaque and Strict options with a TunnelServer option.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 86ba345..8aad583 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.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: protocol_auth.c,v 1.1.4.27 2003/10/11 12:16:13 guus Exp $
+    $Id: protocol_auth.c,v 1.1.4.30 2003/11/17 15:30:18 guus Exp $
 */
 
 #include "system.h"
@@ -51,7 +51,6 @@ bool send_id(connection_t *c)
 bool id_h(connection_t *c)
 {
        char name[MAX_STRING_SIZE];
-       bool choice;
 
        cp();
 
@@ -109,14 +108,6 @@ bool id_h(connection_t *c)
                return false;
        }
 
-       /* Check some options */
-
-       if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
-               c->options |= OPTION_INDIRECT;
-
-       if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
-               c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
-
        c->allow_request = METAKEY;
 
        return send_metakey(c);
@@ -385,8 +376,8 @@ bool send_chal_reply(connection_t *c)
        /* Calculate the hash from the challenge we received */
 
        if(!EVP_DigestInit(&ctx, c->indigest)
-                       || !EVP_DigestUpdate(&ctx, c->mychallenge, RSA_size(myself->connection->rsa_key)
-                       || !EVP_DigestFinal(&ctx, hash, NULL))) {
+                       || !EVP_DigestUpdate(&ctx, c->mychallenge, RSA_size(myself->connection->rsa_key))
+                       || !EVP_DigestFinal(&ctx, hash, NULL)) {
                logger(LOG_ERR, _("Error during calculation of response for %s (%s): %s"),
                        c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
                return false;
@@ -468,6 +459,7 @@ bool send_ack(connection_t *c)
           to create node_t and edge_t structures. */
 
        struct timeval now;
+       bool choice;
 
        cp();
 
@@ -476,6 +468,14 @@ bool send_ack(connection_t *c)
        gettimeofday(&now, NULL);
        c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
 
+       /* Check some options */
+
+       if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
+               c->options |= OPTION_INDIRECT;
+
+       if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
+               c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
+
        return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
 }
 
@@ -488,6 +488,15 @@ static void send_everything(connection_t *c)
 
        /* Send all known subnets and edges */
 
+       if(tunnelserver) {
+               for(node = myself->subnet_tree->head; node; node = node->next) {
+                       s = node->data;
+                       send_add_subnet(c, s);
+               }
+
+               return;
+       }
+
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
 
@@ -572,7 +581,10 @@ bool ack_h(connection_t *c)
 
        /* Notify everyone of the new edge */
 
-       send_add_edge(broadcast, c->edge);
+       if(tunnelserver)
+               send_add_edge(c, c->edge);
+       else
+               send_add_edge(broadcast, c->edge);
 
        /* Run MST and SSSP algorithms */