Make the warning on dropping junk bytes clearer.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index c9231453e1e919062024073d1d73efa1dc1fd487..807abacc87e0f466377b9a3153247454aac1f710 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #include <map>
@@ -22,6 +23,7 @@
 #include "parse.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "stream.h"
 #include "util.h"
 #include "version.h"
 
@@ -74,15 +76,8 @@ HTTPInput::HTTPInput(const InputProto &serialized)
        pending_data.resize(serialized.pending_data().size());
        memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
 
-       string protocol;
-       parse_url(url, &protocol, &host, &port, &path);  // Don't care if it fails.
-
-       // Older versions stored the extra \r\n in the HTTP header.
-       // Strip it if we find it.
-       if (http_header.size() >= 4 &&
-           memcmp(http_header.data() + http_header.size() - 4, "\r\n\r\n", 4) == 0) {
-               http_header.resize(http_header.size() - 2);
-       }
+       string protocol, user;
+       parse_url(url, &protocol, &user, &host, &port, &path);  // Don't care if it fails.
 
        pthread_mutex_init(&stats_mutex, NULL);
        stats.url = url;
@@ -99,6 +94,7 @@ void HTTPInput::close_socket()
 {
        if (sock != -1) {
                safe_close(sock);
+               sock = -1;
        }
 
        MutexLock lock(&stats_mutex);
@@ -226,31 +222,14 @@ bool HTTPInput::parse_response(const std::string &request)
                return false;
        }
 
-       multimap<string, string> parameters;
-       for (size_t i = 1; i < lines.size(); ++i) {
-               size_t split = lines[i].find(":");
-               if (split == string::npos) {
-                       log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'",
-                               url.c_str(), lines[i].c_str());
-                       continue;
-               }
-
-               string key(lines[i].begin(), lines[i].begin() + split);
-
-               // Skip any spaces after the colon.
-               do {
-                       ++split;
-               } while (split < lines[i].size() && lines[i][split] == ' ');
-
-               string value(lines[i].begin() + split, lines[i].end());
-
-               // Remove “Content-encoding: metacube”.
-               // TODO: Make case-insensitive.
-               if (key == "Content-encoding" && value == "metacube") {
-                       continue;
-               }
+       multimap<string, string> parameters = extract_headers(lines, url);
 
-               parameters.insert(make_pair(key, value));
+       // Remove “Content-encoding: metacube”.
+       // TODO: Make case-insensitive.
+       multimap<string, string>::iterator encoding_it =
+               parameters.find("Content-encoding");
+       if (encoding_it != parameters.end() && encoding_it->second == "metacube") {
+               parameters.erase(encoding_it);
        }
 
        // Change “Server: foo” to “Server: metacube/0.1 (reflecting: foo)”
@@ -344,8 +323,8 @@ void HTTPInput::do_work()
                        }
 
                        {
-                               string protocol;  // Thrown away.
-                               if (!parse_url(url, &protocol, &host, &port, &path)) {
+                               string protocol, user;  // Thrown away.
+                               if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
                                        log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
                                        break;
                                }
@@ -416,7 +395,7 @@ void HTTPInput::do_work()
                        RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
                        
                        if (status == RP_OUT_OF_SPACE) {
-                               log(WARNING, "[%s] Sever sent overlong HTTP response!", url.c_str());
+                               log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str());
                                state = CLOSING_SOCKET;
                                continue;
                        } else if (status == RP_NOT_FINISHED_YET) {
@@ -553,7 +532,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        has_metacube_header = false;
                        continue;
                }
-               if (size > 262144) {
+               if (size > 1048576) {
                        log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
                                url.c_str(), size, flags);
                }
@@ -599,7 +578,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
        if (num_bytes == 0) {
                return;
        }
-       log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube2 stream?",
+       log(WARNING, "[%s] Dropping %lld junk bytes; not a Metacube2 stream, or data was dropped from the middle of the stream",
                url.c_str(), (long long)num_bytes);
        assert(pending_data.size() >= num_bytes);
        pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);