Start cleaning up the peer code.

This commit is contained in:
JoelKatz
2011-11-30 14:57:44 -08:00
parent f243286bc9
commit 284445a7fa
2 changed files with 8 additions and 10 deletions

View File

@@ -27,18 +27,17 @@ bool PackedMessage::operator == (const PackedMessage& other)
return(mBuffer==other.mBuffer); return(mBuffer==other.mBuffer);
} }
// TODO: this is nonsense
unsigned PackedMessage::getLength(std::vector<uint8_t>& buf) unsigned PackedMessage::getLength(std::vector<uint8_t>& buf)
{ {
if(buf.size() < HEADER_SIZE) return 0; if(buf.size() < HEADER_SIZE) return 0;
int ret=buf[0]; int ret=buf[0];
ret= ret << 8; ret<<=8;
ret= ret | buf[1]; ret|=buf[1];
ret= ret << 8; ret<<=8;
ret= ret | buf[2]; ret|=buf[2];
ret= ret << 8; ret<<=8;
ret= ret | buf[3]; ret|=buf[3];
return(ret); return(ret);
} }
@@ -48,8 +47,8 @@ int PackedMessage::getType(std::vector<uint8_t>& buf)
if(buf.size() < HEADER_SIZE) return 0; if(buf.size() < HEADER_SIZE) return 0;
int ret=buf[4]; int ret=buf[4];
ret= ret << 8; ret<<=8;
ret= ret | buf[5]; ret|=buf[5];
return(ret); return(ret);
} }

View File

@@ -15,7 +15,6 @@ using namespace boost::asio::ip;
Peer::Peer(boost::asio::io_service& io_service) Peer::Peer(boost::asio::io_service& io_service)
: mSocket(io_service) : mSocket(io_service)
{ {
mSendingPacket=PackedMessage::pointer();
} }
/* /*