zmv7
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong channel number representation in logs (#7205)

master
SmallJoker 2018-04-18 21:26:20 +02:00
parent 3eac249464
commit 9877a1a207
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/connectionthreads.cpp
View File

@ -365,7 +365,7 @@ bool ConnectionSendThread::rawSendAsPacket(session_t peer_id, u8 channelnum,
< channel->getWindowSize()) { < channel->getWindowSize()) {
LOG(dout_con << m_connection->getDesc() LOG(dout_con << m_connection->getDesc()
<< " INFO: sending a reliable packet to peer_id " << peer_id << " INFO: sending a reliable packet to peer_id " << peer_id
<< " channel: " << channelnum << " channel: " << (u32)channelnum
<< " seqnum: " << seqnum << std::endl); << " seqnum: " << seqnum << std::endl);
sendAsPacketReliable(p, channel); sendAsPacketReliable(p, channel);
return true; return true;
@ -373,7 +373,7 @@ bool ConnectionSendThread::rawSendAsPacket(session_t peer_id, u8 channelnum,
LOG(dout_con << m_connection->getDesc() LOG(dout_con << m_connection->getDesc()
<< " INFO: queueing reliable packet for peer_id: " << peer_id << " INFO: queueing reliable packet for peer_id: " << peer_id
<< " channel: " << channelnum << " channel: " << (u32)channelnum
<< " seqnum: " << seqnum << std::endl); << " seqnum: " << seqnum << std::endl);
channel->queued_reliables.push(p); channel->queued_reliables.push(p);
return false; return false;
@ -948,7 +948,7 @@ void ConnectionReceiveThread::receive()
if (channelnum > CHANNEL_COUNT - 1) { if (channelnum > CHANNEL_COUNT - 1) {
LOG(derr_con << m_connection->getDesc() LOG(derr_con << m_connection->getDesc()
<< "Receive(): Invalid channel " << channelnum << std::endl); << "Receive(): Invalid channel " << (u32)channelnum << std::endl);
throw InvalidIncomingDataException("Channel doesn't exist"); throw InvalidIncomingDataException("Channel doesn't exist");
} }
@ -1024,7 +1024,7 @@ void ConnectionReceiveThread::receive()
LOG(dout_con << m_connection->getDesc() LOG(dout_con << m_connection->getDesc()
<< " ProcessPacket from peer_id: " << peer_id << " ProcessPacket from peer_id: " << peer_id
<< ",channel: " << (channelnum & 0xFF) << ", returned " << ", channel: " << (u32)channelnum << ", returned "
<< resultdata.getSize() << " bytes" << std::endl); << resultdata.getSize() << " bytes" << std::endl);
ConnectionEvent e; ConnectionEvent e;