Compare commits
312
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
467c27ce8e | ||
|
|
12255e2fe0 | ||
|
|
816b00190a | ||
|
|
d92536bd97 | ||
|
|
b328916966 | ||
|
|
2a99e16728 | ||
|
|
f69909d49b | ||
|
|
c59fe0b2b5 | ||
|
|
01f384f7ff | ||
|
|
32b0aeea59 | ||
|
|
d75a8d339a | ||
|
|
d9b0ba1d14 | ||
|
|
16b4913be6 | ||
|
|
b6179467eb | ||
|
|
30fc89e556 | ||
|
|
304747f1fa | ||
|
|
4a0eda69ad | ||
|
|
a76b9d151f | ||
|
|
1366d94156 | ||
|
|
86115a8a65 | ||
|
|
8ca842edec | ||
|
|
e1e6a01d6a | ||
|
|
3881d162f7 | ||
|
|
36112a645b | ||
|
|
a98d7ff433 | ||
|
|
77e5daf03e | ||
|
|
ef3adb9830 | ||
|
|
725fcf4852 | ||
|
|
d4e0b79dd6 | ||
|
|
6925890383 | ||
|
|
70814002a9 | ||
|
|
0828dff3ac | ||
|
|
c5cd4df056 | ||
|
|
5bcf3c2ddd | ||
|
|
a5f0cb7e6c | ||
|
|
7263562514 | ||
|
|
1e9517ab74 | ||
|
|
1bf7e5face | ||
|
|
8e6500a0da | ||
|
|
ef6085370f | ||
|
|
2c5e22123e | ||
|
|
2a0052f25e | ||
|
|
0aa1cf7245 | ||
|
|
2b883b93be | ||
|
|
805df2e5ce | ||
|
|
63977459b6 | ||
|
|
076edeab54 | ||
|
|
f50a4d7e85 | ||
|
|
1a797d7b74 | ||
|
|
770e460ba9 | ||
|
|
47fb5e9f3d | ||
|
|
2bd986a00a | ||
|
|
ad9ed4f954 | ||
|
|
978df906b3 | ||
|
|
0080d0d092 | ||
|
|
feaaf83bed | ||
|
|
cf67f483f4 | ||
|
|
c5ebd84fd8 | ||
|
|
4f2ce2d43b | ||
|
|
f0dc3347ec | ||
|
|
1d480c18e3 | ||
|
|
854c2d80f1 | ||
|
|
74fdac7d77 | ||
|
|
133f45f3f3 | ||
|
|
19381f330a | ||
|
|
16b0ce3710 | ||
|
|
f824939662 | ||
|
|
3c7b2a714e | ||
|
|
c5c610c941 | ||
|
|
65142b2a53 | ||
|
|
1de7fd9bf0 | ||
|
|
3dbc4f65fc | ||
|
|
36abf06c6f | ||
|
|
1f693c3f5a | ||
|
|
afd250f5d9 | ||
|
|
25f3a7cd1d | ||
|
|
34986de297 | ||
|
|
eeeee46b1e | ||
|
|
4ca94369e1 | ||
|
|
ac00542df2 | ||
|
|
2c565c77c9 | ||
|
|
42fcb011ad | ||
|
|
eb9932164f | ||
|
|
ff4f291afe | ||
|
|
95fcd08687 | ||
|
|
9933b5910d | ||
|
|
bd25df3334 | ||
|
|
9e4bcc7771 | ||
|
|
6e5466f9e5 | ||
|
|
cc4461f424 | ||
|
|
5867f43fae | ||
|
|
cfbb7a423e | ||
|
|
049fbf819c | ||
|
|
3b34941be1 | ||
|
|
9a44954365 | ||
|
|
fe634b8d55 | ||
|
|
8e17f50853 | ||
|
|
890dcf91d9 | ||
|
|
ec7adc212e | ||
|
|
5fad72ebd9 | ||
|
|
33e9dbc24d | ||
|
|
1fbe8a2385 | ||
|
|
196395398e | ||
|
|
e4d3d619bc | ||
|
|
083275f617 | ||
|
|
5019022e13 | ||
|
|
d477da997f | ||
|
|
bc91192aca | ||
|
|
3326fa258e | ||
|
|
2b230e28e0 | ||
|
|
88a757c4cd | ||
|
|
6831187d62 | ||
|
|
7a1509bf60 | ||
|
|
c85f2fb0f4 | ||
|
|
fa0bd515b5 | ||
|
|
3edfad01a1 | ||
|
|
09548bb7cf | ||
|
|
5267858b3d | ||
|
|
2bbde5bad3 | ||
|
|
890f17788b | ||
|
|
5811a5613b | ||
|
|
8e960f033d | ||
|
|
a499edd2f2 | ||
|
|
fea09e825b | ||
|
|
abee1a2a6f | ||
|
|
0dd1ee5656 | ||
|
|
bfbbd18757 | ||
|
|
33c42f9830 | ||
|
|
1f55dc511f | ||
|
|
bd0fcb2e62 | ||
|
|
0c5a17accb | ||
|
|
5e6a8c0c1f | ||
|
|
669a02cd76 | ||
|
|
b1d25193d2 | ||
|
|
0b0f255cc2 | ||
|
|
950f5cc4e3 | ||
|
|
859d9ea3c3 | ||
|
|
72814bed33 | ||
|
|
bdd295bc2c | ||
|
|
bb978907e6 | ||
|
|
076ba967a8 | ||
|
|
d51f8929e0 | ||
|
|
2e5004ddb2 | ||
|
|
7ffd31ebc3 | ||
|
|
dff1f25193 | ||
|
|
86e89b4e23 | ||
|
|
2c7fb91794 | ||
|
|
31a9da238c | ||
|
|
88425e0199 | ||
|
|
3a1600ff26 | ||
|
|
7ef80f6b78 | ||
|
|
7e64d9f66d | ||
|
|
15f0e1480c | ||
|
|
aa25c06a18 | ||
|
|
cdc0bb8c61 | ||
|
|
1678888284 | ||
|
|
8dbd591053 | ||
|
|
cc582052b3 | ||
|
|
570c75d601 | ||
|
|
2ac240ce6a | ||
|
|
46aab35a29 | ||
|
|
3608ab01b6 | ||
|
|
04be308092 | ||
|
|
ac06ba8320 | ||
|
|
9cc4cbb9d1 | ||
|
|
2321c11eb5 | ||
|
|
d0609ea601 | ||
|
|
66bee475ae | ||
|
|
de3cf260f8 | ||
|
|
be8178fc8d | ||
|
|
b02adcc381 | ||
|
|
4e284b5e40 | ||
|
|
8ea0eaa0d0 | ||
|
|
96340ccea2 | ||
|
|
63a2b359b9 | ||
|
|
7150b40c63 | ||
|
|
3e640a13a4 | ||
|
|
fd4cb10190 | ||
|
|
9987e5b482 | ||
|
|
3e673e91a9 | ||
|
|
7dcceb4daf | ||
|
|
436ab54f5a | ||
|
|
e14d0acbd4 | ||
|
|
e17fa1259a | ||
|
|
a8d2eeddd2 | ||
|
|
04f5c5196e | ||
|
|
552c9b3cc6 | ||
|
|
efb261a95c | ||
|
|
346bb268e2 | ||
|
|
82fa3a0986 | ||
|
|
46ff069117 | ||
|
|
7ce14da0c8 | ||
|
|
6da3474203 | ||
|
|
b11e6a453b | ||
|
|
63ac50e4f4 | ||
|
|
334b43579e | ||
|
|
f692342f3c | ||
|
|
86b56646b5 | ||
|
|
5e8f93c2d1 | ||
|
|
8f718c9051 | ||
|
|
c97e2d67ff | ||
|
|
9004d5c2ca | ||
|
|
1ab5318f9c | ||
|
|
dd7198fcaf | ||
|
|
5ca6f0ac62 | ||
|
|
a8b3baf2b8 | ||
|
|
b1bcf1ff60 | ||
|
|
ace32c9dfe | ||
|
|
4e186f6bfb | ||
|
|
8c224b464f | ||
|
|
596a5fd5dc | ||
|
|
64853dff02 | ||
|
|
98f029a091 | ||
|
|
7d5e4d0f7e | ||
|
|
8de7c49298 | ||
|
|
31d23aee56 | ||
|
|
99d7066ea0 | ||
|
|
684e041998 | ||
|
|
79c1dbe0b2 | ||
|
|
2f9059dc54 | ||
|
|
bfe79243bc | ||
|
|
998bedbbb7 | ||
|
|
0223d3c4f5 | ||
|
|
02a2c80453 | ||
|
|
a11ddd2dc4 | ||
|
|
6b94c9675a | ||
|
|
9a5d60bff6 | ||
|
|
3681de4795 | ||
|
|
de13c6c0bd | ||
|
|
bb370f5ef0 | ||
|
|
6b803f48dc | ||
|
|
6e9dce357b | ||
|
|
f7138f07a6 | ||
|
|
b39ece4428 | ||
|
|
791d3e6ad3 | ||
|
|
8934f7b45f | ||
|
|
40b6d5a2e1 | ||
|
|
de693cbbc9 | ||
|
|
c4ba981370 | ||
|
|
d3e67faf20 | ||
|
|
b6629ba2be | ||
|
|
85751ba9d7 | ||
|
|
ba99330031 | ||
|
|
032e778a6d | ||
|
|
6660feed35 | ||
|
|
77ea80862f | ||
|
|
6da958655c | ||
|
|
bebcce5281 | ||
|
|
9ba16a4837 | ||
|
|
a469009842 | ||
|
|
c7ef3608d9 | ||
|
|
c47e9d201d | ||
|
|
7714507f81 | ||
|
|
7a627296f0 | ||
|
|
b639744c3a | ||
|
|
22cf8b5d8f | ||
|
|
06a63dcbaa | ||
|
|
5c28dbbae2 | ||
|
|
25c1111911 | ||
|
|
f1193d5e6f | ||
|
|
cc5aec5f0a | ||
|
|
d7662379b4 | ||
|
|
4d11941d32 | ||
|
|
3e06bcce8d | ||
|
|
6e0cd16225 | ||
|
|
9ea8a57839 | ||
|
|
04a426feef | ||
|
|
ddb9aa0f95 | ||
|
|
530d0de438 | ||
|
|
04e017a854 | ||
|
|
64ebf73b29 | ||
|
|
b3457c644f | ||
|
|
c22d30786c | ||
|
|
2a3ade397b | ||
|
|
3a75a46212 | ||
|
|
12867962b0 | ||
|
|
0e80828e14 | ||
|
|
9f46d41eca | ||
|
|
9eff075419 | ||
|
|
3585e2d201 | ||
|
|
ebfc1fe827 | ||
|
|
d398f232be | ||
|
|
89cae9ddf2 | ||
|
|
3047e286c0 | ||
|
|
22fb8349b9 | ||
|
|
2768366969 | ||
|
|
e0ad5b49c0 | ||
|
|
d65f8cf15f | ||
|
|
9eb9664516 | ||
|
|
127d8d0d35 | ||
|
|
21c7550157 | ||
|
|
a303756edb | ||
|
|
25420e266e | ||
|
|
807c97344f | ||
|
|
96f0f85e56 | ||
|
|
6a2e8c9fb1 | ||
|
|
d0b46dcf88 | ||
|
|
4075324e2b | ||
|
|
06d4f8c7e5 | ||
|
|
f2f8f9d0ee | ||
|
|
090ba5735f | ||
|
|
f10178f8d2 | ||
|
|
200d1d4cfc | ||
|
|
a3a9a72f31 | ||
|
|
85bab9e660 | ||
|
|
bf413afba1 | ||
|
|
ba4e145aad | ||
|
|
b51a2ac72a | ||
|
|
4bb851384e | ||
|
|
64b8ae38db | ||
|
|
563a24bf6b | ||
|
|
c711f480e3 |
@@ -0,0 +1,12 @@
|
||||
Please sign (check) the below before submitting the Pull Request:
|
||||
|
||||
- [ ] I have signed the ntop Contributor License Agreement at https://github.com/ntop/legal/blob/main/individual-contributor-licence-agreement.md
|
||||
- [ ] I have read the contributing guide lines at https://github.com/ntop/nDPI/blob/dev/CONTRIBUTING.md
|
||||
- [ ] I have updated the documentation (in doc/) to reflect the changes made (if applicable)
|
||||
|
||||
Link to the related [issue](https://github.com/ntop/nDPI/issues):
|
||||
|
||||
|
||||
Describe changes:
|
||||
|
||||
|
||||
+11
-123
@@ -10,40 +10,6 @@ on:
|
||||
release:
|
||||
types: [created]
|
||||
jobs:
|
||||
coverage:
|
||||
name: Coverage (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
CFLAGS: -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev
|
||||
sudo apt-get install rrdtool librrd-dev
|
||||
sudo apt-get install libpcre3-dev libmaxminddb-dev lcov
|
||||
sudo apt-get install wdiff colordiff
|
||||
- name: Configure
|
||||
run: ./autogen.sh --enable-option-checking=fatal --enable-debug-messages --enable-code-coverage --with-pcre --with-maxminddb --enable-tls-sigs
|
||||
- name: Build
|
||||
run: make all
|
||||
- name: Test
|
||||
run: |
|
||||
make check VERBOSE=1
|
||||
- name: Generate Coverage Report
|
||||
run: |
|
||||
mkdir -vp coverage_report/ndpi_coverage_report
|
||||
lcov --directory . --capture --output-file lcov.info
|
||||
genhtml -o coverage_report/ndpi_coverage_report lcov.info
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ndpi-coverage-report
|
||||
path: coverage_report
|
||||
retention-days: 7
|
||||
|
||||
python-bindings:
|
||||
name: Python Bindings (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
@@ -77,76 +43,6 @@ jobs:
|
||||
run: |
|
||||
cd python
|
||||
python tests.py
|
||||
|
||||
documentation:
|
||||
name: Documentation (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Set up Python 3.9
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: "3.9"
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext flex bison doxygen
|
||||
- name: Configure nDPI library
|
||||
run: |
|
||||
./autogen.sh --with-only-libndpi --enable-option-checking=fatal
|
||||
- name: Generate Documentation
|
||||
run: |
|
||||
pip install --upgrade pip
|
||||
pip install -r doc/requirements.txt
|
||||
make doc
|
||||
mkdir -vp doc/_build/ndpi-documentation-upload/ndpi-documentation
|
||||
mv -v doc/_build/html doc/_build/ndpi-documentation-upload/ndpi-documentation/html
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ndpi-documentation
|
||||
path: doc/_build/ndpi-documentation-upload
|
||||
retention-days: 7
|
||||
|
||||
performance:
|
||||
name: Performance (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
GO111MODULE: on
|
||||
CFLAGS: -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo add-apt-repository ppa:longsleep/golang-backports
|
||||
sudo apt-get update
|
||||
sudo apt-get install libunwind-dev
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext flex bison libpcap-dev
|
||||
sudo apt-get install golang-1.16-go libgoogle-perftools-dev graphviz
|
||||
go install github.com/google/pprof@latest
|
||||
sudo ln -s ${HOME}/go/bin/pprof /usr/bin/pprof
|
||||
pprof -h
|
||||
- name: Configure nDPI library
|
||||
run: |
|
||||
./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre --with-maxminddb --enable-tls-sigs
|
||||
- name: Build nDPI library
|
||||
run: |
|
||||
make
|
||||
- name: Performance Profiling
|
||||
run: |
|
||||
./tests/do.sh
|
||||
mkdir ndpi-performance-upload
|
||||
mv -v tests/result/cpu_profile.png ndpi-performance-upload/cpu_profile.png
|
||||
mv -v tests/result/heap_profile.png ndpi-performance-upload/heap_profile.png
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ndpi-performance
|
||||
path: ndpi-performance-upload
|
||||
retention-days: 7
|
||||
|
||||
test-scripts:
|
||||
name: Test Utils (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
@@ -157,7 +53,7 @@ jobs:
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install python3-netaddr git
|
||||
sudo apt-get install python3-netaddr git whois libxml2-utils
|
||||
- name: Run Scripts
|
||||
run: |
|
||||
echo 'Running ./utils/bitcoinnodes.sh'
|
||||
@@ -179,7 +75,9 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: true
|
||||
matrix:
|
||||
os: ["ubuntu-latest", "ubuntu-22.04", "macOS-latest", "macos-12", "windows-latest"]
|
||||
# ubuntu-latest == ubuntu-22.04
|
||||
# macOS-latest == macos-12
|
||||
os: ["ubuntu-latest", "ubuntu-20.04", "macOS-latest", "macos-11", "windows-latest"]
|
||||
arch: ["x86_64"]
|
||||
gcrypt: ["--with-local-libgcrypt", ""]
|
||||
compiler: ["cc"]
|
||||
@@ -227,14 +125,6 @@ jobs:
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
lto_gold_linker: "--with-lto-and-gold-linker"
|
||||
- compiler: "cc"
|
||||
os: ubuntu-latest
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
- compiler: "cc"
|
||||
os: ubuntu-latest
|
||||
arch: "x86_64"
|
||||
@@ -259,14 +149,6 @@ jobs:
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-memory-sanitizer"
|
||||
nBPF: ""
|
||||
- compiler: "cc"
|
||||
os: ubuntu-latest
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
- compiler: "cc"
|
||||
os: macOS-latest
|
||||
arch: "x86_64"
|
||||
@@ -418,12 +300,18 @@ jobs:
|
||||
- name: Print nDPI long help
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
./example/ndpiReader -H
|
||||
./example/ndpiReader -H
|
||||
- name: Install nDPI
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
make install DESTDIR=$(realpath _install)
|
||||
ls -alhHR _install
|
||||
- name: Test nDPI [SYMBOLS]
|
||||
if: (startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'mac')) && startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
./utils/check_symbols.sh || { FAILED=$?; echo "::error file=${NDPI_LIB}::Unwanted libc symbols found: ${FAILED}. Please make sure to use only ndpi_malloc/ndpi_calloc/ndpi_realloc/ndpi_free wrapper instead of malloc/calloc/realloc/free."; false; }
|
||||
env:
|
||||
NDPI_LIB: src/lib/libndpi.a
|
||||
- name: Test nDPI [DIFF]
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
name: Scheduled builds
|
||||
on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
#At the end of every day
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
jobs:
|
||||
coverage:
|
||||
name: Coverage (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
CFLAGS: -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev
|
||||
sudo apt-get install rrdtool librrd-dev
|
||||
sudo apt-get install libpcre3-dev libmaxminddb-dev lcov
|
||||
sudo apt-get install wdiff colordiff
|
||||
- name: Configure
|
||||
run: ./autogen.sh --enable-option-checking=fatal --enable-debug-messages --enable-code-coverage --with-pcre --with-maxminddb --enable-tls-sigs
|
||||
- name: Build
|
||||
run: make all
|
||||
- name: Test
|
||||
run: |
|
||||
make check VERBOSE=1
|
||||
- name: Generate Coverage Report
|
||||
run: |
|
||||
make coverage
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ndpi-coverage-report
|
||||
path: coverage_report
|
||||
retention-days: 7
|
||||
|
||||
documentation:
|
||||
name: Documentation (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Set up Python 3.9
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: "3.9"
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext flex bison doxygen
|
||||
- name: Configure nDPI library
|
||||
run: |
|
||||
./autogen.sh --with-only-libndpi --enable-option-checking=fatal --enable-debug-build
|
||||
- name: Generate Documentation
|
||||
run: |
|
||||
pip install --upgrade pip
|
||||
pip install -r doc/requirements.txt
|
||||
make doc
|
||||
mkdir -vp doc/_build/ndpi-documentation-upload/ndpi-documentation
|
||||
mv -v doc/_build/html doc/_build/ndpi-documentation-upload/ndpi-documentation/html
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ndpi-documentation
|
||||
path: doc/_build/ndpi-documentation-upload
|
||||
retention-days: 7
|
||||
|
||||
performance:
|
||||
name: Performance (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
GO111MODULE: on
|
||||
CFLAGS: -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
run: |
|
||||
sudo add-apt-repository ppa:longsleep/golang-backports
|
||||
sudo apt-get update
|
||||
sudo apt-get install libunwind-dev
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext flex bison libpcap-dev
|
||||
sudo apt-get install golang-1.16-go libgoogle-perftools-dev graphviz
|
||||
go install github.com/google/pprof@latest
|
||||
sudo ln -s ${HOME}/go/bin/pprof /usr/bin/pprof
|
||||
pprof -h
|
||||
- name: Configure nDPI library
|
||||
run: |
|
||||
./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre --with-maxminddb --enable-tls-sigs
|
||||
- name: Build nDPI library
|
||||
run: |
|
||||
make
|
||||
- name: Performance Profiling
|
||||
run: |
|
||||
./tests/do.sh
|
||||
mkdir ndpi-performance-upload
|
||||
for d in $(find ./tests/cfgs/* -type d -maxdepth 0 2>/dev/null) ; do
|
||||
PROFILE="$(basename $d)"
|
||||
mv -v tests/cfgs/${PROFILE}/result/cpu_profile.png ndpi-performance-upload/${PROFILE}_cpu_profile.png
|
||||
mv -v tests/cfgs/${PROFILE}/result/heap_profile.png ndpi-performance-upload/${PROFILE}_heap_profile.png
|
||||
done
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ndpi-performance
|
||||
path: ndpi-performance-upload
|
||||
retention-days: 7
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
|
||||
with:
|
||||
oss-fuzz-project-name: 'ndpi'
|
||||
fuzz-seconds: 1600
|
||||
fuzz-seconds: 1200
|
||||
dry-run: false
|
||||
sanitizer: ${{ matrix.sanitizer }}
|
||||
- name: Check Crash (fails when a crash is detected)
|
||||
|
||||
+31
@@ -58,14 +58,33 @@
|
||||
/fuzz/fuzz_alg_hll
|
||||
/fuzz/fuzz_alg_hw_rsi_outliers_da
|
||||
/fuzz/fuzz_alg_jitter
|
||||
/fuzz/fuzz_alg_crc32_md5
|
||||
/fuzz/fuzz_alg_ses_des
|
||||
/fuzz/fuzz_alg_bytestream
|
||||
/fuzz/fuzz_config
|
||||
/fuzz/fuzz_community_id
|
||||
/fuzz/fuzz_serialization
|
||||
/fuzz/fuzz_ds_patricia
|
||||
/fuzz/fuzz_ds_libcache
|
||||
/fuzz/fuzz_ds_tree
|
||||
/fuzz/fuzz_ds_ptree
|
||||
/fuzz/fuzz_ds_hash
|
||||
/fuzz/fuzz_ds_ahocorasick
|
||||
/fuzz/fuzz_ds_bitmap64
|
||||
/fuzz/fuzz_ds_domain_classify
|
||||
/fuzz/fuzz_libinjection
|
||||
/fuzz/fuzz_binaryfusefilter
|
||||
/fuzz/fuzz_tls_certificate
|
||||
/fuzz/fuzz_dga
|
||||
/fuzz/fuzz_ds_cmsketch
|
||||
/fuzz/fuzz_gcrypt_light
|
||||
/fuzz/fuzz_gcrypt_aes
|
||||
/fuzz/fuzz_gcrypt_gcm
|
||||
/fuzz/fuzz_gcrypt_cipher
|
||||
/fuzz/fuzz_ndpi_reader_payload_analyzer
|
||||
/fuzz/fuzz_filecfg_protocols
|
||||
/fuzz/fuzz_readerutils_workflow
|
||||
/fuzz/fuzz_readerutils_parseprotolist
|
||||
/fuzz/fuzz_ndpi_reader_alloc_fail_seed_corpus.zip
|
||||
/fuzz/fuzz_ndpi_reader_seed_corpus.zip
|
||||
/fuzz/fuzz_quic_get_crypto_data_seed_corpus.zip
|
||||
@@ -76,11 +95,23 @@
|
||||
/fuzz/fuzz_alg_bins_seed_corpus.zip
|
||||
/fuzz/fuzz_alg_hll_seed_corpus.zip
|
||||
/fuzz/fuzz_alg_jitter_seed_corpus.zip
|
||||
/fuzz/fuzz_alg_crc32_md5_seed_corpus.zip
|
||||
/fuzz/fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip
|
||||
/fuzz/fuzz_alg_bytestream_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_patricia_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_libcache_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_tree_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_ptree_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_ahocorasick_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_bitmap64_seed_corpus.zip
|
||||
/fuzz/fuzz_ds_domain_classify_seed_corpus.zip
|
||||
/fuzz/fuzz_libinjection_seed_corpus.zip
|
||||
/fuzz/fuzz_tls_certificate_seed_corpus.zip
|
||||
/fuzz/fuzz_filecfg_protocols_seed_corpus.zip
|
||||
/fuzz/fuzz_dga_seed_corpus.zip
|
||||
/fuzz/fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip
|
||||
/fuzz/fuzz_readerutils_workflow_seed_corpus.zip
|
||||
/fuzz/fuzz_readerutils_parseprotolist_seed_corpus.zip
|
||||
/fuzz/fuzz_*.dict
|
||||
/influxdb/Makefile
|
||||
/install-sh
|
||||
|
||||
+277
-1
@@ -1,10 +1,286 @@
|
||||
# CHANGELOG
|
||||
|
||||
#### nDPI 4.8 (Oct 2023)
|
||||
|
||||
## Major Changes
|
||||
- Reworked lists implementation that decreased memory usage of orders of magnitude
|
||||
- Improved code robustness via extensive code fuzzing
|
||||
- Various improvements to overall library performance
|
||||
- Extended IPv6 support
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
- Add "Heroes of the Storm" video game signature detection. (#1949)
|
||||
- Add Apache Thrift protocol dissector. (#2007)
|
||||
- Add Remote Management Control Protocol (RMCP).
|
||||
- Add Service Location Protocol dissector. (#2036)
|
||||
- Add VK detection (#1880)
|
||||
- Add Yandex services detection (#1882)
|
||||
- Add a new protocol id for generic Adult Content traffic (#1906)
|
||||
- Add a new protocol id for generic advertisement/analytics/tracking stuff (#1904)
|
||||
- Add bitcoing protocol dissector. (#1992)
|
||||
- Add detection of Roblox games (#2054)
|
||||
- Add support for (un-encrypted) HTTP/2 (#2087)
|
||||
- Add support for Epic Games and GeForceNow/Nvidia (#1990)
|
||||
- Add support for SRTP (#1977)
|
||||
- Added BACnet dissector. (#1940)
|
||||
- Added HAProxy protocol. (#2088)
|
||||
- Added OICQ dissector. (#1950)
|
||||
- Added OperaVPN detection
|
||||
- ProtonVPN: add basic detection (#2006)
|
||||
- Added detection of Facebook Reels and Stories
|
||||
- Add an heuristic to detect fully encrypted flows (#2058)
|
||||
- Added NDPI_MALWARE_HOST_CONTACTED flow risk
|
||||
- Added NDPI_TLS_ALPN_SNI_MISMATCH flow risk
|
||||
|
||||
## Improvements
|
||||
|
||||
- Improve protocol detection for:
|
||||
- FreeBSD compilation fix (C) update
|
||||
- Gnutella: improve detection (#2019)
|
||||
- H323: fix false positives (#1916)
|
||||
- HTTP: fix another memory access error (#2049)
|
||||
- HTTP: fix extraction of filename (#2046)
|
||||
- HTTP: fix heap-buffer-overflow (#2044)
|
||||
- HTTP: improve extraction of metadata and of flow risks (#1959)
|
||||
- HTTP: remove useless code about XBOX (#1958)
|
||||
- HTTP: rework state machine (#1966)
|
||||
- Hangout: detect Hangout/Duo/GoogleMeet/... in the STUN code (#2025)
|
||||
- Enhance DNS risk for long hostnames (> 32)
|
||||
- Enhanced MS teams STUN/Azure detection
|
||||
- Enhanced custom port definition and improved error reporting in case of duplications
|
||||
- Improve detection of Alibaba flows (#1991)
|
||||
- Improve detection of crawler/bot traffic (#1956)
|
||||
- Improve detection of crawlers/bots (#1968)
|
||||
- Improved MGCP detection by allowing '\r' as line feed.
|
||||
- Improved MS Teams detection with heuristic
|
||||
- Improved Steam detection by adding steamdiscover pattern. (#2105)
|
||||
- Improved Wireguard detection
|
||||
- Improved checks for duplicated entries in protocols file
|
||||
- Improved classification further reducing memory used
|
||||
- Improved detection of invalid chars in DNS names
|
||||
- Improved domain search tet unit
|
||||
- Improved helper scripts. (#1986)
|
||||
- MS Teams enhancement
|
||||
- MySql: improve detection (#1928)
|
||||
- zabbix: improve detection (#2055)
|
||||
|
||||
## Tools
|
||||
|
||||
- ndpiReader: allow to configure LRU caches TTL and size (#2004)
|
||||
- ndpiReader: fix VXLAN de-tunneling (#1913)
|
||||
- ndpiReader: fix export of DNS/BitTorrent attributes (#1985)
|
||||
- ndpiReader: fix export of HTTP attributes (#1982)
|
||||
- ndpiReader: fix flow stats (#1943)
|
||||
- ndpiReader: fix print of flow payload (#1960)
|
||||
- ndpiReader: improve printing of payload statistics (#1989)
|
||||
- ndpiReader: print how many packets (per flow) were needed to perform full DPI (#1891)
|
||||
- ndpireader: fix detection of DoH traffic based on packet distributions (#2045)
|
||||
|
||||
## Misc
|
||||
- ARM compilation fix
|
||||
- Add `ndpi_domain_classify_finalize()` function (#2084)
|
||||
- Add a configuration knob to enable/disable loading of gambling list (#2047)
|
||||
- Add a new flow risk about literal IP addresses used as SNI (#1892)
|
||||
- Add an heuristic to detect/ignore some anomalous TCP ACK packets (#1948)
|
||||
- Add another example of custom rules (#1923)
|
||||
- Add support for multiline json
|
||||
- Add support for roaring_bitmap_xor_inplace (#1983)
|
||||
- Add support for vxlan decapsulation (#1441) (#1900)
|
||||
- Added Source Engine dissector. (#1937)
|
||||
- Added `lists/gambling.list` to extra dist.
|
||||
- Added `slackb.com` SNI. (#2067)
|
||||
- Added ability to define an unlimited number of custom rules IP:port for the same IP (it used tobe limited to 2)
|
||||
- Added check to avoid skype heuristic false positives
|
||||
- Added comment
|
||||
- Added coverage targets to `Makefile.am` for convenience. (#2039)
|
||||
- Added fix for better handling exceptions rollback in case of later match
|
||||
- Added hyperlink
|
||||
- Added ndpi_binary_bitmap data structure
|
||||
- Added ndpi_bitmap64 support
|
||||
- Added ndpi_bitmap_andnot API call
|
||||
- Added ndpi_bitmap_copy() API call
|
||||
- Added ndpi_bitmap_is_empty() and ndpi_bitmap_optimize() API calls
|
||||
- Added ndpi_domain_classify_XXX(0 API
|
||||
- Added ndpi_filter_add_multi() API call
|
||||
- Added ndpi_murmur_hash to the nDPI API
|
||||
- Added new API calls for implementing Bloom-filter like data structures
|
||||
- Added printf/fprintf replacement for some internal modules. (#1974)
|
||||
- Added scripts to auto generate hostname/SNI *.inc files. (#1984)
|
||||
- Added sub-domain classification fix
|
||||
- Added the ability to define custom protocols with arbitrary Ids in proto.txt
|
||||
- Added vlan_id in ndpi_flow2json() prototype
|
||||
- Adds new pcap for testing "funny" HTTP servers
|
||||
- All protocols should be excluded sooner or later (#1969)
|
||||
- Allow init of app protocols w/o any hostnames set. (#2057)
|
||||
- Avoid calling `ndpi_reconcile_protocols()` twice in `ndpi_detection_giveup()` (#1996)
|
||||
- Boundary check
|
||||
- CI: fix `Performance` job (#1936)
|
||||
- Centos7 fixes
|
||||
- Changed logging callback function sig. (#2000)
|
||||
- Changes for supporting more efficient sub-string matching
|
||||
- Classification fixes
|
||||
- DNS: extract geolocation information, if available (#2065)
|
||||
- Debian 12 fixes
|
||||
- Disabled query string validation in MDNS in order to avoid zapping chars that in DNS (instead) are not permitted
|
||||
- DisneyPlus/Hulu ip lists should be auto-generated (#1905)
|
||||
- Extend content list of Microsoft protocols (#1930)
|
||||
- Extend content-match list (#1967)
|
||||
- Fix LRU/Patricia/Automa stats in `ndpiReader` with multiple threads (#1934)
|
||||
- Fix MS Teams detection with heuristic (#1972)
|
||||
- Fix access to packet/flow information (#2013)
|
||||
- Fix an heap-buffer-overflow (#1994)
|
||||
- Fix classification-by-ip in `ndpi_detection_giveup` (#1981)
|
||||
- Fix compilation (#2011)
|
||||
- Fix compilation in CI jobs (#2048)
|
||||
- Fix compilation on Windows (#2072)
|
||||
- Fix compilation with GCC-7 and latest RoaringBitmap code (#1886)
|
||||
- Fix detection of packet direction and NDPI_UNIDIRECTIONAL_TRAFFIC risk (#1883)
|
||||
- Fix export/serialization of `flow->risk` (#1885)
|
||||
- Fix for buffer overflow in serialization
|
||||
- Fix insert of ip addresses into patricia tree(s) (#1895)
|
||||
- Fix missing u_char, u_short and u_int typedefs for some platforms e.g.: (#2009)
|
||||
- Fix packet counters (#1884)
|
||||
- Fix some errors found by fuzzers (#2078)
|
||||
- Fix some memory errors triggered by allocation failures (#1995)
|
||||
- Fix some prototypes (#2085)
|
||||
- Fix string truncation. (#2056)
|
||||
- Fixed OpenWRT arm related build issues. (#2104)
|
||||
- Fixed heap-buffer-overflow issue
|
||||
- Fixed heap-overflow if compiled with `--enable-tls-sigs`. (#2038)
|
||||
- Fixed invalid use of ndpi_free(). Sorry, my fault. (#1988)
|
||||
- Fixed missing AS_HELP_STRING in configure.ac. (#1893)
|
||||
- Fixed two OpenWRT arm related build issues. (#2103)
|
||||
- Fixes matches with domain name strings that start with a dot
|
||||
- Fixes risk mask exception handling while improving the overall performance
|
||||
- Implemented Count-Min Sketch [count how many times a value has been observed]
|
||||
- Implemented Zoom/Teams stream type detection
|
||||
- Implemented ndpi_XXX_reset() API calls whre XXX is ses, des, hw
|
||||
- Implemented ndpi_predict_linear() for predicting a timeseries value overtime
|
||||
- Improved debug output. (#1951)
|
||||
- Improved invalid logging via printf().
|
||||
- Improved line protocol dissection with heuristic
|
||||
- Improved missing usage of nDPIs malloc wrapper. Fixes #1978. (#1979)
|
||||
- Improved protocol detection exploiting IP-based guess Reworked ndpi_reconcile_protocols() that is now called only in front of a match (less overhead)
|
||||
- Improvement for reducing false positives
|
||||
- Included Gambling website data from the Polish `hazard.mf.gov.pl` list (#2041)
|
||||
- Keep master protocol in `ndpi_reconcile_protocols`
|
||||
- Leak fix
|
||||
- Language fix
|
||||
- Line: fix heap-buffer-overflow error (#2015)
|
||||
- Made VK protocol detection more strict
|
||||
- Make Bittorrent LRU cache IPv6 aware. (#1909)
|
||||
- Merged new and old version of ndpi_domain_classify.c code
|
||||
- Mullvad VPN service added (based on entry node IP addresses) (#2062)
|
||||
- Numeric truncation at `ndpi_analyze.c` at lines 101, 104, 107, 110 (#1999)
|
||||
- Numeric truncation at `tls.c:1010` (#2005)
|
||||
- Ookla: rework detection (#1922)
|
||||
- Optimizes and fixes possible out0of0boundary write in ndpi_fill_prefix_v4()
|
||||
- ProtonVPN: split the ip list (#2060)
|
||||
- QUIC: add support for QUIC version 2
|
||||
- QUIC: export QUIC version as metadata
|
||||
- QUIC: fix a memory access error
|
||||
- QUIC: fix dissection of packets forcing VN
|
||||
- RDP: improve detection over UDP (#2043)
|
||||
- RTP: remove dead-code (#1953)
|
||||
- RTP: rework code (#2021)
|
||||
- Refreshed ASN lists Enhanced the Line IP list with https://ipinfo.io/AS23576/125.209.252.0/24 used by line
|
||||
- Remove some useless checks (#1993)
|
||||
- Remove special handling of some TCP flows without SYN (#1965)
|
||||
- Removed overlapping port
|
||||
- Renamed HTTP/2 to HTTP2 as the '/' can have side effects with applications sitting on top of nDPI
|
||||
- Replaces free() with ndpi_free()
|
||||
- Rework CI jobs to try reducing CI duration (#1903)
|
||||
- Reworked domain classification based on binary filters
|
||||
- Reworked initialization
|
||||
- Reworked ndpi_filter_xxx implementation using compressed bitmaps
|
||||
- Reworked teams handling
|
||||
- RiotGames: add detection of flows (#1935)
|
||||
- STUN: add dissection of DTLS handshake (#2018)
|
||||
- STUN: avoid FacebookVoip false positives (#2029)
|
||||
- STUN: fix Skype/MsTeams detection and monitoring logic (#2028)
|
||||
- STUN: fix detection of Google Voip apps (#2031)
|
||||
- STUN: fix detection over TCP
|
||||
- STUN: improve WhatsappCall detection
|
||||
- STUN: keep monitoring/processing STUN flows (#2012)
|
||||
- STUN: tell RTP from RTCP while in monitoring state (#2027)
|
||||
- Serialization fix
|
||||
- Set _DEFAULT_SOURCE and _GNU_SOURCE globally. (#2010)
|
||||
- Simplify `ndpi_internal_guess_undetected_protocol()` (#1941)
|
||||
- Simplify the report of streaming multimedia info (#2026)
|
||||
- SoftEther: fix invalid memory access
|
||||
- Swap from Aho-Corasick to an experimental/home-grown algorithm that uses a probabilistic approach for handling Internet domain names.
|
||||
- Sync unit tests results
|
||||
- Sync unit tests results
|
||||
- Sync unit tests results (#1962)
|
||||
- Sync utests results (#1887)
|
||||
- TLS: add basic, basic, detection of Encrypted ClientHello (#2053)
|
||||
- TLS: fix another interger overflow in certificate processing (#1915)
|
||||
- TLS: fix parsing of certificate elements (#1910)
|
||||
- Test files for riit games
|
||||
- Test multiple `ndpiReader` configurations (#1931)
|
||||
- Thrift: fix heap-buffer-overflow (#2024)
|
||||
- Update GitHub runners versions (#1889)
|
||||
- Update every ip lists (#2079)
|
||||
- Update libinjection code (#1918)
|
||||
- Update protocols documentation (#2081)
|
||||
- Update roaring bitmap code
|
||||
- Updated line test result
|
||||
- Updated pcap detection results after Facebook Reel/Stories support
|
||||
- Updated results
|
||||
- Updated results after the latest changes
|
||||
- Win include change
|
||||
- Windows code rework
|
||||
- Windows compilation fixes
|
||||
- Windows warning checks
|
||||
- add 2 ns from fdn.fr to DoH section (#1964)
|
||||
- add support for gre decapsulation (#1442) (#1921)
|
||||
- added bimap and/or with allocation
|
||||
- added feature to extract filename from http attachment (#2037)
|
||||
- added new domain names (#2002)
|
||||
- configure: add an option to enable debug build, i.e `-g` (#1929)
|
||||
- fix Stack overflow caused by invalid write in ndpi_automa_match_strin… (#2035)
|
||||
- fixed numeric truncation error
|
||||
- fixed numeric truncation error in diameter.c (#2034)
|
||||
- fixed numeric truncation error in kerberos.c (#2032)
|
||||
- fixed numeric truncation error in ndpi_main.c:6837 (#1998)
|
||||
- fixed numeric truncation error in rtcp.c (#2033)
|
||||
- fuzz: add a new fuzzer to test TLS certificates (#1901)
|
||||
- fuzz: add a new fuzzer triggering the payload analyzer function(s) (#1926)
|
||||
- fuzz: add fuzzer for DGA detection code (#2042)
|
||||
- fuzz: add fuzzer to test internal gcrypt code (#1920)
|
||||
- fuzz: add fuzzers to test bitmap64 and domain_classify data structures (#2082)
|
||||
- fuzz: add fuzzers to test reader_util code (#2080)
|
||||
- fuzz: extend coverage (#2073)
|
||||
- fuzz: extend fuzz coverage (#1888)
|
||||
- fuzz: extend fuzzers coverage (#1952)
|
||||
- fuzz: extend fuzzing coverage (#2040)
|
||||
- fuzz: extend fuzzing coverage (#2052)
|
||||
- fuzz: extend fuzzing coverage (#2083)
|
||||
- fuzz: simplify fuzzers dependencies in CIFuzz (#1896)
|
||||
- fuzz: some improvements and add two new fuzzers (#1881)
|
||||
- fuzzing: extend fuzzing coverage
|
||||
- in case of failure, failing result files are not listed
|
||||
- minor fixes (#2023)
|
||||
- oss-fuzz: sync build script with upstream
|
||||
- remove redefinition to vxlanhdr struct in vxlan dissector (#1911)
|
||||
- removed useless call of ndpi_set_risk func (#2022)
|
||||
- tests: add an option to force the overwrite of the unit tests results (#2001)
|
||||
- tests: restore some old paths as symbolic links (#2050)
|
||||
- tftp: check for Option Acknowledgements
|
||||
- tftp: check incrementation for DATA and ACK packets
|
||||
- tftp: rework request checking to account for options
|
||||
- tftp: update pcap results
|
||||
- version of dirent.c that is liked by both VC++ and MinGW
|
||||
|
||||
|
||||
#### nDPI 4.6 (Feb 2023)
|
||||
|
||||
## New Features
|
||||
|
||||
- New support for custom BPF protocol definition using nBPF (see example/protos.txt)
|
||||
- Improved dissection performance
|
||||
- Added fuzzing all over
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
@@ -18,7 +294,7 @@
|
||||
- Elasticsearch
|
||||
- FastCGI
|
||||
- Kismet
|
||||
- Line App and Line Voip valls
|
||||
- Line App and Line VoIP calls
|
||||
- Meraki Cloud
|
||||
- Munin
|
||||
- NATPMP
|
||||
|
||||
+16
-3
@@ -12,21 +12,34 @@ EXTRA_DIST = README.md README.fuzzer.md CHANGELOG.md CONTRIBUTING.md \
|
||||
autogen.sh wireshark windows utils packages \
|
||||
influxdb/Makefile.in influxdb/metric_anomaly.c influxdb/README.txt \
|
||||
rrdtool/Makefile.in rrdtool/README.txt rrdtool/rrd_anomaly.c rrdtool/rrd_similarity.c \
|
||||
doc/requirements.txt doc/conf.py doc/flow_risks.rst doc/guide/nDPI_QuickStartGuide.pages \
|
||||
doc/requirements.txt doc/conf.py doc/flow_risks.rst doc/protocols.rst doc/guide/nDPI_QuickStartGuide.pages \
|
||||
doc/guide/nDPI_QuickStartGuide.pdf doc/img/logo.png doc/index.rst \
|
||||
doc/Makefile doc/what_is_ndpi.rst \
|
||||
python/DEV_GUIDE.md python/dev_requirements.txt python/ndpi_example.py python/ndpi/__init__.py \
|
||||
python/ndpi/ndpi_build.py python/ndpi/ndpi.py python/README.md \
|
||||
python/requirements.txt python/setup.py python/tests.py \
|
||||
lists/107_gambling.list \
|
||||
lists/107_gambling_custom.list \
|
||||
lists/README.md \
|
||||
sonar-project.properties .github .ci-ignore
|
||||
|
||||
|
||||
.PHONY: doc doc-view
|
||||
doc:
|
||||
make -C doc html
|
||||
|
||||
doc-view:
|
||||
python3 -m http.server --bind 127.0.0.1 --directory doc/_build/html 8080
|
||||
|
||||
coverage: all
|
||||
mkdir -vp coverage_report/ndpi_coverage_report
|
||||
lcov --directory . --capture --output-file lcov.info
|
||||
genhtml -o coverage_report/ndpi_coverage_report lcov.info
|
||||
|
||||
clean-coverage:
|
||||
rm -f lcov.info
|
||||
find . -type f -name "*.gcda" -exec rm "{}" +
|
||||
find . -type f -name "*.gcno" -exec rm "{}" +
|
||||
|
||||
changelog:
|
||||
git log --since={`curl -s https://github.com/ntop/ndpi/releases | grep datetime | head -n1 | egrep -o "[0-9]+\-[0-9]+\-[0-9]+"`} --name-only --pretty=format:" - %s" | grep "^ " > CHANGELOG.latest
|
||||
|
||||
.PHONY: doc doc-view coverage clean-coverage changelog
|
||||
|
||||
@@ -82,6 +82,7 @@ The entire procedure of adding new protocols in detail:
|
||||
8. From the `nDPI` root directory, `./autogen.sh --with-pcre` (nBPF and PCRE are usually optional, but they are needed to run/update *all* the unit tests)
|
||||
9. `make`
|
||||
10. `make check`
|
||||
11. Update the documentation, adding this new protocol to `doc/protocols.rst`
|
||||
|
||||
### How to use nDPI to Block Selected Traffic
|
||||
|
||||
|
||||
+28
-8
@@ -1,4 +1,4 @@
|
||||
AC_INIT([libndpi],[4.6.0])
|
||||
AC_INIT([libndpi],[4.8.0])
|
||||
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects])
|
||||
AC_PREFIX_DEFAULT(/usr)
|
||||
|
||||
EXTRA_TARGETS="example tests tests/dga"
|
||||
AC_ARG_WITH(only-libndpi, AS_HELP_STRING([--with-only-libndpi], [Build only libndpi (no examples, tests etc)]))
|
||||
AC_ARG_WITH(only-libndpi, AS_HELP_STRING([--with-only-libndpi], [Build only libndpi (no examples, tests etc)]))
|
||||
AS_IF([test "${with_only_libndpi+set}" = set],[
|
||||
EXTRA_TARGETS=""
|
||||
])
|
||||
@@ -16,17 +16,21 @@ AS_IF([test "${with_only_libndpi+set}" = set],[
|
||||
PWD=`pwd`
|
||||
|
||||
|
||||
AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer]))
|
||||
AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer]))
|
||||
AC_ARG_WITH(thread-sanitizer, AS_HELP_STRING([--with-thread-sanitizer], [Build with support for thread sanitizer]))
|
||||
AC_ARG_WITH(memory-sanitizer, AS_HELP_STRING([--with-memory-sanitizer], [Build with support for memory sanitizer]))
|
||||
AC_ARG_WITH(macos-memory-sanitizer, AS_HELP_STRING([--with-macos-memory-sanitizer], [Build with support for memory sanitizer macOS]))
|
||||
AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no])
|
||||
AC_ARG_ENABLE(gprof, AS_HELP_STRING([--enable-gprof], [Enable CPU/HEAP profiling with gperftools]),[enable_gprof=$enableval],[enable_gprof=no])
|
||||
AC_ARG_ENABLE(code-coverage, AS_HELP_STRING([--enable-code-coverage], [Generate Code Coverage report]))
|
||||
AC_ARG_WITH(local-libgcrypt, AS_HELP_STRING([--with-local-libgcrypt], [Build with libgcrypt (if present) instead of the enclosed gcrypt light]))
|
||||
AC_ARG_WITH(local-libgcrypt, AS_HELP_STRING([--with-local-libgcrypt], [Build with libgcrypt (if present) instead of the enclosed gcrypt light]))
|
||||
AC_ARG_ENABLE(tls-sigs, AS_HELP_STRING([--enable-tls-sigs], [Enable TLS Client signature algorithm dissection. Rarely used, but requires significantly more memory.]))
|
||||
AC_ARG_ENABLE(npcap, AS_HELP_STRING([--disable-npcap], [msys2 only: Disable linkage against the wpcap/npcap import library in windows/WpdPack/Lib.]))
|
||||
AC_ARG_WITH(nbpf-path, AS_HELP_STRING([--with-nbpf-path], [nBPF library custom path; default: ${PWD}/../PF_RING/userland/nbpf]),[NBPF_HOME=$withval],[NBPF_HOME=${PWD}/../PF_RING/userland/nbpf])
|
||||
AC_ARG_WITH(lto-and-gold-linker, AS_HELP_STRING([--with-lto-and-gold-linker], [Build with LTO and Gold linker])])
|
||||
AC_ARG_WITH(lto-and-gold-linker, AS_HELP_STRING([--with-lto-and-gold-linker], [Build with LTO and Gold linker]))
|
||||
AC_ARG_ENABLE(debug-build, AS_HELP_STRING([--enable-debug-build], [Enable debug build (`-g` flag)]),[enable_debugbuild=$enableval],[enable_debugbuild=no])
|
||||
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -D_DEFAULT_SOURCE=1 -D_GNU_SOURCE=1"
|
||||
|
||||
AS_IF([test "x$enable_fuzztargets" = "xyes"], [
|
||||
BUILD_FUZZTARGETS=1
|
||||
@@ -34,6 +38,10 @@ AS_IF([test "x$enable_fuzztargets" = "xyes"], [
|
||||
], [BUILD_FUZZTARGETS=0])
|
||||
AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"])
|
||||
|
||||
AS_IF([test "x$enable_debugbuild" = "xyes"], [
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -g"
|
||||
])
|
||||
|
||||
AS_IF([test "${with_sanitizer+set}" = set -a "${with_thread_sanitizer+set}" = set],[
|
||||
AC_MSG_ERROR([Configure options `--with-sanitizer' and `--with_thread_sanitizer' can not used at the same time.])
|
||||
])
|
||||
@@ -70,6 +78,11 @@ AS_IF([test "${with_memory_sanitizer+set}" = set],[
|
||||
NDPI_LDFLAGS="${NDPI_LDFLAGS} -fsanitize=memory"
|
||||
])
|
||||
|
||||
AS_IF([test "${with_macos_memory_sanitizer+set}" = set],[
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -fsanitize=address -fno-omit-frame-pointer -fsanitize=signed-integer-overflow -fno-sanitize-recover=address"
|
||||
NDPI_LDFLAGS="${NDPI_LDFLAGS} -fsanitize=address"
|
||||
])
|
||||
|
||||
AS_IF([test "x${enable_code_coverage}" = "xyes"],[
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -fprofile-arcs -ftest-coverage"
|
||||
NDPI_LDFLAGS="${NDPI_LDFLAGS} --coverage"
|
||||
@@ -82,6 +95,8 @@ LT_LIB_M
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP_WERROR
|
||||
AC_C_INLINE
|
||||
|
||||
SYSTEM=`uname -s`
|
||||
if test $SYSTEM = "Darwin"; then
|
||||
@@ -170,7 +185,9 @@ AS_IF([test "x${enable_tls_sigs}" = "xyes"],[
|
||||
HANDLE_TLS_SIGS=""
|
||||
])
|
||||
|
||||
NDPI_CFLAGS="-W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member ${NDPI_CFLAGS}"
|
||||
NDPI_CFLAGS="-W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member ${NDPI_CFLAGS} -Wno-attributes"
|
||||
#Workaround for RoaringBitmap with gcc-7
|
||||
NDPI_CFLAGS="-Wno-attributes ${NDPI_CFLAGS}"
|
||||
|
||||
AS_IF([test "${with_lto_and_gold_linker+set}" = set], [
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -flto -fuse-ld=gold -Wno-unused-command-line-argument"
|
||||
@@ -344,7 +361,7 @@ AS_IF([test "${with_local_libgcrypt+set}" = set],[
|
||||
|
||||
dnl> PCRE
|
||||
PCRE_ENABLED=0
|
||||
AC_ARG_WITH(pcre, [ --with-pcre Enable nDPI build with libpcre])
|
||||
AC_ARG_WITH(pcre, AS_HELP_STRING([--with-pcre], [Enable nDPI build with libpcre]))
|
||||
if test "${with_pcre+set}" = set; then :
|
||||
AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE_UNQUOTED(HAVE_PCRE, 1, [libpcre(-dev) is present]))
|
||||
if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
|
||||
@@ -354,7 +371,7 @@ if test "${with_pcre+set}" = set; then :
|
||||
fi
|
||||
|
||||
dnl> GeoIP
|
||||
AC_ARG_WITH(maxminddb, [ --with-maxminddb Enable nDPI build with libmaxminddb])
|
||||
AC_ARG_WITH(maxminddb, AS_HELP_STRING([--with-maxminddb], [Enable nDPI build with libmaxminddb]))
|
||||
if test "${with_maxminddb+set}" = set; then :
|
||||
AC_CHECK_LIB([maxminddb], [MMDB_lookup_sockaddr])
|
||||
AC_CHECK_HEADERS([maxminddb.h])
|
||||
@@ -364,6 +381,8 @@ if test "${with_maxminddb+set}" = set; then :
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(NDPI_BASE_DIR, "${PWD}", [nDPI base directory])
|
||||
|
||||
dnl> Curl
|
||||
dnl> AC_CHECK_LIB([curl], [curl_easy_perform])
|
||||
dnl> if test ${ac_cv_lib_curl_curl_easy_perform} = "no"; then
|
||||
@@ -408,4 +427,5 @@ AC_SUBST(DISABLE_NPCAP)
|
||||
AC_SUBST(EXE_SUFFIX)
|
||||
AC_SUBST(NDPI_CFLAGS)
|
||||
AC_SUBST(NDPI_LDFLAGS)
|
||||
AC_SUBST(NDPI_BASE_DIR)
|
||||
AC_OUTPUT
|
||||
|
||||
+23
-4
@@ -73,9 +73,9 @@ HTTP only: this risk is triggered whenever the user agent contains suspicious ch
|
||||
|
||||
.. _Risk 012:
|
||||
|
||||
NDPI_HTTP_NUMERIC_IP_HOST
|
||||
NDPI_NUMERIC_IP_HOST
|
||||
=========================
|
||||
HTTP only: this risk is triggered whenever we're accessing a host using its IP rather than its symbolic name. Example http://1.2.3.4.
|
||||
This risk is triggered whenever a HTTP/TLS/QUIC connection is using a literal IPv4 or IPv6 address as ServerName (TLS/QUIC; example: SNI=1.2.3.4) or as Hostname (HTTP; example: http://1.2.3.4.).
|
||||
|
||||
.. _Risk 013:
|
||||
|
||||
@@ -141,7 +141,8 @@ This risk indicates that the protocol used is insecure and that a secure protoco
|
||||
|
||||
NDPI_DNS_SUSPICIOUS_TRAFFIC
|
||||
===========================
|
||||
This risk is returned when DNS traffic returns an unexpected/obsolete `record type <https://en.wikipedia.org/wiki/List_of_DNS_record_types>`_.
|
||||
This risk is returned when DNS traffic returns an unexpected/obsolete `record type <https://en.wikipedia.org/wiki/List_of_DNS_record_types>`_
|
||||
or when a suspicious query with a very long host name is detected.
|
||||
|
||||
.. _Risk 024:
|
||||
|
||||
@@ -219,7 +220,7 @@ This risk is used to detect suspicious data carried in ICMP packets whose entrop
|
||||
|
||||
NDPI_CLEAR_TEXT_CREDENTIALS
|
||||
===========================
|
||||
Clear text protocols are not bad per-se, but they should be avoided when they carry credentials as they can be intercepted by malicious users. This risk is triggered whenever clear text protocols (e.g. FTP, HTTP, IMAP...) contain credentials in clear text (read it as nDPI does not trigger this risk for HTTP connections that do not carry credentials).
|
||||
Clear text protocols are not intrinsically bad, but they should be avoided when they carry credentials as they can be intercepted by malicious users. This risk is triggered whenever clear text protocols (e.g. FTP, HTTP, IMAP...) contain credentials in clear text (read it as nDPI does not trigger this risk for HTTP connections that do not carry credentials).
|
||||
|
||||
.. _Risk 037:
|
||||
|
||||
@@ -309,3 +310,21 @@ Minor packet/flow issues (e.g. DNS traffic with zero TTL) have been detected.
|
||||
NDPI_TCP_ISSUES
|
||||
===============
|
||||
Relevant TCP connection issues such as connection refused, scan, or probe attempt.
|
||||
|
||||
.. _Risk 051
|
||||
|
||||
NDPI_FULLY_ENCRYPTED
|
||||
====================
|
||||
Flow with Unknown protocol containing encrypted traffic.
|
||||
|
||||
.. _Risk 052
|
||||
|
||||
NDPI_TLS_ALPN_SNI_MISMATCH
|
||||
=========================
|
||||
Invalid TLS ALPN/SNI mismatch. For instance ALPN advertises the flow as h2 (HTTP/2.0) and no SNI is reported.
|
||||
|
||||
.. _Risk 053
|
||||
|
||||
NDPI_MALWARE_CONTACTED
|
||||
======================
|
||||
Client contacted a server host labelled as malware.
|
||||
|
||||
@@ -14,6 +14,7 @@ nDPI is an open source DPI (Deep Packet Inspection) toolkit for traffic analysis
|
||||
:caption: Developer's Guide
|
||||
|
||||
api/library_root
|
||||
protocols
|
||||
flow_risks
|
||||
|
||||
.. toctree::
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
nDPI Protocols List
|
||||
###################
|
||||
|
||||
This page provides the list of the protocols/applications supported by nDPI. For each protocol there is a brief description, some links to further, more detailed information and, optionally, some notes that might be useful when handling such a protocol (from the application/integrator point of view)
|
||||
|
||||
Work in progress!
|
||||
|
||||
.. _Proto 338:
|
||||
|
||||
`NDPI_PROTOCOL_SRTP`
|
||||
====================
|
||||
The Secure Real-time Transport Protocol (SRTP) is a profile for Real-time Transport Protocol (RTP) intended to provide encryption, message authentication, integrity, and replay attack protection to the RTP data.
|
||||
|
||||
References: `RFC3711 <https://datatracker.ietf.org/doc/html/rfc3711>`_.
|
||||
|
||||
Notes:
|
||||
|
||||
- You can think of SRTP simply as the "encrypted" version of RTP, something like HTTPS vs HTTP;
|
||||
- It is not usually possible to tell RTP from SRTP. nDPI generally uses the former and it uses the latter only when it is really sure that the media stream has been encrypted.
|
||||
|
||||
|
||||
.. _Proto 339:
|
||||
|
||||
`NDPI_PROTOCOL_OPERA_VPN`
|
||||
=========================
|
||||
Opera VPN is a free VPN included with Opera Browser.
|
||||
|
||||
References: `Main site <https://www.opera.com/it/features/free-vpn>`_.
|
||||
|
||||
|
||||
.. _Proto 340:
|
||||
|
||||
`NDPI_PROTOCOL_EPICGAMES`
|
||||
=========================
|
||||
Epic Games is a video game company developing the Unreal Engine and some successful games as Fortnite and Gears of War.
|
||||
|
||||
References: `Main site <https://store.epicgames.com/en-US/>`_ and `Fortnite <https://www.fortnite.com/>`_.
|
||||
|
||||
|
||||
.. _Proto 341:
|
||||
|
||||
`NDPI_PROTOCOL_GEFORCENOW`
|
||||
==========================
|
||||
GeForce Now is the brand used by Nvidia for its cloud gaming service.
|
||||
|
||||
References: `Main site <https://www.nvidia.com/en-us/geforce-now/>`_.
|
||||
|
||||
|
||||
.. _Proto 342:
|
||||
|
||||
`NDPI_PROTOCOL_NVIDIA`
|
||||
======================
|
||||
Generic web traffic from Nvidia sites.
|
||||
|
||||
References: `Main site <https://www.nvidia.com>`_.
|
||||
|
||||
|
||||
.. _Proto 343:
|
||||
|
||||
`NDPI_PROTOCOL_BITCOIN`
|
||||
=======================
|
||||
Bitcoin is one of the most common crypto currencies.
|
||||
|
||||
References: `Main site <https://en.bitcoin.it/wiki/Protocol_documentation>`_.
|
||||
|
||||
Notes:
|
||||
|
||||
- Not each crypto exchange is a mining, it could be a normal transaction, sending or receving.
|
||||
- Bitcoin network protocol covers the broader set of rules that govern how all nodes in the network communicate and sync with each others blocks and transactions.
|
||||
- On the other hand mining protocols are more specific and deal directly with how miners interact with the network and participate in the mining process.
|
||||
|
||||
|
||||
.. _Proto 344:
|
||||
|
||||
`NDPI_PROTOCOL_PROTONVPN`
|
||||
=========================
|
||||
Proton VPN is a VPN service operated by the Swiss company Proton AG, the company behind the email service Proton Mail
|
||||
|
||||
References: `Main site <https://protonvpn.com/>`_.
|
||||
|
||||
|
||||
.. _Proto 345:
|
||||
|
||||
`NDPI_PROTOCOL_THRIFT`
|
||||
======================
|
||||
Apache Thrift is a generic data interchange framework that supports a bunch of different languages and platforms.
|
||||
|
||||
References: `Official site <https://thrift.apache.org>`_ and `Github <https://github.com/apache/thrift>`_.
|
||||
|
||||
|
||||
.. _Proto 346:
|
||||
|
||||
`NDPI_PROTOCOL_ROBLOX`
|
||||
======================
|
||||
Roblox is an online game platform and game creation system.
|
||||
|
||||
References: `Main site <https://www.roblox.com/>`_.
|
||||
|
||||
Notes:
|
||||
|
||||
- Since Roblox games use a custom version of the RakNet protocol, some Roblox flows might be classified as RakNet.
|
||||
|
||||
|
||||
.. _Proto 347:
|
||||
|
||||
`NDPI_PROTOCOL_SERVICE_LOCATION`
|
||||
================================
|
||||
The Service Location Protocol is a service discovery protocol that allows computers and other devices to find services in a local area network without prior configuration.
|
||||
|
||||
References: `SLPv1 <https://datatracker.ietf.org/doc/html/rfc2165>`_ and `SLPv2 <https://datatracker.ietf.org/doc/html/rfc2608>`_.
|
||||
|
||||
|
||||
.. _Proto 348:
|
||||
|
||||
`NDPI_PROTOCOL_MULLVAD`
|
||||
=======================
|
||||
Mullvad is a VPN service operated by Mullvad VPN AB, based in Sweden
|
||||
|
||||
References: `Main site <https://mullvad.net/>`_.
|
||||
|
||||
|
||||
.. _Proto 349:
|
||||
|
||||
`NDPI_PROTOCOL_HTTP2`
|
||||
=====================
|
||||
HTTP/2 (originally named HTTP/2.0) is a major revision of the HTTP network protocol used by the World Wide Web.
|
||||
|
||||
References: `RFC <https://datatracker.ietf.org/doc/html/rfc9113>`_.
|
||||
|
||||
Notes:
|
||||
|
||||
- HTTP/2 is almost always encrypted, i.e. transported over TLS.
|
||||
|
||||
|
||||
.. _Proto 350:
|
||||
|
||||
`NDPI_PROTOCOL_HAPROXY`
|
||||
=======================
|
||||
HAProxy is a free and open source software that provides a high availability load balancer and reverse proxy for TCP and HTTP-based applications that spreads requests across multiple servers.
|
||||
|
||||
References: `Main site: <https://www.haproxy.org>`_.
|
||||
|
||||
|
||||
.. _Proto 351:
|
||||
|
||||
`NDPI_PROTOCOL_RMCP`
|
||||
====================
|
||||
The Intelligent Platform Management Interface (IPMI) is a set of computer interface specifications for an autonomous computer subsystem that provides management and monitoring capabilities independently of the host system's CPU, firmware (BIOS or UEFI) and operating system.
|
||||
|
||||
References: `Protocol Specs: <https://www.dmtf.org/sites/default/files/standards/documents/DSP0114.pdf>`_.
|
||||
@@ -1,6 +1,9 @@
|
||||
AR=@AR@
|
||||
CC=@CC@
|
||||
CXX=@CXX@
|
||||
ifeq ($(OS),Darwin)
|
||||
CC=clang -fno-color-diagnostics
|
||||
endif
|
||||
BUILD_MINGW=@BUILD_MINGW@
|
||||
BUILD_MINGW_X64=@BUILD_MINGW_X64@
|
||||
DISABLE_NPCAP=@DISABLE_NPCAP@
|
||||
|
||||
+856
-390
File diff suppressed because it is too large
Load Diff
+5
-1
@@ -2,7 +2,7 @@
|
||||
# <tcp|udp>:<port>,<tcp|udp>:<port>,.....@<proto>
|
||||
|
||||
tcp:81,tcp:8181@HTTP
|
||||
udp:5061-5062@SIP
|
||||
udp:5062@SIP
|
||||
tcp:860,udp:860,tcp:3260,udp:3260@iSCSI
|
||||
tcp:3000@ntop
|
||||
tcp:9002@Elasticsearch
|
||||
@@ -50,6 +50,10 @@ ip:213.75.170.11/32:443@CustomProtocol
|
||||
ip:8.248.73.247:443@AmazonPrime
|
||||
ip:54.80.47.130@AmazonPrime
|
||||
|
||||
ip:3.3.3.3:443@CustomProtocolA
|
||||
ip:3.3.3.3:444@CustomProtocolB
|
||||
ip:3.3.3.3:446@CustomProtocolC=400
|
||||
|
||||
#
|
||||
# Risk Exceptions
|
||||
#
|
||||
|
||||
+291
-150
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* reader_util.c
|
||||
*
|
||||
* Copyright (C) 2011-22 - ntop.org
|
||||
* Copyright (C) 2011-23 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
@@ -40,6 +40,7 @@
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/ip.h>
|
||||
#endif
|
||||
|
||||
#include "reader_util.h"
|
||||
@@ -111,21 +112,22 @@ struct payload_stats *pstats = NULL;
|
||||
u_int32_t max_num_packets_per_flow = 10; /* ETTA requires min 10 pkts for record. */
|
||||
u_int32_t max_packet_payload_dissection = 128;
|
||||
u_int32_t max_num_reported_top_payloads = 25;
|
||||
u_int16_t min_pattern_len = 4;
|
||||
u_int16_t max_pattern_len = 8;
|
||||
u_int16_t min_pattern_len = 4;
|
||||
u_int16_t max_pattern_len = 8;
|
||||
|
||||
/* *********************************************************** */
|
||||
|
||||
void ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
u_int8_t src_to_dst_direction,
|
||||
u_int8_t *payload,
|
||||
u_int16_t payload_len,
|
||||
u_int32_t packet_id) {
|
||||
struct payload_stats *ret;
|
||||
struct flow_id_stats *f;
|
||||
struct packet_id_stats *p;
|
||||
int ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
u_int8_t src_to_dst_direction,
|
||||
u_int8_t *payload,
|
||||
u_int16_t payload_len,
|
||||
u_int32_t packet_id) {
|
||||
struct payload_stats *ret, *ret_found;
|
||||
struct flow_id_stats *f, *f_found;
|
||||
struct packet_id_stats *p, *p_found;
|
||||
|
||||
#ifdef DEBUG_PAYLOAD
|
||||
u_int16_t i;
|
||||
for(i=0; i<payload_len; i++)
|
||||
printf("%c", isprint(payload[i]) ? payload[i] : '.');
|
||||
printf("\n");
|
||||
@@ -134,11 +136,11 @@ void ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
HASH_FIND(hh, pstats, payload, payload_len, ret);
|
||||
if(ret == NULL) {
|
||||
if((ret = (struct payload_stats*)ndpi_calloc(1, sizeof(struct payload_stats))) == NULL)
|
||||
return; /* OOM */
|
||||
return -1; /* OOM */
|
||||
|
||||
if((ret->pattern = (u_int8_t*)ndpi_malloc(payload_len)) == NULL) {
|
||||
ndpi_free(ret);
|
||||
return;
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(ret->pattern, payload, payload_len);
|
||||
@@ -147,6 +149,13 @@ void ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
|
||||
HASH_ADD(hh, pstats, pattern[0], payload_len, ret);
|
||||
|
||||
HASH_FIND(hh, pstats, payload, payload_len, ret_found);
|
||||
if(ret_found == NULL) { /* The insertion failed (because of a memory allocation error) */
|
||||
ndpi_free(ret->pattern);
|
||||
ndpi_free(ret);
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_PAYLOAD
|
||||
printf("Added element [total: %u]\n", HASH_COUNT(pstats));
|
||||
#endif
|
||||
@@ -158,20 +167,32 @@ void ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
HASH_FIND_INT(ret->flows, &flow->flow_id, f);
|
||||
if(f == NULL) {
|
||||
if((f = (struct flow_id_stats*)ndpi_calloc(1, sizeof(struct flow_id_stats))) == NULL)
|
||||
return; /* OOM */
|
||||
return -1; /* OOM */
|
||||
|
||||
f->flow_id = flow->flow_id;
|
||||
HASH_ADD_INT(ret->flows, flow_id, f);
|
||||
|
||||
HASH_FIND_INT(ret->flows, &flow->flow_id, f_found);
|
||||
if(f_found == NULL) { /* The insertion failed (because of a memory allocation error) */
|
||||
ndpi_free(f);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
HASH_FIND_INT(ret->packets, &packet_id, p);
|
||||
if(p == NULL) {
|
||||
if((p = (struct packet_id_stats*)ndpi_calloc(1, sizeof(struct packet_id_stats))) == NULL)
|
||||
return; /* OOM */
|
||||
return -1; /* OOM */
|
||||
p->packet_id = packet_id;
|
||||
|
||||
HASH_ADD_INT(ret->packets, packet_id, p);
|
||||
|
||||
HASH_FIND_INT(ret->packets, &packet_id, p_found);
|
||||
if(p_found == NULL) { /* The insertion failed (because of a memory allocation error) */
|
||||
ndpi_free(p);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* *********************************************************** */
|
||||
@@ -198,7 +219,9 @@ void ndpi_payload_analyzer(struct ndpi_flow_info *flow,
|
||||
for(i=0; i<scan_len; i++) {
|
||||
for(j=min_pattern_len; j <= max_pattern_len; j++) {
|
||||
if((i+j) < payload_len) {
|
||||
ndpi_analyze_payload(flow, src_to_dst_direction, &payload[i], j, packet_id);
|
||||
if(ndpi_analyze_payload(flow, src_to_dst_direction, &payload[i], j, packet_id) == -1) {
|
||||
LOG(NDPI_LOG_ERROR, "Error ndpi_analyze_payload (allocation failure)\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -216,67 +239,68 @@ static int payload_stats_sort_asc(void *_a, void *_b) {
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
void print_payload_stat(struct payload_stats *p) {
|
||||
static void print_payload_stat(struct payload_stats *p, FILE *out) {
|
||||
u_int i;
|
||||
struct flow_id_stats *s, *tmp;
|
||||
struct packet_id_stats *s1, *tmp1;
|
||||
|
||||
printf("\t[");
|
||||
fprintf(out, "\t[");
|
||||
|
||||
for(i=0; i<p->pattern_len; i++) {
|
||||
printf("%c", isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
fprintf(out, "%c", isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
}
|
||||
|
||||
printf("]");
|
||||
for(; i<16; i++) printf(" ");
|
||||
printf("[");
|
||||
fprintf(out, "]");
|
||||
for(; i<16; i++) fprintf(out, " ");
|
||||
fprintf(out, "[");
|
||||
|
||||
for(i=0; i<p->pattern_len; i++) {
|
||||
printf("%s%02X", (i > 0) ? " " : "", isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
fprintf(out, "%s%02X", (i > 0) ? " " : "", isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
}
|
||||
|
||||
printf("]");
|
||||
fprintf(out, "]");
|
||||
|
||||
for(; i<16; i++) printf(" ");
|
||||
for(i=p->pattern_len; i<max_pattern_len; i++) printf(" ");
|
||||
for(; i<16; i++) fprintf(out, " ");
|
||||
for(i=p->pattern_len; i<max_pattern_len; i++) fprintf(out, " ");
|
||||
|
||||
printf("[len: %u][num_occurrencies: %u][flowId: ",
|
||||
p->pattern_len, p->num_occurrencies);
|
||||
fprintf(out, "[len: %u][num_occurrencies: %u][flowId: ",
|
||||
p->pattern_len, p->num_occurrencies);
|
||||
|
||||
i = 0;
|
||||
HASH_ITER(hh, p->flows, s, tmp) {
|
||||
printf("%s%u", (i > 0) ? " " : "", s->flow_id);
|
||||
fprintf(out, "%s%u", (i > 0) ? " " : "", s->flow_id);
|
||||
i++;
|
||||
}
|
||||
|
||||
printf("][packetIds: ");
|
||||
fprintf(out, "][packetIds: ");
|
||||
|
||||
/* ******************************** */
|
||||
|
||||
i = 0;
|
||||
HASH_ITER(hh, p->packets, s1, tmp1) {
|
||||
printf("%s%u", (i > 0) ? " " : "", s1->packet_id);
|
||||
fprintf(out, "%s%u", (i > 0) ? " " : "", s1->packet_id);
|
||||
i++;
|
||||
}
|
||||
|
||||
printf("]\n");
|
||||
fprintf(out, "]\n");
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
void ndpi_report_payload_stats() {
|
||||
void ndpi_report_payload_stats(FILE *out) {
|
||||
struct payload_stats *p, *tmp;
|
||||
u_int num = 0;
|
||||
|
||||
printf("\n\nPayload Analysis\n");
|
||||
if(out)
|
||||
fprintf(out, "\n\nPayload Analysis\n");
|
||||
|
||||
HASH_SORT(pstats, payload_stats_sort_asc);
|
||||
|
||||
HASH_ITER(hh, pstats, p, tmp) {
|
||||
if(num <= max_num_reported_top_payloads)
|
||||
print_payload_stat(p);
|
||||
if(out && num <= max_num_reported_top_payloads)
|
||||
print_payload_stat(p, out);
|
||||
|
||||
ndpi_free(p->pattern);
|
||||
|
||||
@@ -410,7 +434,7 @@ int parse_proto_name_list(char *str, NDPI_PROTOCOL_BITMASK *bitmask, int inverte
|
||||
}
|
||||
proto = ndpi_get_proto_id(module, n);
|
||||
if(proto == NDPI_PROTOCOL_UNKNOWN && strcmp(n,"unknown") && strcmp(n,"0")) {
|
||||
fprintf(stderr,"Invalid protocol %s\n",n);
|
||||
LOG(NDPI_LOG_ERROR, "Invalid protocol %s\n", n);
|
||||
ndpi_exit_detection_module(module);
|
||||
return 1;
|
||||
}
|
||||
@@ -435,41 +459,55 @@ struct ndpi_workflow* ndpi_workflow_init(const struct ndpi_workflow_prefs * pref
|
||||
static NDPI_PROTOCOL_BITMASK debug_bitmask;
|
||||
static int _debug_protocols_ok = 0;
|
||||
|
||||
/* On some fuzzers we don't want to use these memory allocators, but some custom ones */
|
||||
#ifndef DISABLE_CUSTOM_ALLOCATOR_ON_READERUTILS
|
||||
set_ndpi_malloc(ndpi_malloc_wrapper), set_ndpi_free(free_wrapper);
|
||||
set_ndpi_flow_malloc(NULL), set_ndpi_flow_free(NULL);
|
||||
#endif
|
||||
|
||||
/* TODO: just needed here to init ndpi ndpi_malloc wrapper */
|
||||
module = ndpi_init_detection_module(init_prefs);
|
||||
|
||||
if(module == NULL) {
|
||||
LOG(NDPI_LOG_ERROR, "global structure initialization failed\n");
|
||||
exit(-1);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
workflow = ndpi_calloc(1, sizeof(struct ndpi_workflow));
|
||||
if(workflow == NULL) {
|
||||
LOG(NDPI_LOG_ERROR, "global structure initialization failed\n");
|
||||
ndpi_free(module);
|
||||
exit(-1);
|
||||
ndpi_exit_detection_module(module);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
workflow->pcap_handle = pcap_handle;
|
||||
workflow->prefs = *prefs;
|
||||
workflow->ndpi_struct = module;
|
||||
|
||||
ndpi_set_user_data(module, workflow);
|
||||
|
||||
ndpi_set_log_level(module, nDPI_LogLevel);
|
||||
|
||||
if(_debug_protocols != NULL && ! _debug_protocols_ok) {
|
||||
NDPI_BITMASK_RESET(debug_bitmask);
|
||||
if(parse_proto_name_list(_debug_protocols, &debug_bitmask, 0))
|
||||
exit(-1);
|
||||
if(parse_proto_name_list(_debug_protocols, &debug_bitmask, 0)) {
|
||||
ndpi_exit_detection_module(module);
|
||||
ndpi_free(workflow);
|
||||
return NULL;
|
||||
}
|
||||
_debug_protocols_ok = 1;
|
||||
}
|
||||
if(_debug_protocols_ok)
|
||||
ndpi_set_debug_bitmask(module, debug_bitmask);
|
||||
|
||||
if(do_init_flows_root)
|
||||
if(do_init_flows_root) {
|
||||
workflow->ndpi_flows_root = ndpi_calloc(workflow->prefs.num_roots, sizeof(void *));
|
||||
if(!workflow->ndpi_flows_root) {
|
||||
ndpi_exit_detection_module(module);
|
||||
ndpi_free(workflow);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
workflow->ndpi_serialization_format = serialization_format;
|
||||
|
||||
@@ -710,24 +748,6 @@ ndpi_flow_update_byte_dist_mean_var(ndpi_flow_info_t *flow, const void *x,
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
float ndpi_flow_get_byte_count_entropy(const uint32_t byte_count[256],
|
||||
unsigned int num_bytes)
|
||||
{
|
||||
int i;
|
||||
float sum = 0.0;
|
||||
|
||||
for(i=0; i<256; i++) {
|
||||
float tmp = (float) byte_count[i] / (float) num_bytes;
|
||||
|
||||
if(tmp > FLT_EPSILON) {
|
||||
sum -= tmp * logf(tmp);
|
||||
}
|
||||
}
|
||||
return(sum / logf(2.0));
|
||||
}
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow,
|
||||
const u_int8_t version,
|
||||
u_int16_t vlan_id,
|
||||
@@ -833,7 +853,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
flow.src_ip = iph->saddr, flow.dst_ip = iph->daddr;
|
||||
flow.src_port = htons(*sport), flow.dst_port = htons(*dport);
|
||||
flow.hashval = hashval = flow.protocol + ntohl(flow.src_ip) + ntohl(flow.dst_ip)
|
||||
+ ntohs(flow.src_port) + ntohs(flow.dst_port);
|
||||
+ ntohs(flow.src_port) + ntohs(flow.dst_port);
|
||||
|
||||
#if 0
|
||||
{
|
||||
@@ -876,10 +896,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
struct ndpi_flow_info *newflow = (struct ndpi_flow_info*)ndpi_malloc(sizeof(struct ndpi_flow_info));
|
||||
|
||||
if(newflow == NULL) {
|
||||
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
/* Avoid too much logging while fuzzing */
|
||||
LOG(NDPI_LOG_ERROR, "[NDPI] %s(1): not enough memory\n", __FUNCTION__);
|
||||
#endif
|
||||
return(NULL);
|
||||
} else
|
||||
workflow->num_allocated_flows++;
|
||||
@@ -920,10 +937,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
}
|
||||
|
||||
if((newflow->ndpi_flow = ndpi_flow_malloc(SIZEOF_FLOW_STRUCT)) == NULL) {
|
||||
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
/* Avoid too much logging while fuzzing */
|
||||
LOG(NDPI_LOG_ERROR, "[NDPI] %s(2): not enough memory\n", __FUNCTION__);
|
||||
#endif
|
||||
ndpi_flow_info_free_data(newflow);
|
||||
ndpi_free(newflow);
|
||||
return(NULL);
|
||||
@@ -958,6 +972,12 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
if(enable_flow_stats) {
|
||||
newflow->entropy = ndpi_calloc(1, sizeof(struct ndpi_entropy));
|
||||
newflow->last_entropy = ndpi_calloc(1, sizeof(struct ndpi_entropy));
|
||||
if(!newflow->entropy || !newflow->last_entropy) {
|
||||
ndpi_tdelete(newflow, &workflow->ndpi_flows_root[idx], ndpi_workflow_node_cmp);
|
||||
ndpi_flow_info_free_data(newflow);
|
||||
ndpi_free(newflow);
|
||||
return(NULL);
|
||||
}
|
||||
newflow->entropy->src2dst_pkt_len[newflow->entropy->src2dst_pkt_count] = l4_data_len;
|
||||
newflow->entropy->src2dst_pkt_time[newflow->entropy->src2dst_pkt_count] = when;
|
||||
if(newflow->entropy->src2dst_pkt_count == 0) {
|
||||
@@ -982,7 +1002,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
*src_to_dst_direction = 1;
|
||||
}
|
||||
if(enable_flow_stats) {
|
||||
if(src_to_dst_direction) {
|
||||
if(*src_to_dst_direction) {
|
||||
if(rflow->entropy->src2dst_pkt_count < max_num_packets_per_flow) {
|
||||
rflow->entropy->src2dst_pkt_len[rflow->entropy->src2dst_pkt_count] = l4_data_len;
|
||||
rflow->entropy->src2dst_pkt_time[rflow->entropy->src2dst_pkt_count] = when;
|
||||
@@ -1107,24 +1127,29 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
flow->num_dissector_calls = flow->ndpi_flow->num_dissector_calls;
|
||||
|
||||
ndpi_snprintf(flow->host_server_name, sizeof(flow->host_server_name), "%s",
|
||||
flow->ndpi_flow->host_server_name);
|
||||
|
||||
ndpi_snprintf(flow->flow_extra_info, sizeof(flow->flow_extra_info), "%s",
|
||||
flow->ndpi_flow->flow_extra_info);
|
||||
flow->ndpi_flow->host_server_name);
|
||||
|
||||
if(is_ndpi_proto(flow, NDPI_PROTOCOL_MINING)) {
|
||||
ndpi_snprintf(flow->mining.currency, sizeof(flow->mining.currency), "%s",
|
||||
flow->ndpi_flow->protos.mining.currency);
|
||||
}
|
||||
|
||||
flow->risk = flow->ndpi_flow->risk;
|
||||
|
||||
if(is_ndpi_proto(flow, NDPI_PROTOCOL_DHCP)) {
|
||||
if(flow->ndpi_flow->protos.dhcp.fingerprint[0] != '\0')
|
||||
flow->dhcp_fingerprint = ndpi_strdup(flow->ndpi_flow->protos.dhcp.fingerprint);
|
||||
|
||||
if(flow->ndpi_flow->protos.dhcp.class_ident[0] != '\0')
|
||||
flow->dhcp_class_ident = ndpi_strdup(flow->ndpi_flow->protos.dhcp.class_ident);
|
||||
} else if(is_ndpi_proto(flow, NDPI_PROTOCOL_BITTORRENT) &&
|
||||
!is_ndpi_proto(flow, NDPI_PROTOCOL_DNS) &&
|
||||
!is_ndpi_proto(flow, NDPI_PROTOCOL_TLS)) {
|
||||
u_int j;
|
||||
|
||||
if(flow->ndpi_flow->protos.bittorrent.hash[0] != '\0') {
|
||||
flow->bittorent_hash = ndpi_malloc(sizeof(flow->ndpi_flow->protos.bittorrent.hash) * 2 + 1);
|
||||
|
||||
if(flow->bittorent_hash) {
|
||||
for(i=0, j = 0; i < sizeof(flow->ndpi_flow->protos.bittorrent.hash); i++) {
|
||||
sprintf(&flow->bittorent_hash[j], "%02x",
|
||||
@@ -1132,6 +1157,7 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
|
||||
j += 2;
|
||||
}
|
||||
|
||||
flow->bittorent_hash[j] = '\0';
|
||||
}
|
||||
}
|
||||
@@ -1160,6 +1186,26 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
ndpi_snprintf(flow->softether.fqdn, sizeof(flow->softether.fqdn), "%s",
|
||||
flow->ndpi_flow->protos.softether.fqdn);
|
||||
}
|
||||
/* SERVICE_LOCATION */
|
||||
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_SERVICE_LOCATION)) {
|
||||
size_t i;
|
||||
|
||||
flow->info_type = INFO_GENERIC;
|
||||
flow->info[0] = 0;
|
||||
if (flow->ndpi_flow->protos.slp.url_count > 0)
|
||||
strncat(flow->info, "URL(s): ", sizeof(flow->info));
|
||||
|
||||
for (i = 0; i < flow->ndpi_flow->protos.slp.url_count; ++i) {
|
||||
size_t length = strlen(flow->info);
|
||||
|
||||
strncat(flow->info + length, flow->ndpi_flow->protos.slp.url[i],
|
||||
sizeof(flow->info) - length);
|
||||
length = strlen(flow->info);
|
||||
|
||||
if (i < (size_t)flow->ndpi_flow->protos.slp.url_count - 1)
|
||||
strncat(flow->info + length, ", ", sizeof(flow->info) - length);
|
||||
}
|
||||
}
|
||||
/* NATPMP */
|
||||
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_NATPMP)) {
|
||||
flow->info_type = INFO_NATPMP;
|
||||
@@ -1190,6 +1236,8 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
/* For consistency across platforms replace :0: with :: */
|
||||
ndpi_patchIPv6Address(flow->info);
|
||||
}
|
||||
if(flow->ndpi_flow->protos.dns.geolocation_iata_code[0] != '\0')
|
||||
strcpy(flow->dns.geolocation_iata_code, flow->ndpi_flow->protos.dns.geolocation_iata_code);
|
||||
}
|
||||
/* MDNS */
|
||||
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_MDNS)) {
|
||||
@@ -1235,23 +1283,6 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
ndpi_snprintf(flow->kerberos.username,
|
||||
sizeof(flow->kerberos.username),
|
||||
"%s", flow->ndpi_flow->protos.kerberos.username);
|
||||
}
|
||||
/* HTTP */
|
||||
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP)
|
||||
|| is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP_PROXY)
|
||||
|| is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP_CONNECT)) {
|
||||
if(flow->ndpi_flow->http.url != NULL) {
|
||||
ndpi_snprintf(flow->http.url, sizeof(flow->http.url), "%s", flow->ndpi_flow->http.url);
|
||||
flow->http.response_status_code = flow->ndpi_flow->http.response_status_code;
|
||||
ndpi_snprintf(flow->http.content_type, sizeof(flow->http.content_type), "%s", flow->ndpi_flow->http.content_type ? flow->ndpi_flow->http.content_type : "");
|
||||
ndpi_snprintf(flow->http.server, sizeof(flow->http.server), "%s", flow->ndpi_flow->http.server ? flow->ndpi_flow->http.server : "");
|
||||
ndpi_snprintf(flow->http.request_content_type, sizeof(flow->http.request_content_type), "%s", flow->ndpi_flow->http.request_content_type ? flow->ndpi_flow->http.request_content_type : "");
|
||||
}
|
||||
}
|
||||
/* RTP */
|
||||
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_RTP)) {
|
||||
flow->info_type = INFO_RTP;
|
||||
flow->rtp.stream_type = flow->ndpi_flow->protos.rtp.stream_type;
|
||||
/* COLLECTD */
|
||||
} else if(is_ndpi_proto(flow, NDPI_PROTOCOL_COLLECTD)) {
|
||||
flow->info_type = INFO_GENERIC;
|
||||
@@ -1286,6 +1317,7 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
|| ((is_quic = is_ndpi_proto(flow, NDPI_PROTOCOL_QUIC)))
|
||||
) {
|
||||
flow->ssh_tls.ssl_version = flow->ndpi_flow->protos.tls_quic.ssl_version;
|
||||
flow->ssh_tls.quic_version = flow->ndpi_flow->protos.tls_quic.quic_version;
|
||||
|
||||
if(flow->ndpi_flow->protos.tls_quic.server_names_len > 0 && flow->ndpi_flow->protos.tls_quic.server_names)
|
||||
flow->ssh_tls.server_names = ndpi_strdup(flow->ndpi_flow->protos.tls_quic.server_names);
|
||||
@@ -1318,6 +1350,8 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
flow->ssh_tls.encrypted_sni.cipher_suite = flow->ndpi_flow->protos.tls_quic.encrypted_sni.cipher_suite;
|
||||
}
|
||||
|
||||
flow->ssh_tls.encrypted_ch.version = flow->ndpi_flow->protos.tls_quic.encrypted_ch.version;
|
||||
|
||||
if(flow->ndpi_flow->protos.tls_quic.tls_supported_versions) {
|
||||
if((flow->ssh_tls.tls_supported_versions = ndpi_strdup(flow->ndpi_flow->protos.tls_quic.tls_supported_versions)) != NULL)
|
||||
correct_csv_data_field(flow->ssh_tls.tls_supported_versions);
|
||||
@@ -1346,29 +1380,46 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
}
|
||||
}
|
||||
|
||||
flow->multimedia_flow_type = flow->ndpi_flow->flow_multimedia_type;
|
||||
|
||||
/* HTTP metadata are "global" not in `flow->ndpi_flow->protos` union; for example, we can have
|
||||
HTTP/BitTorrent and in that case we want to export also HTTP attributes */
|
||||
if(is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP)
|
||||
|| is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP_PROXY)
|
||||
|| is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP_CONNECT)) {
|
||||
if(flow->ndpi_flow->http.url != NULL) {
|
||||
ndpi_snprintf(flow->http.url, sizeof(flow->http.url), "%s", flow->ndpi_flow->http.url);
|
||||
}
|
||||
flow->http.response_status_code = flow->ndpi_flow->http.response_status_code;
|
||||
ndpi_snprintf(flow->http.content_type, sizeof(flow->http.content_type), "%s", flow->ndpi_flow->http.content_type ? flow->ndpi_flow->http.content_type : "");
|
||||
ndpi_snprintf(flow->http.server, sizeof(flow->http.server), "%s", flow->ndpi_flow->http.server ? flow->ndpi_flow->http.server : "");
|
||||
ndpi_snprintf(flow->http.request_content_type, sizeof(flow->http.request_content_type), "%s", flow->ndpi_flow->http.request_content_type ? flow->ndpi_flow->http.request_content_type : "");
|
||||
ndpi_snprintf(flow->http.nat_ip, sizeof(flow->http.nat_ip), "%s", flow->ndpi_flow->http.nat_ip ? flow->ndpi_flow->http.nat_ip : "");
|
||||
ndpi_snprintf(flow->http.filename, sizeof(flow->http.filename), "%s", flow->ndpi_flow->http.filename ? flow->ndpi_flow->http.filename : "");
|
||||
}
|
||||
|
||||
ndpi_snprintf(flow->http.user_agent,
|
||||
sizeof(flow->http.user_agent),
|
||||
"%s", (flow->ndpi_flow->http.user_agent ? flow->ndpi_flow->http.user_agent : ""));
|
||||
|
||||
if (workflow->ndpi_serialization_format != ndpi_serialization_format_unknown)
|
||||
{
|
||||
if (workflow->ndpi_serialization_format != ndpi_serialization_format_unknown) {
|
||||
if (ndpi_flow2json(workflow->ndpi_struct, flow->ndpi_flow,
|
||||
flow->ip_version, flow->protocol,
|
||||
flow->vlan_id,
|
||||
flow->src_ip, flow->dst_ip,
|
||||
&flow->src_ip6, &flow->dst_ip6,
|
||||
flow->src_port, flow->dst_port,
|
||||
flow->detected_protocol,
|
||||
&flow->ndpi_flow_serializer) != 0)
|
||||
{
|
||||
&flow->ndpi_flow_serializer) != 0) {
|
||||
LOG(NDPI_LOG_ERROR, "flow2json failed\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
ndpi_serialize_string_uint32(&flow->ndpi_flow_serializer, "detection_completed", flow->detection_completed);
|
||||
ndpi_serialize_string_uint32(&flow->ndpi_flow_serializer, "check_extra_packets", flow->check_extra_packets);
|
||||
}
|
||||
|
||||
if(flow->detection_completed && (!flow->check_extra_packets)) {
|
||||
|
||||
if(flow->detection_completed && (!flow->check_extra_packets)) {
|
||||
flow->flow_payload = flow->ndpi_flow->flow_payload, flow->flow_payload_len = flow->ndpi_flow->flow_payload_len;
|
||||
flow->ndpi_flow->flow_payload = NULL; /* We'll free the memory */
|
||||
|
||||
@@ -1503,7 +1554,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
if(flow->iat_flow
|
||||
&& (tdiff.tv_sec >= 0) /* Discard backward time */
|
||||
) {
|
||||
u_int32_t ms = ndpi_timeval_to_milliseconds(tdiff);
|
||||
u_int64_t ms = ndpi_timeval_to_milliseconds(tdiff);
|
||||
|
||||
if(ms > 0)
|
||||
ndpi_data_add_value(flow->iat_flow, ms);
|
||||
@@ -1519,7 +1570,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
if(flow->iat_c_to_s
|
||||
&& (tdiff.tv_sec >= 0) /* Discard backward time */
|
||||
) {
|
||||
u_int32_t ms = ndpi_timeval_to_milliseconds(tdiff);
|
||||
u_int64_t ms = ndpi_timeval_to_milliseconds(tdiff);
|
||||
|
||||
ndpi_data_add_value(flow->iat_c_to_s, ms);
|
||||
}
|
||||
@@ -1538,7 +1589,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
ndpi_timer_sub(&when, &flow->dst2src_last_pkt_time, &tdiff);
|
||||
|
||||
if(flow->iat_s_to_c) {
|
||||
u_int32_t ms = ndpi_timeval_to_milliseconds(tdiff);
|
||||
u_int64_t ms = ndpi_timeval_to_milliseconds(tdiff);
|
||||
|
||||
ndpi_data_add_value(flow->iat_s_to_c, ms);
|
||||
}
|
||||
@@ -1579,7 +1630,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
flow->entropy->score = ndpi_classify(flow->entropy->src2dst_pkt_len, flow->entropy->src2dst_pkt_time,
|
||||
flow->entropy->dst2src_pkt_len, flow->entropy->dst2src_pkt_time,
|
||||
flow->entropy->src2dst_start, flow->entropy->dst2src_start,
|
||||
max_num_packets_per_flow, flow->src_port, flow->dst_port,
|
||||
max_num_packets_per_flow, ntohs(flow->src_port), ntohs(flow->dst_port),
|
||||
flow->src2dst_packets, flow->dst2src_packets,
|
||||
flow->entropy->src2dst_opackets, flow->entropy->dst2src_opackets,
|
||||
flow->entropy->src2dst_l4_bytes, flow->entropy->dst2src_l4_bytes, 1,
|
||||
@@ -1587,7 +1638,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
else
|
||||
flow->entropy->score = ndpi_classify(flow->entropy->src2dst_pkt_len, flow->entropy->src2dst_pkt_time,
|
||||
NULL, NULL, flow->entropy->src2dst_start, flow->entropy->src2dst_start,
|
||||
max_num_packets_per_flow, flow->src_port, flow->dst_port,
|
||||
max_num_packets_per_flow, ntohs(flow->src_port), ntohs(flow->dst_port),
|
||||
flow->src2dst_packets, 0,
|
||||
flow->entropy->src2dst_opackets, 0,
|
||||
flow->entropy->src2dst_l4_bytes, 0, 1,
|
||||
@@ -1662,6 +1713,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
workflow->stats.dpi_packet_count[1]++;
|
||||
else
|
||||
workflow->stats.dpi_packet_count[2]++;
|
||||
flow->dpi_packets++;
|
||||
|
||||
memset(&input_info, '\0', sizeof(input_info)); /* To be sure to set to "unknown" any fields */
|
||||
/* Set here any information (easily) available; in this trivial example we don't have any */
|
||||
@@ -1744,6 +1796,120 @@ int ndpi_is_datalink_supported(int datalink_type) {
|
||||
}
|
||||
}
|
||||
|
||||
static bool ndpi_is_valid_vxlan(const struct pcap_pkthdr *header, const u_char *packet, u_int16_t ip_offset, u_int16_t ip_len){
|
||||
if(header->caplen < ip_offset + ip_len + sizeof(struct ndpi_udphdr) + sizeof(struct ndpi_vxlanhdr)) {
|
||||
return false;
|
||||
}
|
||||
u_int32_t vxlan_dst_port = ntohs(4789);
|
||||
struct ndpi_udphdr *udp = (struct ndpi_udphdr *)&packet[ip_offset+ip_len];
|
||||
u_int offset = ip_offset + ip_len + sizeof(struct ndpi_udphdr);
|
||||
/**
|
||||
* rfc-7348
|
||||
* VXLAN Header: This is an 8-byte field that has:
|
||||
|
||||
- Flags (8 bits): where the I flag MUST be set to 1 for a valid
|
||||
VXLAN Network ID (VNI). The other 7 bits (designated "R") are
|
||||
reserved fields and MUST be set to zero on transmission and
|
||||
ignored on receipt.
|
||||
|
||||
- VXLAN Segment ID/VXLAN Network Identifier (VNI): this is a
|
||||
24-bit value used to designate the individual VXLAN overlay
|
||||
network on which the communicating VMs are situated. VMs in
|
||||
different VXLAN overlay networks cannot communicate with each
|
||||
other.
|
||||
|
||||
- Reserved fields (24 bits and 8 bits): MUST be set to zero on
|
||||
transmission and ignored on receipt.
|
||||
VXLAN Header:
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
|R|R|R|R|I|R|R|R| Reserved |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
| VXLAN Network Identifier (VNI) | Reserved |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
*/
|
||||
if((udp->dest == vxlan_dst_port || udp->source == vxlan_dst_port) &&
|
||||
(packet[offset] == 0x8) &&
|
||||
(packet[offset + 1] == 0x0) &&
|
||||
(packet[offset + 2] == 0x0) &&
|
||||
(packet[offset + 3] == 0x0) &&
|
||||
(packet[offset + 7] == 0x0)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static inline u_int ndpi_skip_vxlan(u_int16_t ip_offset, u_int16_t ip_len){
|
||||
return ip_offset + ip_len + sizeof(struct ndpi_udphdr) + sizeof(struct ndpi_vxlanhdr);
|
||||
}
|
||||
|
||||
static uint32_t ndpi_is_valid_gre_tunnel(const struct pcap_pkthdr *header,
|
||||
const u_char *packet, const u_int16_t ip_offset,
|
||||
const u_int16_t ip_len) {
|
||||
if(header->caplen < ip_offset + ip_len + sizeof(struct ndpi_gre_basehdr))
|
||||
return 0; /* Too short for GRE header*/
|
||||
uint32_t offset = ip_offset + ip_len;
|
||||
struct ndpi_gre_basehdr *grehdr = (struct ndpi_gre_basehdr*)&packet[offset];
|
||||
offset += sizeof(struct ndpi_gre_basehdr);
|
||||
/*
|
||||
rfc-1701
|
||||
The GRE flags are encoded in the first two octets. Bit 0 is the
|
||||
most significant bit, bit 15 is the least significant bit. Bits
|
||||
13 through 15 are reserved for the Version field. Bits 5 through
|
||||
12 are reserved for future use and MUST be transmitted as zero.
|
||||
*/
|
||||
if(NDPI_GRE_IS_FLAGS(grehdr->flags))
|
||||
return 0;
|
||||
if(NDPI_GRE_IS_REC(grehdr->flags))
|
||||
return 0;
|
||||
/*GRE rfc 2890 that update 1701*/
|
||||
if(NDPI_GRE_IS_VERSION_0(grehdr->flags)) {
|
||||
if(NDPI_GRE_IS_CSUM(grehdr->flags)) {
|
||||
if(header->caplen < offset + 4)
|
||||
return 0;
|
||||
/*checksum field and offset field*/
|
||||
offset += 4;
|
||||
}
|
||||
if(NDPI_GRE_IS_KEY(grehdr->flags)) {
|
||||
if(header->caplen < offset + 4)
|
||||
return 0;
|
||||
offset += 4;
|
||||
}
|
||||
if(NDPI_GRE_IS_SEQ(grehdr->flags)) {
|
||||
if(header->caplen < offset + 4)
|
||||
return 0;
|
||||
offset += 4;
|
||||
}
|
||||
} else if(NDPI_GRE_IS_VERSION_1(grehdr->flags)) { /*rfc-2637 section 4.1 enhanced gre*/
|
||||
if(NDPI_GRE_IS_CSUM(grehdr->flags))
|
||||
return 0;
|
||||
if(NDPI_GRE_IS_ROUTING(grehdr->flags))
|
||||
return 0;
|
||||
if(!NDPI_GRE_IS_KEY(grehdr->flags))
|
||||
return 0;
|
||||
if(NDPI_GRE_IS_STRICT(grehdr->flags))
|
||||
return 0;
|
||||
if(grehdr->protocol != NDPI_GRE_PROTO_PPP)
|
||||
return 0;
|
||||
/*key field*/
|
||||
if(header->caplen < offset + 4)
|
||||
return 0;
|
||||
offset += 4;
|
||||
if(NDPI_GRE_IS_SEQ(grehdr->flags)) {
|
||||
if(header->caplen < offset + 4)
|
||||
return 0;
|
||||
offset += 4;
|
||||
}
|
||||
if(NDPI_GRE_IS_ACK(grehdr->flags)) {
|
||||
if(header->caplen < offset + 4)
|
||||
return 0;
|
||||
offset += 4;
|
||||
}
|
||||
} else { /*support only ver 0, 1*/
|
||||
return 0;
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
@@ -2242,8 +2408,32 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
}
|
||||
}
|
||||
}
|
||||
}else if(ndpi_is_valid_vxlan(header, packet, ip_offset, ip_len)){
|
||||
tunnel_type = ndpi_vxlan_tunnel;
|
||||
eth_offset = ndpi_skip_vxlan(ip_offset, ip_len);
|
||||
goto datalink_check;
|
||||
}
|
||||
}
|
||||
} else if(workflow->prefs.decode_tunnels && (proto == IPPROTO_GRE)) {
|
||||
if(header->caplen < ip_offset + ip_len + sizeof(struct ndpi_gre_basehdr))
|
||||
return(nproto); /* Too short for GRE header*/
|
||||
u_int32_t offset = 0;
|
||||
if((offset = ndpi_is_valid_gre_tunnel(header, packet, ip_offset, ip_len))) {
|
||||
tunnel_type = ndpi_gre_tunnel;
|
||||
struct ndpi_gre_basehdr *grehdr = (struct ndpi_gre_basehdr*)&packet[ip_offset + ip_len];
|
||||
if(grehdr->protocol == ntohs(ETH_P_IP) || grehdr->protocol == ntohs(ETH_P_IPV6)) {
|
||||
ip_offset = offset;
|
||||
goto iph_check;
|
||||
} else if(grehdr->protocol == NDPI_GRE_PROTO_PPP) { // ppp protocol
|
||||
ip_offset = offset + NDPI_PPP_HDRLEN;
|
||||
goto iph_check;
|
||||
} else {
|
||||
eth_offset = offset;
|
||||
goto datalink_check;
|
||||
}
|
||||
} else {
|
||||
return(nproto);
|
||||
}
|
||||
}
|
||||
|
||||
/* process the packet */
|
||||
@@ -2253,55 +2443,6 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
flow_risk));
|
||||
}
|
||||
|
||||
/* ********************************************************** */
|
||||
/* http://home.thep.lu.se/~bjorn/crc/crc32_fast.c */
|
||||
/* ********************************************************** */
|
||||
|
||||
static uint32_t crc32_for_byte(uint32_t r) {
|
||||
int j;
|
||||
for(j = 0; j < 8; ++j)
|
||||
r = ((r & 1) ? 0 : (uint32_t)0xEDB88320L) ^ r >> 1;
|
||||
return r ^ (uint32_t)0xFF000000L;
|
||||
}
|
||||
|
||||
/* Any unsigned integer type with at least 32 bits may be used as
|
||||
* accumulator type for fast crc32-calulation, but unsigned long is
|
||||
* probably the optimal choice for most systems. */
|
||||
typedef unsigned long accum_t;
|
||||
|
||||
static void init_tables(uint32_t* table, uint32_t* wtable) {
|
||||
size_t i, j, k, w;
|
||||
for(i = 0; i < 0x100; ++i)
|
||||
table[i] = crc32_for_byte(i);
|
||||
for(k = 0; k < sizeof(accum_t); ++k)
|
||||
for(i = 0; i < 0x100; ++i) {
|
||||
for(j = w = 0; j < sizeof(accum_t); ++j)
|
||||
w = table[(uint8_t)(j == k? w ^ i: w)] ^ w >> 8;
|
||||
wtable[(k << 8) + i] = w ^ (k? wtable[0]: 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void __crc32(const void* data, size_t n_bytes, uint32_t* crc) {
|
||||
static uint32_t table[0x100], wtable[0x100*sizeof(accum_t)];
|
||||
size_t n_accum = n_bytes/sizeof(accum_t);
|
||||
size_t i, j;
|
||||
if(!*table)
|
||||
init_tables(table, wtable);
|
||||
for(i = 0; i < n_accum; ++i) {
|
||||
accum_t a = *crc ^ ((accum_t*)data)[i];
|
||||
for(j = *crc = 0; j < sizeof(accum_t); ++j)
|
||||
*crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)];
|
||||
}
|
||||
for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
|
||||
*crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8;
|
||||
}
|
||||
|
||||
u_int32_t ethernet_crc32(const void* data, size_t n_bytes) {
|
||||
u_int32_t crc = 0;
|
||||
__crc32(data, n_bytes, &crc);
|
||||
return crc;
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
#ifdef USE_DPDK
|
||||
|
||||
+34
-10
@@ -93,6 +93,10 @@ extern int dpdk_port_deinit(int port);
|
||||
#define SERIALIZATION_BUFSIZ (8192 * 2)
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
// inner hash table (ja3 -> security state)
|
||||
typedef struct ndpi_ja3_info {
|
||||
char * ja3;
|
||||
@@ -166,7 +170,6 @@ enum info_type {
|
||||
INFO_TIVOCONNECT,
|
||||
INFO_FTP_IMAP_POP_SMTP,
|
||||
INFO_NATPMP,
|
||||
INFO_RTP
|
||||
};
|
||||
|
||||
// flow tracking
|
||||
@@ -206,6 +209,7 @@ typedef struct ndpi_flow_info {
|
||||
ndpi_protocol detected_protocol;
|
||||
ndpi_confidence_t confidence;
|
||||
u_int16_t num_dissector_calls;
|
||||
u_int16_t dpi_packets;
|
||||
|
||||
// Flow data analysis
|
||||
pkt_timeval src2dst_last_pkt_time, dst2src_last_pkt_time, flow_last_pkt_time;
|
||||
@@ -213,30 +217,36 @@ typedef struct ndpi_flow_info {
|
||||
*pktlen_c_to_s, *pktlen_s_to_c;
|
||||
|
||||
enum info_type info_type;
|
||||
|
||||
union {
|
||||
char info[256];
|
||||
|
||||
struct {
|
||||
unsigned char auth_failed;
|
||||
char username[127];
|
||||
char password[128];
|
||||
} ftp_imap_pop_smtp;
|
||||
|
||||
struct {
|
||||
char domain[85];
|
||||
char hostname[85];
|
||||
char username[86];
|
||||
} kerberos;
|
||||
|
||||
struct {
|
||||
char ip[16];
|
||||
char port[6];
|
||||
char hostname[48];
|
||||
char fqdn[48];
|
||||
} softether;
|
||||
|
||||
struct {
|
||||
char identity_uuid[36];
|
||||
char machine[48];
|
||||
char platform[32];
|
||||
char services[48];
|
||||
} tivoconnect;
|
||||
|
||||
struct {
|
||||
uint16_t result_code;
|
||||
uint16_t internal_port;
|
||||
@@ -247,12 +257,15 @@ typedef struct ndpi_flow_info {
|
||||
|
||||
ndpi_serializer ndpi_flow_serializer;
|
||||
|
||||
char flow_extra_info[16];
|
||||
char host_server_name[80]; /* Hostname/SNI */
|
||||
char *bittorent_hash;
|
||||
char *dhcp_fingerprint;
|
||||
char *dhcp_class_ident;
|
||||
ndpi_risk risk;
|
||||
|
||||
struct {
|
||||
char currency[16];
|
||||
} mining;
|
||||
|
||||
struct {
|
||||
u_int16_t ssl_version;
|
||||
@@ -270,17 +283,19 @@ typedef struct ndpi_flow_info {
|
||||
char *esni;
|
||||
} encrypted_sni;
|
||||
|
||||
struct {
|
||||
u_int16_t version;
|
||||
} encrypted_ch;
|
||||
|
||||
time_t notBefore, notAfter;
|
||||
u_int16_t server_cipher;
|
||||
ndpi_cipher_weakness client_unsafe_cipher, server_unsafe_cipher;
|
||||
|
||||
u_int32_t quic_version;
|
||||
} ssh_tls;
|
||||
|
||||
struct {
|
||||
enum ndpi_rtp_stream_type stream_type;
|
||||
} rtp;
|
||||
|
||||
struct {
|
||||
char url[256], request_content_type[64], content_type[64], user_agent[256], server[128];
|
||||
char url[256], request_content_type[64], content_type[64], user_agent[256], server[128], nat_ip[32], filename[256];
|
||||
u_int response_status_code;
|
||||
} http;
|
||||
|
||||
@@ -288,6 +303,12 @@ typedef struct ndpi_flow_info {
|
||||
char *username, *password;
|
||||
} telnet;
|
||||
|
||||
struct {
|
||||
char geolocation_iata_code[4];
|
||||
} dns;
|
||||
|
||||
ndpi_multimedia_flow_type multimedia_flow_type;
|
||||
|
||||
void *src_id, *dst_id;
|
||||
|
||||
struct ndpi_entropy *entropy;
|
||||
@@ -392,15 +413,14 @@ int ndpi_is_datalink_supported(int datalink_type);
|
||||
/* compare two nodes in workflow */
|
||||
int ndpi_workflow_node_cmp(const void *a, const void *b);
|
||||
void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_flow_info *flow);
|
||||
u_int32_t ethernet_crc32(const void* data, size_t n_bytes);
|
||||
void ndpi_flow_info_free_data(struct ndpi_flow_info *flow);
|
||||
void ndpi_flow_info_freer(void *node);
|
||||
const char* print_cipher_id(u_int32_t cipher);
|
||||
float ndpi_flow_get_byte_count_entropy(const uint32_t byte_count[256], unsigned int num_bytes);
|
||||
int parse_proto_name_list(char *str, NDPI_PROTOCOL_BITMASK *bitmask, int inverted_logic);
|
||||
|
||||
extern int nDPI_LogLevel;
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
#if defined(NDPI_ENABLE_DEBUG_MESSAGES) && !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
|
||||
#define LOG(log_level, args...) \
|
||||
{ \
|
||||
if(log_level <= nDPI_LogLevel) \
|
||||
@@ -414,4 +434,8 @@ extern int nDPI_LogLevel;
|
||||
#define LINKTYPE_LINUX_SLL2 276
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
+374
-44
@@ -1,8 +1,16 @@
|
||||
bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail fuzz_quic_get_crypto_data fuzz_config fuzz_community_id fuzz_serialization
|
||||
bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail fuzz_ndpi_reader_payload_analyzer fuzz_quic_get_crypto_data fuzz_config fuzz_community_id fuzz_serialization fuzz_tls_certificate fuzz_dga
|
||||
#Alghoritms
|
||||
bin_PROGRAMS += fuzz_alg_bins fuzz_alg_hll fuzz_alg_hw_rsi_outliers_da fuzz_alg_jitter fuzz_alg_ses_des
|
||||
bin_PROGRAMS += fuzz_alg_bins fuzz_alg_hll fuzz_alg_hw_rsi_outliers_da fuzz_alg_jitter fuzz_alg_ses_des fuzz_alg_crc32_md5 fuzz_alg_bytestream
|
||||
#Data structures
|
||||
bin_PROGRAMS += fuzz_ds_patricia fuzz_ds_ahocorasick fuzz_ds_libcache fuzz_ds_tree
|
||||
bin_PROGRAMS += fuzz_ds_patricia fuzz_ds_ahocorasick fuzz_ds_libcache fuzz_ds_tree fuzz_ds_ptree fuzz_ds_hash fuzz_ds_cmsketch fuzz_ds_bitmap64 fuzz_ds_domain_classify
|
||||
#Third party
|
||||
bin_PROGRAMS += fuzz_libinjection fuzz_binaryfusefilter
|
||||
#Internal crypto
|
||||
bin_PROGRAMS += fuzz_gcrypt_light fuzz_gcrypt_aes fuzz_gcrypt_gcm fuzz_gcrypt_cipher
|
||||
#Configuration files
|
||||
bin_PROGRAMS += fuzz_filecfg_protocols
|
||||
#Reader utils
|
||||
bin_PROGRAMS += fuzz_readerutils_workflow fuzz_readerutils_parseprotolist
|
||||
|
||||
fuzz_process_packet_SOURCES = fuzz_process_packet.c fuzz_common_code.c
|
||||
fuzz_process_packet_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
@@ -17,7 +25,7 @@ fuzz_process_packet_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_process_packet_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_SOURCES = fuzz_ndpi_reader.c ../example/reader_util.c
|
||||
fuzz_ndpi_reader_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c
|
||||
fuzz_ndpi_reader_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ndpi_reader_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
@@ -31,7 +39,7 @@ fuzz_ndpi_reader_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_ndpi_reader_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_alloc_fail_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c
|
||||
fuzz_ndpi_reader_alloc_fail_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
|
||||
fuzz_ndpi_reader_alloc_fail_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -DENABLE_MEM_ALLOC_FAILURES -DCRYPT_FORCE_NO_AESNI
|
||||
fuzz_ndpi_reader_alloc_fail_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_alloc_fail_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -43,6 +51,19 @@ fuzz_ndpi_reader_alloc_fail_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_alloc_fail_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_payload_analyzer_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c
|
||||
fuzz_ndpi_reader_payload_analyzer_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -DENABLE_MEM_ALLOC_FAILURES -DENABLE_PAYLOAD_ANALYZER
|
||||
fuzz_ndpi_reader_payload_analyzer_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_payload_analyzer_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_payload_analyzer_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_payload_analyzer_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_payload_analyzer_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_payload_analyzer_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_quic_get_crypto_data_SOURCES = fuzz_quic_get_crypto_data.c fuzz_common_code.c
|
||||
fuzz_quic_get_crypto_data_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_quic_get_crypto_data_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
@@ -57,8 +78,8 @@ fuzz_quic_get_crypto_data_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS)
|
||||
$(fuzz_quic_get_crypto_data_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_config_SOURCES = fuzz_config.cpp fuzz_common_code.c
|
||||
fuzz_config_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_config_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_config_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_config_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_config_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_config_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -72,8 +93,8 @@ fuzz_config_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_config_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_community_id_SOURCES = fuzz_community_id.cpp fuzz_common_code.c
|
||||
fuzz_community_id_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_community_id_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_community_id_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_community_id_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_community_id_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_community_id_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -87,8 +108,8 @@ fuzz_community_id_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_community_id_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_serialization_SOURCES = fuzz_serialization.cpp fuzz_common_code.c
|
||||
fuzz_serialization_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_serialization_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_serialization_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_serialization_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_serialization_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_serialization_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -102,8 +123,8 @@ fuzz_serialization_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_serialization_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_bins_SOURCES = fuzz_alg_bins.cpp fuzz_common_code.c
|
||||
fuzz_alg_bins_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_bins_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_bins_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_bins_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_bins_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_bins_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -117,8 +138,8 @@ fuzz_alg_bins_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_alg_bins_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_hll_SOURCES = fuzz_alg_hll.cpp fuzz_common_code.c
|
||||
fuzz_alg_hll_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_hll_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_hll_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_hll_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_hll_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_hll_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -132,8 +153,8 @@ fuzz_alg_hll_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_alg_hll_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_hw_rsi_outliers_da_SOURCES = fuzz_alg_hw_rsi_outliers_da.cpp fuzz_common_code.c
|
||||
fuzz_alg_hw_rsi_outliers_da_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_hw_rsi_outliers_da_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_hw_rsi_outliers_da_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_hw_rsi_outliers_da_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_hw_rsi_outliers_da_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_hw_rsi_outliers_da_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -147,8 +168,8 @@ fuzz_alg_hw_rsi_outliers_da_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
|
||||
$(fuzz_alg_hw_rsi_outliers_da_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_jitter_SOURCES = fuzz_alg_jitter.cpp fuzz_common_code.c
|
||||
fuzz_alg_jitter_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_jitter_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_jitter_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_jitter_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_jitter_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_jitter_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -161,9 +182,35 @@ fuzz_alg_jitter_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_alg_jitter_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_crc32_md5_SOURCES = fuzz_alg_crc32_md5.c
|
||||
fuzz_alg_crc32_md5_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_crc32_md5_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_crc32_md5_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_alg_crc32_md5_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_alg_crc32_md5_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_alg_crc32_md5_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_alg_crc32_md5_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_bytestream_SOURCES = fuzz_alg_bytestream.c
|
||||
fuzz_alg_bytestream_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_bytestream_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_bytestream_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_alg_bytestream_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_alg_bytestream_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_alg_bytestream_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_alg_bytestream_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_alg_ses_des_SOURCES = fuzz_alg_ses_des.cpp fuzz_common_code.c
|
||||
fuzz_alg_ses_des_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_ses_des_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_alg_ses_des_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_ses_des_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_alg_ses_des_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_ses_des_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -177,8 +224,8 @@ fuzz_alg_ses_des_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_alg_ses_des_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_patricia_SOURCES = fuzz_ds_patricia.cpp fuzz_common_code.c
|
||||
fuzz_ds_patricia_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_patricia_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_patricia_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_patricia_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_patricia_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_patricia_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -192,8 +239,8 @@ fuzz_ds_patricia_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_ds_patricia_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_ahocorasick_SOURCES = fuzz_ds_ahocorasick.cpp fuzz_common_code.c
|
||||
fuzz_ds_ahocorasick_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_ahocorasick_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_ahocorasick_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_ahocorasick_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_ahocorasick_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_ahocorasick_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -207,8 +254,8 @@ fuzz_ds_ahocorasick_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_ds_ahocorasick_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_libcache_SOURCES = fuzz_ds_libcache.cpp fuzz_common_code.c
|
||||
fuzz_ds_libcache_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_libcache_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_libcache_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_libcache_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_libcache_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_libcache_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -222,8 +269,8 @@ fuzz_ds_libcache_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(fuzz_ds_libcache_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_tree_SOURCES = fuzz_ds_tree.cpp fuzz_common_code.c
|
||||
fuzz_ds_tree_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_tree_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
fuzz_ds_tree_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_tree_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_tree_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_tree_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -236,10 +283,242 @@ fuzz_ds_tree_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ds_tree_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_ptree_SOURCES = fuzz_ds_ptree.cpp fuzz_common_code.c
|
||||
fuzz_ds_ptree_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_ptree_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_ptree_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_ptree_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ds_ptree_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_ptree_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_ptree_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ds_ptree_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ds_ptree_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_hash_SOURCES = fuzz_ds_hash.cpp fuzz_common_code.c
|
||||
fuzz_ds_hash_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_hash_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_hash_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_hash_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ds_hash_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_hash_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_hash_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ds_hash_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ds_hash_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_cmsketch_SOURCES = fuzz_ds_cmsketch.cpp fuzz_common_code.c
|
||||
fuzz_ds_cmsketch_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_cmsketch_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_cmsketch_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_cmsketch_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ds_cmsketch_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_cmsketch_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_cmsketch_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ds_cmsketch_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ds_cmsketch_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_bitmap64_SOURCES = fuzz_ds_bitmap64.cpp fuzz_common_code.c
|
||||
fuzz_ds_bitmap64_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_bitmap64_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_bitmap64_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_bitmap64_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ds_bitmap64_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_bitmap64_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_bitmap64_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ds_bitmap64_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ds_bitmap64_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ds_domain_classify_SOURCES = fuzz_ds_domain_classify.cpp fuzz_common_code.c
|
||||
fuzz_ds_domain_classify_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_domain_classify_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_domain_classify_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_domain_classify_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ds_domain_classify_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_domain_classify_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_domain_classify_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ds_domain_classify_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ds_domain_classify_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_libinjection_SOURCES = fuzz_libinjection.c
|
||||
fuzz_libinjection_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_libinjection_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_libinjection_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_libinjection_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_libinjection_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_libinjection_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_libinjection_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_binaryfusefilter_SOURCES = fuzz_binaryfusefilter.cpp fuzz_common_code.c
|
||||
fuzz_binaryfusefilter_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_binaryfusefilter_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_binaryfusefilter_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_binaryfusefilter_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_binaryfusefilter_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_binaryfusefilter_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_binaryfusefilter_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_binaryfusefilter_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_binaryfusefilter_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_tls_certificate_SOURCES = fuzz_tls_certificate.c fuzz_common_code.c
|
||||
fuzz_tls_certificate_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_tls_certificate_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_tls_certificate_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_tls_certificate_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_tls_certificate_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_tls_certificate_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_tls_certificate_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_dga_SOURCES = fuzz_dga.c fuzz_common_code.c
|
||||
fuzz_dga_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_dga_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_dga_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_dga_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_dga_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_dga_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_dga_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_gcrypt_light_SOURCES = fuzz_gcrypt_light.cpp fuzz_common_code.c
|
||||
fuzz_gcrypt_light_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_light_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_light_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_gcrypt_light_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_gcrypt_light_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_light_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_light_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_gcrypt_light_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_light_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_gcrypt_aes_SOURCES = fuzz_gcrypt_aes.cpp
|
||||
fuzz_gcrypt_aes_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_aes_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_aes_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_gcrypt_aes_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_gcrypt_aes_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_aes_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_aes_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_gcrypt_aes_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_aes_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_gcrypt_gcm_SOURCES = fuzz_gcrypt_gcm.cpp
|
||||
fuzz_gcrypt_gcm_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_gcm_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_gcm_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_gcrypt_gcm_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_gcrypt_gcm_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_gcm_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_gcm_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_gcrypt_gcm_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_gcm_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_gcrypt_cipher_SOURCES = fuzz_gcrypt_cipher.cpp
|
||||
fuzz_gcrypt_cipher_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_cipher_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_gcrypt_cipher_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_gcrypt_cipher_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_gcrypt_cipher_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_cipher_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_gcrypt_cipher_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_gcrypt_cipher_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_gcrypt_cipher_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_protocols_SOURCES = fuzz_filecfg_protocols.c fuzz_common_code.c
|
||||
fuzz_filecfg_protocols_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_filecfg_protocols_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_protocols_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_protocols_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_protocols_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_protocols_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_protocols_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_readerutils_workflow_SOURCES = fuzz_readerutils_workflow.cpp fuzz_common_code.c ../example/reader_util.c
|
||||
fuzz_readerutils_workflow_CXXFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -DDISABLE_CUSTOM_ALLOCATOR_ON_READERUTILS
|
||||
fuzz_readerutils_workflow_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DDISABLE_CUSTOM_ALLOCATOR_ON_READERUTILS
|
||||
fuzz_readerutils_workflow_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_readerutils_workflow_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_readerutils_workflow_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_readerutils_workflow_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_readerutils_workflow_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_readerutils_workflow_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_readerutils_workflow_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_readerutils_parseprotolist_SOURCES = fuzz_readerutils_parseprotolist.cpp fuzz_common_code.c ../example/reader_util.c
|
||||
fuzz_readerutils_parseprotolist_CXXFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_readerutils_parseprotolist_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_readerutils_parseprotolist_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_readerutils_parseprotolist_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_readerutils_parseprotolist_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_readerutils_parseprotolist_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_readerutils_parseprotolist_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_readerutils_parseprotolist_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_readerutils_parseprotolist_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
|
||||
# required for Google oss-fuzz
|
||||
# see https://github.com/google/oss-fuzz/tree/master/projects/ndpi
|
||||
testpcaps := $(wildcard ../tests/pcap/*.pcap*)
|
||||
testpcaps := $(wildcard ../tests/cfgs/default/pcap/*.pcap*)
|
||||
|
||||
fuzz_ndpi_reader_seed_corpus.zip: $(testpcaps)
|
||||
zip -j fuzz_ndpi_reader_seed_corpus.zip $(testpcaps)
|
||||
@@ -247,18 +526,18 @@ fuzz_ndpi_reader_seed_corpus.zip: $(testpcaps)
|
||||
fuzz_ndpi_reader_alloc_fail_seed_corpus.zip: $(testpcaps)
|
||||
zip -j fuzz_ndpi_reader_alloc_fail_seed_corpus.zip $(testpcaps)
|
||||
|
||||
files_corpus_fuzz_quic_get_crypto_data := $(wildcard corpus/fuzz_quic_get_crypto_data/*)
|
||||
fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip: $(testpcaps)
|
||||
zip -j fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip $(testpcaps)
|
||||
|
||||
files_corpus_fuzz_quic_get_crypto_data := $(wildcard corpus/fuzz_quic_get_crypto_data/*)
|
||||
fuzz_quic_get_crypto_data_seed_corpus.zip: $(files_corpus_fuzz_quic_get_crypto_data)
|
||||
zip -j fuzz_quic_get_crypto_data_seed_corpus.zip $(files_corpus_fuzz_quic_get_crypto_data)
|
||||
|
||||
files_corpus_fuzz_config := $(wildcard corpus/fuzz_config/*)
|
||||
|
||||
fuzz_config_seed_corpus.zip: $(files_corpus_fuzz_config)
|
||||
zip -j fuzz_config_seed_corpus.zip $(files_corpus_fuzz_config)
|
||||
|
||||
files_corpus_fuzz_serialization := $(wildcard corpus/fuzz_serialization/*)
|
||||
|
||||
fuzz_serialization_seed_corpus.zip: $(files_corpus_fuzz_serialization)
|
||||
zip -j fuzz_serialization_seed_corpus.zip $(files_corpus_fuzz_serialization)
|
||||
|
||||
@@ -268,51 +547,83 @@ fuzz_community_id_seed_corpus.zip: $(files_corpus_fuzz_community_id)
|
||||
zip -j fuzz_community_id_seed_corpus.zip $(files_corpus_fuzz_community_id)
|
||||
|
||||
files_corpus_fuzz_ds_patricia := $(wildcard corpus/fuzz_ds_patricia/*)
|
||||
|
||||
fuzz_ds_patricia_seed_corpus.zip: $(files_corpus_fuzz_ds_patricia)
|
||||
zip -j fuzz_ds_patricia_seed_corpus.zip $(files_corpus_fuzz_ds_patricia)
|
||||
|
||||
files_corpus_fuzz_ds_ahocorasick := $(wildcard corpus/fuzz_ds_ahocorasick/*)
|
||||
|
||||
fuzz_ds_ahocorasick_seed_corpus.zip: $(files_corpus_fuzz_ds_ahocorasick)
|
||||
zip -j fuzz_ds_ahocorasick_seed_corpus.zip $(files_corpus_fuzz_ds_ahocorasick)
|
||||
|
||||
files_corpus_fuzz_alg_ses_des := $(wildcard corpus/fuzz_alg_ses_des/*)
|
||||
|
||||
fuzz_alg_ses_des_seed_corpus.zip: $(files_corpus_fuzz_alg_ses_des)
|
||||
zip -j fuzz_alg_ses_des_seed_corpus.zip $(files_corpus_fuzz_alg_ses_des)
|
||||
|
||||
files_corpus_fuzz_alg_hw_rsi_outliers_da := $(wildcard corpus/fuzz_alg_hw_rsi_outliers_da/*)
|
||||
|
||||
fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip: $(files_corpus_fuzz_alg_hw_rsi_outliers_da)
|
||||
zip -j fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip $(files_corpus_fuzz_alg_hw_rsi_outliers_da)
|
||||
|
||||
files_corpus_fuzz_alg_bins := $(wildcard corpus/fuzz_alg_bins/*)
|
||||
|
||||
fuzz_alg_bins_seed_corpus.zip: $(files_corpus_fuzz_alg_bins)
|
||||
zip -j fuzz_alg_bins_seed_corpus.zip $(files_corpus_fuzz_alg_bins)
|
||||
|
||||
files_corpus_fuzz_alg_hll := $(wildcard corpus/fuzz_alg_hll/*)
|
||||
|
||||
fuzz_alg_hll_seed_corpus.zip: $(files_corpus_fuzz_alg_hll)
|
||||
zip -j fuzz_alg_hll_seed_corpus.zip $(files_corpus_fuzz_alg_hll)
|
||||
|
||||
files_corpus_fuzz_alg_jitter := $(wildcard corpus/fuzz_alg_jitter/*)
|
||||
|
||||
fuzz_alg_jitter_seed_corpus.zip: $(files_corpus_fuzz_alg_jitter)
|
||||
zip -j fuzz_alg_jitter_seed_corpus.zip $(files_corpus_fuzz_alg_jitter)
|
||||
|
||||
files_corpus_fuzz_ds_libcache := $(wildcard corpus/fuzz_ds_libcache/*)
|
||||
files_corpus_fuzz_alg_crc32_md5 := $(wildcard corpus/fuzz_alg_crc32_md5/*)
|
||||
fuzz_alg_crc32_md5_seed_corpus.zip: $(files_corpus_fuzz_alg_crc32_md5)
|
||||
zip -j fuzz_alg_crc32_md5_seed_corpus.zip $(files_corpus_fuzz_alg_crc32_md5)
|
||||
|
||||
files_corpus_fuzz_ds_libcache := $(wildcard corpus/fuzz_ds_libcache/*)
|
||||
fuzz_ds_libcache_seed_corpus.zip: $(files_corpus_fuzz_ds_libcache)
|
||||
zip -j fuzz_ds_libcache_seed_corpus.zip $(files_corpus_fuzz_ds_libcache)
|
||||
|
||||
files_corpus_fuzz_ds_tree := $(wildcard corpus/fuzz_ds_tree/*)
|
||||
|
||||
fuzz_ds_tree_seed_corpus.zip: $(files_corpus_fuzz_ds_tree)
|
||||
zip -j fuzz_ds_tree_seed_corpus.zip $(files_corpus_fuzz_ds_tree)
|
||||
|
||||
corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_config_seed_corpus.zip fuzz_ds_patricia_seed_corpus.zip fuzz_ds_ahocorasick_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_ds_tree_seed_corpus.zip fuzz_serialization_seed_corpus.zip
|
||||
files_corpus_fuzz_ds_ptree := $(wildcard corpus/fuzz_ds_ptree/*)
|
||||
fuzz_ds_ptree_seed_corpus.zip: $(files_corpus_fuzz_ds_ptree)
|
||||
zip -j fuzz_ds_ptree_seed_corpus.zip $(files_corpus_fuzz_ds_ptree)
|
||||
|
||||
files_corpus_fuzz_alg_bytestream := $(wildcard corpus/fuzz_alg_bytestream/*)
|
||||
fuzz_alg_bytestream_seed_corpus.zip: $(files_corpus_fuzz_alg_bytestream)
|
||||
zip -j fuzz_alg_bytestream_seed_corpus.zip $(files_corpus_fuzz_alg_bytestream)
|
||||
|
||||
files_corpus_fuzz_libinjection := $(wildcard corpus/fuzz_libinjection/*)
|
||||
fuzz_libinjection_seed_corpus.zip: $(files_corpus_fuzz_libinjection)
|
||||
zip -j fuzz_libinjection_seed_corpus.zip $(files_corpus_fuzz_libinjection)
|
||||
|
||||
files_corpus_fuzz_tls_certificate := $(wildcard corpus/fuzz_tls_certificate/*)
|
||||
fuzz_tls_certificate_seed_corpus.zip: $(files_corpus_fuzz_tls_certificate)
|
||||
zip -j fuzz_tls_certificate_seed_corpus.zip $(files_corpus_fuzz_tls_certificate)
|
||||
|
||||
files_corpus_fuzz_filecfg_protocols := $(wildcard corpus/fuzz_filecfg_protocols/*)
|
||||
fuzz_filecfg_protocols_seed_corpus.zip: $(files_corpus_fuzz_filecfg_protocols)
|
||||
zip -j fuzz_filecfg_protocols_seed_corpus.zip $(files_corpus_fuzz_filecfg_protocols)
|
||||
|
||||
files_corpus_fuzz_readerutils_workflow := $(wildcard corpus/fuzz_readerutils_workflow/*)
|
||||
fuzz_readerutils_workflow_seed_corpus.zip: $(files_corpus_fuzz_readerutils_workflow)
|
||||
zip -j fuzz_readerutils_workflow_seed_corpus.zip $(files_corpus_fuzz_readerutils_workflow)
|
||||
|
||||
files_corpus_fuzz_readerutils_parseprotolist := $(wildcard corpus/fuzz_readerutils_parseprotolist/*)
|
||||
fuzz_readerutils_parseprotolist_seed_corpus.zip: $(files_corpus_fuzz_readerutils_parseprotolist)
|
||||
zip -j fuzz_readerutils_parseprotolist_seed_corpus.zip $(files_corpus_fuzz_readerutils_parseprotolist)
|
||||
|
||||
files_corpus_fuzz_ds_bitmap64 := $(wildcard corpus/fuzz_ds_bitmap64/*)
|
||||
fuzz_ds_bitmap64_seed_corpus.zip: $(files_corpus_fuzz_ds_bitmap64)
|
||||
zip -j fuzz_ds_bitmap64_seed_corpus.zip $(files_corpus_fuzz_ds_bitmap64)
|
||||
|
||||
files_corpus_fuzz_ds_domain_classify := $(wildcard corpus/fuzz_ds_domain_classify/*)
|
||||
fuzz_ds_domain_classify_seed_corpus.zip: $(files_corpus_fuzz_ds_domain_classify)
|
||||
zip -j fuzz_ds_domain_classify_seed_corpus.zip $(files_corpus_fuzz_ds_domain_classify)
|
||||
|
||||
corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_config_seed_corpus.zip fuzz_ds_patricia_seed_corpus.zip fuzz_ds_ahocorasick_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_ds_tree_seed_corpus.zip fuzz_serialization_seed_corpus.zip fuzz_ds_ptree_seed_corpus.zip fuzz_alg_crc32_md5_seed_corpus.zip fuzz_alg_bytestream_seed_corpus.zip fuzz_libinjection_seed_corpus.zip fuzz_tls_certificate_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_readerutils_workflow_seed_corpus.zip fuzz_readerutils_parseprotolist_seed_corpus.zip fuzz_ds_bitmap64_seed_corpus.zip fuzz_ds_domain_classify_seed_corpus.zip
|
||||
cp corpus/fuzz_*seed_corpus.zip .
|
||||
|
||||
#Create dictionaries exactly as expected by oss-fuzz.
|
||||
#This way, if we need to change/update/add something,
|
||||
@@ -320,7 +631,9 @@ corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus
|
||||
dictionaries:
|
||||
cp dictionary.dict fuzz_ndpi_reader.dict
|
||||
cp dictionary.dict fuzz_ndpi_reader_alloc_fail.dict
|
||||
cp dictionary.dict fuzz_ndpi_reader_payload_analyzer.dict
|
||||
cp dictionary.dict fuzz_process_packet.dict
|
||||
cp dictionary_tls_certificate.dict fuzz_tls_certificate.dict
|
||||
|
||||
distdir:
|
||||
find . -type d | xargs -I'{}' mkdir -p '$(distdir)/{}'
|
||||
@@ -328,19 +641,36 @@ distdir:
|
||||
-o -name '*.am' \
|
||||
-o -name '*.h' \
|
||||
-o -name '*.cpp' \
|
||||
-o -name '*.dict' \
|
||||
-o -name '*.options' \
|
||||
-o -name 'ipv4_addresses.txt' \
|
||||
-o -name 'bd_param.txt' \
|
||||
-o -name 'splt_param.txt' \
|
||||
-o -name 'random_list.list' \
|
||||
-o -path './dictionary.dict' \
|
||||
-o -path './dictionary_tls_certificate.dict' \
|
||||
-o -path './corpus/fuzz_*.zip' \
|
||||
-o -path './corpus/fuzz_quic_get_crypto_data/*' \
|
||||
-o -path './corpus/fuzz_filecfg_protocols/*' \
|
||||
-o -path './corpus/fuzz_readerutils_workflow/*' \
|
||||
-o -path './corpus/fuzz_readerutils_parseprotolist/*' \
|
||||
-o -path './corpus/fuzz_config/*' \
|
||||
-o -path './corpus/fuzz_serialization/*' \
|
||||
-o -path './corpus/fuzz_community_id/*' \
|
||||
-o -path './corpus/fuzz_libinjection/*' \
|
||||
-o -path './corpus/fuzz_tls_certificate/*' \
|
||||
-o -path './corpus/fuzz_alg_ses_des/*' \
|
||||
-o -path './corpus/fuzz_alg_bins/*' \
|
||||
-o -path './corpus/fuzz_alg_hll/*' \
|
||||
-o -path './corpus/fuzz_alg_jitter/*' \
|
||||
-o -path './corpus/fuzz_alg_crc32_md5/*' \
|
||||
-o -path './corpus/fuzz_alg_hw_rsi_outliers_da/*' \
|
||||
-o -path './corpus/fuzz_alg_bytestream/*' \
|
||||
-o -path './corpus/fuzz_ds_ahocorasick/*' \
|
||||
-o -path './corpus/fuzz_ds_libcache/*' \
|
||||
-o -path './corpus/fuzz_ds_tree/*' \
|
||||
-o -path './corpus/fuzz_ds_bitmap64/*' \
|
||||
-o -path './corpus/fuzz_ds_domain_classify/*' \
|
||||
-o -path './corpus/fuzz_ds_ptree/*' \
|
||||
-o -path './corpus/fuzz_ds_patricia/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}'
|
||||
|
||||
all: corpus dictionaries
|
||||
|
||||
@@ -0,0 +1,627 @@
|
||||
-2.088057846500587456e+00
|
||||
7.763936238952200239e-05
|
||||
4.404309737393306595e-05
|
||||
-9.467385027293546973e-02
|
||||
4.348947142638090457e-01
|
||||
-2.091409170053043390e-04
|
||||
-5.788902107267982974e-04
|
||||
4.481443450852441001e-10
|
||||
-3.136135459023654537e+00
|
||||
-1.507730262127600751e+00
|
||||
-1.204663669965535977e+00
|
||||
-1.171839254318371104e+00
|
||||
4.329302247232582057e-01
|
||||
8.310653628092458334e+00
|
||||
3.299246725156660176e+00
|
||||
0.000000000000000000e+00
|
||||
1.847454931582027254e-02
|
||||
-1.498024139966201096e+00
|
||||
-7.660670007653060942e-01
|
||||
-2.908130300830076731e+00
|
||||
-1.252564844610269734e+00
|
||||
-1.910955328742287573e+00
|
||||
9.471710980110392697e-01
|
||||
2.352302758516665371e+00
|
||||
2.982269972214651954e+00
|
||||
4.280736383314343918e+00
|
||||
4.633629909719495288e+00
|
||||
-2.198052637823726840e+00
|
||||
-1.150759637168392580e+00
|
||||
3.420433363184381292e+00
|
||||
1.857878113059351077e-02
|
||||
-1.559806674919653746e+00
|
||||
4.197498183183401288e+00
|
||||
6.262186949633183453e+00
|
||||
1.100694844370524095e+01
|
||||
2.778688785515088000e+01
|
||||
3.679948298336883195e+00
|
||||
-2.432801394376875592e+00
|
||||
5.133442052706843617e-01
|
||||
2.181172654073517680e+00
|
||||
-8.577551729671881731e-01
|
||||
7.013844214023315926e-01
|
||||
3.138233436228588857e+00
|
||||
7.319940508466630247e-01
|
||||
0.000000000000000000e+00
|
||||
3.529209394581482861e+00
|
||||
1.464585117707144413e+01
|
||||
8.506550226820598359e-01
|
||||
-9.060397326548508268e-01
|
||||
6.787474954688997641e+00
|
||||
8.125411068867387954e+00
|
||||
4.515740684104064151e+00
|
||||
5.372135582950940069e+00
|
||||
9.210951196799497254e-01
|
||||
4.802177410869620466e+00
|
||||
2.945445016176073594e+01
|
||||
1.575032253128311632e+00
|
||||
-1.355276854364796946e-01
|
||||
-3.322474764169629502e-01
|
||||
3.018397817188666732e+00
|
||||
1.186503569922195744e+00
|
||||
0.000000000000000000e+00
|
||||
8.883242370198487503e-01
|
||||
7.248276146728496627e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-4.831246718433664711e+00
|
||||
6.124136970173365002e-01
|
||||
4.145693892559814686e-01
|
||||
2.683998941637626867e+00
|
||||
2.063906603639539039e+00
|
||||
2.989801217386735210e+00
|
||||
2.262965767379551962e-01
|
||||
2.240332214649647380e+00
|
||||
5.984550782416063086e+00
|
||||
4.587011255338186544e+00
|
||||
1.233118485315272039e+01
|
||||
1.115223490909697857e+00
|
||||
-3.682686422016995476e+00
|
||||
6.096498453291562258e-01
|
||||
1.119275528656461516e+00
|
||||
1.377886278915177731e-01
|
||||
3.828176805973048324e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
1.442927634029647344e+01
|
||||
0.000000000000000000e+00
|
||||
5.719118583309401593e-01
|
||||
1.993632609731877392e-01
|
||||
3.047472271520709430e+00
|
||||
5.736784864911910198e+00
|
||||
6.677826247219391220e+00
|
||||
6.307175478564531090e+00
|
||||
3.150295169417364249e+01
|
||||
3.738597740702392258e+00
|
||||
1.129754590514236234e+01
|
||||
6.108506268573830056e+00
|
||||
1.605489516792866667e+00
|
||||
2.929631990348545489e+00
|
||||
-2.832543082245212937e-02
|
||||
1.358286530670594461e+00
|
||||
1.655932469853677924e+00
|
||||
6.701964773769768513e-01
|
||||
2.131182050917533211e+00
|
||||
2.998351165769753468e+00
|
||||
7.772095996358327596e+00
|
||||
1.285014785269981141e+00
|
||||
4.407334784589962418e+00
|
||||
1.719858214230612026e+00
|
||||
-1.012765674651314063e+00
|
||||
-5.749271123172469133e-01
|
||||
-3.559614093795681278e+00
|
||||
-3.073088477387719397e+00
|
||||
-4.492469521371540431e+00
|
||||
-3.753286990415885427e+00
|
||||
-3.219255423324282273e+00
|
||||
-2.806436518181075090e+00
|
||||
-2.697305948568419875e+00
|
||||
-7.879608430851776646e-01
|
||||
4.625507221739111330e+00
|
||||
4.809280703883450414e+00
|
||||
-3.435194026629848629e+00
|
||||
-3.218943068168937049e+00
|
||||
3.335535704890596698e+00
|
||||
2.071359212435486263e+00
|
||||
4.538992059175040339e+00
|
||||
-2.770772323566738038e+01
|
||||
2.903047708571506735e+00
|
||||
-4.436143805989154032e+00
|
||||
-2.647991280011542381e-01
|
||||
1.737252348126810064e+00
|
||||
-4.121989655995259128e+00
|
||||
3.209709099445720581e-01
|
||||
1.012758514896711759e+01
|
||||
3.313255624721038295e+00
|
||||
4.631467619785444967e+00
|
||||
7.668642402146534032e+00
|
||||
6.780938812710099128e+00
|
||||
-3.256164342602652972e+00
|
||||
6.749565128319576779e-01
|
||||
0.000000000000000000e+00
|
||||
-4.407265954524525853e+00
|
||||
0.000000000000000000e+00
|
||||
-3.666522115024547901e+01
|
||||
-7.886029397826226273e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-2.261283814517791058e+01
|
||||
-4.024317426178160240e+00
|
||||
3.213063737030031342e-01
|
||||
5.079805145796887800e+00
|
||||
1.326813226475260343e+00
|
||||
1.233684078112145643e+00
|
||||
8.671852503871454232e+00
|
||||
-2.041800256066371944e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-1.607347800380474823e+01
|
||||
-4.430790279223246309e+00
|
||||
1.177552465851384511e+00
|
||||
6.342921220500139512e+00
|
||||
-2.466913734548706327e-02
|
||||
3.451642566010713065e-01
|
||||
-6.012767168531006234e+00
|
||||
7.328146570137336724e+00
|
||||
7.500088131707050465e+00
|
||||
0.000000000000000000e+00
|
||||
-3.547913249211809017e+01
|
||||
-3.130964814607208879e+00
|
||||
8.247326544297072237e-01
|
||||
3.757262485775580418e-01
|
||||
-2.136528302027558723e+00
|
||||
-2.631627236037529793e-01
|
||||
-2.016718799388414141e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-7.708602132869285528e-01
|
||||
-2.602868328868111814e+00
|
||||
1.435184800833797958e+00
|
||||
0.000000000000000000e+00
|
||||
-2.080420864280113413e+00
|
||||
1.169498351211070819e+00
|
||||
-1.798334115637199560e+01
|
||||
-1.193885252696202670e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
4.304089297965300709e+00
|
||||
-3.020893216686394656e+00
|
||||
-1.234427481614708721e+00
|
||||
0.000000000000000000e+00
|
||||
1.853340741926325697e+00
|
||||
-2.686000064995862147e+01
|
||||
-1.672275139058893600e+01
|
||||
-2.826268691607605987e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-1.547397429377200817e+00
|
||||
-4.018181657009961327e+00
|
||||
-7.289186736637049968e+00
|
||||
-7.458655219230571731e+00
|
||||
-9.625538282761622710e+00
|
||||
-1.103039457077456298e+01
|
||||
-6.262675161142102809e+01
|
||||
-9.265912629799268885e+00
|
||||
-8.961543476816615339e+00
|
||||
-9.622764435629340696e+00
|
||||
-1.097978292092879826e+01
|
||||
-1.097978292092879826e+01
|
||||
-2.088057846500587456e+00
|
||||
7.763936238952200239e-05
|
||||
4.404309737393306595e-05
|
||||
-9.467385027293546973e-02
|
||||
4.348947142638090457e-01
|
||||
-2.091409170053043390e-04
|
||||
-5.788902107267982974e-04
|
||||
4.481443450852441001e-10
|
||||
-3.136135459023654537e+00
|
||||
-1.507730262127600751e+00
|
||||
-1.204663669965535977e+00
|
||||
-1.171839254318371104e+00
|
||||
4.329302247232582057e-01
|
||||
8.310653628092458334e+00
|
||||
3.299246725156660176e+00
|
||||
0.000000000000000000e+00
|
||||
1.847454931582027254e-02
|
||||
-1.498024139966201096e+00
|
||||
-7.660670007653060942e-01
|
||||
-2.908130300830076731e+00
|
||||
-1.252564844610269734e+00
|
||||
-1.910955328742287573e+00
|
||||
9.471710980110392697e-01
|
||||
2.352302758516665371e+00
|
||||
2.982269972214651954e+00
|
||||
4.280736383314343918e+00
|
||||
4.633629909719495288e+00
|
||||
-2.198052637823726840e+00
|
||||
-1.150759637168392580e+00
|
||||
3.420433363184381292e+00
|
||||
1.857878113059351077e-02
|
||||
-1.559806674919653746e+00
|
||||
4.197498183183401288e+00
|
||||
6.262186949633183453e+00
|
||||
1.100694844370524095e+01
|
||||
2.778688785515088000e+01
|
||||
3.679948298336883195e+00
|
||||
-2.432801394376875592e+00
|
||||
5.133442052706843617e-01
|
||||
2.181172654073517680e+00
|
||||
-8.577551729671881731e-01
|
||||
7.013844214023315926e-01
|
||||
3.138233436228588857e+00
|
||||
7.319940508466630247e-01
|
||||
0.000000000000000000e+00
|
||||
3.529209394581482861e+00
|
||||
1.464585117707144413e+01
|
||||
8.506550226820598359e-01
|
||||
-9.060397326548508268e-01
|
||||
6.787474954688997641e+00
|
||||
8.125411068867387954e+00
|
||||
4.515740684104064151e+00
|
||||
5.372135582950940069e+00
|
||||
9.210951196799497254e-01
|
||||
4.802177410869620466e+00
|
||||
2.945445016176073594e+01
|
||||
1.575032253128311632e+00
|
||||
-1.355276854364796946e-01
|
||||
-3.322474764169629502e-01
|
||||
3.018397817188666732e+00
|
||||
1.186503569922195744e+00
|
||||
0.000000000000000000e+00
|
||||
8.883242370198487503e-01
|
||||
7.248276146728496627e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-4.831246718433664711e+00
|
||||
6.124136970173365002e-01
|
||||
4.145693892559814686e-01
|
||||
2.683998941637626867e+00
|
||||
2.063906603639539039e+00
|
||||
2.989801217386735210e+00
|
||||
2.262965767379551962e-01
|
||||
2.240332214649647380e+00
|
||||
5.984550782416063086e+00
|
||||
4.587011255338186544e+00
|
||||
1.233118485315272039e+01
|
||||
1.115223490909697857e+00
|
||||
-3.682686422016995476e+00
|
||||
6.096498453291562258e-01
|
||||
1.119275528656461516e+00
|
||||
1.377886278915177731e-01
|
||||
3.828176805973048324e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
1.442927634029647344e+01
|
||||
0.000000000000000000e+00
|
||||
5.719118583309401593e-01
|
||||
1.993632609731877392e-01
|
||||
3.047472271520709430e+00
|
||||
5.736784864911910198e+00
|
||||
6.677826247219391220e+00
|
||||
6.307175478564531090e+00
|
||||
3.150295169417364249e+01
|
||||
3.738597740702392258e+00
|
||||
1.129754590514236234e+01
|
||||
6.108506268573830056e+00
|
||||
1.605489516792866667e+00
|
||||
2.929631990348545489e+00
|
||||
-2.832543082245212937e-02
|
||||
1.358286530670594461e+00
|
||||
1.655932469853677924e+00
|
||||
6.701964773769768513e-01
|
||||
2.131182050917533211e+00
|
||||
2.998351165769753468e+00
|
||||
7.772095996358327596e+00
|
||||
1.285014785269981141e+00
|
||||
4.407334784589962418e+00
|
||||
1.719858214230612026e+00
|
||||
-1.012765674651314063e+00
|
||||
-5.749271123172469133e-01
|
||||
-3.559614093795681278e+00
|
||||
-3.073088477387719397e+00
|
||||
-4.492469521371540431e+00
|
||||
-3.753286990415885427e+00
|
||||
-3.219255423324282273e+00
|
||||
-2.806436518181075090e+00
|
||||
-2.697305948568419875e+00
|
||||
-7.879608430851776646e-01
|
||||
4.625507221739111330e+00
|
||||
4.809280703883450414e+00
|
||||
-3.435194026629848629e+00
|
||||
-3.218943068168937049e+00
|
||||
3.335535704890596698e+00
|
||||
2.071359212435486263e+00
|
||||
4.538992059175040339e+00
|
||||
-2.770772323566738038e+01
|
||||
2.903047708571506735e+00
|
||||
-4.436143805989154032e+00
|
||||
-2.647991280011542381e-01
|
||||
1.737252348126810064e+00
|
||||
-4.121989655995259128e+00
|
||||
3.209709099445720581e-01
|
||||
1.012758514896711759e+01
|
||||
3.313255624721038295e+00
|
||||
4.631467619785444967e+00
|
||||
7.668642402146534032e+00
|
||||
6.780938812710099128e+00
|
||||
-3.256164342602652972e+00
|
||||
6.749565128319576779e-01
|
||||
0.000000000000000000e+00
|
||||
-4.407265954524525853e+00
|
||||
0.000000000000000000e+00
|
||||
-3.666522115024547901e+01
|
||||
-7.886029397826226273e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-2.261283814517791058e+01
|
||||
-4.024317426178160240e+00
|
||||
3.213063737030031342e-01
|
||||
5.079805145796887800e+00
|
||||
1.326813226475260343e+00
|
||||
1.233684078112145643e+00
|
||||
8.671852503871454232e+00
|
||||
-2.041800256066371944e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-1.607347800380474823e+01
|
||||
-4.430790279223246309e+00
|
||||
1.177552465851384511e+00
|
||||
6.342921220500139512e+00
|
||||
-2.466913734548706327e-02
|
||||
3.451642566010713065e-01
|
||||
-6.012767168531006234e+00
|
||||
7.328146570137336724e+00
|
||||
7.500088131707050465e+00
|
||||
0.000000000000000000e+00
|
||||
-3.547913249211809017e+01
|
||||
-3.130964814607208879e+00
|
||||
8.247326544297072237e-01
|
||||
3.757262485775580418e-01
|
||||
-2.136528302027558723e+00
|
||||
-2.631627236037529793e-01
|
||||
-2.016718799388414141e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-7.708602132869285528e-01
|
||||
-2.602868328868111814e+00
|
||||
1.435184800833797958e+00
|
||||
0.000000000000000000e+00
|
||||
-2.080420864280113413e+00
|
||||
1.169498351211070819e+00
|
||||
-1.798334115637199560e+01
|
||||
-1.193885252696202670e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
4.304089297965300709e+00
|
||||
-3.020893216686394656e+00
|
||||
-1.234427481614708721e+00
|
||||
0.000000000000000000e+00
|
||||
1.853340741926325697e+00
|
||||
-2.686000064995862147e+01
|
||||
-1.672275139058893600e+01
|
||||
-2.826268691607605987e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-1.547397429377200817e+00
|
||||
-4.018181657009961327e+00
|
||||
-7.289186736637049968e+00
|
||||
-7.458655219230571731e+00
|
||||
-9.625538282761622710e+00
|
||||
-1.103039457077456298e+01
|
||||
-6.262675161142102809e+01
|
||||
-9.265912629799268885e+00
|
||||
-8.961543476816615339e+00
|
||||
-9.622764435629340696e+00
|
||||
-1.097978292092879826e+01
|
||||
-1.097978292092879826e+01
|
||||
-2.088057846500587456e+00
|
||||
7.763936238952200239e-05
|
||||
4.404309737393306595e-05
|
||||
-9.467385027293546973e-02
|
||||
4.348947142638090457e-01
|
||||
-2.091409170053043390e-04
|
||||
-5.788902107267982974e-04
|
||||
4.481443450852441001e-10
|
||||
-3.136135459023654537e+00
|
||||
-1.507730262127600751e+00
|
||||
-1.204663669965535977e+00
|
||||
-1.171839254318371104e+00
|
||||
4.329302247232582057e-01
|
||||
8.310653628092458334e+00
|
||||
3.299246725156660176e+00
|
||||
0.000000000000000000e+00
|
||||
1.847454931582027254e-02
|
||||
-1.498024139966201096e+00
|
||||
-7.660670007653060942e-01
|
||||
-2.908130300830076731e+00
|
||||
-1.252564844610269734e+00
|
||||
-1.910955328742287573e+00
|
||||
9.471710980110392697e-01
|
||||
2.352302758516665371e+00
|
||||
2.982269972214651954e+00
|
||||
4.280736383314343918e+00
|
||||
4.633629909719495288e+00
|
||||
-2.198052637823726840e+00
|
||||
-1.150759637168392580e+00
|
||||
3.420433363184381292e+00
|
||||
1.857878113059351077e-02
|
||||
-1.559806674919653746e+00
|
||||
4.197498183183401288e+00
|
||||
6.262186949633183453e+00
|
||||
1.100694844370524095e+01
|
||||
2.778688785515088000e+01
|
||||
3.679948298336883195e+00
|
||||
-2.432801394376875592e+00
|
||||
5.133442052706843617e-01
|
||||
2.181172654073517680e+00
|
||||
-8.577551729671881731e-01
|
||||
7.013844214023315926e-01
|
||||
3.138233436228588857e+00
|
||||
7.319940508466630247e-01
|
||||
0.000000000000000000e+00
|
||||
3.529209394581482861e+00
|
||||
1.464585117707144413e+01
|
||||
8.506550226820598359e-01
|
||||
-9.060397326548508268e-01
|
||||
6.787474954688997641e+00
|
||||
8.125411068867387954e+00
|
||||
4.515740684104064151e+00
|
||||
5.372135582950940069e+00
|
||||
9.210951196799497254e-01
|
||||
4.802177410869620466e+00
|
||||
2.945445016176073594e+01
|
||||
1.575032253128311632e+00
|
||||
-1.355276854364796946e-01
|
||||
-3.322474764169629502e-01
|
||||
3.018397817188666732e+00
|
||||
1.186503569922195744e+00
|
||||
0.000000000000000000e+00
|
||||
8.883242370198487503e-01
|
||||
7.248276146728496627e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-4.831246718433664711e+00
|
||||
6.124136970173365002e-01
|
||||
4.145693892559814686e-01
|
||||
2.683998941637626867e+00
|
||||
2.063906603639539039e+00
|
||||
2.989801217386735210e+00
|
||||
2.262965767379551962e-01
|
||||
2.240332214649647380e+00
|
||||
5.984550782416063086e+00
|
||||
4.587011255338186544e+00
|
||||
1.233118485315272039e+01
|
||||
1.115223490909697857e+00
|
||||
-3.682686422016995476e+00
|
||||
6.096498453291562258e-01
|
||||
1.119275528656461516e+00
|
||||
1.377886278915177731e-01
|
||||
3.828176805973048324e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
1.442927634029647344e+01
|
||||
0.000000000000000000e+00
|
||||
5.719118583309401593e-01
|
||||
1.993632609731877392e-01
|
||||
3.047472271520709430e+00
|
||||
5.736784864911910198e+00
|
||||
6.677826247219391220e+00
|
||||
6.307175478564531090e+00
|
||||
3.150295169417364249e+01
|
||||
3.738597740702392258e+00
|
||||
1.129754590514236234e+01
|
||||
6.108506268573830056e+00
|
||||
1.605489516792866667e+00
|
||||
2.929631990348545489e+00
|
||||
-2.832543082245212937e-02
|
||||
1.358286530670594461e+00
|
||||
1.655932469853677924e+00
|
||||
6.701964773769768513e-01
|
||||
2.131182050917533211e+00
|
||||
2.998351165769753468e+00
|
||||
7.772095996358327596e+00
|
||||
1.285014785269981141e+00
|
||||
4.407334784589962418e+00
|
||||
1.719858214230612026e+00
|
||||
-1.012765674651314063e+00
|
||||
-5.749271123172469133e-01
|
||||
-3.559614093795681278e+00
|
||||
-3.073088477387719397e+00
|
||||
-4.492469521371540431e+00
|
||||
-3.753286990415885427e+00
|
||||
-3.219255423324282273e+00
|
||||
-2.806436518181075090e+00
|
||||
-2.697305948568419875e+00
|
||||
-7.879608430851776646e-01
|
||||
4.625507221739111330e+00
|
||||
4.809280703883450414e+00
|
||||
-3.435194026629848629e+00
|
||||
-3.218943068168937049e+00
|
||||
3.335535704890596698e+00
|
||||
2.071359212435486263e+00
|
||||
4.538992059175040339e+00
|
||||
-2.770772323566738038e+01
|
||||
2.903047708571506735e+00
|
||||
-4.436143805989154032e+00
|
||||
-2.647991280011542381e-01
|
||||
1.737252348126810064e+00
|
||||
-4.121989655995259128e+00
|
||||
3.209709099445720581e-01
|
||||
1.012758514896711759e+01
|
||||
3.313255624721038295e+00
|
||||
4.631467619785444967e+00
|
||||
7.668642402146534032e+00
|
||||
6.780938812710099128e+00
|
||||
-3.256164342602652972e+00
|
||||
6.749565128319576779e-01
|
||||
0.000000000000000000e+00
|
||||
-4.407265954524525853e+00
|
||||
0.000000000000000000e+00
|
||||
-3.666522115024547901e+01
|
||||
-7.886029397826226273e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-2.261283814517791058e+01
|
||||
-4.024317426178160240e+00
|
||||
3.213063737030031342e-01
|
||||
5.079805145796887800e+00
|
||||
1.326813226475260343e+00
|
||||
1.233684078112145643e+00
|
||||
8.671852503871454232e+00
|
||||
-2.041800256066371944e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-1.607347800380474823e+01
|
||||
-4.430790279223246309e+00
|
||||
1.177552465851384511e+00
|
||||
6.342921220500139512e+00
|
||||
-2.466913734548706327e-02
|
||||
3.451642566010713065e-01
|
||||
-6.012767168531006234e+00
|
||||
7.328146570137336724e+00
|
||||
7.500088131707050465e+00
|
||||
0.000000000000000000e+00
|
||||
-3.547913249211809017e+01
|
||||
-3.130964814607208879e+00
|
||||
8.247326544297072237e-01
|
||||
3.757262485775580418e-01
|
||||
-2.136528302027558723e+00
|
||||
-2.631627236037529793e-01
|
||||
-2.016718799388414141e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-7.708602132869285528e-01
|
||||
-2.602868328868111814e+00
|
||||
1.435184800833797958e+00
|
||||
0.000000000000000000e+00
|
||||
-2.080420864280113413e+00
|
||||
1.169498351211070819e+00
|
||||
-1.798334115637199560e+01
|
||||
-1.193885252696202670e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
4.304089297965300709e+00
|
||||
-3.020893216686394656e+00
|
||||
-1.234427481614708721e+00
|
||||
0.000000000000000000e+00
|
||||
1.853340741926325697e+00
|
||||
-2.686000064995862147e+01
|
||||
-1.672275139058893600e+01
|
||||
-2.826268691607605987e+01
|
||||
0.000000000000000000e+00
|
||||
0.000000000000000000e+00
|
||||
-1.547397429377200817e+00
|
||||
-4.018181657009961327e+00
|
||||
-7.289186736637049968e+00
|
||||
-7.458655219230571731e+00
|
||||
-9.625538282761622710e+00
|
||||
-1.103039457077456298e+01
|
||||
-6.262675161142102809e+01
|
||||
-9.265912629799268885e+00
|
||||
-8.961543476816615339e+00
|
||||
-9.622764435629340696e+00
|
||||
-1.097978292092879826e+01
|
||||
-1.097978292092879826e+01
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
5�70
|
||||
@@ -0,0 +1 @@
|
||||
59708719594136008472212676481906
|
||||
@@ -0,0 +1 @@
|
||||
5コ705コ(770(777
|
||||
@@ -0,0 +1 @@
|
||||
2Bba5a7FEEcfced4fbbBfFEe16bfcaA4
|
||||
@@ -0,0 +1 @@
|
||||
5コ70(77247・906:
|
||||
@@ -0,0 +1 @@
|
||||
0
|
||||
@@ -0,0 +1 @@
|
||||
70
|
||||
@@ -0,0 +1 @@
|
||||
5コ700772212676481906:
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
�
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user