From db39772aa7b10ee6fb9e21db8f44c0f5fca7a1d2 Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Wed, 19 May 2021 15:07:11 +0200
Subject: Fixed CMake global CFLAGS misuse which can cause xcompile errors.
 nDPIsrvd-captured supports skipping flows w/o any layer 4 payload.

 * libndpi update
 * run_tests does not generate any *.out files for fuzz-*.pcap anymore and
   does not fail if nDPId-test exits with value 1 (most likely caused by a libpcap failure)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 daemon.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'daemon.sh')

diff --git a/daemon.sh b/daemon.sh
index dc9b5abe1..af062a702 100755
--- a/daemon.sh
+++ b/daemon.sh
@@ -19,14 +19,12 @@ if [ -r "/tmp/nDPId-${NSUFFIX}.pid" -o -r "/tmp/nDPIsrvd-${NSUFFIX}.pid" ]; then
 
     if [ x"${nDPId_PID}" != x ]; then
         sudo kill "${nDPId_PID}"
-        wait "${nDPId_PID}"
     else
         printf '%s\n' "${1} not started .." >&2
     fi
 
     if [ x"${nDPIsrvd_PID}" != x ]; then
         kill "${nDPIsrvd_PID}"
-        wait "${nDPIsrvd_PID}"
     else
         printf '%s\n' "${2} not started .." >&2
     fi
@@ -35,10 +33,12 @@ if [ -r "/tmp/nDPId-${NSUFFIX}.pid" -o -r "/tmp/nDPIsrvd-${NSUFFIX}.pid" ]; then
     rm -f "/tmp/nDPIsrvd-${NSUFFIX}.pid"
     printf '%s\n' "daemons stopped" >&2
 else
+    set -x
     ${2} -p "/tmp/nDPIsrvd-${NSUFFIX}.pid" -c "/tmp/nDPIsrvd-${NSUFFIX}-collector.sock" -s "/tmp/nDPIsrvd-${NSUFFIX}-distributor.sock" -d
     sudo chgrp "$(id -n -g "${NUSER}")" "/tmp/nDPIsrvd-${NSUFFIX}-collector.sock"
     sudo chmod g+w "/tmp/nDPIsrvd-${NSUFFIX}-collector.sock"
     sudo ${1} -p "/tmp/nDPId-${NSUFFIX}.pid" -c "/tmp/nDPIsrvd-${NSUFFIX}-collector.sock" -d -u "${NUSER}"
+    set +x
     printf '%s\n' "daemons started" >&2
     printf '%s\n' "You may now run examples e.g.: ./examples/py-flow-info/flow-info.py --unix /tmp/nDPIsrvd-${NSUFFIX}-distributor.sock"
 fi
-- 
cgit v1.2.3