X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=f5aa0994412e2b0416467cf03ada7ce423cc3f6b;hb=c19cc669d01b7720add8c80a47947a5c43ed12fc;hp=3b584f3928e0584296234e875a8c3ce137d4bf93;hpb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;p=tinc

diff --git a/src/edge.c b/src/edge.c
index 3b584f39..f5aa0994 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -13,16 +13,15 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
 #include "splay_tree.h"
+#include "control_common.h"
 #include "edge.h"
 #include "logger.h"
 #include "netutl.h"
@@ -53,48 +52,34 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 }
 
 void init_edges(void) {
-	cp();
-
 	edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
 splay_tree_t *new_edge_tree(void) {
-	cp();
-
 	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
 }
 
 void free_edge_tree(splay_tree_t *edge_tree) {
-	cp();
-
 	splay_delete_tree(edge_tree);
 }
 
 void exit_edges(void) {
-	cp();
-
 	splay_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void) {
-	cp();
-
 	return xmalloc_and_zero(sizeof(edge_t));
 }
 
 void free_edge(edge_t *e) {
-	cp();
-	
 	sockaddrfree(&e->address);
 
 	free(e);
 }
 
 void edge_add(edge_t *e) {
-	cp();
-
 	splay_insert(edge_weight_tree, e);
 	splay_insert(e->from->edge_tree, e);
 
@@ -105,8 +90,6 @@ void edge_add(edge_t *e) {
 }
 
 void edge_del(edge_t *e) {
-	cp();
-
 	if(e->reverse)
 		e->reverse->reverse = NULL;
 
@@ -117,37 +100,30 @@ void edge_del(edge_t *e) {
 edge_t *lookup_edge(node_t *from, node_t *to) {
 	edge_t v;
 	
-	cp();
-
 	v.from = from;
 	v.to = to;
 
 	return splay_search(from->edge_tree, &v);
 }
 
-int dump_edges(struct evbuffer *out) {
+bool dump_edges(connection_t *c) {
 	splay_node_t *node, *node2;
 	node_t *n;
 	edge_t *e;
 	char *address;
 
-	cp();
-
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
 		for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
 			e = node2->data;
 			address = sockaddr2hostname(&e->address);
-			if(evbuffer_add_printf(out,
-								   _(" %s to %s at %s options %lx weight %d\n"),
-								   e->from->name, e->to->name, address,
-								   e->options, e->weight) == -1) {
-				free(address);
-				return errno;
-			}
+			send_request(c, "%d %d %s to %s at %s options %x weight %d",
+					CONTROL, REQ_DUMP_EDGES,
+					e->from->name, e->to->name, address,
+					e->options, e->weight);
 			free(address);
 		}
 	}
 
-	return 0;
+	return send_request(c, "%d %d", CONTROL, REQ_DUMP_EDGES);
 }