X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprotocol_auth.c;h=21f13a13ad042b9a7e5df7de10612db692341f9b;hb=084ba04f51441098c55d3bd21b11bbe368e7b52e;hp=d69c8ab722913732c2521ec94356df5ec9e35106;hpb=9699f08afc6420d2bdac1063ea6789b585aaf42e;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index d69c8ab7..21f13a13 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -22,8 +22,6 @@
 
 #include "conf.h"
 #include "connection.h"
-#include "control.h"
-#include "control_common.h"
 #include "cipher.h"
 #include "crypto.h"
 #include "digest.h"
@@ -174,6 +172,9 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
 	fclose(f);
 
 	logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
+
+	//TODO: callback to application to inform of an accepted invitation
+
 	sptps_send_record(&c->sptps, 2, data, 0);
 	return true;
 }
@@ -272,18 +273,7 @@ bool id_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	/* Check if this is a control connection */
-
-	if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
-		c->status.control = true;
-		c->allow_request = CONTROL;
-		c->last_ping_time = now.tv_sec + 3600;
-
-		free(c->name);
-		c->name = xstrdup("<control>");
-
-		return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
-	}
+	/* Check if this is an invitation  */
 
 	if(name[0] == '?') {
 		if(!invitation_key) {
@@ -652,7 +642,8 @@ bool send_ack(connection_t *c) {
 	if(choice)
 		c->options |= OPTION_CLAMP_MSS;
 
-	get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
+	if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight))
+		get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
 
 	return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
 }
@@ -660,6 +651,7 @@ bool send_ack(connection_t *c) {
 static void send_everything(connection_t *c) {
 	/* Send all known subnets and edges */
 
+	// TODO: remove this
 	if(disablebuggypeers) {
 		static struct {
 			vpn_packet_t pkt;
@@ -671,17 +663,7 @@ static void send_everything(connection_t *c) {
 		send_tcppacket(c, &zeropkt.pkt);
 	}
 
-	if(tunnelserver) {
-		for splay_each(subnet_t, s, myself->subnet_tree)
-			send_add_subnet(c, s);
-
-		return;
-	}
-
 	for splay_each(node_t, n, node_tree) {
-		for splay_each(subnet_t, s, n->subnet_tree)
-			send_add_subnet(c, s);
-
 		for splay_each(edge_t, e, n->edge_tree)
 			send_add_edge(c, e);
 	}
@@ -746,7 +728,7 @@ bool ack_h(connection_t *c, const char *request) {
 			}
 
 			terminate_connection(n->connection, false);
-			/* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */
+			/* Run graph algorithm to keep things in sync */
 			graph();
 		}
 	}