aboutsummaryrefslogtreecommitdiff
path: root/backends/networking
diff options
context:
space:
mode:
Diffstat (limited to 'backends/networking')
-rw-r--r--backends/networking/curl/connectionmanager.cpp2
-rw-r--r--backends/networking/curl/curljsonrequest.cpp2
-rw-r--r--backends/networking/curl/curlrequest.cpp2
-rw-r--r--backends/networking/curl/networkreadstream.cpp4
-rw-r--r--backends/networking/sdl_net/client.cpp8
-rw-r--r--backends/networking/sdl_net/localwebserver.cpp20
-rw-r--r--backends/networking/sdl_net/reader.cpp10
7 files changed, 24 insertions, 24 deletions
diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp
index 1d5fd0d0cb..f3dc91ad60 100644
--- a/backends/networking/curl/connectionmanager.cpp
+++ b/backends/networking/curl/connectionmanager.cpp
@@ -194,7 +194,7 @@ void ConnectionManager::processTransfers() {
if (curlMsg->msg == CURLMSG_DONE) {
debug(9, "ConnectionManager: SUCCESS (%d - %s)", curlMsg->data.result, curl_easy_strerror(curlMsg->data.result));
} else {
- debug("ConnectionManager: FAILURE (CURLMsg (%d))", curlMsg->msg);
+ warning("ConnectionManager: FAILURE (CURLMsg (%d))", curlMsg->msg);
}
curl_multi_remove_handle(_multi, easyHandle);
diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp
index 7db56cfdcc..aac89a1513 100644
--- a/backends/networking/curl/curljsonrequest.cpp
+++ b/backends/networking/curl/curljsonrequest.cpp
@@ -68,7 +68,7 @@ void CurlJsonRequest::handle() {
uint32 readBytes = _stream->read(_buffer, CURL_JSON_REQUEST_BUFFER_SIZE);
if (readBytes != 0)
if (_contentsStream.write(_buffer, readBytes) != readBytes)
- warning("MemoryWriteStreamDynamic was unable to write all the bytes");
+ warning("CurlJsonRequest: unable to write all the bytes into MemoryWriteStreamDynamic");
if (_stream->eos()) {
char *contents = getPreparedContents();
diff --git a/backends/networking/curl/curlrequest.cpp b/backends/networking/curl/curlrequest.cpp
index 2d5bb1fa2b..64fa347023 100644
--- a/backends/networking/curl/curlrequest.cpp
+++ b/backends/networking/curl/curlrequest.cpp
@@ -52,7 +52,7 @@ void CurlRequest::handle() {
if (_stream && _stream->eos()) {
if (_stream->httpResponseCode() != 200) {
- warning("HTTP response code is not 200 OK (it's %ld)", _stream->httpResponseCode());
+ warning("CurlRequest: HTTP response code is not 200 OK (it's %ld)", _stream->httpResponseCode());
ErrorResponse error(this, false, true, "", _stream->httpResponseCode());
finishError(error);
return;
diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp
index 5c760d9e01..21f26895e9 100644
--- a/backends/networking/curl/networkreadstream.cpp
+++ b/backends/networking/curl/networkreadstream.cpp
@@ -129,7 +129,7 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, Common::H
);
if (code != CURL_FORMADD_OK)
- debug("field failed formadd");
+ warning("NetworkReadStream: field curl_formadd('%s') failed", i->_key.c_str());
}
for (Common::HashMap<Common::String, Common::String>::iterator i = formFiles.begin(); i != formFiles.end(); ++i) {
@@ -142,7 +142,7 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, Common::H
);
if (code != CURL_FORMADD_OK)
- debug("file failed formadd");
+ warning("NetworkReadStream: file curl_formadd('%s') failed", i->_key.c_str());
}
curl_easy_setopt(_easy, CURLOPT_HTTPPOST, formpost);
diff --git a/backends/networking/sdl_net/client.cpp b/backends/networking/sdl_net/client.cpp
index 0026d0e346..dab38ba5c0 100644
--- a/backends/networking/sdl_net/client.cpp
+++ b/backends/networking/sdl_net/client.cpp
@@ -62,7 +62,7 @@ void Client::open(SDLNet_SocketSet set, TCPsocket socket) {
if (set) {
int numused = SDLNet_TCP_AddSocket(set, socket);
if (numused == -1) {
- error("SDLNet_AddSocket: %s\n", SDLNet_GetError());
+ error("Client: SDLNet_AddSocket: %s\n", SDLNet_GetError());
}
}
}
@@ -79,13 +79,13 @@ bool Client::readMoreIfNeeded() {
int bytes = SDLNet_TCP_Recv(_socket, _buffer, CLIENT_BUFFER_SIZE);
if (bytes <= 0) {
- warning("Client::readHeaders recv fail");
+ warning("Client::readMoreIfNeeded: recv fail");
close();
return false;
}
if (_stream->write(_buffer, bytes) != bytes) {
- warning("failed to write() into MemoryReadWriteStream");
+ warning("Client::readMoreIfNeeded: failed to write() into MemoryReadWriteStream");
close();
return false;
}
@@ -146,7 +146,7 @@ void Client::close() {
if (_socket) {
int numused = SDLNet_TCP_DelSocket(_set, _socket);
if (numused == -1)
- error("SDLNet_DelSocket: %s\n", SDLNet_GetError());
+ error("Client: SDLNet_DelSocket: %s\n", SDLNet_GetError());
}
_set = nullptr;
}
diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp
index 75dbea0d56..8a40aed697 100644
--- a/backends/networking/sdl_net/localwebserver.cpp
+++ b/backends/networking/sdl_net/localwebserver.cpp
@@ -96,14 +96,14 @@ void LocalWebserver::start() {
// Create a listening TCP socket
IPaddress ip;
if (SDLNet_ResolveHost(&ip, NULL, _serverPort) == -1) {
- error("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+ error("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
}
resolveAddress(&ip);
_serverSocket = SDLNet_TCP_Open(&ip);
if (!_serverSocket) {
- warning("SDLNet_TCP_Open: %s", SDLNet_GetError());
+ warning("LocalWebserver: SDLNet_TCP_Open: %s", SDLNet_GetError());
stopTimer();
g_system->displayMessageOnOSD(_("Failed to start local webserver.\nCheck whether selected port is not used by another application and try again."));
_handleMutex.unlock();
@@ -113,12 +113,12 @@ void LocalWebserver::start() {
// Create a socket set
_set = SDLNet_AllocSocketSet(MAX_CONNECTIONS + 1); //one more for our server socket
if (!_set) {
- error("SDLNet_AllocSocketSet: %s\n", SDLNet_GetError());
+ error("LocalWebserver: SDLNet_AllocSocketSet: %s\n", SDLNet_GetError());
}
int numused = SDLNet_TCP_AddSocket(_set, _serverSocket);
if (numused == -1) {
- error("SDLNet_AddSocket: %s\n", SDLNet_GetError());
+ error("LocalWebserver: SDLNet_AddSocket: %s\n", SDLNet_GetError());
}
_handleMutex.unlock();
}
@@ -183,7 +183,7 @@ void LocalWebserver::handle() {
_handleMutex.lock();
int numready = SDLNet_CheckSockets(_set, 0);
if (numready == -1) {
- error("SDLNet_CheckSockets: %s\n", SDLNet_GetError());
+ error("LocalWebserver: SDLNet_CheckSockets: %s\n", SDLNet_GetError());
} else if (numready) {
acceptClient();
}
@@ -268,11 +268,11 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
// default way (might work everywhere, surely works on Windows)
const char *name = SDLNet_ResolveIP(ip);
if (name == NULL) {
- warning("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+ warning("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
} else {
IPaddress localIp;
if (SDLNet_ResolveHost(&localIp, name, _serverPort) == -1) {
- warning("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+ warning("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
} else {
_address = Common::String::format(
"http://%u.%u.%u.%u:%u/",
@@ -284,7 +284,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
// check that our trick worked
if (_address.contains("/127.0.0.1:") || _address.contains("localhost") || _address.contains("/0.0.0.0:"))
- warning("Failed to resolve IP with the default way");
+ warning("LocalWebserver: Failed to resolve IP with the default way");
else
return;
@@ -307,7 +307,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
tmpAddrPtr = &((struct sockaddr_in *)i->ifa_addr)->sin_addr;
char addressBuffer[INET_ADDRSTRLEN];
inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
- debug("%s IP Address %s", i->ifa_name, addressBuffer);
+ debug(9, "%s IP Address %s", i->ifa_name, addressBuffer);
addr = addressBuffer;
}
@@ -317,7 +317,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
tmpAddrPtr = &((struct sockaddr_in6 *)i->ifa_addr)->sin6_addr;
char addressBuffer[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
- debug("%s IP Address %s", i->ifa_name, addressBuffer);
+ debug(9, "%s IP Address %s", i->ifa_name, addressBuffer);
addr = addressBuffer;
}
*/
diff --git a/backends/networking/sdl_net/reader.cpp b/backends/networking/sdl_net/reader.cpp
index 828f583003..0e4cc9a106 100644
--- a/backends/networking/sdl_net/reader.cpp
+++ b/backends/networking/sdl_net/reader.cpp
@@ -138,7 +138,7 @@ void readFromThatUntilLineEnd(const char *cstr, Common::String needle, Common::S
void Reader::handleFirstHeaders(Common::String headers) {
if (!_boundary.empty()) {
- warning("handleFirstHeaders() called when first headers were already handled");
+ warning("Reader: handleFirstHeaders() called when first headers were already handled");
return;
}
@@ -252,7 +252,7 @@ void Reader::parseQueryParameters() {
} else {
if (_query[i] == '&') {
if (_queryParameters.contains(key))
- warning("Query parameter \"%s\" is already set!", key.c_str());
+ warning("Reader: query parameter \"%s\" is already set!", key.c_str());
else
_queryParameters[key] = LocalWebserver::urlDecode(value);
readingKey = true;
@@ -265,7 +265,7 @@ void Reader::parseQueryParameters() {
if (!key.empty()) {
if (_queryParameters.contains(key))
- warning("Query parameter \"%s\" is already set!", key.c_str());
+ warning("Reader: query parameter \"%s\" is already set!", key.c_str());
else
_queryParameters[key] = LocalWebserver::urlDecode(value);
}
@@ -410,9 +410,9 @@ bool Reader::readBlockContent(Common::WriteStream *stream) {
if (bts == "--")
_allContentRead = true;
else if (bts != "\r\n")
- warning("strange bytes: \"%s\"", bts.c_str());
+ warning("Reader: strange bytes: \"%s\"", bts.c_str());
} else {
- warning("strange ending");
+ warning("Reader: strange ending");
_allContentRead = true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 20:34:32 +0000