mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Choose first running interface, rather than first "up" interface (Redhat #1403025)

Browse Source 
Robert Scheck <robert@fedoraproject.org>
This commit is contained in:
Paul Warren
2017-03-22 09:11:22 +00:00
parent 35af3cf65f
commit 949ed0f7e2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,6 +6,9 @@ Unattributed items are by Paul Warren and Chris Lightfoot.
1.0 1.0
* Choose first running interface, rather than first "up" interface (Redhat #1403025)
Robert Scheck <robert@fedoraproject.org>
* Support for unlimited number of lines of output for text mode * Support for unlimited number of lines of output for text mode
Roman Hoog Antink <rha@open.ch> Roman Hoog Antink <rha@open.ch>

2
options.c
View File

@@ -110,7 +110,7 @@ static char *get_first_interface(void) {
while(nameindex[j].if_index != 0) { while(nameindex[j].if_index != 0) {
if (strcmp(nameindex[j].if_name, "lo") != 0 && !is_bad_interface_name(nameindex[j].if_name)) { if (strcmp(nameindex[j].if_name, "lo") != 0 && !is_bad_interface_name(nameindex[j].if_name)) {
strncpy(ifr.ifr_name, nameindex[j].if_name, sizeof(ifr.ifr_name)); strncpy(ifr.ifr_name, nameindex[j].if_name, sizeof(ifr.ifr_name));
if ((s == -1) || (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) || (ifr.ifr_flags & IFF_UP)) { if ((s == -1) || (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) || (ifr.ifr_flags & IFF_RUNNING)) {
i = xstrdup(nameindex[j].if_name); i = xstrdup(nameindex[j].if_name);
break; break;
} }