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

Merge pull request #286 from duskCoder/#283

Browse Source 
Fix issue #283 (shown IP belonging to wrong network interface)
This commit is contained in:
Ingo Bürk 2018-06-11 22:18:53 +02:00 committed by GitHub
commit ac78e1abe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/print_ip_addr.c
View File

@ -12,6 +12,31 @@
#include "i3status.h" #include "i3status.h"
/*
* Return a copy of the .ifa_name field passed as argument where the optional
* IP label, if present, is removed.
*
* example:
* - strip_optional_label("eth0") => "eth0"
* - strip_optional_label("eth0:label") => "eth0"
*
* The memory for the returned string is obtained with malloc(3), and can be
* freed with free(3).
*
*
*/
static char *strip_optional_label(const char *ifa_name) {
char *copy = sstrdup(ifa_name);
char *ptr = strchr(copy, ':');
if (ptr) {
*ptr = '\0';
}
return copy;
}
/* /*
* Return the IP address for the given interface or "no IP" if the * Return the IP address for the given interface or "no IP" if the
* interface is up and running but hasn't got an IP address yet * interface is up and running but hasn't got an IP address yet
@ -29,7 +54,6 @@ const char *get_ip_addr(const char *interface, int family) {
struct ifaddrs *ifaddr, *addrp; struct ifaddrs *ifaddr, *addrp;
bool found = false; bool found = false;
int interface_len = strlen(interface);
getifaddrs(&ifaddr); getifaddrs(&ifaddr);
@ -37,22 +61,30 @@ 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) {
/* Strip the label if present in the .ifa_name field. */
char *stripped_ifa_name = strip_optional_label(addrp->ifa_name);
(addrp != NULL && bool name_matches = strcmp(stripped_ifa_name, interface) != 0;
(strncmp(addrp->ifa_name, interface, interface_len) != 0 || free(stripped_ifa_name);
addrp->ifa_addr == NULL || if (name_matches) {
addrp->ifa_addr->sa_family != family)); /* The interface does not have the right name, skip it. */
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) {