diff --git a/getifaddr.c b/getifaddr.c index c673391..9c437b7 100644 --- a/getifaddr.c +++ b/getifaddr.c @@ -53,6 +53,7 @@ #include #endif #endif +#include "upnpglobalvars.h" #include "getifaddr.h" #include "log.h" @@ -85,19 +86,19 @@ getifaddr(const char * ifname, char * buf, int len) struct ifaddrs *ifap, *p; struct sockaddr_in *addr_in; - if( getifaddrs(&ifap) != 0 ) + if (getifaddrs(&ifap) != 0) { DPRINTF(E_ERROR, L_GENERAL, "getifaddrs(): %s\n", strerror(errno)); return -1; } - for( p = ifap; p != NULL; p = p->ifa_next ) + for (p = ifap; p != NULL; p = p->ifa_next) { - if( p->ifa_addr && p->ifa_addr->sa_family == AF_INET ) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET) { - if( strcmp(p->ifa_name, ifname) != 0 ) + if (strcmp(p->ifa_name, ifname) != 0) continue; addr_in = (struct sockaddr_in *)p->ifa_addr; - if( !inet_ntop(AF_INET, &addr_in->sin_addr, buf, len) ) + if (!inet_ntop(AF_INET, &addr_in->sin_addr, buf, len)) { DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); break; @@ -108,7 +109,7 @@ getifaddr(const char * ifname, char * buf, int len) } } freeifaddrs(ifap); - if( !p ) + if (!p) { DPRINTF(E_ERROR, L_GENERAL, "Network interface %s not found\n", ifname); return -1; @@ -121,26 +122,26 @@ getifaddr(const char * ifname, char * buf, int len) ifrlen = sizeof(ifr); s = socket(PF_INET, SOCK_DGRAM, 0); - if(s < 0) + if (s < 0) { DPRINTF(E_ERROR, L_GENERAL, "socket(PF_INET, SOCK_DGRAM): %s\n", strerror(errno)); return -1; } strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if(ioctl(s, SIOCGIFADDR, &ifr, &ifrlen) < 0) + if (ioctl(s, SIOCGIFADDR, &ifr, &ifrlen) < 0) { DPRINTF(E_ERROR, L_GENERAL, "ioctl(s, SIOCGIFADDR, ...): %s\n", strerror(errno)); close(s); return -1; } addr = (struct sockaddr_in *)&ifr.ifr_addr; - if(!inet_ntop(AF_INET, &addr->sin_addr, buf, len)) + if (!inet_ntop(AF_INET, &addr->sin_addr, buf, len)) { DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); close(s); return -1; } - if(ioctl(s, SIOCGIFNETMASK, &ifr, &ifrlen) == 0) + if (ioctl(s, SIOCGIFNETMASK, &ifr, &ifrlen) == 0) { addr = (struct sockaddr_in *)&ifr.ifr_netmask; mask = get_netmask(addr); @@ -158,82 +159,89 @@ getifaddr(const char * ifname, char * buf, int len) } int -getsysaddr(char * buf, int len) +getsysaddrs(void) { - int i; - uint32_t mask = 0; - int ret = -1; #if HAVE_GETIFADDRS struct ifaddrs *ifap, *p; struct sockaddr_in *addr_in; - uint8_t a; - if( getifaddrs(&ifap) != 0 ) + if (getifaddrs(&ifap) != 0) { DPRINTF(E_ERROR, L_GENERAL, "getifaddrs(): %s\n", strerror(errno)); return -1; } - for( p = ifap; p != NULL; p = p->ifa_next ) + for (p = ifap; p != NULL; p = p->ifa_next) { - 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; - a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF; - if( a == 127 ) + if (p->ifa_flags & (IFF_LOOPBACK | IFF_SLAVE)) 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)); - break; + continue; } addr_in = (struct sockaddr_in *)p->ifa_netmask; - mask = get_netmask(addr_in); - ret = 0; - break; + memcpy(&lan_addr[n_lan_addr].mask, &addr_in->sin_addr, sizeof(lan_addr[n_lan_addr].mask)); + n_lan_addr++; + if (n_lan_addr >= MAX_LAN_ADDR) + break; } } freeifaddrs(ifap); #else int s = socket(PF_INET, SOCK_STREAM, 0); struct sockaddr_in addr; - struct ifreq ifr; - for (i=1; i > 0; i++) + struct ifconf ifc; + 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; - if( ioctl(s, SIOCGIFNAME, &ifr) < 0 ) - break; - if(ioctl(s, SIOCGIFADDR, &ifr, sizeof(struct ifreq)) < 0) + DPRINTF(E_ERROR, L_GENERAL, "SIOCGIFCONF: %s\n", strerror(errno)); + close(s); + return -1; + } + + 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; - memcpy(&addr, &ifr.ifr_addr, sizeof(addr)); - if(strncmp(inet_ntoa(addr.sin_addr), "127.", 4) == 0) + if (ioctl(s, SIOCGIFADDR, ifr) < 0) continue; - if(ioctl(s, SIOCGIFNETMASK, &ifr, sizeof(struct ifreq)) < 0) - continue; - if(!inet_ntop(AF_INET, &addr.sin_addr, buf, len)) + memcpy(&addr, &(ifr->ifr_addr), sizeof(addr)); + 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, lan_addr[n_lan_addr].str, sizeof(lan_addr[0].str))) { DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); close(s); - break; + continue; } - memcpy(&addr, &ifr.ifr_netmask, sizeof(addr)); - mask = get_netmask(&addr); - ret = 0; - break; + if (ioctl(s, SIOCGIFNETMASK, ifr) < 0) + continue; + 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; } close(s); #endif - - if (mask) - { - i = strlen(buf); - snprintf(buf+i, len-i, "/%u", mask); - } - - return(ret); + return n_lan_addr; } int -getsyshwaddr(char * buf, int len) +getsyshwaddr(char *buf, int len) { unsigned char mac[6]; int ret = -1; @@ -242,27 +250,27 @@ getsyshwaddr(char * buf, int len) struct sockaddr_in *addr_in; uint8_t a; - if( getifaddrs(&ifap) != 0 ) + if (getifaddrs(&ifap) != 0) { DPRINTF(E_ERROR, L_GENERAL, "getifaddrs(): %s\n", strerror(errno)); return -1; } - for( p = ifap; p != NULL; p = p->ifa_next ) + for (p = ifap; p != NULL; p = p->ifa_next) { - if( p->ifa_addr && p->ifa_addr->sa_family == AF_LINK ) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_LINK) { addr_in = (struct sockaddr_in *)p->ifa_addr; a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF; - if( a == 127 ) + if (a == 127) continue; #ifdef __linux__ struct ifreq ifr; int fd; fd = socket(AF_INET, SOCK_DGRAM, 0); - if( fd < 0 ) + if (fd < 0) continue; strncpy(ifr.ifr_name, p->ifa_name, IFNAMSIZ); - if( ioctl(fd, SIOCGIFHWADDR, &ifr) < 0 ) + if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { close(fd); continue; @@ -273,7 +281,7 @@ getsyshwaddr(char * buf, int len) sdl = (struct sockaddr_dl*)p->ifa_addr; memcpy(mac, LLADDR(sdl), sdl->sdl_alen); #endif - if( MACADDR_IS_ZERO(mac) ) + if (MACADDR_IS_ZERO(mac)) continue; ret = 0; break; @@ -288,23 +296,23 @@ getsyshwaddr(char * buf, int len) memset(&mac, '\0', sizeof(mac)); /* Get the spatially unique node identifier */ fd = socket(AF_INET, SOCK_DGRAM, 0); - if( fd < 0 ) - return(ret); + if (fd < 0) + return ret; ifaces = if_nameindex(); - if(!ifaces) - return(ret); + if (!ifaces) + return ret; - for(if_idx = ifaces; if_idx->if_index; if_idx++) + for (if_idx = ifaces; if_idx->if_index; if_idx++) { strncpy(ifr.ifr_name, if_idx->if_name, IFNAMSIZ); - if(ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) continue; - if(ifr.ifr_ifru.ifru_flags & IFF_LOOPBACK) + if (ifr.ifr_ifru.ifru_flags & IFF_LOOPBACK) continue; - if( ioctl(fd, SIOCGIFHWADDR, &ifr) < 0 ) + if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) continue; - if( MACADDR_IS_ZERO(ifr.ifr_hwaddr.sa_data) ) + if (MACADDR_IS_ZERO(ifr.ifr_hwaddr.sa_data)) continue; memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); ret = 0; @@ -313,13 +321,13 @@ getsyshwaddr(char * buf, int len) if_freenameindex(ifaces); close(fd); #endif - if(ret == 0) + if (ret == 0) { - if(len > 12) + if (len > 12) sprintf(buf, "%02x%02x%02x%02x%02x%02x", mac[0]&0xFF, mac[1]&0xFF, mac[2]&0xFF, mac[3]&0xFF, mac[4]&0xFF, mac[5]&0xFF); - else if(len == 6) + else if (len == 6) memmove(buf, mac, 6); } return ret; @@ -335,23 +343,23 @@ get_remote_mac(struct in_addr ip_addr, unsigned char *mac) memset(mac, 0xFF, 6); arp = fopen("/proc/net/arp", "r"); - if( !arp ) + if (!arp) return 1; - while( !feof(arp) ) + while (!feof(arp)) { matches = fscanf(arp, "%15s 0x%8X 0x%8X %2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx", remote_ip, &hwtype, &flags, &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); - if( matches != 9 ) + if (matches != 9) continue; inet_pton(AF_INET, remote_ip, &arp_ent); - if( ip_addr.s_addr == arp_ent.s_addr ) + if (ip_addr.s_addr == arp_ent.s_addr) break; mac[0] = 0xFF; } fclose(arp); - if( mac[0] == 0xFF ) + if (mac[0] == 0xFF) { memset(mac, 0xFF, 6); return 1; diff --git a/getifaddr.h b/getifaddr.h index 331a051..016985c 100644 --- a/getifaddr.h +++ b/getifaddr.h @@ -46,7 +46,7 @@ int getifaddr(const char * ifname, char * buf, int len); int -getsysaddr(char * buf, int len); +getsysaddrs(void); int getsyshwaddr(char * buf, int len); diff --git a/minidlna.c b/minidlna.c index d591a70..efa18a2 100644 --- a/minidlna.c +++ b/minidlna.c @@ -923,14 +923,8 @@ init(int argc, char **argv) /* If no IP was specified, try to detect one */ if (n_lan_addr < 1) { - if ((getsysaddr(ip_addr, sizeof(ip_addr)) < 0) && - (getifaddr("eth0", ip_addr, sizeof(ip_addr)) < 0) && - (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 (getsysaddrs() <= 0) + DPRINTF(E_FATAL, L_GENERAL, "No IP address automatically detected!\n"); } 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"); } #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(); if (sudp < 0) {