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

to prevent duplicate UDP packets (I hope), bind the UDP socket to a

Browse source 
single ip address rather than INADDR_ANY.  Get that address at runtime
for an interface provided in the config file.
This commit is contained in:
Eric House 2013-09-30 23:40:12 -07:00
parent 552fa28b39
commit b3723897d5
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/relay/xwrelay.conf_tmplate
View file

@ -28,6 +28,9 @@ DEVICE_PORTS=10998
# Port for per-device UDP interface (experimental) # Port for per-device UDP interface (experimental)
UDP_PORT=10997 UDP_PORT=10997
# interface to listen on -- may get dup packets if not specified
UDP_IFACE=eth0
# How long after we've read from an address before we assume it's # How long after we've read from an address before we assume it's
# recycled. Also sent to clients as a suggested ping interval # recycled. Also sent to clients as a suggested ping interval
UDP_RECYLE_INTERVAL=60 UDP_RECYLE_INTERVAL=60

37
xwords4/relay/xwrelay.cpp
View file

@ -51,6 +51,7 @@
#include <syslog.h> #include <syslog.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <ifaddrs.h>
#include <glib.h> #include <glib.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
@ -1876,6 +1877,40 @@ maint_str_loop( int udpsock, const char* str )
} // for } // for
} // maint_str_loop } // maint_str_loop
static uint32_t
getIPAddr( void )
{
uint32_t result = INADDR_ANY;
char iface[16] = {0};
if ( RelayConfigs::GetConfigs()->GetValueFor( "UDP_IFACE", iface,
sizeof(iface) ) ) {
struct ifaddrs* ifa;
if ( 0 != getifaddrs( &ifa ) ) {
assert(0);
}
struct ifaddrs* next;
for ( next = ifa; !!next; next = next->ifa_next ) {
if ( 0 != strcmp( iface, next->ifa_name ) ) {
continue;
}
if ( !next->ifa_addr ) {
continue;
}
int family = next->ifa_addr->sa_family;
if ( AF_INET != family ) {
continue;
}
struct sockaddr_in* sin = (struct sockaddr_in*)next->ifa_addr;
result = sin->sin_addr.s_addr;
break;
}
freeifaddrs( ifa );
}
logf( XW_LOGINFO, "%s(iface=%s)=>%x", __func__, iface, result );
return result;
}
int int
main( int argc, char** argv ) main( int argc, char** argv )
{ {
@ -2070,7 +2105,7 @@ main( int argc, char** argv )
struct sockaddr_in saddr; struct sockaddr_in saddr;
g_udpsock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); g_udpsock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
saddr.sin_family = PF_INET; saddr.sin_family = PF_INET;
saddr.sin_addr.s_addr = htonl(INADDR_ANY); saddr.sin_addr.s_addr = getIPAddr();
saddr.sin_port = htons(udpport); saddr.sin_port = htons(udpport);
int err = bind( g_udpsock, (struct sockaddr*)&saddr, sizeof(saddr) ); int err = bind( g_udpsock, (struct sockaddr*)&saddr, sizeof(saddr) );
if ( 0 == err ) { if ( 0 == err ) {