FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add multicast support for sockets

Browse Source
This commit is contained in:
Torsten Dreyer 2011-04-13 18:43:28 +02:00
parent 83243f471a
commit 4ff014d275
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
simgear/io/raw_socket.cxx
View File

@ -196,7 +196,8 @@ bool Socket::open ( bool stream )
// killed. // killed.
// //
// Reference: http://www.unixguide.net/network/socketfaq/4.5.shtml // Reference: http://www.unixguide.net/network/socketfaq/4.5.shtml
// // --
// Also required for joining multicast domains
if ( stream ) { if ( stream ) {
int opt_boolean = 1; int opt_boolean = 1;
#if defined(_WIN32) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__CYGWIN__)
@ -256,9 +257,28 @@ void Socket::setBroadcast ( bool broadcast )
int Socket::bind ( const char* host, int port ) int Socket::bind ( const char* host, int port )
{ {
int result;
assert ( handle != -1 ) ; assert ( handle != -1 ) ;
IPAddress addr ( host, port ) ; IPAddress addr ( host, port ) ;
return ::bind(handle,(const sockaddr*)&addr,sizeof(IPAddress)); if( (result = ::bind(handle,(const sockaddr*)&addr,sizeof(IPAddress))) < 0 ) {
SG_LOG(SG_IO, SG_ALERT, "bind(" << host << ":" << port << ") failed. Errno " << errno << " (" << strerror(errno) << ")");
return result;
}
// 224.0.0.0 - 239.255.255.255 are multicast
// Usage of 239.x.x.x is recommended for local scope
// Reference: http://tools.ietf.org/html/rfc5771
if( ntohl(addr.getIP()) >= 0xe0000000 && ntohl(addr.getIP()) <= 0xefffffff ) {
struct ip_mreq mreq;
mreq.imr_multiaddr.s_addr = addr.getIP();
mreq.imr_interface.s_addr = htonl(INADDR_ANY);
if( (result=::setsockopt(getHandle(), IPPROTO_IP, IP_ADD_MEMBERSHIP, (const char *)&mreq, sizeof(mreq))) != 0 ) {
SG_LOG(SG_IO, SG_ALERT, "setsockopt(IP_ADD_MEMBERSHIP) failed. Errno " << errno << " (" << strerror(errno) << ")");
return result;
}
}
return 0;
} }

2
simgear/io/sg_socket.cxx
View File

@ -84,7 +84,7 @@ SGSocket::make_server_socket()
return false; return false;
} }
if (sock.bind( "", port ) < 0) if (sock.bind( hostname.c_str(), port ) < 0)
{ {
SG_LOG( SG_IO, SG_ALERT, SG_LOG( SG_IO, SG_ALERT,
"Error: bind() failed in make_server_socket()" ); "Error: bind() failed in make_server_socket()" );