Ticket #3873: multiple-udp-socket.2.patch

libs/libmythlivemedia/groupsock/GroupsockHelper.cpp

@@ -34 +34 @@
 // By default, use INADDR_ANY for the sending and receiving interfaces:
 netAddressBits SendingInterfaceAddr = INADDR_ANY;
 netAddressBits ReceivingInterfaceAddr = INADDR_ANY;
+netAddressBits ReceivingSocketAddr = INADDR_ANY;
 
 static void socketErr(UsageEnvironment& env, char* errorMsg) {
         env.setResultErrMsg(errorMsg);
@@ -93 +94 @@
 #else
   if (port.num() != 0 || ReceivingInterfaceAddr != INADDR_ANY) {
 #endif
-    MAKE_SOCKADDR_IN(name, ReceivingInterfaceAddr, port.num());
+    MAKE_SOCKADDR_IN(name, ReceivingSocketAddr, port.num());
     if (bind(newSocket, (struct sockaddr*)&name, sizeof name) != 0) {
       char tmpBuffer[100];
       sprintf(tmpBuffer, "bind() error (port number: %d): ",
@@ -560 +561 @@
       testAddr.s_addr = our_inet_addr("228.67.43.91"); // arbitrary
       Port testPort(15947); // ditto
       
+      ReceivingSocketAddr = INADDR_ANY;
+
       sock = setupDatagramSocket(env, testPort);
       if (sock < 0) break;
       

libs/libmythlivemedia/groupsock/include/GroupsockHelper.hh

@@ -79 +79 @@
 // are INADDR_ANY (i.e., 0), specifying the default interface.)
 extern netAddressBits SendingInterfaceAddr;
 extern netAddressBits ReceivingInterfaceAddr;
+extern netAddressBits ReceivingSocketAddr;
 
 // Allocates a randomly-chosen IPv4 SSM (multicast) address:
 netAddressBits chooseRandomIPv4SSMAddress(UsageEnvironment& env);

libs/libmythtv/iptv/iptvfeederudp.cpp

@@ -69 +69 @@
     if (!InitEnv())
         return false;
     
+    ReceivingSocketAddr = our_inet_addr(parse.host().latin1());
+
     Groupsock *socket = new Groupsock(*_live_env, addr, parse.port(), 0);
     if (!socket)
     {