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

better client token logging

Browse source
This commit is contained in:
Eric House 2013-07-10 23:13:50 -07:00
parent 2060aa4577
commit 5814febad5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/relay/xwrelay.cpp
View file

@ -483,18 +483,19 @@ send_with_length_unsafe( const AddrInfo* addr, const unsigned char* buf,
__func__, socket );
}
} else {
AddrInfo::ClientToken clientToken = addr->clientToken();
const AddrInfo::ClientToken clientToken = addr->clientToken();
assert( 0 != clientToken );
clientToken = htonl(clientToken);
uint32_t asNetTok = htonl(clientToken);
const struct sockaddr* saddr = addr->sockaddr();
int socket = addr->socket();
assert( g_udpsock == socket || socket == -1 );
if ( -1 == socket ) {
socket = g_udpsock;
}
send_via_udp( socket, saddr, XWPDEV_MSG, &clientToken,
sizeof(clientToken), buf, bufLen, NULL );
logf( XW_LOGINFO, "sent %d bytes on UDP socket %d", bufLen, socket );
send_via_udp( socket, saddr, XWPDEV_MSG, &asNetTok,
sizeof(asNetTok), buf, bufLen, NULL );
logf( XW_LOGINFO, "%s: sent %d bytes on UDP socket %d, token=%x(%d)",
__func__, bufLen, socket, clientToken, clientToken );
ok = true;
}
@ -1316,7 +1317,7 @@ ackPacketIf( const UDPHeader* header, const AddrInfo* addr )
}
static void
udp_thread_proc( UdpThreadClosure* utc )
handle_udp_packet( UdpThreadClosure* utc )
{
const unsigned char* ptr = utc->buf();
const unsigned char* end = ptr + utc->len();
@ -1432,7 +1433,7 @@ read_udp_packet( int udpsock )
logf( XW_LOGINFO, "%s: recvfrom=>%d", __func__, nRead );
if ( 0 < nRead ) {
AddrInfo addr( udpsock, &saddr, false );
UdpQueue::get()->handle( &addr, buf, nRead, udp_thread_proc );
UdpQueue::get()->handle( &addr, buf, nRead, handle_udp_packet );
}
}