disorder-speaker now logs what it's transmitting too, and only

[disorder] / server / speaker-network.c

diff --git a/server/speaker-network.c b/server/speaker-network.c
index affc1a16a7527657811528553da89619330f2b2d..6ffe9295d3ca8b97971b5c374a93fd024d7a91c1 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 <sys/socket.h>
 #include <sys/uio.h>
 #include <assert.h>

+#include <sys/ioctl.h>
+#include <net/if.h>

 
 #include "configuration.h"
 #include "syscalls.h"
 
 #include "configuration.h"
 #include "syscalls.h"


@@ -37,6 +39,7 @@
 #include "addr.h"
 #include "timeval.h"
 #include "rtp.h"
 #include "addr.h"
 #include "timeval.h"
 #include "rtp.h"

+#include "ifreq.h"

 #include "speaker-protocol.h"
 #include "speaker.h"
 
 #include "speaker-protocol.h"
 #include "speaker.h"
 


@@ -99,7 +102,7 @@ static void network_init(void) {
     0
   };
   static const int one = 1;
     0
   };
   static const int one = 1;

-  int sndbuf, target_sndbuf = 131072;
+  int sndbuf, target_sndbuf = 131072, n;

   socklen_t len;
   char *sockname, *ssockname;
 
   socklen_t len;
   char *sockname, *ssockname;
 


@@ -145,10 +148,25 @@ static void network_init(void) {
     default:
       fatal(0, "unsupported address family %d", res->ai_family);
     }
     default:
       fatal(0, "unsupported address family %d", res->ai_family);
     }

+    info("multicasting on %s", sockname);

   } else {
   } 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 ifreq *ifs;
+    int nifs;
+
+    /* See if the address matches the broadcast address of some interface */
+    ifreq_list(bfd, &ifs, &nifs);
+    for(n = 0; n < nifs; ++n) {
+      if(ioctl(bfd, SIOCGIFBRDADDR, &ifs[n]) < 0)
+        fatal(errno, "error calling ioctl SIOCGIFBRDADDR");
+      if(sockaddr_equal(&ifs[n].ifr_broadaddr, res->ai_addr))
+        break;
+    }
+    if(n < nifs) {
+      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[n].ifr_name);
+    } else
+      info("unicasting on %s", sockname);

   }
   len = sizeof sndbuf;
   if(getsockopt(bfd, SOL_SOCKET, SO_SNDBUF,
   }
   len = sizeof sndbuf;
   if(getsockopt(bfd, SOL_SOCKET, SO_SNDBUF,