Merge pull request #51 from netfoundry/v0.7.8-release-candidate

V0.7.8 release candidate
netfoundry · Jun 13, 2024 · d85b41e · d85b41e
2 parents c821ffd + 97d3392
commit d85b41e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,14 +3,20 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
----
+# [0.7.8] - 2024-06-13
+
+###
+
+- Fixed issue where zombie processes were generated by zfw_tc_ingress.c when adding or deleting
+  routes via ip system calls.
+
 # [0.7.7] - 2024-06-11
 
 ###
 
 - Fixed fw-init.service changed after= to After=
 - Cleanup in zfw_tunnel_wrapper.c removed various unused variables
--   
+
 # [0.7.6] - 2024-06-04
 
 ###

diff --git a/src/zfw.c b/src/zfw.c
@@ -182,7 +182,7 @@ char *log_file_name;
 char *object_file;
 char *direction_string;
 
-const char *argp_program_version = "0.7.7";
+const char *argp_program_version = "0.7.8";
 struct ring_buffer *ring_buffer;
 
 __u32 if_list[MAX_IF_LIST_ENTRIES];

diff --git a/src/zfw_tunnel_wrapper.c b/src/zfw_tunnel_wrapper.c
@@ -834,6 +834,13 @@ void bind_route(struct in_addr *address, unsigned short mask)
     {
         execv("/usr/sbin/ip", parmList);
         printf("execv error: unknown error binding route");
+    }else{
+        int status =0;
+        if(!(waitpid(pid, &status, 0) > 0)){
+            if(WIFEXITED(status) && !WEXITSTATUS(status)){
+                printf("bound %s to dev lo\n", cidr_block);
+            }
+        }
     }
     free(cidr_block);
 }
@@ -854,6 +861,13 @@ void unbind_route_loopback(struct in_addr *address, unsigned short mask)
     {
         execv("/usr/sbin/ip", parmList);
         printf("execv error: unknown error unbinding route");
+    }else{
+        int status =0;
+        if(!(waitpid(pid, &status, 0) > 0)){
+            if(WIFEXITED(status) && !WEXITSTATUS(status)){
+                printf("unbound %s from dev lo\n", cidr_block);
+            }
+        }
     }
     free(cidr_block);
 }
@@ -874,6 +888,13 @@ void unbind_route(struct in_addr *address, unsigned short mask, char *dev)
     {
         execv("/usr/sbin/ip", parmList);
         printf("execv error: unknown error unbinding route");
+    }else{
+        int status =0;
+        if(!(waitpid(pid, &status, 0) > 0)){
+            if(WIFEXITED(status) && !WEXITSTATUS(status)){
+                printf("unbound %s from dev %s\n", cidr_block, dev);
+            }
+        }
     }
     free(cidr_block);
 }
@@ -999,7 +1020,7 @@ void zfw_update(char *ip, char *mask, char *lowport, char *highport, char *proto
         int status =0;
         if(!(waitpid(pid, &status, 0) > 0)){
             if(WIFEXITED(status) && !WEXITSTATUS(status)){
-                printf("zfw %s action for : %s not set\n", action,  ip);
+                printf("zfw %s action for : %s set\n", action,  ip);
             }
         }
     }
@@ -1017,7 +1038,7 @@ bool check_diag(){
         int status =0;
         if(!(waitpid(pid, &status, 0) > 0)){
             if(WIFEXITED(status) && !WEXITSTATUS(status)){
-                printf("Diag Interface List Failed!");
+                printf("Diag Interface Listed!\n");
                 return false;
             }
         }