Merge remote-tracking branch 'origin/everbase' into discovery

diff --cc src/meshlink.c
index d33c0d172914631b6946b8f8b1dfc33aa9147068,9fc80153d48210b0cbb60f7c7793b673c4e090cd..f9e7e9054d291c308b6987a6d4460794e6c030f7
--- 1/src/meshlink.c
--- 2/src/meshlink.c
+++ b/src/meshlink.c
@@@ -832,12 -862,11 +867,14 @@@ bool meshlink_start(meshlink_handle_t *
  }
  
  void meshlink_stop(meshlink_handle_t *mesh) {
-       if(!mesh)
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
                return;
+       }
  
 +      // Stop discovery
 +      discovery_stop(mesh);
 +
        // Shut down the listening sockets to signal the main thread to shut down
  
        for(int i = 0; i < mesh->listen_sockets; i++) {

diff --cc src/meshlink_internal.h
Simple merge