diff options
Diffstat (limited to 'src/network/core/tcp_http.cpp')
| -rw-r--r-- | src/network/core/tcp_http.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/network/core/tcp_http.cpp b/src/network/core/tcp_http.cpp index ccad120ae..08961e402 100644 --- a/src/network/core/tcp_http.cpp +++ b/src/network/core/tcp_http.cpp @@ -45,7 +45,7 @@ NetworkHTTPSocketHandler::NetworkHTTPSocketHandler(SOCKET s, size_t bufferSize = strlen(url) + strlen(host) + strlen(GetNetworkRevisionString()) + (data == nullptr ? 0 : strlen(data)) + 128; char *buffer = AllocaM(char, bufferSize); - DEBUG(net, 7, "[tcp/http] requesting %s%s", host, url); + DEBUG(net, 5, "[tcp/http] Requesting %s%s", host, url); if (data != nullptr) { seprintf(buffer, buffer + bufferSize - 1, "POST %s HTTP/1.0\r\nHost: %s\r\nUser-Agent: OpenTTD/%s\r\nContent-Type: text/plain\r\nContent-Length: %d\r\n\r\n%s\r\n", url, host, GetNetworkRevisionString(), (int)strlen(data), data); } else { @@ -85,7 +85,7 @@ NetworkRecvStatus NetworkHTTPSocketHandler::CloseConnection(bool error) * Helper to simplify the error handling. * @param msg the error message to show. */ -#define return_error(msg) { DEBUG(net, 0, msg); return -1; } +#define return_error(msg) { DEBUG(net, 1, msg); return -1; } static const char * const NEWLINE = "\r\n"; ///< End of line marker static const char * const END_OF_HEADER = "\r\n\r\n"; ///< End of header marker @@ -112,7 +112,7 @@ int NetworkHTTPSocketHandler::HandleHeader() /* We expect a HTTP/1.[01] reply */ if (strncmp(this->recv_buffer, HTTP_1_0, strlen(HTTP_1_0)) != 0 && strncmp(this->recv_buffer, HTTP_1_1, strlen(HTTP_1_1)) != 0) { - return_error("[tcp/http] received invalid HTTP reply"); + return_error("[tcp/http] Received invalid HTTP reply"); } char *status = this->recv_buffer + strlen(HTTP_1_0); @@ -121,7 +121,7 @@ int NetworkHTTPSocketHandler::HandleHeader() /* Get the length of the document to receive */ char *length = strcasestr(this->recv_buffer, CONTENT_LENGTH); - if (length == nullptr) return_error("[tcp/http] missing 'content-length' header"); + if (length == nullptr) return_error("[tcp/http] Missing 'content-length' header"); /* Skip the header */ length += strlen(CONTENT_LENGTH); @@ -139,9 +139,9 @@ int NetworkHTTPSocketHandler::HandleHeader() /* Make sure we're going to download at least something; * zero sized files are, for OpenTTD's purposes, always * wrong. You can't have gzips of 0 bytes! */ - if (len == 0) return_error("[tcp/http] refusing to download 0 bytes"); + if (len == 0) return_error("[tcp/http] Refusing to download 0 bytes"); - DEBUG(net, 7, "[tcp/http] downloading %i bytes", len); + DEBUG(net, 7, "[tcp/http] Downloading %i bytes", len); return len; } @@ -154,15 +154,15 @@ int NetworkHTTPSocketHandler::HandleHeader() /* Search the end of the line. This is safe because the header will * always end with two newlines. */ *strstr(status, NEWLINE) = '\0'; - DEBUG(net, 0, "[tcp/http] unhandled status reply %s", status); + DEBUG(net, 1, "[tcp/http] Unhandled status reply %s", status); return -1; } - if (this->redirect_depth == 5) return_error("[tcp/http] too many redirects, looping redirects?"); + if (this->redirect_depth == 5) return_error("[tcp/http] Too many redirects, looping redirects?"); /* Redirect to other URL */ char *uri = strcasestr(this->recv_buffer, LOCATION); - if (uri == nullptr) return_error("[tcp/http] missing 'location' header for redirect"); + if (uri == nullptr) return_error("[tcp/http] Missing 'location' header for redirect"); uri += strlen(LOCATION); @@ -171,7 +171,7 @@ int NetworkHTTPSocketHandler::HandleHeader() char *end_of_line = strstr(uri, NEWLINE); *end_of_line = '\0'; - DEBUG(net, 6, "[tcp/http] redirecting to %s", uri); + DEBUG(net, 7, "[tcp/http] Redirecting to %s", uri); int ret = NetworkHTTPSocketHandler::Connect(uri, this->callback, this->data, this->redirect_depth + 1); if (ret != 0) return ret; @@ -194,12 +194,12 @@ int NetworkHTTPSocketHandler::HandleHeader() /* static */ int NetworkHTTPSocketHandler::Connect(char *uri, HTTPCallback *callback, const char *data, int depth) { char *hname = strstr(uri, "://"); - if (hname == nullptr) return_error("[tcp/http] invalid location"); + if (hname == nullptr) return_error("[tcp/http] Invalid location"); hname += 3; char *url = strchr(hname, '/'); - if (url == nullptr) return_error("[tcp/http] invalid location"); + if (url == nullptr) return_error("[tcp/http] Invalid location"); *url = '\0'; @@ -228,7 +228,7 @@ int NetworkHTTPSocketHandler::Receive() NetworkError err = NetworkError::GetLast(); if (!err.WouldBlock()) { /* Something went wrong... */ - if (!err.IsConnectionReset()) DEBUG(net, 0, "recv failed with error %s", err.AsString()); + if (!err.IsConnectionReset()) DEBUG(net, 0, "Recv failed: %s", err.AsString()); return -1; } /* Connection would block, so stop for now */ @@ -256,7 +256,7 @@ int NetworkHTTPSocketHandler::Receive() if (end_of_header == nullptr) { if (read == lengthof(this->recv_buffer)) { - DEBUG(net, 0, "[tcp/http] header too big"); + DEBUG(net, 1, "[tcp/http] Header too big"); return -1; } this->recv_pos = read; |