mirror of
https://github.com/vel21ripn/nDPI.git
synced 2026-04-28 15:09:47 +00:00
c35a5ca087
Reformatted shell scripts according to [ShellCheck](https://github.com/koalaman/shellcheck/). I. Most common changes: 1. https://github.com/koalaman/shellcheck/wiki/SC2086 `$var` → `"$var"` Note: this isn't always necessary and I've been careful not to substitute where it wasn't necessary in meaning. 2. https://github.com/koalaman/shellcheck/wiki/SC2006 `` `command` `` → `$(command)` 3. https://github.com/koalaman/shellcheck/wiki/SC2004 `$(( $a + $b ))` → `$(( a + b ))` 4. https://github.com/koalaman/shellcheck/wiki/SC2164 `cd "$dir"` → `cd "$dir" || exit 1` 5. https://github.com/koalaman/shellcheck/wiki/SC2166 `[ check1 -o check2 ]` → `[ check1 ] || [ check2 ]` 6. https://github.com/koalaman/shellcheck/wiki/SC2002 `cat "${file}" | wc -c` → `< "${file}" wc -c` Note: this looks a bit uglier but works faster. II. Some special changes: 1. In file `utils/common.sh`: https://github.com/koalaman/shellcheck/wiki/SC2112 This script is interpreted by `sh`, not by `bash`, but uses the keyword `function`. So I replaced `#!/usr/bin/env sh` to `#!/usr/bin/env bash`. 2. After that I thought of replacing all shebangs to `#!/usr/bin/env bash` for consistency and cross-platform compatibility, especially since most of the files already use bash. 3. But in cases when it was `#!/bin/sh -e` or `#!/bin/bash -eu` another problem appears: https://github.com/koalaman/shellcheck/wiki/SC2096 So I decided to make all shebangs look uniform: ``` #!/usr/bin/env bash set -e (or set -eu) (if needed) ``` 4. In file `tests/ossfuzz.sh`: https://github.com/koalaman/shellcheck/wiki/SC2162 `read i` → `read -r i` Note: I think that there is no need in special treatment for backslashes, but I could be wrong. 5. In file `tests/do.sh.in`: https://github.com/koalaman/shellcheck/wiki/SC2035 `ls *.*cap*` → `ls -- *.*cap*` 6. In file `utils/verify_dist_tarball.sh`: https://github.com/koalaman/shellcheck/wiki/SC2268 `[ "x${TARBALL}" = x ]` → `[ -z "${TARBALL}" ]` 7. In file `utils/check_symbols.sh`: https://github.com/koalaman/shellcheck/wiki/SC2221 `'[ndpi_utils.o]'|'[ndpi_memory.o]'|'[roaring.o]')` → `'[ndpi_utils.o]'|'[ndpi_memory.o]')` 8. In file `autogen.sh`: https://github.com/koalaman/shellcheck/wiki/SC2145 `echo "./configure $@"` → `echo "./configure $*"` https://github.com/koalaman/shellcheck/wiki/SC2068 `./configure $@` → `./configure "$@"` III. `LIST6_MERGED` and `LIST_MERGED6` There were typos with this variables in files `utils/aws_ip_addresses_download.sh`, `utils/aws_ip_addresses_download.sh` and `utils/microsoft_ip_addresses_download.sh` where variable `LIST6_MERGED` was defined, but `LIST_MERGED6` was removed by `rm`. I changed all `LIST_MERGED6` to `LIST6_MERGED`. Not all changes are absolutely necessary, but some may save you from future bugs.
39 lines
1.3 KiB
Bash
Executable file
39 lines
1.3 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
cd "$(dirname "${0}")" || exit 1
|
|
. ./common.sh || exit 1
|
|
|
|
DEST=../src/lib/inc_generated/ndpi_zoom_match.c.inc
|
|
LIST=/tmp/zoom.list
|
|
LIST6=/tmp/zoom.list6
|
|
LIST_MERGED=/tmp/zoom.list_m
|
|
LIST6_MERGED=/tmp/zoom.list6_m
|
|
# https://support.zoom.us/hc/en-us/articles/201362683-Zoom-network-firewall-or-proxy-server-settings
|
|
# There are few lists in this page, partially overlapping. Pick the generic one
|
|
ORIGIN="https://assets.zoom.us/docs/ipranges/Zoom.txt"
|
|
|
|
|
|
echo "(1) Downloading file... ${ORIGIN}"
|
|
http_response=$(curl -s -o "${LIST}" -w "%{http_code}" "${ORIGIN}")
|
|
check_http_response "${http_response}"
|
|
is_file_empty "${LIST}"
|
|
./mergeipaddrlist.py $LIST > $LIST_MERGED
|
|
is_file_empty "${LIST_MERGED}"
|
|
|
|
# IPv6: in that page there is a few IPv6 prefixes but these prefixes are not present in
|
|
# the "main" list!
|
|
# Add them manually: TODO: keep them in sync
|
|
echo "2620:123:2000::/40" > $LIST6
|
|
echo "2600:9000:2600::/48" >> $LIST6
|
|
echo "2407:30C0::/32" >> $LIST6
|
|
./mergeipaddrlist.py $LIST6 > $LIST6_MERGED
|
|
is_file_empty "${LIST6_MERGED}"
|
|
|
|
echo "(2) Processing IP addresses..."
|
|
./ipaddr2list.py "${LIST_MERGED}" NDPI_PROTOCOL_ZOOM "${LIST6_MERGED}" > "${DEST}"
|
|
rm -f "${LIST}" "${LIST6}" "${LIST_MERGED}" "${LIST6_MERGED}"
|
|
is_file_empty "${DEST}"
|
|
|
|
echo "(3) ZOOM IPs are available in ${DEST}"
|
|
exit 0
|