Add Opaque option which prevent information from being forwarded to certain nodes.

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index e1e2ca0..af0b2e7 100644 (file)
--- 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.19 2003/07/22 20:55:20 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.22 2003/11/10 22:31:53 guus Exp $
 */
 
 #include "system.h"
@@ -36,7 +36,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_add_edge(connection_t *c, edge_t *e)
+bool send_add_edge(connection_t *c, const edge_t *e)
 {
        bool x;
        char *address, *port;
@@ -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? */
 
@@ -163,7 +167,7 @@ bool add_edge_h(connection_t *c)
        return true;
 }
 
-bool send_del_edge(connection_t *c, edge_t *e)
+bool send_del_edge(connection_t *c, const edge_t *e)
 {
        cp();
 
@@ -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 */
 
@@ -250,5 +258,15 @@ bool del_edge_h(connection_t *c)
 
        graph();
 
+       /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+
+       if(!to->status.reachable) {
+               e = lookup_edge(to, myself);
+               if(e) {
+                       send_del_edge(broadcast, e);
+                       edge_del(e);
+               }
+       }
+
        return true;
 }