storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Increment version to 1.0.14.

Browse Source 
* Fix TiVo beacon issue where it would only broadcast on eth0.
* Fix a couple gcc4.4 warnings.
This commit is contained in:
Justin Maggard
2009-06-16 01:08:29 +00:00
parent 94989f8b15
commit 944729cf12
6 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tivo_beacon.c
View File

@ -98,31 +98,39 @@ OpenAndConfTivoBeaconSocket()
/*
* Returns the interface broadcast address to be used for beacons
*/
uint32_t getBcastAddress( void )
uint32_t
getBcastAddress(void)
{
struct ifreq ifr;
struct sockaddr_in *sin;
int s, rval;
int i, rval;
int s = socket(PF_INET, SOCK_STREAM, 0);
struct sockaddr_in sin;
struct sockaddr_in addr;
struct ifreq ifr;
s = socket( AF_INET, SOCK_DGRAM, 0 );
if ( s < 0 )
for (i=1; i > 0; i++)
{
return INADDR_BROADCAST;
ifr.ifr_ifindex = i;
if( ioctl(s, SIOCGIFNAME, &ifr) < 0 )
break;
if(ioctl(s, SIOCGIFADDR, &ifr, sizeof(struct ifreq)) < 0)
continue;
memcpy(&addr, &ifr.ifr_addr, sizeof(addr));
if(strcmp(inet_ntoa(addr.sin_addr), lan_addr[0].str) == 0)
{
rval = ioctl(s, SIOCGIFBRDADDR, &ifr);
if( rval < 0 )
{
close(s);
return INADDR_BROADCAST;
}
memcpy(&sin, &ifr.ifr_broadaddr, sizeof(sin));
close(s);
DPRINTF(E_DEBUG, L_TIVO, "Interface: %s broadcast addr %s \n", ifr.ifr_name, inet_ntoa(sin.sin_addr));
return ntohl((uint32_t)(sin.sin_addr.s_addr));
}
}
strcpy( ifr.ifr_name, "eth0" );
rval = ioctl( s, SIOCGIFBRDADDR, &ifr );
if ( rval < 0 )
{
close(s);
return INADDR_BROADCAST;
}
sin = (struct sockaddr_in *)&ifr.ifr_broadaddr;
close(s);
DPRINTF(E_DEBUG, L_TIVO, "Interface: %s broadcast addr %s \n", "eth0", inet_ntoa(sin->sin_addr) );
return ntohl((uint32_t)(sin->sin_addr.s_addr));
return INADDR_BROADCAST;
}
/*