Support setting TTL on outgoing UDP streams. Especially useful for multicast.

diff --git a/config.cpp b/config.cpp
index f1b05c1821035819debc55d364c05189a774fed9..57bf10a7f0ddc038f892a4e08b62706341d98842 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -290,6 +290,14 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
                udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
        }
 
                udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
        }
 

+       // Parse the TTL. The same value is used for unicast and multicast.
+       map<string, string>::const_iterator ttl_it = line.parameters.find("ttl");
+       if (ttl_it == line.parameters.end()) {
+               udpstream.ttl = -1;
+       } else {
+               udpstream.ttl = atoi(ttl_it->second.c_str());
+       }
+

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

diff --git a/config.h b/config.h
index 60531486ea94e91cf82740bc9fe9293110f836e6..d5b04113303d2cf026a21b823d97e385e02eb540 100644 (file)
--- a/config.h
+++ b/config.h
@@ -21,6 +21,7 @@ struct UDPStreamConfig {
        sockaddr_in6 dst;
        std::string src;  // Can be empty.
        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        sockaddr_in6 dst;
        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).

 };
 
 struct AcceptorConfig {
 };
 
 struct AcceptorConfig {

diff --git a/cubemap.config.sample b/cubemap.config.sample
index 9b3c22b0552724d9dd9d62c2bfb424324f1ae5d5..a68bfb8f3485ad661ceb51c88b01bb985d62557c 100644 (file)
--- a/cubemap.config.sample
+++ b/cubemap.config.sample
@@ -38,3 +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

diff --git a/main.cpp b/main.cpp
index 5ba79f95a6baa30cddd1d9f6c085274ff455f487..eaec887e30eef776e8eb4bf31018ec05ddbcc4ff 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -201,7 +201,10 @@ void create_streams(const Config &config,
        // UDP streams.
        for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
                const UDPStreamConfig &udpstream_config = config.udpstreams[i];
        // UDP streams.
        for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
                const UDPStreamConfig &udpstream_config = config.udpstreams[i];

-               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);

 
                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 70f8658f3e5ec3400a43f8815e5baa7eb347e38f..021cf1d22de4d0a6681c2cadde91ca3dac481cba 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 ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl)

 {
 {

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

        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 2c2c5371bec8a48d9d80a8773f26d596672c28b3..07d9a5d6193ee0dca27a682caf4e332d6c8e0793 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 add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl);

 
        // 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 1e79494a3d8d302c5195ea17efeab83954eb37ea..74d6ef03ce7853658e8836bbb4a07256e32c9e5c 100644 (file)
--- a/udpstream.cpp
+++ b/udpstream.cpp
@@ -9,8 +9,8 @@
 #define SO_MAX_PACING_RATE 47
 #endif
 
 #define SO_MAX_PACING_RATE 47
 #endif
 

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

 {
        sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
        if (sock == -1) {
 {
        sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
        if (sock == -1) {


@@ -24,6 +24,23 @@ UDPStream::UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate)
                        log_perror("setsockopt(SO_MAX_PACING_RATE)");
                }
        }
                        log_perror("setsockopt(SO_MAX_PACING_RATE)");
                }
        }

+
+       if (ttl != -1) {
+               // Seemingly the IPv4 parameters are used for sending to IPv4,
+               // even on an AF_INET6 socket, so we need to set both.
+               if (setsockopt(sock, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) == -1) {
+                       log_perror("setsockopt(IP_TTL)");
+               }
+               if (setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) == -1) {
+                       log_perror("setsockopt(IP_MULTICAST_TTL)");
+               }
+               if (setsockopt(sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)) == -1) {
+                       log_perror("setsockopt(IPV6_UNICAST_HOPS)");
+               }
+               if (setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) == -1) {
+                       log_perror("setsockopt(IPV6_MULTICAST_HOPS)");
+               }
+       }

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

diff --git a/udpstream.h b/udpstream.h
index ebc8ebc9b070822d74b0ba6ef759f5ec2cc80bdf..4a2de654071353318bcd97febfd50129969f1b80 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);
+       UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate, int ttl);

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