Remove some leftover debug code that would cause compile errors.

[cubemap] / input.cpp

diff --git a/input.cpp b/input.cpp
index 3f6a9d73ee42095b7462ba32a93088c5a60aadfb..f5d8d5ef19ff8dced7f5d75a73b5a724b2942a82 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -1,15 +1,34 @@
-#include <string.h>
+#include <stddef.h>
 #include <string>
 
 #include "httpinput.h"
-#include "udpinput.h"
 #include "input.h"
 #include "state.pb.h"
+#include "udpinput.h"
 
 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) {
@@ -18,16 +37,38 @@ bool parse_url(const string &url, string *protocol, string *host, string *port,
        *protocol = string(url.begin(), url.begin() + split);
 
        string rest = string(url.begin() + split + 3, url.end());
-       split = rest.find_first_of(":/");
-       if (split == string::npos) {
+
+       // Split at the first slash, or the first colon that's not within [].
+       bool within_brackets = false;
+       for (split = 0; split < rest.size(); ++split) {
+               if (rest[split] == '[') {
+                       if (within_brackets) {
+                               // Can't nest brackets.
+                               return false;
+                       }
+                       within_brackets = true;
+               } else if (rest[split] == ']') {
+                       if (!within_brackets) {
+                               // ] without matching [.
+                               return false;
+                       }
+                       within_brackets = false;
+               } else if (rest[split] == '/') {
+                       break;
+               } else if (rest[split] == ':' && !within_brackets) {
+                       break;
+               }
+       }
+
+       if (split == rest.size()) {
                // 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 +90,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") {