Add assert() calls to the library.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index c3937307ae477065169ab4b14cc9e60ab83f252a..46a2631e6b5154fcce850edb445d060601c550dd 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -109,6 +109,8 @@ void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report)
   and close the connection.
 */
 static void timeout_handler(event_loop_t *loop, void *data) {
+       assert(data);
+
        meshlink_handle_t *mesh = loop->data;
        logger(mesh, MESHLINK_DEBUG, "timeout_handler()");
 
@@ -421,7 +423,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                logger(mesh, MESHLINK_DEBUG, "* could not find node for initial connect");
                        }
 
-                       splay_free_tree(nodes);
+                       splay_delete_tree(nodes);
                }
 
 
@@ -450,11 +452,11 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                                logger(mesh, MESHLINK_DEBUG, "* found better node");
                                                connect_to = (node_t *)nodes->head->data;
 
-                                               splay_free_tree(nodes);
+                                               splay_delete_tree(nodes);
                                                break;
                                        }
 
-                                       splay_free_tree(nodes);
+                                       splay_delete_tree(nodes);
                                } else {
                                        break;
                                }
@@ -484,7 +486,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                logger(mesh, MESHLINK_DEBUG, "* could not find nodes for partition healing");
                        }
 
-                       splay_free_tree(nodes);
+                       splay_delete_tree(nodes);
                }
 
 
@@ -546,7 +548,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                                disconnect_from = (node_t *)nodes->head->data;
                                        }
 
-                                       splay_free_tree(nodes);
+                                       splay_delete_tree(nodes);
                                        break;
                                }
                        }
@@ -577,7 +579,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                logger(mesh, MESHLINK_DEBUG, "* no node we want to disconnect, even though we have too many connections");
                        }
 
-                       splay_free_tree(nodes);
+                       splay_delete_tree(nodes);
                }