+#include <assert.h>
+#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <poll.h>
+#include <stdint.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <stdint.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <sys/types.h>
#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/socket.h>
-#include <netdb.h>
-#include <poll.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
+#include <unistd.h>
#include <map>
+#include <string>
+#include <utility>
+#include <vector>
-#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;
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;
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",
- host.c_str(), gai_strerror(err));
+ log(WARNING, "[%s] Lookup of '%s' failed (%s).",
+ stream_id.c_str(), host.c_str(), gai_strerror(err));
freeaddrinfo(ai);
return -1;
}
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",
- host.c_str(), strerror(errno));
+ log(WARNING, "[%s] Connect to '%s' failed (%s)",
+ stream_id.c_str(), host.c_str(), strerror(errno));
freeaddrinfo(ai);
return -1;
}
{
vector<string> lines = split_lines(response);
if (lines.empty()) {
- fprintf(stderr, "WARNING: Empty HTTP response from input.\n");
+ log(WARNING, "[%s] Empty HTTP response from input.", stream_id.c_str());
return false;
}
vector<string> first_line_tokens = split_tokens(lines[0]);
if (first_line_tokens.size() < 2) {
- fprintf(stderr, "WARNING: Malformed response line '%s' from input.\n",
- lines[0].c_str());
+ log(WARNING, "[%s] Malformed response line '%s' from input.",
+ stream_id.c_str(), 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",
- lines[0].c_str());
+ log(WARNING, "[%s] Non-200 response '%s' from input.",
+ stream_id.c_str(), lines[0].c_str());
return false;
}
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",
- lines[i].c_str());
+ log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'",
+ stream_id.c_str(), lines[i].c_str());
continue;
}
// 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<string, string>::iterator it = parameters.begin();
it != parameters.end();
if (it->first != "Server") {
continue;
}
- it->second = "metacube/0.1 (reflecting: " + it->second + ")";
+ it->second = SERVER_IDENTIFICATION " (reflecting: " + it->second + ")";
}
}
continue;
}
if (nfds == -1) {
- perror("poll");
+ log_perror("poll");
state = CLOSING_SOCKET;
}
}
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, "[%s] Failed to parse URL '%s'", stream_id.c_str(), url.c_str());
break;
}
}
// 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;
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- perror("write");
+ log_perror("write");
state = CLOSING_SOCKET;
continue;
}
} 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, "[%s] Socket unexpectedly closed while reading header",
+ stream_id.c_str());
state = CLOSING_SOCKET;
continue;
}
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, "[%s] Sever sent overlong HTTP response!", stream_id.c_str());
state = CLOSING_SOCKET;
continue;
} else if (status == RP_NOT_FINISHED_YET) {
process_data(&extra_data[0], extra_data.size());
}
+ log(INFO, "[%s] Connected to '%s', receiving data.",
+ stream_id.c_str(), url.c_str());
state = RECEIVING_DATA;
break;
}
} 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, "[%s] Socket unexpectedly closed while reading header",
+ stream_id.c_str());
state = CLOSING_SOCKET;
continue;
}
} while (err == -1 && errno == EINTR);
if (err == -1) {
- perror("close");
+ log_perror("close");
}
state = NOT_CONNECTED;
// 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, "[%s] Waiting 0.2 second and restarting...", stream_id.c_str());
usleep(200000);
}
}
if (num_bytes == 0) {
return;
}
- fprintf(stderr, "Warning: Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?\n",
- (long long)num_bytes);
+ log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?",
+ stream_id.c_str(), (long long)num_bytes);
pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
}
projects / cubemap / blobdiff