Merge branch 'master' into dirtydebug

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 9c459787eabbb5bc94a200a2dc01e3effbc1be58..55a7c981d3e7d46ef91e5a6aafe36474d42d8fbe 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -24,11 +24,10 @@
 #include "list.h"
 #include "cipher.h"
 #include "conf.h"
-#include "control_common.h"
+#include "connection.h"
 #include "list.h"
 #include "logger.h"
 #include "rsa.h"
-#include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
@@ -48,7 +47,7 @@ void exit_connections(void) {
 }
 
 connection_t *new_connection(void) {
-       return xmalloc_and_zero(sizeof(connection_t));
+       return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
@@ -90,14 +89,3 @@ void connection_add(connection_t *c) {
 void connection_del(connection_t *c) {
        list_delete(connection_list, c);
 }
-
-bool dump_connections(connection_t *cdump) {
-       for list_each(connection_t, c, connection_list) {
-               send_request(cdump, "%d %d %s %s %x %d %x",
-                               CONTROL, REQ_DUMP_CONNECTIONS,
-                               c->name, c->hostname, c->options, c->socket,
-                               bitfield_to_int(&c->status, sizeof c->status));
-       }
-
-       return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
-}