X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=962be2a47d2c91a5de834727d90915e182378078;hp=1db4f91f16e0221f6afcf886111142d7a36a097e;hb=889d72b31a646feeba52acd3fd2616210b550e71;hpb=239a9eab1a2468b401183745a24b2fbd590a6998 diff --git a/httpinput.cpp b/httpinput.cpp index 1db4f91..962be2a 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -1,29 +1,27 @@ +#include +#include +#include +#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include +#include -#include "metacube.h" -#include "mutexlock.h" #include "httpinput.h" -#include "server.h" -#include "serverpool.h" +#include "log.h" +#include "metacube.h" #include "parse.h" +#include "serverpool.h" #include "state.pb.h" +#include "version.h" using namespace std; @@ -56,6 +54,18 @@ HTTPInput::HTTPInput(const InputProto &serialized) parse_url(url, &protocol, &host, &port, &path); // Don't care if it fails. } +void HTTPInput::close_socket() +{ + int ret; + do { + ret = close(sock); + } while (ret == -1 && errno == EINTR); + + if (ret == -1) { + log_perror("close()"); + } +} + InputProto HTTPInput::serialize() const { InputProto serialized; @@ -77,7 +87,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) addrinfo *ai; int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai); if (err == -1) { - fprintf(stderr, "WARNING: Lookup of '%s' failed (%s).\n", + log(WARNING, "Lookup of '%s' failed (%s).", host.c_str(), gai_strerror(err)); freeaddrinfo(ai); return -1; @@ -100,11 +110,20 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) return sock; } + do { + err = close(sock); + } while (err == -1 && errno == EINTR); + + if (err == -1) { + log_perror("close"); + // Can still continue. + } + ai = ai->ai_next; } // Give the last one as error. - fprintf(stderr, "WARNING: Connect to '%s' failed (%s)\n", + log(WARNING, "Connect to '%s' failed (%s)", host.c_str(), strerror(errno)); freeaddrinfo(ai); return -1; @@ -114,20 +133,20 @@ bool HTTPInput::parse_response(const std::string &request) { vector lines = split_lines(response); if (lines.empty()) { - fprintf(stderr, "WARNING: Empty HTTP response from input.\n"); + log(WARNING, "Empty HTTP response from input."); return false; } vector first_line_tokens = split_tokens(lines[0]); if (first_line_tokens.size() < 2) { - fprintf(stderr, "WARNING: Malformed response line '%s' from input.\n", + log(WARNING, "Malformed response line '%s' from input.", lines[0].c_str()); return false; } int response = atoi(first_line_tokens[1].c_str()); if (response != 200) { - fprintf(stderr, "WARNING: Non-200 response '%s' from input.\n", + log(WARNING, "Non-200 response '%s' from input.", lines[0].c_str()); return false; } @@ -136,7 +155,7 @@ bool HTTPInput::parse_response(const std::string &request) for (size_t i = 1; i < lines.size(); ++i) { size_t split = lines[i].find(":"); if (split == string::npos) { - fprintf(stderr, "WARNING: Ignoring malformed HTTP response line '%s'\n", + log(WARNING, "Ignoring malformed HTTP response line '%s'", lines[i].c_str()); continue; } @@ -163,7 +182,7 @@ bool HTTPInput::parse_response(const std::string &request) // TODO: Make case-insensitive. // XXX: Use a Via: instead? if (parameters.count("Server") == 0) { - parameters.insert(make_pair("Server", "metacube/0.1")); + parameters.insert(make_pair("Server", SERVER_IDENTIFICATION)); } else { for (multimap::iterator it = parameters.begin(); it != parameters.end(); @@ -171,7 +190,7 @@ bool HTTPInput::parse_response(const std::string &request) if (it->first != "Server") { continue; } - it->second = "metacube/0.1 (reflecting: " + it->second + ")"; + it->second = SERVER_IDENTIFICATION " (reflecting: " + it->second + ")"; } } @@ -204,7 +223,7 @@ void HTTPInput::do_work() continue; } if (nfds == -1) { - perror("poll"); + log_perror("poll"); state = CLOSING_SOCKET; } } @@ -214,11 +233,13 @@ void HTTPInput::do_work() request.clear(); request_bytes_sent = 0; response.clear(); + pending_data.clear(); + servers->set_header(stream_id, ""); { string protocol; // Thrown away. if (!parse_url(url, &protocol, &host, &port, &path)) { - fprintf(stderr, "Failed to parse URL '%s'\n", url.c_str()); + log(WARNING, "Failed to parse URL '%s'", url.c_str()); break; } } @@ -228,7 +249,7 @@ void HTTPInput::do_work() // Yay, successful connect. Try to set it as nonblocking. int one = 1; if (ioctl(sock, FIONBIO, &one) == -1) { - perror("ioctl(FIONBIO)"); + log_perror("ioctl(FIONBIO)"); state = CLOSING_SOCKET; } else { state = SENDING_REQUEST; @@ -246,7 +267,7 @@ void HTTPInput::do_work() } while (ret == -1 && errno == EINTR); if (ret == -1) { - perror("write"); + log_perror("write"); state = CLOSING_SOCKET; continue; } @@ -268,14 +289,14 @@ void HTTPInput::do_work() } while (ret == -1 && errno == EINTR); if (ret == -1) { - perror("read"); + log_perror("read"); state = CLOSING_SOCKET; continue; } if (ret == 0) { // This really shouldn't happen... - fprintf(stderr, "Socket unexpectedly closed while reading header\n"); + log(ERROR, "Socket unexpectedly closed while reading header"); state = CLOSING_SOCKET; continue; } @@ -283,7 +304,7 @@ void HTTPInput::do_work() RequestParseStatus status = wait_for_double_newline(&response, buf, ret); if (status == RP_OUT_OF_SPACE) { - fprintf(stderr, "WARNING: fd %d sent overlong response!\n", sock); + log(WARNING, "fd %d sent overlong response!", sock); state = CLOSING_SOCKET; continue; } else if (status == RP_NOT_FINISHED_YET) { @@ -322,14 +343,14 @@ void HTTPInput::do_work() } while (ret == -1 && errno == EINTR); if (ret == -1) { - perror("read"); + log_perror("read"); state = CLOSING_SOCKET; continue; } if (ret == 0) { // This really shouldn't happen... - fprintf(stderr, "Socket unexpectedly closed while reading header\n"); + log(ERROR, "Socket unexpectedly closed while reading header"); state = CLOSING_SOCKET; continue; } @@ -344,7 +365,7 @@ void HTTPInput::do_work() } while (err == -1 && errno == EINTR); if (err == -1) { - perror("close"); + log_perror("close"); } state = NOT_CONNECTED; @@ -358,7 +379,7 @@ void HTTPInput::do_work() // or the connection just got closed. // The earlier steps have already given the error message, if any. if (state == NOT_CONNECTED && !should_stop) { - fprintf(stderr, "Waiting 0.2 second and restarting...\n"); + log(INFO, "Waiting 0.2 second and restarting..."); usleep(200000); } } @@ -432,7 +453,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes) if (num_bytes == 0) { return; } - fprintf(stderr, "Warning: Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?\n", + log(WARNING, "Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?", (long long)num_bytes); pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes); }