stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

udp: use if_nametoindex instead of SIOCGIFINDEX ioctl

Browse source 
if_nametoindex is more portable and shorter
This commit is contained in:
Damjan Marion 2014-05-25 22:39:03 +02:00
parent 6f03dd8aa3
commit 17f2d7c222
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/udp.c
View file

@ -95,21 +95,16 @@ udp_resolve( udp_connection_t *uc, int receiver )
}
static int
udp_get_ifindex( int fd, const char *ifname )
udp_get_ifindex( const char *ifname )
{
struct ifreq ifr;
unsigned int r;
if (ifname == NULL || *ifname == '\0')
return 0;
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
ifr.ifr_name[IFNAMSIZ - 1] = '\0';
if (ioctl(fd, SIOCGIFINDEX, &ifr))
r = if_nametoindex(ifname);
if (!r)
return -1;
#if defined(PLATFORM_LINUX)
return ifr.ifr_ifindex;
#elif defined(PLATFORM_FREEBSD)
return ifr.ifr_index;
#endif
return r;
}
static int
@ -160,7 +155,7 @@ udp_bind ( const char *subsystem, const char *name,
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
/* Bind to interface */
ifindex = uc->multicast ? udp_get_ifindex(fd, ifname) : 0;
ifindex = uc->multicast ? udp_get_ifindex(ifname) : 0;
if (ifindex < 0) {
tvherror(subsystem, "%s - could not find interface %s",
name, ifname);
@ -308,7 +303,7 @@ udp_connect ( const char *subsystem, const char *name,
}
/* Bind to interface */
ifindex = uc->multicast ? udp_get_ifindex(fd, ifname) : 0;
ifindex = uc->multicast ? udp_get_ifindex(ifname) : 0;
if (ifindex < 0) {
tvherror(subsystem, "%s - could not find interface %s",
name, ifname);