Make meshlink_set_port() return false if we didn't bind to the requested port.

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 48eabf3fbf5fdf80cfb3586c6a5001e808a7e208..8287e0382632777df5d4c0f1a7e59d4c398259ad 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -533,7 +533,9 @@ public:
         *                       If the port is set to 0, then MeshLink will listen on a port
         *                       that is randomly assigned by the operating system every time open() is called.
         *
-        *  @return              This function returns true if the port was successfully changed, false otherwise.
+        *  @return              This function returns true if the port was successfully changed
+        *                       to the desired port, false otherwise. If it returns false, there
+        *                       is no guarantee that MeshLink is listening on the old port.
         */
        bool set_port(int port) {
                return meshlink_set_port(handle, port);

diff --git a/src/meshlink.c b/src/meshlink.c
index 9641173af047cb987be69ec72fd22e8852ef22f6..496e5d3c753763560bf173591a3aa8f883559dd6 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -2339,7 +2339,7 @@ bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
 done:
        pthread_mutex_unlock(&(mesh->mesh_mutex));
 
-       return rval;
+       return rval && meshlink_get_port(mesh) == port;
 }
 
 void meshlink_set_invitation_timeout(meshlink_handle_t *mesh, int timeout) {

diff --git a/src/meshlink.h b/src/meshlink.h
index 8ec7b50835fedbadb94704a871689ebffc7dc471..c6cb86c6bc6192c308037f5ccca5578de9c8fa66 100644 (file)
--- a/src/meshlink.h
+++ b/src/meshlink.h
@@ -730,7 +730,9 @@ extern int meshlink_get_port(meshlink_handle_t *mesh);
  *                       If the port is set to 0, then MeshLink will listen on a port
  *                       that is randomly assigned by the operating system every time meshlink_open() is called.
  *
- *  @return              This function returns true if the port was successfully changed, false otherwise.
+ *  @return              This function returns true if the port was successfully changed
+ *                       to the desired port, false otherwise. If it returns false, there
+ *                       is no guarantee that MeshLink is listening on the old port.
  */
 
 extern bool meshlink_set_port(meshlink_handle_t *mesh, int port);