summaryrefslogtreecommitdiffstats
path: root/src/Net/Connection.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/Connection.cpp
parent55a6045504bee4bf425870b6b427abd5240e7303 (diff)
downloadmad-c4c91c7cbc6c413e59f05be88e6bd1c6bc83679d.tar
mad-c4c91c7cbc6c413e59f05be88e6bd1c6bc83679d.zip
Server-Status-Abfrage zeigt jetzt uptime an
Diffstat (limited to 'src/Net/Connection.cpp')
-rw-r--r--src/Net/Connection.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Net/Connection.cpp b/src/Net/Connection.cpp
index cfced4f..22adeaf 100644
--- a/src/Net/Connection.cpp
+++ b/src/Net/Connection.cpp
@@ -74,7 +74,7 @@ void Connection::packetHeaderReceiveHandler(const void *data, unsigned long leng
return;
}
- header = *reinterpret_cast<const Packet::Data*>(data);
+ header = *(const Packet::Data*)data;
if(header.length == 0) {
signal(this, Packet((Packet::Type)ntohs(header.type), ntohs(header.requestId)));
@@ -124,7 +124,7 @@ void Connection::doReceive() {
if(receiveComplete()) {
// Save data pointer, as transR.notify might start a new reception
- unsigned char *data = transR.data;
+ uint8_t *data = transR.data;
transR.data = 0;
transR.notify(data, transR.length);
@@ -142,7 +142,7 @@ bool Connection::rawReceive(unsigned long length,
if(!receiveComplete())
return false;
- transR.data = new unsigned char[length];
+ transR.data = new uint8_t[length];
transR.length = length;
transR.transmitted = 0;
transR.notify = notify;
@@ -176,11 +176,11 @@ void Connection::doSend() {
}
}
-bool Connection::rawSend(const unsigned char *data, unsigned long length) {
+bool Connection::rawSend(const uint8_t *data, unsigned long length) {
if(!isConnected())
return false;
- Transmission trans = {length, 0, new unsigned char[length], sigc::slot<void,const void*,unsigned long>()};
+ Transmission trans = {length, 0, new uint8_t[length], sigc::slot<void,const void*,unsigned long>()};
std::memcpy(trans.data, data, length);
transS.push(trans);