From 0e59fb022c6c015a5be7ed70e0378cb011be98b5 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 10 Nov 2003 22:31:53 +0000 Subject: [PATCH] Add Opaque option which prevent information from being forwarded to certain nodes. --- src/connection.h | 6 ++++-- src/meta.c | 4 ++-- src/protocol_auth.c | 41 +++++++++++++++++++++++++++++------------ src/protocol_edge.c | 14 +++++++++++--- src/protocol_subnet.c | 14 +++++++++++--- 5 files changed, 57 insertions(+), 22 deletions(-) diff --git a/src/connection.h b/src/connection.h index 29bace11..f075f19a 100644 --- a/src/connection.h +++ b/src/connection.h @@ -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: connection.h,v 1.1.2.36 2003/07/30 21:52:41 guus Exp $ + $Id: connection.h,v 1.1.2.37 2003/11/10 22:31:53 guus Exp $ */ #ifndef __TINC_CONNECTION_H__ @@ -40,7 +40,9 @@ typedef struct connection_status_t { int timeout:1; /* 1 if gotten timeout */ int encryptout:1; /* 1 if we can encrypt outgoing traffic */ int decryptin:1; /* 1 if we have to decrypt incoming traffic */ - int mst:1; /* 1 if this connection is part of a minimum spanning tree */ + int mst:1; /* 1 if this connection is part of a minimum spanning tree */ + int opaque:1; /* 1 if we do not forward information about other nodes */ + int strict:1; /* 1 if we strictly check edges and subnets received from this connection */ int unused:18; } connection_status_t; diff --git a/src/meta.c b/src/meta.c index 77e19295..2ff272ec 100644 --- a/src/meta.c +++ b/src/meta.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: meta.c,v 1.1.2.48 2003/10/12 11:40:00 guus Exp $ + $Id: meta.c,v 1.1.2.49 2003/11/10 22:31:53 guus Exp $ */ #include "system.h" @@ -88,7 +88,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) for(node = connection_tree->head; node; node = node->next) { c = node->data; - if(c != from && c->status.active) + if(c != from && c->status.active && !c->status.opaque) send_meta(c, buffer, length); } } diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 36de236c..920324fe 100644 --- 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.28 2003/10/11 12:28:48 guus Exp $ + $Id: protocol_auth.c,v 1.1.4.29 2003/11/10 22:31:53 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); @@ -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,27 @@ 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; + + choice = false; + get_config_bool(lookup_config(config_tree, "Opaque"), &choice); + get_config_bool(lookup_config(c->config_tree, "Opaque"), &choice); + c->status.opaque = choice; + + if(c->status.opaque) + c->options |= OPTION_INDIRECT; + + choice = false; + get_config_bool(lookup_config(config_tree, "Strict"), &choice); + get_config_bool(lookup_config(c->config_tree, "Strict"), &choice); + c->status.strict = choice; + return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options); } @@ -552,7 +565,8 @@ bool ack_h(connection_t *c) /* Send him everything we know */ - send_everything(c); + if(!c->status.opaque) + send_everything(c); /* Create an edge_t for this connection */ @@ -572,7 +586,10 @@ bool ack_h(connection_t *c) /* Notify everyone of the new edge */ - send_add_edge(broadcast, c->edge); + if(c->status.opaque) + send_add_edge(broadcast, c->edge); + else + send_add_edge(c, c->edge); /* Run MST and SSSP algorithms */ diff --git a/src/protocol_edge.c b/src/protocol_edge.c index 5949a38e..af0b2e72 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.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_edge.c,v 1.1.4.21 2003/08/28 15:27:12 guus Exp $ + $Id: protocol_edge.c,v 1.1.4.22 2003/11/10 22:31:53 guus Exp $ */ #include "system.h" @@ -110,6 +110,9 @@ bool add_edge_h(connection_t *c) node_add(to); } + if(c->status.opaque && from != myself && from != c->node && to != myself && to != c->node) + return false; + /* Convert addresses */ address = str2sockaddr(to_address, to_port); @@ -154,7 +157,8 @@ bool add_edge_h(connection_t *c) /* Tell the rest about the new edge */ - forward_request(c); + if(!c->status.opaque) + forward_request(c); /* Run MST before or after we tell the rest? */ @@ -221,6 +225,9 @@ bool del_edge_h(connection_t *c) return true; } + if(c->status.opaque && from != myself && from != c->node && to != myself && to != c->node) + return false; + /* Check if edge exists */ e = lookup_edge(from, to); @@ -240,7 +247,8 @@ bool del_edge_h(connection_t *c) /* Tell the rest about the deleted edge */ - forward_request(c); + if(!c->status.opaque) + forward_request(c); /* Delete the edge */ diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index bb2f2def..cb33ba0a 100644 --- a/src/protocol_subnet.c +++ b/src/protocol_subnet.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_subnet.c,v 1.1.4.15 2003/07/24 12:08:16 guus Exp $ + $Id: protocol_subnet.c,v 1.1.4.16 2003/11/10 22:31:53 guus Exp $ */ #include "system.h" @@ -94,6 +94,9 @@ bool add_subnet_h(connection_t *c) node_add(owner); } + if(c->status.opaque && owner != myself && owner != c->node) + return false; + /* Check if we already know this subnet */ if(lookup_subnet(owner, s)) { @@ -117,7 +120,8 @@ bool add_subnet_h(connection_t *c) /* Tell the rest */ - forward_request(c); + if(!c->status.opaque) + forward_request(c); return true; } @@ -171,6 +175,9 @@ bool del_subnet_h(connection_t *c) return true; } + if(c->status.opaque && owner != myself && owner != c->node) + return false; + /* Check if subnet string is valid */ s = str2net(subnetstr); @@ -209,7 +216,8 @@ bool del_subnet_h(connection_t *c) /* Tell the rest */ - forward_request(c); + if(!c->status.opaque) + forward_request(c); /* Finally, delete it. */ -- 2.20.1