]> git.sesse.net Git - cubemap/blobdiff - udpinput.cpp
Use in-class initialization for making it harder to forget to set a default.
[cubemap] / udpinput.cpp
index e444bbc09aa56e3231f9c8f06debad62386856fd..93eaaa76801c0dbab7383e2e7b8902b5fd408ea0 100644 (file)
@@ -4,7 +4,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <time.h>
 #include <unistd.h>
+#include <math.h>
 #include <string>
 
 #include "acceptor.h"
@@ -12,6 +14,7 @@
 #include "mutexlock.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "stream.h"
 #include "udpinput.h"
 #include "util.h"
 #include "version.h"
@@ -20,21 +23,99 @@ using namespace std;
 
 extern ServerPool *servers;
 
+namespace {
+
+// Similar to parse_hostport(), but only parses the IP address,
+// and does not use mapped-v4 addresses, since multicast seems
+// to not like that too much.
+bool parse_ip_address(const string &ip, sockaddr_storage *addr)
+{
+       memset(addr, 0, sizeof(*addr));
+
+       assert(!ip.empty());
+       if (ip[0] == '[') {
+               sockaddr_in6 *addr6 = (sockaddr_in6 *)addr;
+               addr6->sin6_family = AF_INET6;
+               if (ip[ip.size() - 1] != ']') {
+                       log(ERROR, "address '%s' is malformed; must be either [ipv6addr] or ipv4addr",
+                               ip.c_str());
+                       return false;
+               }
+               string raw_ip(ip.begin() + 1, ip.end() - 1);
+               if (inet_pton(AF_INET6, raw_ip.c_str(), &addr6->sin6_addr) != 1) {
+                       log(ERROR, "'%s' is not a valid IPv6 address", raw_ip.c_str());
+                       return false;
+               }
+       } else {
+               sockaddr_in *addr4 = (sockaddr_in *)addr;
+               addr4->sin_family = AF_INET;
+               if (inet_pton(AF_INET, ip.c_str(), &addr4->sin_addr) != 1) {
+                       log(ERROR, "'%s' is not a valid IPv4 address");
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+bool maybe_join_multicast_group(int sock, const string &group, const string &source)
+{
+       if (group.empty()) {
+               // Not multicast.
+               return true;
+       }
+
+       // Join the given multicast group (ASM or SSM).
+       // TODO: Also support sources apart from multicast groups,
+       // e.g. udp://[::1]:1234 for only receiving from localhost.
+       if (!source.empty()) {
+               // Single-Source Multicast (SSM).
+               group_source_req gsr;
+               memset(&gsr, 0, sizeof(gsr));
+               if (!parse_ip_address(group, &gsr.gsr_group)) {
+                       return false;
+               }
+               if (!parse_ip_address(source, &gsr.gsr_source)) {
+                       return false;
+               }
+               int level = (gsr.gsr_group.ss_family == AF_INET) ? SOL_IP : SOL_IPV6;
+               if (setsockopt(sock, level, MCAST_JOIN_SOURCE_GROUP, &gsr, sizeof(gsr)) == -1) {
+                       log_perror("setsockopt(MCAST_JOIN_SOURCE_GROUP)");
+                       return false;
+               }
+       } else {
+               // Any-Source Multicast (ASM).
+               group_req gr;
+               memset(&gr, 0, sizeof(gr));
+               if (!parse_ip_address(group, &gr.gr_group)) {
+                       return false;
+               }
+               int level = (gr.gr_group.ss_family == AF_INET) ? SOL_IP : SOL_IPV6;
+               if (setsockopt(sock, level, MCAST_JOIN_GROUP, &gr, sizeof(gr)) == -1) {
+                       log_perror("setsockopt(MCAST_JOIN_GROUP)");
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+}  // namespace
+
 UDPInput::UDPInput(const string &url)
        : url(url),
          sock(-1)
 {
        // Should be verified by the caller.
        string protocol;
-       bool ok = parse_url(url, &protocol, &host, &port, &path);
+       bool ok = parse_url(url, &protocol, &user, &host, &port, &path);
        assert(ok);
 
        construct_header();
 
-       pthread_mutex_init(&stats_mutex, NULL);
+       pthread_mutex_init(&stats_mutex, nullptr);
        stats.url = url;
-       stats.bytes_received = 0;
-       stats.data_bytes_received = 0;
+       stats.connect_time = time(nullptr);
 }
 
 UDPInput::UDPInput(const InputProto &serialized)
@@ -43,15 +124,20 @@ UDPInput::UDPInput(const InputProto &serialized)
 {
        // Should be verified by the caller.
        string protocol;
-       bool ok = parse_url(url, &protocol, &host, &port, &path);
+       bool ok = parse_url(url, &protocol, &user, &host, &port, &path);
        assert(ok);
 
        construct_header();
 
-       pthread_mutex_init(&stats_mutex, NULL);
+       pthread_mutex_init(&stats_mutex, nullptr);
        stats.url = url;
        stats.bytes_received = serialized.bytes_received();
        stats.data_bytes_received = serialized.data_bytes_received();
+       if (serialized.has_connect_time()) {
+               stats.connect_time = serialized.connect_time();
+       } else {
+               stats.connect_time = time(nullptr);
+       }
 }
 
 InputProto UDPInput::serialize() const
@@ -61,6 +147,8 @@ InputProto UDPInput::serialize() const
        serialized.set_sock(sock);
        serialized.set_bytes_received(stats.bytes_received);
        serialized.set_data_bytes_received(stats.data_bytes_received);
+       serialized.set_connect_time(stats.connect_time);
+       serialized.set_is_metacube_encoded(false);
        return serialized;
 }
 
@@ -91,17 +179,30 @@ void UDPInput::do_work()
        while (!should_stop()) {
                if (sock == -1) {
                        int port_num = atoi(port.c_str());
-                       sock = create_server_socket(port_num, UDP_SOCKET);
+                       sockaddr_in6 addr = create_any_address(port_num);
+                       sock = create_server_socket(addr, UDP_SOCKET);
                        if (sock == -1) {
                                log(WARNING, "[%s] UDP socket creation failed. Waiting 0.2 seconds and trying again...",
                                             url.c_str());
                                usleep(200000);
                                continue;
                        }
+
+                       // The syntax udp://source@group (abusing the username field
+                       // to store the sender in SSM) seems to be a VLC invention.
+                       // We mimic it.
+                       if (!maybe_join_multicast_group(sock, host, user)) {
+                               log(WARNING, "[%s] Multicast join failed. Waiting 0.2 seconds and trying again...",
+                                            url.c_str());
+                               safe_close(sock);
+                               sock = -1;
+                               usleep(200000);
+                               continue;
+                       }
                }
 
                // Wait for a packet, or a wakeup.
-               bool activity = wait_for_activity(sock, POLLIN, NULL);
+               bool activity = wait_for_activity(sock, POLLIN, nullptr);
                if (!activity) {
                        // Most likely, should_stop was set.
                        continue;
@@ -123,9 +224,9 @@ void UDPInput::do_work()
                        stats.bytes_received += ret;
                        stats.data_bytes_received += ret;
                }
-               
-               for (size_t i = 0; i < stream_indices.size(); ++i) {
-                       servers->add_data(stream_indices[i], packet_buf, ret, SUITABLE_FOR_STREAM_START);
+       
+               for (size_t stream_index : stream_indices) {    
+                       servers->add_data(stream_index, packet_buf, ret, /*metacube_flags=*/0);
                }
        }
 }