FOSS/nethogs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* src/main.cpp: Make the capability imports conditional.

Browse Source 
* src/nethogs.cpp: Make the capability check conditional. Bug fix in the != test.
This commit is contained in:
rain1
2016-04-14 12:15:48 +00:00
parent c0dd0e2e0c
commit a5fbdc1910
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.cpp
View File

@@ -173,20 +173,19 @@ int main(int argc, char **argv) {
init_ui(); init_ui();
} }
if (NEEDROOT) { #if NEEDROOT == 1
if (geteuid() != 0) if (geteuid() != 0)
forceExit(false, "You need to be root to run NetHogs!"); forceExit(false, "You need to be root to run NetHogs!");
} #else
else {
unsigned int caps[5] = {0}; unsigned int caps[5] = {0};
getxattr(argv[0], "security.capability", (char *)caps, sizeof(caps)); getxattr(argv[0], "security.capability", (char *)caps, sizeof(caps));
if ((caps[1] >> CAP_NET_ADMIN) & 1 != 1) if (((caps[1] >> CAP_NET_ADMIN) & 1) != 1)
forceExit(false, "You need to enable cap_net_admin (and cap_net_raw) to run NetHogs!"); forceExit(false, "You need to enable cap_net_admin (and cap_net_raw) to run NetHogs!");
if ((caps[1] >> CAP_NET_RAW) & 1 != 1) if (((caps[1] >> CAP_NET_RAW) & 1) != 1)
forceExit(false, "You need to enable cap_net_raw to run NetHogs!"); forceExit(false, "You need to enable cap_net_raw to run NetHogs!");
} #endif
// use the Self-Pipe trick to interrupt the select() in the main loop // use the Self-Pipe trick to interrupt the select() in the main loop
self_pipe = create_self_pipe(); self_pipe = create_self_pipe();

3
src/nethogs.cpp
View File

@@ -37,9 +37,12 @@
#include <netinet/ip6.h> #include <netinet/ip6.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netinet/udp.h> #include <netinet/udp.h>
#if NEEDROOT == 0
#include <sys/types.h> #include <sys/types.h>
#include <sys/xattr.h> #include <sys/xattr.h>
#include <linux/capability.h> #include <linux/capability.h>
#endif
#include "cui.h" #include "cui.h"