summaryrefslogtreecommitdiff
path: root/src/net/network.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-25 14:36:55 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-25 14:36:55 +0000
commit42f5932053d90dbc49a4401ef259e1f5ef58adbb (patch)
tree32f19e6910fd3fd43c8fa81757e26e9c45e1e8d5 /src/net/network.cpp
parentb5a9e699b9685e2a7d448171e282fd284754caf1 (diff)
downloadmana-client-42f5932053d90dbc49a4401ef259e1f5ef58adbb.tar.gz
mana-client-42f5932053d90dbc49a4401ef259e1f5ef58adbb.tar.bz2
mana-client-42f5932053d90dbc49a4401ef259e1f5ef58adbb.tar.xz
mana-client-42f5932053d90dbc49a4401ef259e1f5ef58adbb.zip
Fix a few more log and error calls to make sure it compiles...
Diffstat (limited to 'src/net/network.cpp')
-rw-r--r--src/net/network.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 8ad0fd85..b9d0fc55 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -22,6 +22,7 @@
*/
#include "network.h"
+#include "../main.h"
#ifndef WIN32
#include <unistd.h>
#include <fcntl.h>
@@ -44,7 +45,7 @@ fd_set write_socket;
void WFIFOSET(int len)
{
if (out_size + len >= buffer_size) {
- log("Warning: Output buffer full");
+ logger.log("Warning: Output buffer full");
}
else {
out_size += len;
@@ -153,30 +154,30 @@ void flush()
}
}
if (ret == SOCKET_ERROR) {
- error("Socket Error");
+ logger.error("Socket Error");
#ifdef WIN32
- log("Error: Socket error: %i ", WSAGetLastError());
+ logger.log("Error: Socket error: %i ", WSAGetLastError());
if (WSAGetLastError() == 10053)
- log("Error: Packet size error");
+ logger.log("Error: Packet size error");
/** Probably the last packet you sent, was defined with
* wrong size: WFIFOSET(size);
*/
#else
- log("Error: Undefined socket error");
+ logger.log("Error: Undefined socket error");
#endif
}
}
// Read data, if available
- if(FD_ISSET(sock, &read_socket)) {
+ if (FD_ISSET(sock, &read_socket)) {
/* There's no check for partial received packets because at this level
the app doesn't know packet length, but it will done when parsing received data */
ret = recv(sock, in+in_size, RFIFOSPACE, 0);
- if(ret==SOCKET_ERROR) {
+ if (ret == SOCKET_ERROR) {
#ifdef WIN32
- log("Error: Socket error: %i ", WSAGetLastError());
+ logger.log("Error: Socket error: %i ", WSAGetLastError());
#else
- log("Error: Undefined socket error");
+ logger.log("Error: Undefined socket error");
#endif
} else RFIFOSET(ret); // Set size of available data to read
}