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

Fixed typo in changelog, and error in application of i/f autodetection patch.

Browse Source
This commit is contained in:
pdw
2011-10-04 20:40:34 +00:00
parent 09f3d33527
commit af3ed6ff48
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -49,7 +49,7 @@ Unattributed items are by Paul Warren and Chris Lightfoot.
* Attempt to detect if interface is actually up when doing autodetection. * Attempt to detect if interface is actually up when doing autodetection.
* Fixed segfault when selecting interfaces with empty MAC address (e.g. gprs * Fixed segfault when selecting interfaces with empty MAC address (e.g. gprs
interface on Nokia N900) interface on Nokia N900)
Graham Ings <graham@nerve.org.za> Graham Inggs <graham@nerve.org.za>
* Avoid autodetecting wmaster interfaces * Avoid autodetecting wmaster interfaces
* Experimental support for IEEE802_11 radiotap interfaces (DLT 127) * Experimental support for IEEE802_11 radiotap interfaces (DLT 127)

2
options.c
View File

@@ -103,7 +103,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_UP)) {
i = xstrdup(nameindex[j].if_name); i = xstrdup(nameindex[j].if_name);
break; break;
} }