nettrace/netlock

netblue30 · Jan 4, 2022 · 1000c23 · 1000c23
1 parent 732282e
commit 1000c23
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 195 deletions.
diff --git a/src/firejail/main.c b/src/firejail/main.c
@@ -2294,12 +2294,6 @@ int main(int argc, char **argv, char **envp) {
  //*************************************
  // network
  //*************************************
- else if (strcmp(argv[i], "--netlock") == 0)
- arg_netlock = 1;
- else if (strncmp(argv[i], "--netlock=", 10) == 0) {
- pid_t pid = require_pid(argv[i] + 10);
- netfilter_netlock(pid);
- }
  else if (strcmp(argv[i], "--net=none") == 0) {
  arg_nonetwork = 1;
  cfg.bridge0.configured = 0;
@@ -2313,6 +2307,12 @@ int main(int argc, char **argv, char **envp) {
  continue;
  }
 #ifdef HAVE_NETWORK
+ else if (strcmp(argv[i], "--netlock") == 0)
+ arg_netlock = 1;
+ else if (strncmp(argv[i], "--netlock=", 10) == 0) {
+ pid_t pid = require_pid(argv[i] + 10);
+ netfilter_netlock(pid);
+ }
  else if (strncmp(argv[i], "--interface=", 12) == 0) {
  if (checkcfg(CFG_NETWORK)) {
  // checks

diff --git a/src/firejail/netfilter.c b/src/firejail/netfilter.c
@@ -53,6 +53,9 @@ void netfilter_netlock(pid_t pid) {
 // else if (access("/usr/bin/gnome-terminal", X_OK) == 0)
 // terminal = "/usr/bin/gnome-terminal";
 
+ if (isatty(STDIN_FILENO))
+ terminal = NULL;
+
  if (terminal) {
  pid_t p = fork();
  if (p == -1)

diff --git a/src/fnettrace/fnettrace.h b/src/fnettrace/fnettrace.h
@@ -28,47 +28,22 @@
 #include <time.h>
 #include <stdarg.h>
 
-//#define NETLOCK_INTERVAL 60
+//#define NETLOCK_INTERVAL 15
 #define NETLOCK_INTERVAL 60
 #define DISPLAY_INTERVAL 3
 
 void logprintf(char* fmt, ...);
 
-static inline void ansi_topleft(int tolog) {
+static inline void ansi_topleft(void) {
  char str[] = {0x1b, '[', '1', ';', '1', 'H', '\0'};
- if (tolog)
- logprintf("%s", str);
- else
- printf("%s", str);
+ printf("%s", str);
  fflush(0);
 }
 
-static inline void ansi_clrscr(int tolog) {
- ansi_topleft(tolog);
+static inline void ansi_clrscr(void) {
+ ansi_topleft();
  char str[] = {0x1b, '[', '0', 'J', '\0'};
- if (tolog)
- logprintf("%s", str);
- else
- printf("%s", str);
- fflush(0);
-}
-
-static inline void ansi_linestart(int tolog) {
- char str[] = {0x1b, '[', '0', 'G', '\0'};
- if (tolog)
- logprintf("%s", str);
- else
- printf("%s", str);
- fflush(0);
-}
-
-static inline void ansi_clrline(int tolog) {
- ansi_linestart(tolog);
- char str[] = {0x1b, '[', '0', 'K', '\0'};
- if (tolog)
- logprintf("%s", str);
- else
- printf("%s", str);
+ printf("%s", str);
  fflush(0);
 }