Replace Opaque and Strict options with a TunnelServer option.

This commit is contained in:
Guus Sliepen 2003-11-17 15:30:18 +00:00
parent 0e59fb022c
commit e3220cacb5
12 changed files with 82 additions and 49 deletions

View file

@ -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.22 2003/11/10 22:31:53 guus Exp $
$Id: protocol_edge.c,v 1.1.4.23 2003/11/17 15:30:18 guus Exp $
*/
#include "system.h"
@ -110,7 +110,7 @@ bool add_edge_h(connection_t *c)
node_add(to);
}
if(c->status.opaque && from != myself && from != c->node && to != myself && to != c->node)
if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
return false;
/* Convert addresses */
@ -157,7 +157,7 @@ bool add_edge_h(connection_t *c)
/* Tell the rest about the new edge */
if(!c->status.opaque)
if(!tunnelserver)
forward_request(c);
/* Run MST before or after we tell the rest? */
@ -225,7 +225,7 @@ bool del_edge_h(connection_t *c)
return true;
}
if(c->status.opaque && from != myself && from != c->node && to != myself && to != c->node)
if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
return false;
/* Check if edge exists */
@ -247,7 +247,7 @@ bool del_edge_h(connection_t *c)
/* Tell the rest about the deleted edge */
if(!c->status.opaque)
if(!tunnelserver)
forward_request(c);
/* Delete the edge */
@ -263,7 +263,8 @@ bool del_edge_h(connection_t *c)
if(!to->status.reachable) {
e = lookup_edge(to, myself);
if(e) {
send_del_edge(broadcast, e);
if(!tunnelserver)
send_del_edge(broadcast, e);
edge_del(e);
}
}