Use getifaddrs() instead of ioctls. This is only documented on BSD

[disorder] / server / speaker-network.c

diff --git a/server/speaker-network.c b/server/speaker-network.c
index affc1a16a7527657811528553da89619330f2b2d..c81b7dbf354cded5993e1de8d9e08d72a5fcc8b1 100644 (file)
--- a/server/speaker-network.c
+++ b/server/speaker-network.c
@@ -30,6 +30,8 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <assert.h>
+#include <net/if.h>
+#include <ifaddrs.h>
 
 #include "configuration.h"
 #include "syscalls.h"
@@ -37,6 +39,7 @@
 #include "addr.h"
 #include "timeval.h"
 #include "rtp.h"
+#include "ifreq.h"
 #include "speaker-protocol.h"
 #include "speaker.h"
 
@@ -145,10 +148,24 @@ static void network_init(void) {
     default:
       fatal(0, "unsupported address family %d", res->ai_family);
     }
+    info("multicasting on %s", sockname);
   } else {
-    /* Presumably just broadcasting */
-    if(setsockopt(bfd, SOL_SOCKET, SO_BROADCAST, &one, sizeof one) < 0)
-      fatal(errno, "error setting SO_BROADCAST on broadcast socket");
+    struct ifaddrs *ifs;
+
+    if(getifaddrs(&ifs) < 0)
+      fatal(errno, "error calling getifaddrs");
+    while(ifs) {
+      if((ifs->ifa_flags & IFF_BROADCAST)
+         && sockaddr_equal(ifs->ifa_broadaddr, res->ai_addr))
+        break;
+      ifs = ifs->ifa_next;
+    }
+    if(ifs) {
+      if(setsockopt(bfd, SOL_SOCKET, SO_BROADCAST, &one, sizeof one) < 0)
+        fatal(errno, "error setting SO_BROADCAST on broadcast socket");
+      info("broadcasting on %s (%s)", sockname, ifs->ifa_name);
+    } else
+      info("unicasting on %s", sockname);
   }
   len = sizeof sndbuf;
   if(getsockopt(bfd, SOL_SOCKET, SO_SNDBUF,