Fix some issues in parsing IPv6 multicast addresses.

diff --git a/input.cpp b/input.cpp
index 0ee7d1ce918af18a9999a414cc9014a97ae07f7d..102207f955deabdc8861ffbd9798fcefd1542e29 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -37,10 +37,33 @@ bool parse_url(const string &url, string *protocol, string *user, string *host,
        *protocol = string(url.begin(), url.begin() + split);
 
        string rest = string(url.begin() + split + 3, url.end());
        *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
                split_user_host(rest, user, host);
                // http://foo
                split_user_host(rest, user, host);

+               fprintf(stderr, "ooo user='%s' host='%s'\n", user->c_str(), host->c_str());

                *port = *protocol;
                *path = "/";
                return true;
                *port = *protocol;
                *path = "/";
                return true;

diff --git a/udpinput.cpp b/udpinput.cpp
index 001ef5f6d3db7a5fbf89ec279482b27241eb1a16..559e9cd29c0c773c7519f814eea5cc3b265e96db 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -40,8 +40,9 @@ bool parse_ip_address(const string &ip, sockaddr_storage *addr)
                                ip.c_str());
                        return false;
                }
                                ip.c_str());
                        return false;
                }

-               if (inet_pton(AF_INET6, ip.c_str(), &addr6->sin6_addr) != 1) {
-                       log(ERROR, "'%s' is not a valid IPv6 address");
+               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 {
                        return false;
                }
        } else {