Support joining multicast addresses (both ASM and SSM).

[cubemap] / input.cpp

diff --git a/input.cpp b/input.cpp
index 7c776e124f0cfa2627b20a4760964ad9f4af246a..0ee7d1ce918af18a9999a414cc9014a97ae07f7d 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -8,8 +8,27 @@
 
 using namespace std;
 
+namespace {
+
+// Does not support passwords, only user:host, since this is really only used
+// to parse VLC's udp://source@multicastgroup:1234/ syntax (we do not support
+// even basic auth).
+void split_user_host(const string &user_host, string *user, string *host)
+{
+       size_t split = user_host.find("@");
+       if (split == string::npos) {
+               user->clear();
+               *host = user_host;
+       } else {
+               *user = string(user_host.begin(), user_host.begin() + split);
+               *host = string(user_host.begin() + split + 1, user_host.end());
+       }
+}
+
+}  // namespace
+
 // Extremely rudimentary URL parsing.
-bool parse_url(const string &url, string *protocol, string *host, string *port, string *path)
+bool parse_url(const string &url, string *protocol, string *user, string *host, string *port, string *path)
 {
        size_t split = url.find("://");
        if (split == string::npos) {
@@ -21,13 +40,13 @@ bool parse_url(const string &url, string *protocol, string *host, string *port,
        split = rest.find_first_of(":/");
        if (split == string::npos) {
                // http://foo
-               *host = rest;
+               split_user_host(rest, user, host);
                *port = *protocol;
                *path = "/";
                return true;
        }
 
-       *host = string(rest.begin(), rest.begin() + split);
+       split_user_host(string(rest.begin(), rest.begin() + split), user, host);
        char ch = rest[split];  // Colon or slash.
        rest = string(rest.begin() + split + 1, rest.end());
 
@@ -49,29 +68,29 @@ bool parse_url(const string &url, string *protocol, string *host, string *port,
 
        // http://foo/bar
        *port = *protocol;
-       *path = rest;
+       *path = "/" + rest;
        return true;
 }
 
-Input *create_input(const std::string &stream_id, const std::string &url)
+Input *create_input(const std::string &url)
 {
-       string protocol, host, port, path;
-       if (!parse_url(url, &protocol, &host, &port, &path)) {
+       string protocol, user, host, port, path;
+       if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
                return NULL;
        }
        if (protocol == "http") {
-               return new HTTPInput(stream_id, url);
+               return new HTTPInput(url);
        }
        if (protocol == "udp") {
-               return new UDPInput(stream_id, url);
+               return new UDPInput(url);
        }
        return NULL;
 }
 
 Input *create_input(const InputProto &serialized)
 {
-       string protocol, host, port, path;
-       if (!parse_url(serialized.url(), &protocol, &host, &port, &path)) {
+       string protocol, user, host, port, path;
+       if (!parse_url(serialized.url(), &protocol, &user, &host, &port, &path)) {
                return NULL;
        }
        if (protocol == "http") {