Skip to content

Commit

Permalink
Fix wrong channel number representation in logs (#7205)
Browse files Browse the repository at this point in the history
  • Loading branch information
SmallJoker committed Apr 18, 2018
1 parent 3eac249 commit 9877a1a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/network/connectionthreads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,15 @@ bool ConnectionSendThread::rawSendAsPacket(session_t peer_id, u8 channelnum,
< channel->getWindowSize()) {
LOG(dout_con << m_connection->getDesc()
<< " INFO: sending a reliable packet to peer_id " << peer_id
<< " channel: " << channelnum
<< " channel: " << (u32)channelnum
<< " seqnum: " << seqnum << std::endl);
sendAsPacketReliable(p, channel);
return true;
}

LOG(dout_con << m_connection->getDesc()
<< " INFO: queueing reliable packet for peer_id: " << peer_id
<< " channel: " << channelnum
<< " channel: " << (u32)channelnum
<< " seqnum: " << seqnum << std::endl);
channel->queued_reliables.push(p);
return false;
Expand Down Expand Up @@ -948,7 +948,7 @@ void ConnectionReceiveThread::receive()

if (channelnum > CHANNEL_COUNT - 1) {
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");
}

Expand Down Expand Up @@ -1024,7 +1024,7 @@ void ConnectionReceiveThread::receive()

LOG(dout_con << m_connection->getDesc()
<< " ProcessPacket from peer_id: " << peer_id
<< ",channel: " << (channelnum & 0xFF) << ", returned "
<< ", channel: " << (u32)channelnum << ", returned "
<< resultdata.getSize() << " bytes" << std::endl);

ConnectionEvent e;
Expand Down

0 comments on commit 9877a1a

Please sign in to comment.