Support setting outgoing interface for multicast.

This should complete multicast output support.

diff --git a/config.cpp b/config.cpp
index 57bf10a7f0ddc038f892a4e08b62706341d98842..f474f8c495f2cd07c624bd87a9e7a0f4d58f3f6c 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <net/if.h>

 #include <sys/socket.h>
 #include <map>
 #include <string>
 #include <sys/socket.h>
 #include <map>
 #include <string>


@@ -298,6 +299,18 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
                udpstream.ttl = atoi(ttl_it->second.c_str());
        }
 
                udpstream.ttl = atoi(ttl_it->second.c_str());
        }
 

+       // Parse the multicast interface index.
+       map<string, string>::const_iterator multicast_iface_it = line.parameters.find("multicast_output_interface");
+       if (multicast_iface_it == line.parameters.end()) {
+               udpstream.multicast_iface_index = -1;
+       } else {
+               udpstream.multicast_iface_index = if_nametoindex(multicast_iface_it->second.c_str());
+               if (udpstream.multicast_iface_index == 0) {
+                       log(ERROR, "Interface '%s' does not exist", multicast_iface_it->second.c_str());
+                       return false;
+               }
+       }
+

        config->udpstreams.push_back(udpstream);
        return true;
 }
        config->udpstreams.push_back(udpstream);
        return true;
 }

diff --git a/config.h b/config.h
index d5b04113303d2cf026a21b823d97e385e02eb540..3014b48d4128d4f4b1150a28a23ddc953b33d3ac 100644 (file)
--- a/config.h
+++ b/config.h
@@ -22,6 +22,7 @@ struct UDPStreamConfig {
        std::string src;  // Can be empty.
        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        int ttl;  // Default is -1 (use operating system default).
        std::string src;  // Can be empty.
        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        int ttl;  // Default is -1 (use operating system default).

+       int multicast_iface_index;  // Default is -1 (use operating system default).

 };
 
 struct AcceptorConfig {
 };
 
 struct AcceptorConfig {

diff --git a/cubemap.config.sample b/cubemap.config.sample
index a68bfb8f3485ad661ceb51c88b01bb985d62557c..6378642d0c260ac94778bfc1a4fa92cd7ea61cd3 100644 (file)
--- a/cubemap.config.sample
+++ b/cubemap.config.sample
@@ -38,4 +38,4 @@ stream /test.flv.metacube src=http://gruessi.zrh.sesse.net:4013/test.flv encodin
 stream /udp.ts src=udp://@:1234 backlog_size=1048576 pacing_rate_kbit=2000
 udpstream [2001:67c:29f4::50]:5000 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube
 udpstream 193.35.52.50:5001 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube
 stream /udp.ts src=udp://@:1234 backlog_size=1048576 pacing_rate_kbit=2000
 udpstream [2001:67c:29f4::50]:5000 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube
 udpstream 193.35.52.50:5001 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube

-udpstream 233.252.0.1:5002 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube ttl=32
+udpstream 233.252.0.1:5002 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube ttl=32 multicast_output_interface=eth1

diff --git a/main.cpp b/main.cpp
index eaec887e30eef776e8eb4bf31018ec05ddbcc4ff..14f6323ae01cf1ca821adbcf9a93bfed43ab304d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -204,7 +204,8 @@ void create_streams(const Config &config,
                int stream_index = servers->add_udpstream(
                        udpstream_config.dst,
                        udpstream_config.pacing_rate,
                int stream_index = servers->add_udpstream(
                        udpstream_config.dst,
                        udpstream_config.pacing_rate,

-                       udpstream_config.ttl);
+                       udpstream_config.ttl,
+                       udpstream_config.multicast_iface_index);

 
                string src = udpstream_config.src;
                if (!src.empty()) {
 
                string src = udpstream_config.src;
                if (!src.empty()) {

diff --git a/serverpool.cpp b/serverpool.cpp
index 021cf1d22de4d0a6681c2cadde91ca3dac481cba..4684d8c63267d4af225f55eeab61b401829f00b1 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -121,9 +121,9 @@ int ServerPool::add_stream_from_serialized(const StreamProto &stream, const vect
        return num_http_streams++;
 }
        
        return num_http_streams++;
 }
        

-int ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl)
+int ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index)

 {
 {

-       udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl));
+       udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));

        return num_http_streams + udp_streams.size() - 1;
 }
 
        return num_http_streams + udp_streams.size() - 1;
 }
 

diff --git a/serverpool.h b/serverpool.h
index 07d9a5d6193ee0dca27a682caf4e332d6c8e0793..8fa46e2493be3ce0796593d4ec31a628f0d01127 100644 (file)
--- a/serverpool.h
+++ b/serverpool.h
@@ -32,7 +32,7 @@ public:
        int add_stream(const std::string &url, size_t backlog_size, Stream::Encoding encoding);
        int add_stream_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
        void delete_stream(const std::string &url);
        int add_stream(const std::string &url, size_t backlog_size, Stream::Encoding encoding);
        int add_stream_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
        void delete_stream(const std::string &url);

-       int add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl);
+       int add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index);

 
        // Returns the stream index for the given URL (e.g. /foo.ts). Returns -1 on failure.
        int lookup_stream_by_url(const std::string &url) const;
 
        // Returns the stream index for the given URL (e.g. /foo.ts). Returns -1 on failure.
        int lookup_stream_by_url(const std::string &url) const;

diff --git a/udpstream.cpp b/udpstream.cpp
index 74d6ef03ce7853658e8836bbb4a07256e32c9e5c..77476499a69a2e13b61d1708ef366f222359424d 100644 (file)
--- a/udpstream.cpp
+++ b/udpstream.cpp
@@ -1,3 +1,4 @@
+#include <string.h>

 #include <sys/socket.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
 #include <sys/types.h>
 


@@ -9,7 +10,7 @@
 #define SO_MAX_PACING_RATE 47
 #endif
 
 #define SO_MAX_PACING_RATE 47
 #endif
 

-UDPStream::UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate, int ttl)
+UDPStream::UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate, int ttl, int multicast_iface_index)

        : dst(dst)
 {
        sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
        : dst(dst)
 {
        sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);


@@ -41,6 +42,18 @@ UDPStream::UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate, int ttl)
                        log_perror("setsockopt(IPV6_MULTICAST_HOPS)");
                }
        }
                        log_perror("setsockopt(IPV6_MULTICAST_HOPS)");
                }
        }

+
+       if (multicast_iface_index != -1) {
+               ip_mreqn mr;
+               memset(&mr, 0, sizeof(mr));
+               mr.imr_ifindex = multicast_iface_index;
+               if (setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, &mr, sizeof(mr)) == -1) {
+                       log_perror("setsockopt(IP_MULTICAST_IF)");
+               }
+               if (setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, &multicast_iface_index, sizeof(multicast_iface_index)) == -1) {
+                       log_perror("setsockopt(IPV6_MULTICAST_IF)");
+               }
+       }

 }
 
 UDPStream::~UDPStream()
 }
 
 UDPStream::~UDPStream()

diff --git a/udpstream.h b/udpstream.h
index 4a2de654071353318bcd97febfd50129969f1b80..ede738edb45d075eec53a50a7945786301cc336f 100644 (file)
--- a/udpstream.h
+++ b/udpstream.h
@@ -16,7 +16,7 @@ class MarkPool;
 
 class UDPStream {
 public:
 
 class UDPStream {
 public:

-       UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate, int ttl);
+       UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate, int ttl, int multicast_iface_index);

        ~UDPStream();
 
        void send(const char *data, size_t bytes);
        ~UDPStream();
 
        void send(const char *data, size_t bytes);