projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added graph dumping ability based on Markus Goetz's patch.
[tinc]
/
src
/
protocol_edge.c
diff --git
a/src/protocol_edge.c
b/src/protocol_edge.c
index
e1e2ca0
..
bcc17db
100644
(file)
--- a/
src/protocol_edge.c
+++ b/
src/protocol_edge.c
@@
-1,7
+1,7
@@
/*
protocol_edge.c -- handle the meta-protocol, edges
/*
protocol_edge.c -- handle the meta-protocol, edges
- Copyright (C) 1999-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1999-200
5 Ivo Timmermans
,
+ 2000-200
6 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
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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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$
*/
#include "system.h"
*/
#include "system.h"
@@
-36,7
+36,7
@@
#include "utils.h"
#include "xalloc.h"
#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;
{
bool x;
char *address, *port;
@@
-110,6
+110,9
@@
bool add_edge_h(connection_t *c)
node_add(to);
}
node_add(to);
}
+ if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
+ return false;
+
/* Convert addresses */
address = str2sockaddr(to_address, to_port);
/* 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 */
/* Tell the rest about the new edge */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c);
/* Run MST before or after we tell the rest? */
/* Run MST before or after we tell the rest? */
@@
-163,7
+167,7
@@
bool add_edge_h(connection_t *c)
return true;
}
return true;
}
-bool send_del_edge(connection_t *c, edge_t *e)
+bool send_del_edge(connection_t *c,
const
edge_t *e)
{
cp();
{
cp();
@@
-221,6
+225,9
@@
bool del_edge_h(connection_t *c)
return true;
}
return true;
}
+ if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
+ return false;
+
/* Check if edge exists */
e = lookup_edge(from, to);
/* 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 */
/* Tell the rest about the deleted edge */
- forward_request(c);
+ if(!tunnelserver)
+ forward_request(c);
/* Delete the edge */
/* Delete the edge */
@@
-250,5
+258,16
@@
bool del_edge_h(connection_t *c)
graph();
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) {
+ if(!tunnelserver)
+ send_del_edge(broadcast, e);
+ edge_del(e);
+ }
+ }
+
return true;
}
return true;
}