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

* Enable all network interfaces by default if none were specified.

Browse Source
This commit is contained in:
Justin Maggard 2013-04-30 21:09:30 +00:00
parent bcc69d0dd3
commit 1e4cf74436
3 changed files with 91 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
getifaddr.c
View File

@ -53,6 +53,7 @@
#include <net/if_dl.h> #include <net/if_dl.h>
#endif #endif
#endif #endif
#include "upnpglobalvars.h"
#include "getifaddr.h" #include "getifaddr.h"
#include "log.h" #include "log.h"
@ -158,15 +159,11 @@ getifaddr(const char * ifname, char * buf, int len)
} }
int int
getsysaddr(char * buf, int len) getsysaddrs(void)
{ {
int i;
uint32_t mask = 0;
int ret = -1;
#if HAVE_GETIFADDRS #if HAVE_GETIFADDRS
struct ifaddrs *ifap, *p; struct ifaddrs *ifap, *p;
struct sockaddr_in *addr_in; struct sockaddr_in *addr_in;
uint8_t a;
if (getifaddrs(&ifap) != 0) if (getifaddrs(&ifap) != 0)
{ {
@ -178,17 +175,18 @@ getsysaddr(char * buf, int len)
if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET) if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET)
{ {
addr_in = (struct sockaddr_in *)p->ifa_addr; addr_in = (struct sockaddr_in *)p->ifa_addr;
a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF; if (p->ifa_flags & (IFF_LOOPBACK | IFF_SLAVE))
if( a == 127 )
continue; continue;
if( !inet_ntop(AF_INET, &addr_in->sin_addr, buf, len) ) memcpy(&lan_addr[n_lan_addr].addr, &addr_in->sin_addr, sizeof(lan_addr[n_lan_addr].addr));
if (!inet_ntop(AF_INET, &addr_in->sin_addr, lan_addr[n_lan_addr].str, sizeof(lan_addr[0].str)) )
{ {
DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno));
break; continue;
} }
addr_in = (struct sockaddr_in *)p->ifa_netmask; addr_in = (struct sockaddr_in *)p->ifa_netmask;
mask = get_netmask(addr_in); memcpy(&lan_addr[n_lan_addr].mask, &addr_in->sin_addr, sizeof(lan_addr[n_lan_addr].mask));
ret = 0; n_lan_addr++;
if (n_lan_addr >= MAX_LAN_ADDR)
break; break;
} }
} }
@ -196,40 +194,50 @@ getsysaddr(char * buf, int len)
#else #else
int s = socket(PF_INET, SOCK_STREAM, 0); int s = socket(PF_INET, SOCK_STREAM, 0);
struct sockaddr_in addr; struct sockaddr_in addr;
struct ifreq ifr; struct ifconf ifc;
for (i=1; i > 0; i++) struct ifreq *ifr;
char buf[8192];
int i, n;
memset(&ifc, '\0', sizeof(ifc));
ifc.ifc_buf = buf;
ifc.ifc_len = sizeof(buf);
if (ioctl(s, SIOCGIFCONF, &ifc) < 0)
{ {
ifr.ifr_ifindex = i; DPRINTF(E_ERROR, L_GENERAL, "SIOCGIFCONF: %s\n", strerror(errno));
if( ioctl(s, SIOCGIFNAME, &ifr) < 0 ) close(s);
break; return -1;
if(ioctl(s, SIOCGIFADDR, &ifr, sizeof(struct ifreq)) < 0) }
n = ifc.ifc_len / sizeof(struct ifreq);
for (i=0; i < n; i++)
{
ifr = &ifc.ifc_req[i];
if (ioctl(s, SIOCGIFFLAGS, ifr) < 0 ||
ifr->ifr_ifru.ifru_flags & IFF_LOOPBACK)
continue; continue;
memcpy(&addr, &ifr.ifr_addr, sizeof(addr)); if (ioctl(s, SIOCGIFADDR, ifr) < 0)
if(strncmp(inet_ntoa(addr.sin_addr), "127.", 4) == 0)
continue; continue;
if(ioctl(s, SIOCGIFNETMASK, &ifr, sizeof(struct ifreq)) < 0) memcpy(&addr, &(ifr->ifr_addr), sizeof(addr));
continue; memcpy(&lan_addr[n_lan_addr].addr, &addr.sin_addr, sizeof(lan_addr[n_lan_addr].addr));
if(!inet_ntop(AF_INET, &addr.sin_addr, buf, len)) if (!inet_ntop(AF_INET, &addr.sin_addr, lan_addr[n_lan_addr].str, sizeof(lan_addr[0].str)))
{ {
DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno));
close(s); close(s);
break; continue;
} }
memcpy(&addr, &ifr.ifr_netmask, sizeof(addr)); if (ioctl(s, SIOCGIFNETMASK, ifr) < 0)
mask = get_netmask(&addr); continue;
ret = 0; memcpy(&addr, &(ifr->ifr_addr), sizeof(addr));
memcpy(&lan_addr[n_lan_addr].mask, &addr.sin_addr, sizeof(addr));
n_lan_addr++;
if (n_lan_addr >= MAX_LAN_ADDR)
break; break;
} }
close(s); close(s);
#endif #endif
return n_lan_addr;
if (mask)
{
i = strlen(buf);
snprintf(buf+i, len-i, "/%u", mask);
}
return(ret);
} }
int int
@ -289,11 +297,11 @@ getsyshwaddr(char * buf, int len)
/* Get the spatially unique node identifier */ /* Get the spatially unique node identifier */
fd = socket(AF_INET, SOCK_DGRAM, 0); fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0) if (fd < 0)
return(ret); return ret;
ifaces = if_nameindex(); ifaces = if_nameindex();
if (!ifaces) if (!ifaces)
return(ret); return ret;
for (if_idx = ifaces; if_idx->if_index; if_idx++) for (if_idx = ifaces; if_idx->if_index; if_idx++)
{ {

2
getifaddr.h
View File

@ -46,7 +46,7 @@ int
getifaddr(const char * ifname, char * buf, int len); getifaddr(const char * ifname, char * buf, int len);
int int
getsysaddr(char * buf, int len); getsysaddrs(void);
int int
getsyshwaddr(char * buf, int len); getsyshwaddr(char * buf, int len);

16
minidlna.c
View File

@ -923,14 +923,8 @@ init(int argc, char **argv)
/* If no IP was specified, try to detect one */ /* If no IP was specified, try to detect one */
if (n_lan_addr < 1) if (n_lan_addr < 1)
{ {
if ((getsysaddr(ip_addr, sizeof(ip_addr)) < 0) && if (getsysaddrs() <= 0)
(getifaddr("eth0", ip_addr, sizeof(ip_addr)) < 0) && DPRINTF(E_FATAL, L_GENERAL, "No IP address automatically detected!\n");
(getifaddr("eth1", ip_addr, sizeof(ip_addr)) < 0))
{
DPRINTF(E_OFF, L_GENERAL, "No IP address automatically detected\n");
}
if (*ip_addr && parselanaddr(&lan_addr[n_lan_addr], ip_addr) == 0)
n_lan_addr++;
} }
if (!n_lan_addr || runtime_vars.port <= 0) if (!n_lan_addr || runtime_vars.port <= 0)
@ -1093,6 +1087,12 @@ main(int argc, char **argv)
DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_inotify. EXITING\n"); DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_inotify. EXITING\n");
} }
#endif #endif
for (i = 0; i < n_lan_addr; i++)
{
DPRINTF(E_INFO, L_GENERAL, "Enabled interface %s/%s\n",
lan_addr[i].str, inet_ntoa(lan_addr[i].mask));
}
sudp = OpenAndConfSSDPReceiveSocket(); sudp = OpenAndConfSSDPReceiveSocket();
if (sudp < 0) if (sudp < 0)
{ {