Revert "Fix warnings caused by C-only flags passed to the C++ compiler."

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index d3cf36ad5e5801fdaae0d8591520841cea230385..d0b8bef5d7c6ee46533069baf865939610070887 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -268,6 +268,11 @@ char *meshlink_get_external_address_for_family(meshlink_handle_t *mesh, int fami
 
                int s = socket_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns);
 
+#ifdef SO_NOSIGPIPE
+               int nosigpipe = 1;
+               setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
+#endif
+
                if(s >= 0) {
                        set_timeout(s, 5000);
 
@@ -2905,6 +2910,11 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
                                        continue;
                                }
 
+#ifdef SO_NOSIGPIPE
+                               int nosigpipe = 1;
+                               setsockopt(state.sock, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
+#endif
+
                                set_timeout(state.sock, 5000);
 
                                if(connect(state.sock, aip->ai_addr, aip->ai_addrlen)) {
@@ -4295,6 +4305,7 @@ void handle_network_change(meshlink_handle_t *mesh, bool online) {
        }
 
        retry(mesh);
+       signal_trigger(&mesh->loop, &mesh->datafromapp);
 }
 
 void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t cb_errno) {