Merge pull request #86 from netfoundry/v0.9.6-release-candidate

redirect system call output to /dev/null for set_tc_filter()

Author: r-caamano

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format
 ---
 ###
 
+# [0.9.56 - 2024-12-09
+
+- Updated zfw.c to redirect system call output to /dev/null for set_tc_filter() 
+  
+###
+
 # [0.9.5] - 2024-11-29
 
 - updated the release workflow to upload zfw-router deb package to jfrog repo

src/zfw.c

@@ -41,6 +41,7 @@
 #include <time.h>
 #include <signal.h>
 #include <limits.h>
+#include <fcntl.h>
 
 #ifndef BPF_MAX_ENTRIES
 #define BPF_MAX_ENTRIES 100 // MAX # PREFIXES
@@ -262,7 +263,7 @@ char *direction_string;
 char *masq_interface;
 char check_alt[IF_NAMESIZE];
 
-const char *argp_program_version = "0.9.5";
+const char *argp_program_version = "0.9.6";
 struct ring_buffer *ring_buffer;
 
 __u32 if_list[MAX_IF_LIST_ENTRIES];
@@ -727,6 +728,15 @@ void set_tc_filter(char *action)
         close_maps(1);
     }
     pid_t pid;
+    int o_std_out = dup(STDOUT_FILENO);
+    int o_std_err = dup(STDERR_FILENO);
+    int fd = open("/dev/null", O_WRONLY);
+    if (fd == -1){
+        return; 
+    }
+    dup2(fd, STDOUT_FILENO);
+    dup2(fd, STDERR_FILENO);
+    close(fd);
     if (!strcmp(action, "add") && check_filter(if_nametoindex(tc_interface),direction_string))
     {
         if(check_qdisc(tc_interface)){
@@ -782,6 +792,10 @@ void set_tc_filter(char *action)
             printf("execv error: unknown error removing filter");
         }
     }
+    dup2(o_std_out, STDOUT_FILENO);
+    dup2(o_std_err, STDERR_FILENO);
+    close(o_std_out);
+    close(o_std_err); 
 }
 
 void disable_ebpf()

src/zfw_monitor.c

@@ -87,7 +87,7 @@ char check_alt[IF_NAMESIZE];
 char doc[] = "zfw_monitor -- ebpf firewall monitor tool";
 const char *rb_map_path = "/sys/fs/bpf/tc/globals/rb_map";
 const char *tproxy_map_path = "/sys/fs/bpf/tc/globals/zt_tproxy_map";
-const char *argp_program_version = "0.9.5";
+const char *argp_program_version = "0.9.6";
 union bpf_attr rb_map;
 int rb_fd = -1;