diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2021-05-02 22:00:28 +0200 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2021-05-02 22:00:28 +0200 |
commit | ae33e8ca07ba8cb72d9823b5137aeeb93bd2056c (patch) | |
tree | 87272635dc112d914cf37aa49dcd7770cc921019 | |
parent | 2a027d304a09fa9645cb7e121a2650085328fb6c (diff) | |
download | gnunet-ae33e8ca07ba8cb72d9823b5137aeeb93bd2056c.tar.gz gnunet-ae33e8ca07ba8cb72d9823b5137aeeb93bd2056c.zip |
-corrected sub-process cleanup for netjail
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
-rwxr-xr-x | contrib/scripts/netjail/netjail_core.sh | 9 | ||||
-rwxr-xr-x | contrib/scripts/netjail/netjail_setup_internet.sh | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/contrib/scripts/netjail/netjail_core.sh b/contrib/scripts/netjail/netjail_core.sh index 8dbbeacf1..a3271a3e4 100755 --- a/contrib/scripts/netjail/netjail_core.sh +++ b/contrib/scripts/netjail/netjail_core.sh | |||
@@ -126,4 +126,13 @@ netjail_node_exec() { | |||
126 | unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN | 126 | unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN |
127 | } | 127 | } |
128 | 128 | ||
129 | netjail_kill() { | ||
130 | PID=$1 | ||
131 | |||
132 | for CHILD in $(ps -o pid,ppid -ax | awk "{ if ( \$2 == $PID ) { print \$1 } }"); do | ||
133 | netjail_kill $CHILD | ||
134 | done | ||
135 | |||
136 | kill $PID | ||
137 | } | ||
129 | 138 | ||
diff --git a/contrib/scripts/netjail/netjail_setup_internet.sh b/contrib/scripts/netjail/netjail_setup_internet.sh index 2d448168a..94aec007e 100755 --- a/contrib/scripts/netjail/netjail_setup_internet.sh +++ b/contrib/scripts/netjail/netjail_setup_internet.sh | |||
@@ -86,7 +86,7 @@ for N in $(seq $GLOBAL_N); do | |||
86 | done | 86 | done |
87 | 87 | ||
88 | for PID in $WAITING; do wait $PID; done | 88 | for PID in $WAITING; do wait $PID; done |
89 | for PID in $KILLING; do kill $PID; done | 89 | for PID in $KILLING; do netjail_kill $PID; done |
90 | wait | 90 | wait |
91 | 91 | ||
92 | if [ $STUN -gt 0 ]; then | 92 | if [ $STUN -gt 0 ]; then |