Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

log contents of incoming udp packets

Browse source
This commit is contained in:
Eric House 2013-07-22 06:06:39 -07:00
parent 13550865ad
commit 48a2567edf
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xwords4/relay/xwrelay.cpp
View file

@ -1366,7 +1366,7 @@ ackPacketIf( const UDPHeader* header, const AddrInfo* addr )
{ {
if ( UDPAckTrack::shouldAck( header->cmd ) ) { if ( UDPAckTrack::shouldAck( header->cmd ) ) {
uint32_t packetID = header->packetID; uint32_t packetID = header->packetID;
logf( XW_LOGINFO, "acking packet %d", packetID ); logf( XW_LOGINFO, "%s: acking packet %d", __func__, packetID );
packetID = htonl( packetID ); packetID = htonl( packetID );
send_via_udp( addr, XWPDEV_ACK, send_via_udp( addr, XWPDEV_ACK,
&packetID, sizeof(packetID), NULL ); &packetID, sizeof(packetID), NULL );
@ -1489,8 +1489,15 @@ read_udp_packet( int udpsock )
ssize_t nRead = recvfrom( udpsock, buf, sizeof(buf), 0 /*flags*/, ssize_t nRead = recvfrom( udpsock, buf, sizeof(buf), 0 /*flags*/,
&saddr.u.addr, &fromlen ); &saddr.u.addr, &fromlen );
logf( XW_LOGINFO, "%s: recvfrom=>%d", __func__, nRead );
if ( 0 < nRead ) { if ( 0 < nRead ) {
#ifdef LOG_UDP_PACKETS
gchar* b64 = g_base64_encode( (unsigned char*)&saddr, sizeof(saddr) );
logf( XW_LOGINFO, "%s: recvfrom=>%d (saddr='%s')", __func__, nRead, b64 );
g_free( b64 );
#else
logf( XW_LOGINFO, "%s: recvfrom=>%d", __func__, nRead );
#endif
AddrInfo addr( udpsock, &saddr, false ); AddrInfo addr( udpsock, &saddr, false );
UdpQueue::get()->handle( &addr, buf, nRead, handle_udp_packet ); UdpQueue::get()->handle( &addr, buf, nRead, handle_udp_packet );
} }
@ -1989,8 +1996,7 @@ main( int argc, char** argv )
logf( XW_LOGINFO, logf( XW_LOGINFO,
"%s: accepting connection from %s on socket %d", "%s: accepting connection from %s on socket %d",
__func__, inet_ntoa(saddr.u.addr_in.sin_addr), __func__, inet_ntoa(saddr.u.addr_in.sin_addr), newSock );
newSock );
AddrInfo addr( newSock, &saddr, true ); AddrInfo addr( newSock, &saddr, true );
tPool->AddSocket( perGame ? XWThreadPool::STYPE_GAME tPool->AddSocket( perGame ? XWThreadPool::STYPE_GAME