Add warning messages when checking for bad fds after select() returns an error.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index ce999cba00aebe133d3bb41a36c1d5b1a298ff57..99c29c943290b1ea7636b7b01dd9ed072a965665 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -713,9 +713,11 @@ void retry(meshlink_handle_t *mesh) {
        }
 
        /* Kick the ping timeout handler */
-       timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
-               0, 0
-       });
+       if(mesh->pingtimer.cb) {
+               timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
+                       0, 0
+               });
+       }
 }
 
 /*
@@ -733,7 +735,7 @@ void main_loop(meshlink_handle_t *mesh) {
        mesh->datafromapp.signum = 0;
        signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
 
-       if(!event_loop_run(&mesh->loop, &mesh->mutex)) {
+       if(!event_loop_run(&mesh->loop, mesh)) {
                logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
                call_error_cb(mesh, MESHLINK_ENETWORK);
        }