From 2327d3f6eb5982bcc922ff1ab1ec436ba6aeffdc Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Mon, 9 Feb 2009 23:51:10 +0100 Subject: [PATCH] Allow tunnelserver to work with clients that have other peers. In TunnelServer mode, tinc server disconnects any client if it announces indirect subnets -- subnets that are not theirs (e.g. subnets for nodes the CLIENT has connections now, even if those nodes are known to the server too). Fix that by ignoring such (indirect) announces instead. While we're at it, move check for such indirect subnet registration to before allocating new node structure, as in TunnelServer mode we don't really need to know that other node. --- src/protocol_subnet.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index e3600bd..22fb058 100644 --- a/src/protocol_subnet.c +++ b/src/protocol_subnet.c @@ -83,15 +83,19 @@ bool add_subnet_h(connection_t *c) owner = lookup_node(name); + if(tunnelserver && owner != myself && owner != c->node) { + /* in case of tunnelserver, ignore indirect subnet registrations */ + ifdebug(PROTOCOL) logger(LOG_WARNING, _("Ignoring indirect %s from %s (%s) for %s"), + "ADD_SUBNET", c->name, c->hostname, subnetstr); + return true; + } + if(!owner) { owner = new_node(); owner->name = xstrdup(name); node_add(owner); } - if(tunnelserver && owner != myself && owner != c->node) - return false; - /* Check if we already know this subnet */ if(lookup_subnet(owner, &s)) -- 2.25.1