diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-04-10 23:43:19 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-04-11 00:16:52 +0200 |
| commit | 131cf5385ba31108c131d36f366183a8ac813727 (patch) | |
| tree | 9acd86f2064af61cd2ff2c0c8335c35ff39e559e /dependencies | |
| parent | ba586e1ecf848937a612cf35bed6275578dad088 (diff) | |
Added IPv6 support for -I / -E.
* added another Python search path and try-catch ModuleNotFoundError again
* run_tests.sh checks for OpenBSD netcat (required for -q)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'dependencies')
| -rw-r--r-- | dependencies/nDPIsrvd.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dependencies/nDPIsrvd.py b/dependencies/nDPIsrvd.py index d8cccc266..643a1a7e5 100644 --- a/dependencies/nDPIsrvd.py +++ b/dependencies/nDPIsrvd.py @@ -349,12 +349,14 @@ def defaultArgumentParser(): return parser def validateAddress(args): + tcp_addr_set = False address = None if args.host is None: address_tcpip = (DEFAULT_HOST, DEFAULT_PORT) else: address_tcpip = (args.host, args.port) + tcp_addr_set = True if args.unix is None: address_unix = DEFAULT_UNIX @@ -366,7 +368,7 @@ def validateAddress(args): possible_sock_mode = os.stat(address_unix).st_mode except: pass - if stat.S_ISSOCK(possible_sock_mode): + if tcp_addr_set == False and stat.S_ISSOCK(possible_sock_mode): address = address_unix else: address = address_tcpip |