summaryrefslogtreecommitdiffstats
path: root/src/Net/ServerConnection.cpp
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2008-09-10 21:46:33 +0200
committerMatthias Schiffer <matthias@gamezock.de>2008-09-10 21:46:33 +0200
commitc4c91c7cbc6c413e59f05be88e6bd1c6bc83679d (patch)
treecd6148bbf037eb323bbfe6bd40a697ea0bbd2d17 /src/Net/ServerConnection.cpp
parent55a6045504bee4bf425870b6b427abd5240e7303 (diff)
downloadmad-c4c91c7cbc6c413e59f05be88e6bd1c6bc83679d.tar
mad-c4c91c7cbc6c413e59f05be88e6bd1c6bc83679d.zip
Server-Status-Abfrage zeigt jetzt uptime an
Diffstat (limited to 'src/Net/ServerConnection.cpp')
-rw-r--r--src/Net/ServerConnection.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Net/ServerConnection.cpp b/src/Net/ServerConnection.cpp
index 0c35991..fbdd69f 100644
--- a/src/Net/ServerConnection.cpp
+++ b/src/Net/ServerConnection.cpp
@@ -32,7 +32,7 @@ void ServerConnection::connectionHeaderReceiveHandler(const void *data, unsigned
// Error... disconnect
return;
- const ConnectionHeader *header = reinterpret_cast<const ConnectionHeader*>(data);
+ const ConnectionHeader *header = (const ConnectionHeader*)data;
if(header->m != 'M' || header->a != 'A' || header->d != 'D')
// Error... disconnect
@@ -52,7 +52,7 @@ void ServerConnection::connectionHeaderReceiveHandler(const void *data, unsigned
ConnectionHeader header2 = {'M', 'A', 'D', 0, 0, 1, 1, 0};
- rawSend(reinterpret_cast<unsigned char*>(&header2), sizeof(header2));
+ rawSend((uint8_t*)&header2, sizeof(header2));
enterReceiveLoop();
}
@@ -69,7 +69,7 @@ ServerConnection::ServerConnection(int sock0, const IPAddress &address, gnutls_d
gnutls_init(&session, GNUTLS_SERVER);
gnutls_set_default_priority(session);
gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
- gnutls_transport_set_ptr(session, reinterpret_cast<gnutls_transport_ptr_t>(sock));
+ gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t)sock);
handshake();
}