X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconnection.c;h=9cc64914cd4ba217a85d824f9ff378e5f41884b1;hp=9b80db6b9e1c8fd3384e66d8b3cdae489dc54712;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=b67296418c51784d39a24c3041e2cb199bee06f2

diff --git a/src/connection.c b/src/connection.c
index 9b80db6b..9cc64914 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -29,6 +29,9 @@
 #include "xalloc.h"
 
 void init_connections(meshlink_handle_t *mesh) {
+	assert(!mesh->connections);
+	assert(!mesh->everyone);
+
 	mesh->connections = list_alloc((list_action_t) free_connection);
 	mesh->everyone = new_connection();
 	mesh->everyone->name = xstrdup("mesh->everyone");
@@ -39,7 +42,9 @@ void exit_connections(meshlink_handle_t *mesh) {
 		list_delete_list(mesh->connections);
 	}
 
-	free_connection(mesh->everyone);
+	if(mesh->everyone) {
+		free_connection(mesh->everyone);
+	}
 
 	mesh->connections = NULL;
 	mesh->everyone = NULL;
@@ -50,9 +55,7 @@ connection_t *new_connection(void) {
 }
 
 void free_connection(connection_t *c) {
-	if(!c) {
-		return;
-	}
+	assert(c);
 
 	sptps_stop(&c->sptps);
 	ecdsa_free(c->ecdsa);
@@ -70,19 +73,19 @@ void free_connection(connection_t *c) {
 
 	free(c->name);
 
-	if(c->config_tree) {
-		exit_configuration(&c->config_tree);
-	}
-
 	free(c);
 }
 
 void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+	assert(c);
+
 	c->mesh = mesh;
 	list_insert_tail(mesh->connections, c);
 }
 
 void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+	assert(c);
+
 	io_del(&mesh->loop, &c->io);
 	list_delete(mesh->connections, c);
 }