marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify the algorithm used to determine the IP address

Browse Source 
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
This commit is contained in:
Olivier Gayot 2018-06-04 19:59:09 +02:00
parent 9f08fe297a
commit 99a6fb5e49
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/print_ip_addr.c
View File

@ -37,22 +37,25 @@ const char *get_ip_addr(const char *interface, int family) {
return NULL; return NULL;
/* Skip until we are at the input family address of interface */ /* Skip until we are at the input family address of interface */
for (addrp = ifaddr; for (addrp = ifaddr; addrp != NULL; addrp = addrp->ifa_next) {
if (strncmp(addrp->ifa_name, interface, interface_len) != 0) {
(addrp != NULL && /* The interface does not have the right name, skip it. */
(strncmp(addrp->ifa_name, interface, interface_len) != 0 ||
addrp->ifa_addr == NULL ||
addrp->ifa_addr->sa_family != family));
addrp = addrp->ifa_next) {
/* Check if the interface is down */
if (strncmp(addrp->ifa_name, interface, interface_len) != 0)
continue; continue;
found = true; }
if (addrp->ifa_addr != NULL && addrp->ifa_addr->sa_family == family) {
/* We found the right interface with the right address. */
break;
}
/* Check if the interface is down. If it is, no need to look any
* further. */
if ((addrp->ifa_flags & IFF_RUNNING) == 0) { if ((addrp->ifa_flags & IFF_RUNNING) == 0) {
freeifaddrs(ifaddr); freeifaddrs(ifaddr);
return NULL; return NULL;
} }
found = true;
} }
if (addrp == NULL) { if (addrp == NULL) {