From: Guus Sliepen <guus@meshlink.io>
Date: Mon, 21 May 2018 20:03:47 +0000 (+0200)
Subject: Use getsockname() to get a listening sockets actual address in meshlink_stop().
X-Git-Url: http://git.meshlink.io/?p=meshlink;a=commitdiff_plain;h=56e0dd5ad3936663d398500f80c9a502553659df

Use getsockname() to get a listening sockets actual address in meshlink_stop().

This should be better than sending a packet to the listening address,
which might be a link-local address for which a valid scope-id is
necessary, and which might not be in listen_socket.sa.
---

diff --git a/src/meshlink.c b/src/meshlink.c
index 0bc947a6..66d87ee9 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -1211,10 +1211,18 @@ void meshlink_stop(meshlink_handle_t *mesh) {
 	event_loop_stop(&mesh->loop);
 
 	// Send ourselves a UDP packet to kick the event loop
-	listen_socket_t *s = &mesh->listen_socket[0];
+	for(int i = 0; i < mesh->listen_sockets; i++) {
+		sockaddr_t sa;
+		socklen_t salen = sizeof(sa.sa);
 
-	if(sendto(s->udp.fd, "", 1, MSG_NOSIGNAL, &s->sa.sa, SALEN(s->sa.sa)) == -1) {
-		logger(mesh, MESHLINK_ERROR, "Could not send a UDP packet to ourself");
+		if(getsockname(mesh->listen_socket[i].udp.fd, &sa.sa, &salen) == -1) {
+			logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getsockname", sockstrerror(sockerrno));
+			continue;
+		}
+
+		if(sendto(mesh->listen_socket[i].udp.fd, "", 1, MSG_NOSIGNAL, &sa.sa, salen) == -1) {
+			logger(mesh, MESHLINK_ERROR, "Could not send a UDP packet to ourself: %s", sockstrerror(sockerrno));
+		}
 	}
 
 	// Wait for the main thread to finish