Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

add new send_via_udp that may be able to check for address validity

Browse source
This commit is contained in:
Eric House 2013-07-20 10:37:38 -07:00
parent 792a51a404
commit 464ef49018
1 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
xwords4/relay/xwrelay.cpp
View file

@ -419,8 +419,8 @@ denyConnection( const AddrInfo* addr, XWREASON err )
} }
static ssize_t static ssize_t
send_via_udp( int socket, const struct sockaddr* dest_addr, send_via_udp_impl( int socket, const struct sockaddr* dest_addr,
XWRelayReg cmd, ... ) XWRelayReg cmd, va_list* app )
{ {
uint32_t packetNum = UDPAckTrack::nextPacketID( cmd ); uint32_t packetNum = UDPAckTrack::nextPacketID( cmd );
struct iovec vec[10]; struct iovec vec[10];
@ -435,19 +435,16 @@ send_via_udp( int socket, const struct sockaddr* dest_addr,
vec[iocount].iov_len = sizeof(header); vec[iocount].iov_len = sizeof(header);
++iocount; ++iocount;
va_list ap;
va_start( ap, cmd );
for ( ; ; ) { for ( ; ; ) {
unsigned char* ptr = va_arg(ap, unsigned char*); unsigned char* ptr = va_arg(*app, unsigned char*);
if ( !ptr ) { if ( !ptr ) {
break; break;
} }
assert( iocount < VSIZE(vec) ); assert( iocount < VSIZE(vec) );
vec[iocount].iov_base = ptr; vec[iocount].iov_base = ptr;
vec[iocount].iov_len = va_arg(ap, int); vec[iocount].iov_len = va_arg(*app, int);
++iocount; ++iocount;
} }
va_end( ap );
#ifdef LOG_UDP_PACKETS #ifdef LOG_UDP_PACKETS
gsize size = 0; gsize size = 0;
@ -487,7 +484,36 @@ send_via_udp( int socket, const struct sockaddr* dest_addr,
#endif #endif
return nSent; return nSent;
} // send_via_udp } // send_via_udp_impl
static ssize_t
send_via_udp( const AddrInfo* addr, XWRelayReg cmd, ... )
{
ssize_t result = 0;
int socket = addr->socket();
assert( g_udpsock == socket || socket == -1 );
if ( -1 == socket ) {
socket = g_udpsock;
}
va_list ap;
va_start( ap, cmd );
result = send_via_udp_impl( socket, addr->sockaddr(), cmd, &ap );
va_end( ap );
return result;
}
static ssize_t
send_via_udp( int socket, const struct sockaddr* dest_addr,
XWRelayReg cmd, ... )
{
va_list ap;
va_start( ap, cmd );
ssize_t result = send_via_udp_impl( socket, dest_addr, cmd, &ap );
va_end( ap );
return result;
}
/* No mutex here. Caller better be ensuring no other thread can access this /* No mutex here. Caller better be ensuring no other thread can access this
* socket. */ * socket. */
@ -522,16 +548,10 @@ send_with_length_unsafe( const AddrInfo* addr, const unsigned char* buf,
const AddrInfo::ClientToken clientToken = addr->clientToken(); const AddrInfo::ClientToken clientToken = addr->clientToken();
assert( 0 != clientToken ); assert( 0 != clientToken );
uint32_t asNetTok = htonl(clientToken); uint32_t asNetTok = htonl(clientToken);
const struct sockaddr* saddr = addr->sockaddr(); send_via_udp( addr, XWPDEV_MSG, &asNetTok,
int socket = addr->socket();
assert( g_udpsock == socket || socket == -1 );
if ( -1 == socket ) {
socket = g_udpsock;
}
send_via_udp( socket, saddr, XWPDEV_MSG, &asNetTok,
sizeof(asNetTok), buf, bufLen, NULL ); sizeof(asNetTok), buf, bufLen, NULL );
logf( XW_LOGINFO, "%s: sent %d bytes (plus header) on UDP socket %d, " logf( XW_LOGINFO, "%s: sent %d bytes (plus header) on UDP socket, "
"token=%x(%d)", __func__, bufLen, socket, clientToken, "token=%x(%d)", __func__, bufLen, clientToken,
clientToken ); clientToken );
ok = true; ok = true;
} }
@ -552,7 +572,7 @@ send_havemsgs( const AddrInfo* addr )
socket = g_udpsock; socket = g_udpsock;
} }
send_via_udp( socket, addr->sockaddr(), XWPDEV_HAVEMSGS, NULL ); send_via_udp( addr, XWPDEV_HAVEMSGS, NULL );
} }
/* A CONNECT message from a device gives us the hostID and socket we'll /* A CONNECT message from a device gives us the hostID and socket we'll
@ -1348,7 +1368,7 @@ ackPacketIf( const UDPHeader* header, const AddrInfo* addr )
uint32_t packetID = header->packetID; uint32_t packetID = header->packetID;
logf( XW_LOGINFO, "acking packet %d", packetID ); logf( XW_LOGINFO, "acking packet %d", packetID );
packetID = htonl( packetID ); packetID = htonl( packetID );
send_via_udp( addr->socket(), addr->sockaddr(), XWPDEV_ACK, send_via_udp( addr, XWPDEV_ACK,
&packetID, sizeof(packetID), NULL ); &packetID, sizeof(packetID), NULL );
} }
} }
@ -1362,7 +1382,6 @@ handle_udp_packet( UdpThreadClosure* utc )
UDPHeader header; UDPHeader header;
if ( getHeader( &ptr, end, &header ) ) { if ( getHeader( &ptr, end, &header ) ) {
logf( XW_LOGINFO, "%s(msg=%s)", __func__, msgToStr( header.cmd ) ); logf( XW_LOGINFO, "%s(msg=%s)", __func__, msgToStr( header.cmd ) );
ackPacketIf( &header, utc->addr() );
switch( header.cmd ) { switch( header.cmd ) {
case XWPDEV_REG: { case XWPDEV_REG: {
DevIDType typ = (DevIDType)*ptr++; DevIDType typ = (DevIDType)*ptr++;
@ -1454,6 +1473,9 @@ handle_udp_packet( UdpThreadClosure* utc )
default: default:
logf( XW_LOGERROR, "%s: unexpected msg %d", __func__, header.cmd ); logf( XW_LOGERROR, "%s: unexpected msg %d", __func__, header.cmd );
} }
// Do this after the device and address are registered
ackPacketIf( &header, utc->addr() );
} }
} }