Compare commits
419
Commits
4.8-stable
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebcea42e2b | ||
|
|
83e6e753af | ||
|
|
8f6f73505d | ||
|
|
556f892a56 | ||
|
|
f44832cc51 | ||
|
|
3f0ea18866 | ||
|
|
b5afa165f0 | ||
|
|
2daab3f248 | ||
|
|
46e450456b | ||
|
|
e92568e4bb | ||
|
|
aa1d7247d1 | ||
|
|
9feede9a14 | ||
|
|
26cc1f131f | ||
|
|
a35fae6b75 | ||
|
|
8fd649ab1e | ||
|
|
bbe52da5cf | ||
|
|
526cf6f291 | ||
|
|
2bedd14aae | ||
|
|
f796c94375 | ||
|
|
7c7c375b45 | ||
|
|
312dc424bd | ||
|
|
aee2c81f76 | ||
|
|
b90d39c4ac | ||
|
|
070a0908b3 | ||
|
|
619005c5b2 | ||
|
|
b6beeef623 | ||
|
|
6a9d4b1ab6 | ||
|
|
7be482f5b1 | ||
|
|
85587a8f98 | ||
|
|
81e42b748e | ||
|
|
6127e04900 | ||
|
|
80171dbcf3 | ||
|
|
25f8964a23 | ||
|
|
abce6d4023 | ||
|
|
d1a59c0308 | ||
|
|
41050af5b5 | ||
|
|
521ce609c8 | ||
|
|
44a290286b | ||
|
|
74d3843ebe | ||
|
|
15643547fe | ||
|
|
5a25f89ab3 | ||
|
|
fd02baa13a | ||
|
|
3639d2045b | ||
|
|
83840f1bb9 | ||
|
|
0109014f2c | ||
|
|
bc8bc69beb | ||
|
|
399be12585 | ||
|
|
2093ac5bf6 | ||
|
|
42dba2e4af | ||
|
|
c63446e592 | ||
|
|
33d3d254ac | ||
|
|
3d1da00d8d | ||
|
|
d6b1c24079 | ||
|
|
0110623b4e | ||
|
|
a064261e85 | ||
|
|
2d33431948 | ||
|
|
8c5e6e9761 | ||
|
|
70c4920184 | ||
|
|
b116456fc5 | ||
|
|
a813121e0a | ||
|
|
4b4b358562 | ||
|
|
6bbae9a70a | ||
|
|
d4650f0f81 | ||
|
|
e4fd6e47a3 | ||
|
|
2e7fc82e55 | ||
|
|
18e03a26ca | ||
|
|
b65a755e85 | ||
|
|
7c6910d9e5 | ||
|
|
e9dc035c5c | ||
|
|
2b4e2f9c9a | ||
|
|
5f8ad0527d | ||
|
|
3d2b611ea6 | ||
|
|
0d495294bf | ||
|
|
6195dbad76 | ||
|
|
1773d7ff2d | ||
|
|
95fe21015d | ||
|
|
b7d77972bc | ||
|
|
e31ef00715 | ||
|
|
266af02752 | ||
|
|
a1845da359 | ||
|
|
a6fd981fcf | ||
|
|
57ecbf38c0 | ||
|
|
66133d1501 | ||
|
|
af955169e1 | ||
|
|
9e549ba781 | ||
|
|
d5bda47efe | ||
|
|
7040847eed | ||
|
|
66036a14f4 | ||
|
|
fd388845d5 | ||
|
|
abc7e430e2 | ||
|
|
a62679952c | ||
|
|
f494bdd653 | ||
|
|
246e972f9c | ||
|
|
95f4d0b852 | ||
|
|
ef89183469 | ||
|
|
905120588b | ||
|
|
1b2e2cd968 | ||
|
|
e75d7a620e | ||
|
|
ad117bfaab | ||
|
|
108b8331d5 | ||
|
|
95897c6436 | ||
|
|
d97afd6efd | ||
|
|
06f4814085 | ||
|
|
8edb2f133c | ||
|
|
f51dfc6973 | ||
|
|
0535e54484 | ||
|
|
bb4fccd2cf | ||
|
|
b83eb7c7a2 | ||
|
|
31de94ba12 | ||
|
|
c63697205b | ||
|
|
93f02ee507 | ||
|
|
65fef09ff2 | ||
|
|
082b00ede7 | ||
|
|
a8507c3308 | ||
|
|
17965c8852 | ||
|
|
fd2838e9a1 | ||
|
|
39a5d234fd | ||
|
|
8b4fdbc0fb | ||
|
|
9ff4bece33 | ||
|
|
142c8f5afb | ||
|
|
1d0be6c4f4 | ||
|
|
54517d8e04 | ||
|
|
bd2968dcd3 | ||
|
|
00a360f30a | ||
|
|
98bf0e243e | ||
|
|
48b0f8e2c1 | ||
|
|
1b3ef7d7b2 | ||
|
|
f5905a62c7 | ||
|
|
a5d45253c4 | ||
|
|
727e72d1f1 | ||
|
|
b535033674 | ||
|
|
700637a162 | ||
|
|
0f77f49b77 | ||
|
|
99e521eaf8 | ||
|
|
09bb383437 | ||
|
|
ead9aa72da | ||
|
|
df29e12f5e | ||
|
|
c0d3f8a92e | ||
|
|
6e61368cd6 | ||
|
|
dface63157 | ||
|
|
6917acffda | ||
|
|
9185c2ccc4 | ||
|
|
aacbc9e918 | ||
|
|
225ff7f8a4 | ||
|
|
1acc9ee396 | ||
|
|
41eef9246c | ||
|
|
b5e8bc2214 | ||
|
|
599cc0f4b8 | ||
|
|
5b32c98a21 | ||
|
|
51f5fc7140 | ||
|
|
be0fd7444f | ||
|
|
27f9ca9d04 | ||
|
|
15a80527c6 | ||
|
|
5ccf41739b | ||
|
|
f758f3605a | ||
|
|
ee87c4bc66 | ||
|
|
58894dd788 | ||
|
|
dabf29ea61 | ||
|
|
e6474d835f | ||
|
|
15f61e7abe | ||
|
|
231748bb0e | ||
|
|
97fae6e00a | ||
|
|
37ddf02e63 | ||
|
|
25c145f26d | ||
|
|
8fad77991d | ||
|
|
4102c8df72 | ||
|
|
1aedbefffa | ||
|
|
6152d595e8 | ||
|
|
56ce228a8b | ||
|
|
c09b4dacdf | ||
|
|
1fb4719e59 | ||
|
|
e2949048e0 | ||
|
|
21da53d3a0 | ||
|
|
8f63a11735 | ||
|
|
65b9ad88a9 | ||
|
|
e7f1946ae7 | ||
|
|
58fdc9fafb | ||
|
|
70aae6e998 | ||
|
|
e0587fe75e | ||
|
|
f2e3c7fb90 | ||
|
|
c2b5b48fc8 | ||
|
|
b287d6ec85 | ||
|
|
478c31b6c9 | ||
|
|
ed5ba179f6 | ||
|
|
c95e8c184e | ||
|
|
71b7afccf5 | ||
|
|
75485e177c | ||
|
|
bfb21dc09b | ||
|
|
31c706c3db | ||
|
|
2399abd272 | ||
|
|
66b6e2b3f2 | ||
|
|
4f2e642fbe | ||
|
|
a1280a2fd1 | ||
|
|
12e142565e | ||
|
|
2f814c526b | ||
|
|
ffd6c3edee | ||
|
|
23536ff77a | ||
|
|
d1aed7b391 | ||
|
|
e93bcfd619 | ||
|
|
ae36648c6c | ||
|
|
0d36d9c8c2 | ||
|
|
4072cb8862 | ||
|
|
f4d7aa45fe | ||
|
|
ad25affcb7 | ||
|
|
31f0608b9a | ||
|
|
03ecb026ff | ||
|
|
f5cec001f3 | ||
|
|
f352e4f77b | ||
|
|
2abb68c8ca | ||
|
|
6207be43fa | ||
|
|
4543385d10 | ||
|
|
a4da4467ac | ||
|
|
b86452f2b1 | ||
|
|
66371c202f | ||
|
|
f2b09014f9 | ||
|
|
02030ac16e | ||
|
|
b15b877c51 | ||
|
|
b59994fa20 | ||
|
|
9af2b9d815 | ||
|
|
ede25cc2b3 | ||
|
|
f8aa642c3c | ||
|
|
13212711ab | ||
|
|
8fbef7fb5a | ||
|
|
4c9446379f | ||
|
|
6c5ecae607 | ||
|
|
c78ed93ec3 | ||
|
|
400cd516b5 | ||
|
|
44c2e59661 | ||
|
|
d2f22d1308 | ||
|
|
47f72443fa | ||
|
|
6c08601c3d | ||
|
|
426494b4ba | ||
|
|
14cfa174be | ||
|
|
fb58f838e5 | ||
|
|
ae501e2503 | ||
|
|
92c2ac5a0f | ||
|
|
fb095a339d | ||
|
|
c807d84054 | ||
|
|
8e562c4ecd | ||
|
|
ec83a592b8 | ||
|
|
7a7df2b7d7 | ||
|
|
65b9c68d7d | ||
|
|
bcca89b78c | ||
|
|
9a0affc6aa | ||
|
|
b3efa7d3fe | ||
|
|
4e712e3ab5 | ||
|
|
d577508727 | ||
|
|
7a83a8dc91 | ||
|
|
f04b4450a1 | ||
|
|
9b26e74bb7 | ||
|
|
82e8bf91dd | ||
|
|
5620e10742 | ||
|
|
7d24e1258d | ||
|
|
49591dda9b | ||
|
|
42d23cff6a | ||
|
|
8651ce9811 | ||
|
|
eb129297e9 | ||
|
|
c83698c957 | ||
|
|
6ac2ce84f8 | ||
|
|
248f3d5588 | ||
|
|
0712d496fe | ||
|
|
6c85f10cd5 | ||
|
|
c704be1a20 | ||
|
|
950f209a17 | ||
|
|
c669044a44 | ||
|
|
88720331ae | ||
|
|
1289951b32 | ||
|
|
311d8b6dae | ||
|
|
4cbe2674ab | ||
|
|
f55358973f | ||
|
|
3107a95881 | ||
|
|
d72a760ac3 | ||
|
|
ca7df1db82 | ||
|
|
1637a991a4 | ||
|
|
111015b872 | ||
|
|
0891ad0e77 | ||
|
|
b22fa558ff | ||
|
|
d29c2f3ad1 | ||
|
|
a1634604e1 | ||
|
|
162c38f18f | ||
|
|
61a18623e7 | ||
|
|
dd8be1fcb1 | ||
|
|
0aea509e23 | ||
|
|
75d3f78f7d | ||
|
|
7b2bbb2309 | ||
|
|
30c2386ee2 | ||
|
|
4f9a08cf05 | ||
|
|
3d57dec6b4 | ||
|
|
ead5bf2adb | ||
|
|
c5b0b05b80 | ||
|
|
6c3d162cd6 | ||
|
|
90b999e3f1 | ||
|
|
8321b79539 | ||
|
|
ce08291ccd | ||
|
|
40797521af | ||
|
|
3d09b25653 | ||
|
|
f23e9dc7bb | ||
|
|
7f9973bd0c | ||
|
|
88d1416b70 | ||
|
|
0180c1f04a | ||
|
|
3c7ed34ce9 | ||
|
|
0f4d9f5054 | ||
|
|
3dbd89eee8 | ||
|
|
308f71a6e8 | ||
|
|
d886a6107f | ||
|
|
2796bc9b47 | ||
|
|
2f657cb8f9 | ||
|
|
1366518bff | ||
|
|
99d4838328 | ||
|
|
f2be972224 | ||
|
|
caa223d2ba | ||
|
|
5c7200f2bb | ||
|
|
7c4be6d077 | ||
|
|
53b9ae23e8 | ||
|
|
cbea1b2203 | ||
|
|
a95d4744b6 | ||
|
|
8285fffdae | ||
|
|
b90c18e906 | ||
|
|
5eb468d07b | ||
|
|
6fc8aa4e61 | ||
|
|
41aa2f96b6 | ||
|
|
28b1ce41cb | ||
|
|
a5595d16c0 | ||
|
|
149067b3fc | ||
|
|
33f11cb10f | ||
|
|
8aa09f9c99 | ||
|
|
308b266333 | ||
|
|
6af93c09c8 | ||
|
|
59c8eabc0e | ||
|
|
d8c7a76611 | ||
|
|
0f3e6d832b | ||
|
|
8ea16ffd77 | ||
|
|
ef62391dba | ||
|
|
bda037c57f | ||
|
|
193f28582b | ||
|
|
8e14aac5e0 | ||
|
|
241c42ad7e | ||
|
|
7b5354588b | ||
|
|
b3f2b1bb7f | ||
|
|
673b6e7345 | ||
|
|
adf8982d8e | ||
|
|
59d476195c | ||
|
|
c809e7c069 | ||
|
|
f74cf16c36 | ||
|
|
ad20846fad | ||
|
|
72601a69ff | ||
|
|
be50493f44 | ||
|
|
7b0c16a70d | ||
|
|
c34bded4ef | ||
|
|
983b8e8eee | ||
|
|
24df1913ac | ||
|
|
6f046df0dc | ||
|
|
d85f8592b8 | ||
|
|
1100326edb | ||
|
|
d3d9770b96 | ||
|
|
cc721fd3ce | ||
|
|
0114992f5f | ||
|
|
3b35cb37d9 | ||
|
|
ac90b1f009 | ||
|
|
5fb631c8fe | ||
|
|
c60c03766c | ||
|
|
688a197b85 | ||
|
|
ebb1bc2f34 | ||
|
|
84427b0754 | ||
|
|
3763c702f0 | ||
|
|
0b6e261523 | ||
|
|
da629709f3 | ||
|
|
7ff22a7e3c | ||
|
|
87399b3544 | ||
|
|
27802b0134 | ||
|
|
fbae51ae9d | ||
|
|
5c8c5c90c2 | ||
|
|
21f2574033 | ||
|
|
35abafec4f | ||
|
|
ae6e6d61f0 | ||
|
|
55664392a9 | ||
|
|
8d71998670 | ||
|
|
bdb73db1a4 | ||
|
|
6c9571d9a9 | ||
|
|
344ac69468 | ||
|
|
38f9a74713 | ||
|
|
0cb6f4cb75 | ||
|
|
b08c787fe2 | ||
|
|
0673da54b5 | ||
|
|
b539b0d090 | ||
|
|
58a9e2d967 | ||
|
|
0db12b1390 | ||
|
|
6dcecd73d3 | ||
|
|
d5c9a16a48 | ||
|
|
5a2666ce9e | ||
|
|
cd59485f7e | ||
|
|
50006516b3 | ||
|
|
773e9b8170 | ||
|
|
f49cedc1e8 | ||
|
|
5e9f10f820 | ||
|
|
c6af36990e | ||
|
|
42d24f8799 | ||
|
|
e399bd7e3d | ||
|
|
8769a2282b | ||
|
|
9fb7a63576 | ||
|
|
76829b413f | ||
|
|
b8e0602bfd | ||
|
|
2c2eaf8e79 | ||
|
|
03fd155ae3 | ||
|
|
32b50f5aa4 | ||
|
|
c711251578 | ||
|
|
e8e4b9e8ff | ||
|
|
ed17f4d658 | ||
|
|
8b07be4b9f | ||
|
|
611c3b66f0 | ||
|
|
1832d247b3 | ||
|
|
9509cd507a | ||
|
|
4a8e7105b2 | ||
|
|
e70333de87 | ||
|
|
71d768d036 | ||
|
|
a443bba0dd | ||
|
|
25c54dd6d7 | ||
|
|
7122599287 | ||
|
|
23759c6d2d |
@@ -1,3 +1,5 @@
|
||||
mpile
|
||||
|
||||
# Codige Code Review ignore
|
||||
|
||||
# Prevent Codiga complaining about Sphinx config.py
|
||||
|
||||
@@ -21,7 +21,7 @@ A clear and concise description of what happening.
|
||||
* OS version: [e.g. 18.04]
|
||||
* Architecture: [e.g. arm64]
|
||||
* nDPI version or commit hash: [e.g. 4.0-stable or 937357e4bc55610f116f66d15a8e0fc1e260c02c].
|
||||
* nDPI compilation flags used: if you are building from source [e.g. --with-pcre --with-local-libgcrypt].
|
||||
* nDPI compilation flags used: if you are building from source [e.g. --with-pcre2 --with-local-libgcrypt].
|
||||
* Attach the `config.log` file generated after `./configure` ran (if you are building from source).
|
||||
|
||||
## How to reproduce the reported bug
|
||||
|
||||
@@ -15,10 +15,10 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.1
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
||||
- name: Download NuGet packages
|
||||
run: msbuild windows/nDPI.sln -t:restore -p:RestorePackagesConfig=true
|
||||
@@ -36,7 +36,7 @@ jobs:
|
||||
run: msbuild windows/nDPI.sln -t:rebuild -property:Configuration=Debug-ndpiReader
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: build-artifacts
|
||||
path: windows/bin
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
name: RPM Build
|
||||
on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
# At the end of every day
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- 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
|
||||
|
||||
- name: Configure nDPI
|
||||
run: |
|
||||
# fake CentOS 7 env
|
||||
echo 'CentOS Linux release 7.9.2009 (Core)' | sudo tee /etc/centos-release
|
||||
# symlink source directory for ndpi.spec
|
||||
ln -sr . $HOME/nDPI
|
||||
./autogen.sh
|
||||
cd packages/rpm
|
||||
./configure
|
||||
|
||||
- name: Build RPM package
|
||||
run: |
|
||||
make -C packages/rpm package
|
||||
+105
-79
@@ -14,13 +14,13 @@ jobs:
|
||||
name: Python Bindings (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
CFLAGS: -Werror
|
||||
CFLAGS: -Wextra -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Set up Python 3.9
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.9"
|
||||
- name: Install Ubuntu Prerequisites
|
||||
@@ -30,7 +30,7 @@ jobs:
|
||||
- name: Build nDPI library
|
||||
run: |
|
||||
./autogen.sh
|
||||
make
|
||||
make -j
|
||||
sudo make install
|
||||
- name: Generate Python bindings
|
||||
run: |
|
||||
@@ -47,7 +47,7 @@ jobs:
|
||||
name: Test Utils (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
@@ -67,17 +67,17 @@ jobs:
|
||||
git diff-index --quiet HEAD -- || true
|
||||
|
||||
test:
|
||||
name: ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.gcrypt }} ${{ matrix.compiler }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} ${{ matrix.msan }} ${{ matrix.nBPF }} ${{matrix.lto_gold_linker}}
|
||||
name: ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.gcrypt }} ${{ matrix.compiler }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} ${{ matrix.msan }} ${{ matrix.nBPF }} ${{matrix.lto_gold_linker}} ${{matrix.global_context}}
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
CC: ${{ matrix.compiler }}
|
||||
CFLAGS: -Werror
|
||||
CFLAGS: -Wextra -Werror -DNDPI_EXTENDED_SANITY_CHECKS
|
||||
strategy:
|
||||
fail-fast: true
|
||||
matrix:
|
||||
# ubuntu-latest == ubuntu-22.04
|
||||
# macOS-latest == macos-12
|
||||
os: ["ubuntu-latest", "ubuntu-20.04", "macOS-latest", "macos-11", "windows-latest"]
|
||||
# macOS-latest == macos-14 on **ARM64**
|
||||
# There are some issues with external dependencies on macOS-latest. Disable it for the time being
|
||||
os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04", "macOS-12", "macOS-13", "windows-latest"]
|
||||
arch: ["x86_64"]
|
||||
gcrypt: ["--with-local-libgcrypt", ""]
|
||||
compiler: ["cc"]
|
||||
@@ -88,48 +88,64 @@ jobs:
|
||||
msan: [""]
|
||||
nBPF: [""]
|
||||
lto_gold_linker: [""]
|
||||
global_context: [""] #Enable by default
|
||||
include:
|
||||
- compiler: "gcc-7" # "Oldest" gcc easily available
|
||||
- compiler: "gcc-4.9" # "Oldest" gcc easily available. To simulate RHEL7
|
||||
os: ubuntu-20.04
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
- compiler: "gcc-12" # "Newest" gcc easily available
|
||||
os: ubuntu-22.04
|
||||
- compiler: "gcc-14" # "Newest" gcc easily available
|
||||
os: ubuntu-24.04
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
lto_gold_linker: "--with-lto-and-gold-linker"
|
||||
- compiler: "clang-7" # "Oldest" clang easily available
|
||||
- compiler: "clang-9" # "Oldest" clang easily available
|
||||
os: ubuntu-20.04
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
- compiler: "clang-14" # "Newest" clang easily available
|
||||
ar: "llvm-ar-14"
|
||||
ranlib: "llvm-ranlib-14"
|
||||
os: ubuntu-22.04
|
||||
- compiler: "clang-17" # "Newest" clang easily available. See also below...
|
||||
ar: "llvm-ar-17"
|
||||
ranlib: "llvm-ranlib-17"
|
||||
os: ubuntu-24.04
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
lto_gold_linker: "--with-lto-and-gold-linker"
|
||||
- compiler: "clang-18" # "The latest clang version easily available should be 18,
|
||||
# but it is buggy on ubuntu-24.04 with LTO and Gold linker:
|
||||
# https://github.com/llvm/llvm-project/issues/87553
|
||||
# https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-18/+bug/2064187
|
||||
# Waiting for a fix...
|
||||
ar: "llvm-ar-18"
|
||||
ranlib: "llvm-ranlib-18"
|
||||
os: ubuntu-24.04
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
lto_gold_linker: ""
|
||||
- compiler: "cc"
|
||||
os: ubuntu-latest
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-thread-sanitizer"
|
||||
nBPF: ""
|
||||
@@ -137,39 +153,48 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: "nBPF"
|
||||
- compiler: "clang-14"
|
||||
- compiler: "cc"
|
||||
os: ubuntu-latest
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
global_context: "--disable-global-context-support"
|
||||
- compiler: "clang" #TODO: some issues with masan/clang/ubuntu-24.04
|
||||
os: ubuntu-22.04
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-memory-sanitizer"
|
||||
nBPF: ""
|
||||
- compiler: "cc"
|
||||
os: macOS-latest
|
||||
os: macOS-13
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "" # Disable sanitizer on macos
|
||||
nBPF: ""
|
||||
- compiler: "cc"
|
||||
os: macos-12
|
||||
os: macos-14
|
||||
arch: "x86_64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
maxminddb: "--with-maxminddb"
|
||||
pcre: ""
|
||||
maxminddb: ""
|
||||
msan: "" # Disable sanitizer on macos
|
||||
nBPF: ""
|
||||
- compiler: "cc"
|
||||
os: ubuntu-latest
|
||||
arch: "arm64"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "" # Disable sanitizer on arm64
|
||||
nBPF: ""
|
||||
@@ -177,7 +202,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
arch: "armhf"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: "--with-sanitizer"
|
||||
nBPF: ""
|
||||
@@ -185,7 +210,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
arch: "s390x"
|
||||
gcrypt: ""
|
||||
pcre: "--with-pcre"
|
||||
pcre: "--with-pcre2"
|
||||
maxminddb: "--with-maxminddb"
|
||||
msan: ""
|
||||
nBPF: ""
|
||||
@@ -194,9 +219,15 @@ jobs:
|
||||
if: startsWith(matrix.os, 'ubuntu') && !startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
|
||||
- name: Fix kernel mmap rnd bits on Ubuntu
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
# Workaround for compatinility between latest kernel and sanitizer
|
||||
# See https://github.com/actions/runner-images/issues/9491
|
||||
sudo sysctl vm.mmap_rnd_bits=28
|
||||
- name: Install Ubuntu Prerequisites
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
@@ -204,13 +235,13 @@ jobs:
|
||||
sudo apt-get install autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev
|
||||
sudo apt-get install gcc-mingw-w64 libc6-dev
|
||||
sudo apt-get install doxygen python3-sphinx python3-sphinx-rtd-theme python3-breathe python3-pip
|
||||
sudo apt-get install rrdtool librrd-dev
|
||||
sudo apt-get install rrdtool librrd-dev parallel
|
||||
- name: Install Ubuntu Prerequisites (libgcrypt)
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.gcrypt, '--with-local-libgcrypt')
|
||||
run: |
|
||||
sudo apt-get install libgcrypt20-dev
|
||||
- name: Install Ubuntu Prerequisites (libpcre)
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre')
|
||||
- name: Install Ubuntu Prerequisites (libpcre2)
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre2')
|
||||
run: |
|
||||
sudo apt-get install libpcre3-dev
|
||||
- name: Install Ubuntu Prerequisites (maxminddb)
|
||||
@@ -226,8 +257,13 @@ jobs:
|
||||
make
|
||||
cd -
|
||||
- name: Setup Ubuntu specified compiler
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && ! startsWith(matrix.compiler, 'cc')
|
||||
if: startsWith(matrix.os, 'ubuntu-20.04') && startsWith(matrix.arch, 'x86_64') && ! startsWith(matrix.compiler, 'cc')
|
||||
run: |
|
||||
#For gcc-4.9 (on ubuntu-20.04)
|
||||
echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" | sudo tee -a /etc/apt/sources.list
|
||||
echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" | sudo tee -a /etc/apt/sources.list
|
||||
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
|
||||
sudo apt-get update
|
||||
sudo apt-get install ${{ matrix.compiler }}
|
||||
- name: Install Windows msys2 prerequisites
|
||||
if: startsWith(matrix.os, 'windows')
|
||||
@@ -235,39 +271,22 @@ jobs:
|
||||
with:
|
||||
msystem: MINGW64
|
||||
update: true
|
||||
install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool make mingw-w64-x86_64-json-c mingw-w64-x86_64-crt-git mingw-w64-x86_64-pcre mingw-w64-x86_64-libpcap
|
||||
- name: Setup Windows msys2 prerequisites (libgcrypt)
|
||||
if: startsWith(matrix.os, 'windows') && startsWith(matrix.gcrypt, '--with-local-libgcrypt')
|
||||
run: |
|
||||
msys2 -c 'git clone --branch libgpg-error-1.42 https://github.com/gpg/libgpg-error'
|
||||
cd libgpg-error
|
||||
msys2 -c './autogen.sh'
|
||||
msys2 -c './configure -enable-maintainer-mode --enable-static --enable-shared --with-pic --disable-doc --disable-nls'
|
||||
msys2 -c 'make'
|
||||
msys2 -c 'make install'
|
||||
msys2 -c 'cd ..'
|
||||
msys2 -c 'rm -rf libgpg-error/'
|
||||
msys2 -c 'git clone --branch libgcrypt-1.8.8 https://github.com/gpg/libgcrypt'
|
||||
cd libgcrypt
|
||||
msys2 -c './autogen.sh'
|
||||
msys2 -c './configure -enable-maintainer-mode --enable-static --enable-shared --with-pic --disable-doc'
|
||||
msys2 -c 'make'
|
||||
msys2 -c 'make install'
|
||||
msys2 -c 'cd ..'
|
||||
msys2 -c 'rm -rf libgcrypt/'
|
||||
env:
|
||||
CC:
|
||||
CFLAGS:
|
||||
install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool make mingw-w64-x86_64-json-c mingw-w64-x86_64-crt-git mingw-w64-x86_64-pcre mingw-w64-x86_64-libpcap mingw-w64-x86_64-libgcrypt parallel
|
||||
- name: Installing MacOS prerequisites
|
||||
if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
brew install coreutils wdiff colordiff autoconf automake libtool pkg-config gettext json-c rrdtool
|
||||
# A workaround for "The `brew link` step did not complete successfully" error.
|
||||
# See https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
|
||||
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
|
||||
sudo rm -rf /Library/Frameworks/Python.framework/
|
||||
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
|
||||
brew install coreutils wdiff colordiff autoconf automake libtool pkg-config gettext json-c rrdtool parallel
|
||||
- name: Install MacOS Prerequisites (libgcrypt)
|
||||
if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.gcrypt, '--with-local-libgcrypt')
|
||||
run: |
|
||||
brew install libgcrypt
|
||||
- name: Install MacOS Prerequisites (libpcre)
|
||||
if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre')
|
||||
- name: Install MacOS Prerequisites (libpcre2)
|
||||
if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre2')
|
||||
run: |
|
||||
brew install pcre
|
||||
- name: Install MacOS Prerequisites (maxminddb)
|
||||
@@ -277,7 +296,7 @@ jobs:
|
||||
- name: Configure nDPI on Ubuntu
|
||||
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
AR=${{ matrix.ar }} RANLIB=${{ matrix.ranlib }} ./autogen.sh --enable-option-checking=fatal --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} --enable-tls-sigs ${{matrix.lto_gold_linker}}
|
||||
AR=${{ matrix.ar }} RANLIB=${{ matrix.ranlib }} ./autogen.sh --enable-option-checking=fatal --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} --enable-tls-sigs ${{matrix.lto_gold_linker}} ${{matrix.global_context}}
|
||||
- name: Configure nDPI on MacOS
|
||||
if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.compiler, 'cc')
|
||||
run: |
|
||||
@@ -289,23 +308,30 @@ jobs:
|
||||
- name: Build nDPI on Windows msys2
|
||||
if: startsWith(matrix.os, 'windows') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.compiler, 'cc')
|
||||
run: |
|
||||
msys2 -c 'make all'
|
||||
msys2 -c 'make -j all'
|
||||
msys2 -c 'ldd ./example/ndpiReader.exe'
|
||||
- name: Build nDPI
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows')
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macos-14')
|
||||
run: |
|
||||
make all
|
||||
make -j all
|
||||
make -C example ndpiSimpleIntegration
|
||||
make -C rrdtool
|
||||
- name: Build nDPI (MacOS M1)
|
||||
if: startsWith(matrix.os, 'macos-14')
|
||||
run: |
|
||||
make -j all
|
||||
make -C example ndpiSimpleIntegration
|
||||
#There are somes issues with librrd
|
||||
#make -C rrdtool
|
||||
- name: Print nDPI long help
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
./example/ndpiReader -H
|
||||
cd ./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
|
||||
DESTDIR=/tmp/ndpi make install
|
||||
ls -alhHR /tmp/ndpi
|
||||
- name: Test nDPI [SYMBOLS]
|
||||
if: (startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'mac')) && startsWith(matrix.arch, 'x86_64')
|
||||
run: |
|
||||
@@ -315,10 +341,10 @@ jobs:
|
||||
- name: Test nDPI [DIFF]
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
./tests/do.sh
|
||||
NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh
|
||||
- name: Test nDPI [UNIT]
|
||||
#Some issues with masan + json-c. Disable the test as workaround
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows') && !startsWith(matrix.msan, '--with-memory-sanitizer')
|
||||
if: startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.os, 'windows') && !startsWith(matrix.msan, '--with-memory-sanitizer') && !startsWith(matrix.os, 'macos-14')
|
||||
run: |
|
||||
./tests/do-unit.sh
|
||||
- name: Test nDPI [DGA]
|
||||
@@ -328,7 +354,7 @@ jobs:
|
||||
- name: Test nDPI [DIFF] (runs only on windows jobs)
|
||||
if: startsWith(matrix.arch, 'x86_64') && startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
msys2 -c './tests/do.sh'
|
||||
msys2 -c 'NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh'
|
||||
- name: Test nDPI [UNIT] (runs only on windows jobs)
|
||||
if: startsWith(matrix.arch, 'x86_64') && startsWith(matrix.os, 'windows')
|
||||
run: |
|
||||
@@ -347,7 +373,7 @@ jobs:
|
||||
run: |
|
||||
make distclean
|
||||
./autogen.sh --enable-option-checking=fatal --enable-debug-messages --enable-tls-sigs --host=x86_64-w64-mingw32
|
||||
make all
|
||||
make -j $(nproc) all
|
||||
env:
|
||||
CC:
|
||||
- name: Display qemu specified architecture (arm64 - little endian)
|
||||
@@ -369,7 +395,7 @@ jobs:
|
||||
apt-get -y install git wdiff colordiff autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev libgcrypt20-dev libpcre3-dev libmaxminddb-dev rrdtool librrd-dev &&
|
||||
git config --global --add safe.directory $(realpath .) &&
|
||||
env CC=gcc CFLAGS='-Werror' ./autogen.sh --enable-option-checking=fatal --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} --enable-tls-sigs &&
|
||||
make all &&
|
||||
make -j all &&
|
||||
make -C example ndpiSimpleIntegration &&
|
||||
make -C rrdtool &&
|
||||
make check VERBOSE=1
|
||||
@@ -393,7 +419,7 @@ jobs:
|
||||
apt-get -y install git wdiff colordiff autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev libgcrypt20-dev libpcre3-dev libmaxminddb-dev rrdtool librrd-dev &&
|
||||
git config --global --add safe.directory $(realpath .) &&
|
||||
env CC=gcc CFLAGS='-Werror' ./autogen.sh --enable-option-checking=fatal --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} --enable-tls-sigs &&
|
||||
make all &&
|
||||
make -j all &&
|
||||
make -C example ndpiSimpleIntegration &&
|
||||
make -C rrdtool &&
|
||||
make check VERBOSE=1
|
||||
@@ -417,7 +443,7 @@ jobs:
|
||||
apt-get -y install git wdiff colordiff autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev libgcrypt20-dev libpcre3-dev libmaxminddb-dev rrdtool librrd-dev &&
|
||||
git config --global --add safe.directory $(realpath .) &&
|
||||
env CC=gcc CFLAGS='-Werror' ./autogen.sh --enable-option-checking=fatal --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} --enable-tls-sigs &&
|
||||
make all &&
|
||||
make -j all &&
|
||||
make -C example ndpiSimpleIntegration &&
|
||||
make -C rrdtool &&
|
||||
make check VERBOSE=1
|
||||
|
||||
@@ -12,7 +12,7 @@ jobs:
|
||||
env:
|
||||
CFLAGS: -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
@@ -23,7 +23,7 @@ jobs:
|
||||
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
|
||||
run: ./autogen.sh --enable-option-checking=fatal --enable-debug-messages --enable-code-coverage --with-pcre2 --with-maxminddb --enable-tls-sigs
|
||||
- name: Build
|
||||
run: make all
|
||||
- name: Test
|
||||
@@ -32,7 +32,7 @@ jobs:
|
||||
- name: Generate Coverage Report
|
||||
run: |
|
||||
make coverage
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ndpi-coverage-report
|
||||
path: coverage_report
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
name: Documentation (ubuntu-latest)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Set up Python 3.9
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
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
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ndpi-documentation
|
||||
path: doc/_build/ndpi-documentation-upload
|
||||
@@ -76,7 +76,7 @@ jobs:
|
||||
GO111MODULE: on
|
||||
CFLAGS: -Werror
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
@@ -84,27 +84,27 @@ jobs:
|
||||
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 autoconf automake libtool pkg-config gettext flex bison libpcap-dev parallel
|
||||
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
|
||||
./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre2 --with-maxminddb --enable-tls-sigs
|
||||
- name: Build nDPI library
|
||||
run: |
|
||||
make
|
||||
make -j
|
||||
- name: Performance Profiling
|
||||
run: |
|
||||
./tests/do.sh
|
||||
NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./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
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ndpi-performance
|
||||
path: ndpi-performance-upload
|
||||
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
|
||||
with:
|
||||
oss-fuzz-project-name: 'ndpi'
|
||||
fuzz-seconds: 1200
|
||||
fuzz-seconds: 1320
|
||||
dry-run: false
|
||||
sanitizer: ${{ matrix.sanitizer }}
|
||||
- name: Check Crash (fails when a crash is detected)
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
run: |
|
||||
exit $(ls out/artifacts |wc -l)
|
||||
- name: Upload Crash (upload detected crash as artifacts)
|
||||
uses: actions/upload-artifact@v1
|
||||
uses: actions/upload-artifact@v4
|
||||
if: failure()
|
||||
with:
|
||||
name: ${{ matrix.sanitizer }}-artifacts
|
||||
|
||||
@@ -24,10 +24,10 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
language: [ 'cpp', 'python', 'ruby' ]
|
||||
language: [ 'cpp', 'python' ]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Ubuntu Prerequisites
|
||||
@@ -42,18 +42,18 @@ jobs:
|
||||
pprof -h
|
||||
- name: Configure nDPI library
|
||||
run: |
|
||||
./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre --with-maxminddb --enable-tls-sigs --enable-debug-messages
|
||||
./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre2 --with-maxminddb --enable-tls-sigs --enable-debug-messages
|
||||
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v2
|
||||
uses: github/codeql-action/init@v3
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
|
||||
- name: Build nDPI library
|
||||
run: |
|
||||
make
|
||||
make -j
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v2
|
||||
uses: github/codeql-action/analyze@v3
|
||||
with:
|
||||
category: "/language:${{matrix.language}}"
|
||||
|
||||
+31
-7
@@ -61,6 +61,7 @@
|
||||
/fuzz/fuzz_alg_crc32_md5
|
||||
/fuzz/fuzz_alg_ses_des
|
||||
/fuzz/fuzz_alg_bytestream
|
||||
/fuzz/fuzz_alg_shoco
|
||||
/fuzz/fuzz_config
|
||||
/fuzz/fuzz_community_id
|
||||
/fuzz/fuzz_serialization
|
||||
@@ -70,49 +71,71 @@
|
||||
/fuzz/fuzz_ds_ptree
|
||||
/fuzz/fuzz_ds_hash
|
||||
/fuzz/fuzz_ds_ahocorasick
|
||||
/fuzz/fuzz_ds_bitmap64
|
||||
/fuzz/fuzz_ds_bitmap64_fuse
|
||||
/fuzz/fuzz_ds_domain_classify
|
||||
/fuzz/fuzz_libinjection
|
||||
/fuzz/fuzz_binaryfusefilter
|
||||
/fuzz/fuzz_tls_certificate
|
||||
/fuzz/fuzz_dga
|
||||
/fuzz/fuzz_is_stun_udp
|
||||
/fuzz/fuzz_is_stun_tcp
|
||||
/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_ndpi_reader_pl7m_simplest
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_simplest_internal
|
||||
/fuzz/fuzz_ndpi_reader_pl7m
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_64k
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_internal
|
||||
/fuzz/fuzz_filecfg_protocols
|
||||
/fuzz/fuzz_filecfg_categories
|
||||
/fuzz/fuzz_filecfg_category
|
||||
/fuzz/fuzz_filecfg_malicious_sha1
|
||||
/fuzz/fuzz_filecfg_malicious_ja3
|
||||
/fuzz/fuzz_filecfg_risk_domains
|
||||
/fuzz/fuzz_filecfg_config
|
||||
/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_ndpi_reader_pl7m_seed_corpus.zip
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_64k_seed_corpus.zip
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_internal_seed_corpus.zip
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_simplest_seed_corpus.zip
|
||||
/fuzz/fuzz_ndpi_reader_pl7m_simplest_internal_seed_corpus.zip
|
||||
/fuzz/fuzz_quic_get_crypto_data_seed_corpus.zip
|
||||
/fuzz/fuzz_config_seed_corpus.zip
|
||||
/fuzz/fuzz_community_id_seed_corpus.zip
|
||||
/fuzz/fuzz_is_stun_udp_seed_corpus.zip
|
||||
/fuzz/fuzz_is_stun_tcp_seed_corpus.zip
|
||||
/fuzz/fuzz_serialization_seed_corpus.zip
|
||||
/fuzz/fuzz_alg_ses_des_seed_corpus.zip
|
||||
/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_bitmap64_fuse_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_filecfg_categories_seed_corpus.zip
|
||||
/fuzz/fuzz_filecfg_category_seed_corpus.zip
|
||||
/fuzz/fuzz_filecfg_malicious_sha1_seed_corpus.zip
|
||||
/fuzz/fuzz_filecfg_malicious_ja3_seed_corpus.zip
|
||||
/fuzz/fuzz_filecfg_risk_domains_seed_corpus.zip
|
||||
/fuzz/fuzz_filecfg_config_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
|
||||
/fuzz/testpcaps.zip
|
||||
/influxdb/Makefile
|
||||
/install-sh
|
||||
/libndpi.pc
|
||||
@@ -139,6 +162,7 @@
|
||||
/src/lib/libndpi.so*
|
||||
/src/lib/protocols/.deps/
|
||||
/src/lib/third_party/src/.deps/
|
||||
/src/lib/third_party/src/fuzz/.deps/
|
||||
/tags
|
||||
/test-driver
|
||||
/tests/Makefile
|
||||
|
||||
+1
-1
@@ -384,7 +384,7 @@
|
||||
- Fix stop of extra dissection in HTTP, Bittorrent, Kerberos
|
||||
- Fix signed integer overflow in ASN1/BER dissector
|
||||
- Fix char/uchar bug in ahocorasick
|
||||
- Fix endianess in IP-Port lookup
|
||||
- Fix endianness in IP-Port lookup
|
||||
- Fix FastCGI memory allocation issue
|
||||
- Fix metadata extraction in NAT-PMP
|
||||
- Fix invalid unidirectional traffic alert for unidirectional protocols (e.g. sFlow)
|
||||
|
||||
@@ -24,4 +24,10 @@ Please keep all code, comments, issues and pull requests in English, otherwise t
|
||||
- If there is an open issue for the bug, ensure the description of the pull request contains `Fixes #issue_number`.
|
||||
- Ensure the pull request passes CI testing. Any pull request which fails CI will be **ignored**.
|
||||
|
||||
## Before you submit your code
|
||||
|
||||
As we want to make sure that we can incorporate your changes in nDPI, we ask all contributors to read and sign the
|
||||
[Contributor License Agreement](https://github.com/ntop/legal/blob/main/individual-contributor-licence-agreement.md)
|
||||
that guarantees that your code is original and royalty-free to keep nDPI free and available for everybody,
|
||||
|
||||
Finally, thank you for your contributions.
|
||||
|
||||
+4
-1
@@ -14,12 +14,15 @@ EXTRA_DIST = README.md README.fuzzer.md CHANGELOG.md CONTRIBUTING.md \
|
||||
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/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 \
|
||||
doc/Makefile doc/what_is_ndpi.rst doc/FAQ.md doc/configuration_parameters.md \
|
||||
doc/library_initialization.md \
|
||||
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/100_malware.list \
|
||||
lists/107_gambling.list \
|
||||
lists/107_gambling_custom.list \
|
||||
lists/public_suffix_list.dat \
|
||||
lists/README.md \
|
||||
sonar-project.properties .github .ci-ignore
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
![ntop][ntopng_logo] ![ntop][ntop_logo]
|
||||
# nDPI
|
||||
|
||||
[](https://github.com/ntop/nDPI/actions?query=workflow%3ABuild)
|
||||
@@ -8,6 +7,8 @@
|
||||
|
||||
nDPI® is an open source LGPLv3 library for deep-packet inspection. Based on OpenDPI it includes ntop extensions. We have tried to push them into the OpenDPI source tree but nobody answered emails so we have decided to create our own source tree
|
||||
|
||||
A generic FAQ about nDPI® is available [here](https://github.com/ntop/nDPI/blob/dev/doc/FAQ.md)
|
||||
|
||||
### How To Compile nDPI
|
||||
|
||||
In order to compile this project do
|
||||
@@ -51,7 +52,7 @@ On Windows:
|
||||
There are three supported ways to build nDPI:
|
||||
|
||||
1. MSYS2 (assuming [MSYS2](https://www.msys2.org/) already installed):
|
||||
- msys2 -c "pacman --noconfirm -S --needed --overwrite '\*' git mingw-w64-x86\_64-toolchain automake1.16 automake-wrapper autoconf libtool make mingw-w64-x86\_64-json-c mingw-w64-x86\_64-crt-git mingw-w64-x86\_64-pcre mingw-w64-x86\_64-libpcap"
|
||||
- msys2 -c "pacman --noconfirm -S --needed --overwrite '\*' git mingw-w64-x86\_64-toolchain automake1.16 automake-wrapper autoconf libtool make mingw-w64-x86\_64-json-c mingw-w64-x86\_64-crt-git mingw-w64-x86\_64-pcre2 mingw-w64-x86\_64-libpcap"
|
||||
|
||||
2. Mingw-w64
|
||||
|
||||
@@ -78,11 +79,12 @@ The entire procedure of adding new protocols in detail:
|
||||
4. Add a new entry for the search function for the new protocol in: `src/include/ndpi_protocols.h`
|
||||
5. Choose (do not change anything) a selection bitmask from: `src/include/ndpi_define.h`
|
||||
6. Set protocol default ports in `ndpi_init_protocol_defaults` in: `src/lib/ndpi_main.c`
|
||||
7. Be sure to have nBPF support, cloning `PF_RING` in the same directory where you cloned `nDPI`: `git clone https://github.com/ntop/PF_RING/ && cd PF_RING/userland/nbpf && ./configure && make`
|
||||
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)
|
||||
7. Be sure to have nBPF support, cloning `PF_RING` in the same directory where you cloned `nDPI`: `git clone https://github.com/ntop/PF_RING/ && cd PF_RING/userland/nbpf && ./configure && make`. You can ignore the `/bin/sh: 1: ../lib/pfring_config: not found` error
|
||||
8. From the `nDPI` root directory, `./autogen.sh --with-pcre2` (nBPF and PCRE2 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`
|
||||
12. Update the Windows Visual Studio configuration, adding the new c file in `windows/nDPI.vcxproj`
|
||||
|
||||
### How to use nDPI to Block Selected Traffic
|
||||
|
||||
|
||||
+66
-23
@@ -1,4 +1,4 @@
|
||||
AC_INIT([libndpi],[4.7.0])
|
||||
AC_INIT([libndpi],[4.9.0])
|
||||
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
@@ -29,6 +29,7 @@ AC_ARG_ENABLE(npcap, AS_HELP_STRING([--disable-npcap], [msys2 only: Disable link
|
||||
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_ENABLE(debug-build, AS_HELP_STRING([--enable-debug-build], [Enable debug build (`-g` flag)]),[enable_debugbuild=$enableval],[enable_debugbuild=no])
|
||||
AC_ARG_ENABLE(global-context-support, AS_HELP_STRING([--disable-global-context-support], [Disable support for global context. No external dependency on libpthread]))
|
||||
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -D_DEFAULT_SOURCE=1 -D_GNU_SOURCE=1"
|
||||
|
||||
@@ -64,8 +65,14 @@ AS_IF([test "${with_sanitizer+set}" = set -o "${with_thread_sanitizer+set}" = se
|
||||
])
|
||||
|
||||
AS_IF([test "${with_sanitizer+set}" = set],[
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer"
|
||||
NDPI_LDFLAGS="${NDPI_LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak"
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak -fno-omit-frame-pointer"
|
||||
NDPI_LDFLAGS="${NDPI_LDFLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak"
|
||||
#Sanitizers should work on any compilers that we support (or that we test on CI, at least)
|
||||
#Exception: "-fsanitize=alignment" is not supported in gcc 4.9
|
||||
AX_CHECK_COMPILE_FLAG([-fno-sanitize=alignment], [
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -fno-sanitize=alignment"
|
||||
NDPI_LDFLAGS="${NDPI_LDFLAGS} -fno-sanitize=alignment"
|
||||
])
|
||||
])
|
||||
|
||||
AS_IF([test "${with_thread_sanitizer+set}" = set],[
|
||||
@@ -113,6 +120,29 @@ AC_CHECK_TOOL(AR, ar, [false])
|
||||
|
||||
AC_LANG_WERROR
|
||||
|
||||
AC_MSG_CHECKING([whether roaring v3 works])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#if __has_include (<stdio.h>)
|
||||
#endif
|
||||
]])],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([no])
|
||||
AC_DEFINE_UNQUOTED(USE_ROARING_V2, "1", [Use CRoaring 2.1.x])
|
||||
])
|
||||
|
||||
GCC_VERSION=`gcc --version | cut -d ' ' -f 3 | head -1|cut -d '.' -f 1`
|
||||
if test "${GCC_VERSION}" == "version" ; then
|
||||
GCC_VERSION=`gcc --version | cut -d ' ' -f 4 | head -1|cut -d '.' -f 1`
|
||||
fi
|
||||
|
||||
if test "${GCC_VERSION}" -lt "7" ; then
|
||||
AC_DEFINE_UNQUOTED(USE_ROARING_V2, "1", [Use CRoaring 2.1.x])
|
||||
fi
|
||||
|
||||
|
||||
NDPI_MAJOR=`echo "${PACKAGE_VERSION}" | cut -d . -f 1`
|
||||
NDPI_MINOR=`echo "${PACKAGE_VERSION}" | cut -d . -f 2`
|
||||
NDPI_PATCH=`echo "${PACKAGE_VERSION}" | cut -d . -f 3`
|
||||
@@ -125,8 +155,8 @@ AC_DEFINE_UNQUOTED(NDPI_PATCH_LEVEL, "${NDPI_PATCH}", [nDPI patch level])
|
||||
# .git as directory in a cloned repo
|
||||
# .git as file in submodule based integration
|
||||
if test -d ".git" || test -r ".git"; then
|
||||
GIT_TAG=`git log -1 --format=%h`
|
||||
GIT_DATE=`git log -1 --format=%cd`
|
||||
GIT_TAG=`git log -1 --abbrev=7 --format=%h`
|
||||
GIT_DATE=`git log -1 --abbrev=7 --format=%cd`
|
||||
#
|
||||
# On CentOS 6 `git rev-list HEAD --count` does not work
|
||||
#
|
||||
@@ -171,12 +201,19 @@ if ! test "${with_only_libndpi+set}" = set; then :
|
||||
JSONC_LIBS=""
|
||||
JSONC_CFLAGS=""
|
||||
])
|
||||
AX_PTHREAD([],[
|
||||
AC_MSG_WARN([POSIX Threads not available. Building library only.])
|
||||
JSONC_LIBS=""
|
||||
JSONC_CFLAGS=""
|
||||
EXTRA_TARGETS=""
|
||||
])
|
||||
dnl> AX_PTHREAD test does not work along with MingW/MSYS anymore
|
||||
case "$host" in
|
||||
*-*-mingw32*|*-*-msys)
|
||||
;;
|
||||
*)
|
||||
AX_PTHREAD([],[
|
||||
AC_MSG_WARN([POSIX Threads not available. Building library only.])
|
||||
JSONC_LIBS=""
|
||||
JSONC_CFLAGS=""
|
||||
EXTRA_TARGETS=""
|
||||
])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
AM_CONDITIONAL([BUILD_UNITTESTS], [test "x$build_unittests" = "xyes"])
|
||||
|
||||
@@ -185,9 +222,7 @@ 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} -Wno-attributes"
|
||||
#Workaround for RoaringBitmap with gcc-7
|
||||
NDPI_CFLAGS="-Wno-attributes ${NDPI_CFLAGS}"
|
||||
NDPI_CFLAGS="-W -Wall -Wno-address-of-packed-member ${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"
|
||||
@@ -203,6 +238,13 @@ if test "x$ac_cv_lib_rrd_rrd_fetch_r" = xyes; then :
|
||||
EXTRA_TARGETS="$EXTRA_TARGETS rrdtool"
|
||||
fi
|
||||
|
||||
GLOBAL_CONTEXT_ENABLED=0
|
||||
AS_IF([test "x$enable_global_context_support" != "xno"], [
|
||||
AC_CHECK_LIB([pthread], [pthread_mutex_init])
|
||||
NDPI_CFLAGS="${NDPI_CFLAGS} -DUSE_GLOBAL_CONTEXT"
|
||||
GLOBAL_CONTEXT_ENABLED=1
|
||||
])
|
||||
|
||||
ADDITIONAL_INCS=
|
||||
ADDITIONAL_LIBS="$LIBM"
|
||||
PCAP_HOME=$HOME/PF_RING/userland
|
||||
@@ -359,14 +401,14 @@ AS_IF([test "${with_local_libgcrypt+set}" = set],[
|
||||
AC_DEFINE_UNQUOTED(USE_HOST_LIBGCRYPT, 1, [Use locally installed libgcrypt instead of builtin gcrypt-light])
|
||||
])
|
||||
|
||||
dnl> PCRE
|
||||
PCRE_ENABLED=0
|
||||
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 :
|
||||
ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lpcre"
|
||||
PCRE_ENABLED=1
|
||||
dnl> PCRE2
|
||||
PCRE2_ENABLED=0
|
||||
AC_ARG_WITH(pcre2, AS_HELP_STRING([--with-pcre2], [Enable nDPI build with libpcre2]))
|
||||
if test "${with_pcre2+set}" = set; then :
|
||||
AC_CHECK_LIB(pcre2-8, pcre2_compile_8, AC_DEFINE_UNQUOTED(HAVE_PCRE2, 1, [libpcre2(-dev) is present]))
|
||||
if test "x$ac_cv_lib_pcre2_8_pcre2_compile_8" = xyes; then :
|
||||
ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lpcre2-8"
|
||||
PCRE2_ENABLED=1
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -420,8 +462,9 @@ AC_SUBST(GPROF_CFLAGS)
|
||||
AC_SUBST(GPROF_LIBS)
|
||||
AC_SUBST(GPROF_ENABLED)
|
||||
AC_SUBST(USE_HOST_LIBGCRYPT)
|
||||
AC_SUBST(PCRE_ENABLED)
|
||||
AC_SUBST(PCRE2_ENABLED)
|
||||
AC_SUBST(NBPF_ENABLED)
|
||||
AC_SUBST(GLOBAL_CONTEXT_ENABLED)
|
||||
AC_SUBST(HANDLE_TLS_SIGS)
|
||||
AC_SUBST(DISABLE_NPCAP)
|
||||
AC_SUBST(EXE_SUFFIX)
|
||||
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
# FAQ
|
||||
|
||||
From https://www.ntop.org/ndpi/ndpi-internals-and-frequent-questions/
|
||||
|
||||
**Q**: How nDPI implements protocol detection?\
|
||||
**A**: nDPI includes a list of protocol dissectors (364 as of today) that are able to dissect protocols such as WhatsApp or TLS. As soon as a new flow is submitted to nDPI, the library applies in sequence dissectors that can potentially match the protocols (i.e. telnet is a TCP-based protocol and it will not be considered for UDP flows). We start from the dissector that can most probably match using the port number. This means for traffic on TCP/22 nDPI will start with the SSH dissectors and if not matching continue with the others. Dissection completes as soon as a protocol matches or when none of them matched and in this case the flow will be labelled as Unknown.
|
||||
|
||||
**Q**: What is the nDPI release cycle?\
|
||||
**A**: We cut release a approximately every 6-8 months, fixes and improvements are on a daily basis (check the nDPI code on GitHub).
|
||||
|
||||
**Q**: Is nDPI running on all popular platforms?\
|
||||
**A**: Yes it runs on Linux, macOS, Windows… and also on not-so-popular ones such as IBM mainframes. We support ARM, Intel, RISC… architectures.
|
||||
|
||||
**Q**: How many packets does nDPI need in order to implement detection?\
|
||||
**A**: It depends on the protocol. For UDP-based protocols such as DNS one packet is enough, for more complex protocols such as TLS about 10 packets. For sure if after 15-20 packets nDPI has not detected the application protocol, then the protocol is labelled as Unknown.
|
||||
|
||||
**Q**: Is nDPI detection only based on protocol dissectors?\
|
||||
**A**: No, payload inspection is the main technique, but nDPI can also use IP address, ports, TLS certificates etc as signatures for protocols. In this case, after detection is complete, nDPI will report if the match was performed on payload inspection or other means (e.g. IP address).
|
||||
|
||||
**Q**: Does nDPI contain list of known IP addresses?\
|
||||
**A**: Yes it includes lists of well known IPs such as those provided by Microsoft of Meta for identifying known service.
|
||||
|
||||
**Q**: Can I extend nDPI by defining new protocols with a configuration file?\
|
||||
**A**: Yes you can. See this [file](https://github.com/ntop/nDPI/blob/dev/example/protos.txt) as an example for defining new protocols..
|
||||
|
||||
**Q**: Is nDPI able to detect VPNs?\
|
||||
**A**: Yes it can detect VPNS such as Tailscale, WireGuard, OpenVPN, FortiClient.. and also in-app VPNs such as UltraSurf or OperaVPN.
|
||||
|
||||
**Q**: Is nDPI able to detect malware and viruses?\
|
||||
**A**: It can detect anomalous behaviour that can be caused by a malware, but nDPI is not a signature-based tool so it does not include signatures for malware A or B. This is because [signature-based tools](https://en.wikipedia.org/wiki/Intrusion_detection_system) have various limitations and resource intensive, whereas nDPI has been designed to be used also in high-speed (100 Gbit+) networks.
|
||||
|
||||
**Q**: Is nDPI able to detect security issues?\
|
||||
**A**: Yes it can by means of a technique called [flow risk](https://github.com/ntop/nDPI/blob/dev/doc/flow_risks.rst). It can identify 50+ threats (e.g. a host that is talking with a malware host).
|
||||
|
||||
**Q**: Is nDPI able to block traffic?\
|
||||
**A**: No, nDPI is a passive traffic analysis library that does not manipulate packets. You can create applications on top of it for policing (i.e. blocking or shaping) traffic. Examples of such applications are ntopng Edge, nProbe IPS and nProbe Cento.
|
||||
@@ -0,0 +1,49 @@
|
||||
|
||||
# Configuration knobs
|
||||
|
||||
TODO
|
||||
|
||||
| Protocol | Parameter | Default value | Min value | Max value | Description | Notes |
|
||||
| ------ | ------ | ------ | ------ | ------ | ------ | ------ |
|
||||
| NULL | "packets_limit_per_flow" | 32 | 0 | 255 | The upper limit on the number of packets per flow that will be subject to DPI, after which classification will be considered complete (0 = no limit) |
|
||||
| NULL | "flow.direction_detection" | enable | NULL | NULL | Enable/disable internal detection of packet direction (client to server or server to client) |
|
||||
| NULL | "flow.track_payload" | disable | NULL | NULL | Enable/disable tracking/export of flow payload (i.e. L5/7 data): if enabled, the library exports the first 1024 bytes of payload for each flow |
|
||||
| NULL | "tcp_ack_payload_heuristic" | disable | NULL | NULL | In some networks, there are some anomalous TCP flows where the smallest ACK packets have some kind of zero padding. It looks like the IP and TCP headers in those frames wrongly consider the 0x00 Ethernet padding bytes as part of the TCP payload. While this kind of packets is perfectly valid per-se, in some conditions they might be treated by the TCP reassembler logic as (partial) overlaps, deceiving the classification engine. This parameter enable/disable an heuristic to detect these packets and to ignore them, allowing correct detection/classification. See #1946 for other details |
|
||||
| NULL | "fully_encrypted_heuristic" | enable | NULL | NULL | Enable/disable an heuristic to detect fully encrypted sessions, i.e. flows where every bytes of the payload is encrypted in an attempt to “look like nothing”. This heuristic only analyzes the first packet of the flow. See: https://www.usenix.org/system/files/sec23fall-prepub-234-wu-mingshi.pdf |
|
||||
| NULL | "libgcrypt.init" | 1 | NULL | NULL | Enable/disable initialization of libgcrypt. When using the external libgcrypt (instead of the internal crypto code) the libgcrypt runtime must be initialized. If, for whatever reasons, the application alread does it, nDPI must be told to skip it. Note that, by default, nDPI uses the crypto code and not libgcrypt: in that case this parameter is ignored |
|
||||
| NULL | "dpi.compute_entropy" | 1 | NULL | NULL | Enable/disable computation of flow entropy |
|
||||
| NULL | "dpi.guess_on_giveup" | 0x03 | 0x00 | 0x03 | Tell the library to guess flow classification, if any DPI algorithms/logics fail. The value is a bitmask. Values: 0x0 = disabled; 0x01 = enable guessing by port; 0x02 = enable guessing by ip |
|
||||
| NULL | "flow_risk_lists.load" | 1 | NULL | NULL | Enable/disable loading of every IP addresses lists used to check any flow risks |
|
||||
| NULL | "flow_risk.anonymous_subscriber.list.icloudprivaterelay.load" | 1 | NULL | NULL | Enable/disable loading of internal iCouldPrivateRealy IP address list used to check `NDPI_ANONYMOUS_SUBSCRIBER` flow risk |
|
||||
| NULL | "flow_risk.anonymous_subscriber.list.protonvpn.load" | 1 | NULL | NULL | Enable/disable loading of internal IP address list of ProtonVPN exit nodes used to check `NDPI_ANONYMOUS_SUBSCRIBER` flow risk |
|
||||
| NULL | "flow_risk.crawler_bot.list.load" | 1 | NULL | NULL | Enable/disable loading of internal IP address list used to check `NDPI_HTTP_CRAWLER_BOT` flow risk |
|
||||
| NULL | "filename.config" | NULL | NULL | NULL | Name of the file containing a list of configuration knobs itself (one per line)!. Useful to configure nDPI via text file instead of via API |
|
||||
| NULL | "log.level" | 0 | 0 | 3 | Configure the log/debug level. Possible values: 0 = error, 1 = trace, 2 = debug, 3 = extra debug |
|
||||
| NULL | "lru.$CACHE_NAME.size" | See description | 0 | 16777215 | Set the size (in number of elements) of the specified LRU cache (0 = the cache is disabled). The keyword "$CACHE_NAME" is a placeholder for the cache name and the possible values are: ookla, bittorrent, stun, tls_cert, mining, msteams. The default value is "32768" for the bittorrent cache and "1024" for all the other caches |
|
||||
| NULL | "lru.$CACHE_NAME.ttl" | See description | 0 | 16777215 | Set the TTL (in seconds) for the elements of the specified LRU cache (0 = the elements never explicitly expire). The keyword "$CACHE_NAME" is a placeholder for the cache name and the possible values are: ookla, bittorrent, stun, tls_cert, mining, msteams. The default value is "120" for the ookla cache, "60" for the msteams cache and "0" for all the other caches |
|
||||
| NULL | "lru.$CACHE_NAME.scope" | 0 | 0 | 1 | Set the scope of the specified LRU cache (0 = the cache is local, 1 = the cache is global). The keyword "$CACHE_NAME" is a placeholder for the cache name and the possible values are: ookla, bittorrent, stun, tls_cert, mining, msteams. The global scope con be set only if a global context has been initialized |
|
||||
| "tls" | "certificate_expiration_threshold" | 30 | 0 | 365 | The threshold (in days) used to trigger the `NDPI_TLS_CERTIFICATE_ABOUT_TO_EXPIRE` flow risk |
|
||||
| "tls" | "application_blocks_tracking" | disable | NULL | NULL | Enable/disable processing of TLS Application Blocks (post handshake) to extract statistical information about the flow |
|
||||
| "tls" | "metadata.sha1_fingerprint" | enable | NULL | NULL | Enable/disable computation and export of SHA1 fingerprint for TLS flows. Note that if it is disable, the flow risk `NDPI_MALICIOUS_SHA1_CERTIFICATE` is not checked |
|
||||
| "tls" | "metadata.ja3c_fingerprint" | enable | NULL | NULL | Enable/disable computation and export of JA3C fingerprint for TLS flows. Note that if it is disable, the flow risk `NDPI_MALICIOUS_JA3` is not checked |
|
||||
| "tls" | "metadata.ja3s_fingerprint" | enable | NULL | NULL | Enable/disable computation and export of JA3S fingerprint for TLS flows |
|
||||
| "tls" | "metadata.ja4c_fingerprint" | enable | NULL | NULL | Enable/disable computation and export of JA4C fingerprint for TLS flows |
|
||||
| "smtp" | "tls_dissection" | enable | NULL | NULL | Enable/disable dissection of TLS packets in cleartext SMTP flows (because of opportunistic TLS, via STARTTLS msg) |
|
||||
| "imap" | "tls_dissection" | enable | NULL | NULL | Enable/disable dissection of TLS packets in cleartext IMAP flows (because of opportunistic TLS, via STARTTLS msg) |
|
||||
| "pop" | "tls_dissection" | enable | NULL | NULL | Enable/disable dissection of TLS packets in cleartext POP flows (because of opportunistic TLS, via STARTTLS msg) |
|
||||
| "ftp" | "tls_dissection" | enable | NULL | NULL | Enable/disable dissection of TLS packets in cleartext FTP flows (because of opportunistic TLS, via AUTH TLS msg) |
|
||||
| "stun" | "max_packets_extra_dissection" | 4 | 0 | 255 | After a flow has been classified has STUN, nDPI might analyse more packets to look for a sub-classification or for metadata. This parameter set the upper limit on the number of these packets |
|
||||
| "stun" | "tls_dissection" | enable | NULL | NULL | Enable/disable dissection of TLS packets multiplexed into STUN flows |
|
||||
| "stun" | "metadata.attribute.mapped_address" | enable | NULL | NULL | Enable/disable extraction of (xor)-mapped-address attribute for STUN flows. If it is disabled, STUN classification might be significant faster |
|
||||
| "stun" | "metadata.attribute.response_origin" | enable | NULL | NULL | Enable/disable extraction of response-origin attribute for STUN flows. If it is disabled, STUN classification might be significant faster |
|
||||
| "stun" | "metadata.attribute.other_address" | enable | NULL | NULL | Enable/disable extraction of other-address attribute for STUN flows. If it is disabled, STUN classification might be significant faster |
|
||||
| "stun" | "metadata.attribute.relayed_address" | enable | NULL | NULL | Enable/disable extraction of (xor-)relayed-address attribute for STUN flows. If it is disabled, STUN classification might be significant faster |
|
||||
| "stun" | "metadata.attribute.peer_address" | enable | NULL | NULL | Enable/disable extraction of (xor-)peer-address attribute for STUN flows. If it is disabled, STUN classification might be significant faster; however sub-classification capability might be negatively impacted |
|
||||
| "dns" | "subclassification" | enable | NULL | NULL | Enable/disable sub-classification of DNS flows (via query/response domain name). If disabled, some flow risks are not checked |
|
||||
| "dns" | "process_response" | enable | NULL | NULL | Enable/disable processing of DNS responses. By default, DNS flows are fully classified after the first request/response pair (or after the first response, if the request is missing). If this parameter is disabled, the flows are fully classified after the first packet, i.e. usually after the first request; in that case, some flow risks are not checked and some metadata are not exported |
|
||||
| "http" | "process_response" | enable | NULL | NULL | Enable/disable processing of HTTP responses. By default, HTTP flows are usually fully classified after the first request/response pair. If this parameter is disabled, the flows are fully classified after the first request (or after the first response, if the request is missing); in that case, some flow risks are not checked and some metadata are not exported |
|
||||
| "ookla" | "dpi.aggressiveness", | 0x01 | 0x00 | 0x01 | Detection aggressiveness for Ookla. The value is a bitmask. Values: 0x0 = disabled; 0x01 = enable heuristic for detection over TLS (via Ookla LRU cache) |
|
||||
| "zoom" | "max_packets_extra_dissection" | 4 | 0 | 255 | After a flow has been classified has Zoom, nDPI might analyse more packets to look for a sub-classification or for metadata. This parameter set the upper limit on the number of these packets |
|
||||
| "rtp" | "search_for_stun" | disable | NULL | NULL | After a flow has been classified as RTP or RTCP, nDPI might analyse more packets to look for STUN/DTLS packets, i.e. to try to tell if this flow is a "pure" RTP/RTCP flow or if the RTP/RTCP packets are multiplexed with STUN/DTLS. Useful for proper (sub)classification when the beginning of the flows are not captured or if there are lost packets in the the captured traffic. If enabled, nDPI requires more packets to process for each RTP/RTCP flow. |
|
||||
| $PROTO_NAME | "log" | disable | NULL | NULL | Enable/disable logging/debug for specific protocol. Use "any" as protocol name if you want to easily enable/disable logging/debug for all protocols |
|
||||
| $PROTO_NAME | "ip_list.load" | 1 | NULL | NULL | Enable/disable loading of internal list of IP addresses (used for (sub)classification) specific to that protocol. Use "any" as protocol name if you want to easily enable/disable all lists. This knob is valid only for the following protocols: Alibaba, Amazon AWS, Apple, Avast, Bloomberg, Cachefly, Cloudflare, Discord, Disney+, Dropbox, Edgecast, EpicGames, Ethereum, Facebook, Github, Google, Google Cloud, GoTo, Hotspot Shield, Hulu, Line, Microsoft 365, Microsoft Azure, Microsoft One Drive, Microsoft Outlook, Mullvad, Netflix, Nvidia, OpenDNS, ProtonVPN, RiotGames, Roblox, Skype/Teams, Starcraft, Steam, Teamviewer, Telegram, Tencent, Threema, TOR, Twitch, Twitter, UbuntuONE, VK, Yandex, Yandex Cloud, Webex, Whatsapp, Zoom |
|
||||
+15
-3
@@ -105,7 +105,7 @@ A `DGA <https://en.wikipedia.org/wiki/Domain_generation_algorithm>`_ is used to
|
||||
|
||||
NDPI_MALFORMED_PACKET
|
||||
=====================
|
||||
This risk is generated when a packet (e.g. a DNS packet) has an unexpected formt. This can indicate a protocol error or more often an attempt to jeopardize a valid protocol to carry other type of data.
|
||||
This risk is generated when a packet (e.g. a DNS packet) has an unexpected format. This can indicate a protocol error or more often an attempt to jeopardize a valid protocol to carry other type of data.
|
||||
|
||||
.. _Risk 018:
|
||||
|
||||
@@ -247,7 +247,7 @@ Additionally, some TLS protocol fields are checked for printable characters as w
|
||||
|
||||
NDPI_POSSIBLE_EXPLOIT
|
||||
=====================
|
||||
The risk is set whenever a possible exploit (e.g. `Log4J/Log4Shell <https://en.wikipedia.org/wiki/Log4Shell>`_) is detected.
|
||||
The risk is set whenever a possible exploit attempt (e.g. `Log4J/Log4Shell <https://en.wikipedia.org/wiki/Log4Shell>`_) is detected.
|
||||
|
||||
.. _Risk 041:
|
||||
|
||||
@@ -277,7 +277,7 @@ The risk is set whenever a crawler/bot/robot has been detected
|
||||
|
||||
NDPI_ANONYMOUS_SUBSCRIBER
|
||||
===================================
|
||||
The risk is set whenever the (source) ip address has been anonymized and it can't be used to identify the subscriber.
|
||||
The risk is set whenever the (source) IP address has been anonymized and it can't be used to identify the subscriber.
|
||||
Example: the flow is generated by an iCloud-private-relay exit node.
|
||||
|
||||
.. _Risk 046:
|
||||
@@ -328,3 +328,15 @@ Invalid TLS ALPN/SNI mismatch. For instance ALPN advertises the flow as h2 (HTTP
|
||||
NDPI_MALWARE_CONTACTED
|
||||
======================
|
||||
Client contacted a server host labelled as malware.
|
||||
|
||||
.. _Risk 054:
|
||||
|
||||
NDPI_BINARY_DATA_TRANSFER
|
||||
============================
|
||||
HTTP only: this risk indicates that a binary file/data application transfer (attempt).
|
||||
|
||||
.. _Risk 055:
|
||||
|
||||
NDPI_PROBING_ATTEMPT
|
||||
====================
|
||||
Connection with no data exchagef that looks like a probing attempt
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
|
||||
|
||||
|
||||
A simple, common example
|
||||
|
||||
```
|
||||
|
||||
struct ndpi_detection_module_struct *ndpi_struct;
|
||||
ndpi_cfg_error rc;
|
||||
int ret;
|
||||
|
||||
ndpi_struct = ndpi_init_detection_module(NULL);
|
||||
if(!ndpi_struct) {
|
||||
ERROR;
|
||||
}
|
||||
|
||||
/* Configuration */
|
||||
|
||||
rc = ndpi_set_config(ndpi_struct, "tls", "certificate_expiration_threshold", "10");
|
||||
if(rc != NDPI_CFG_OK) {
|
||||
ERROR;
|
||||
}
|
||||
|
||||
/* Finalization */
|
||||
ret = ndpi_finalize_initialization(ndpi_struct);
|
||||
if(ret != 0) {
|
||||
ERROR;
|
||||
}
|
||||
|
||||
|
||||
/* Initialization done, now you can feed packets to the library */
|
||||
|
||||
|
||||
|
||||
/* Cleanup */
|
||||
|
||||
ndpi_exit_detection_module(ndpi_struct);
|
||||
|
||||
|
||||
```
|
||||
|
||||
A more complex example, with global context and a shared Oookla LRU cache (all the others caches are local)
|
||||
|
||||
```
|
||||
|
||||
struct ndpi_global_context *g_ctx;
|
||||
struct ndpi_detection_module_struct *ndpi_structs[num_local_contexts];
|
||||
ndpi_cfg_error rc;
|
||||
int i, ret;
|
||||
|
||||
g_ctx = ndpi_global_init();
|
||||
if(!g_ctx) {
|
||||
ERROR;
|
||||
}
|
||||
|
||||
for(i = 0; i < num_local_contexts; i++) {
|
||||
ndpi_structs[i] = ndpi_init_detection_module(g_ctx);
|
||||
if(!ndpi_struct[i]) {
|
||||
ERROR;
|
||||
}
|
||||
|
||||
rc = ndpi_set_config(ndpi_structs[i], NULL, "lru.ookla.scope", "1");
|
||||
if(rc != NDPI_CFG_OK) {
|
||||
ERROR;
|
||||
}
|
||||
|
||||
ret = ndpi_finalize_initialization(ndpi_structs[i]);
|
||||
if(ret != 0) {
|
||||
ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialization done */
|
||||
|
||||
/* Cleanup */
|
||||
|
||||
for(i = 0; i < num_local_contexts; i++) {
|
||||
ndpi_exit_detection_module(ndpi_structs[i]);
|
||||
}
|
||||
|
||||
ndpi_global_deinit(g_ctx);
|
||||
|
||||
|
||||
```
|
||||
+722
-14
@@ -5,13 +5,126 @@ This page provides the list of the protocols/applications supported by nDPI. For
|
||||
|
||||
Work in progress!
|
||||
|
||||
.. _Proto 32:
|
||||
|
||||
`NDPI_PROTOCOL_BFCP`
|
||||
=======================
|
||||
BFCP (Binary Floor Control Protocol) is used for controlling and coordinating real-time data sharing and collaboration during video conferencing sessions.
|
||||
|
||||
References: `RFC: <https://datatracker.ietf.org/doc/html/rfc8855>`_
|
||||
|
||||
|
||||
.. _Proto 54:
|
||||
|
||||
`NDPI_PROTOCOL_IQIYI`
|
||||
===========================
|
||||
iQIYI is a Chinese online video platform that offers a wide range of original and licensed content including movies, dramas, variety shows, and anime.
|
||||
|
||||
References: `Main site: <https://www.iqiyi.com/>`_
|
||||
|
||||
|
||||
.. _Proto 59:
|
||||
|
||||
`NDPI_PROTOCOL_ADOBE_CONNECT`
|
||||
===========================
|
||||
Adobe Connect is a web conferencing platform that allows users to conduct online meetings, webinars, and virtual classrooms.
|
||||
|
||||
References: `Main site: <https://www.adobe.com/products/adobeconnect.html>`_
|
||||
|
||||
|
||||
.. _Proto 65:
|
||||
|
||||
`NDPI_PROTOCOL_IRC`
|
||||
==================
|
||||
IRC (Internet Relay Chat) is a text-based chat system for instant messaging.
|
||||
|
||||
References: `Wikipiedia: <https://en.wikipedia.org/wiki/IRC>`_ and `Some statistics: <https://netsplit.de/networks/top10.php>`
|
||||
|
||||
|
||||
.. _Proto 72:
|
||||
|
||||
`NDPI_PROTOCOL_HART_IP`
|
||||
=======================
|
||||
Highway Addressable Remote Transducer over IP
|
||||
|
||||
References: `Protocol Specs: <https://library.fieldcommgroup.org/20085/TS20085>`_
|
||||
|
||||
|
||||
.. _Proto 96:
|
||||
|
||||
`NDPI_PROTOCOL_TFTP`
|
||||
====================
|
||||
TFTP is a very simple protocol used to transfer files. It is from this that its name comes, Trivial File Transfer Protocol or TFTP.
|
||||
|
||||
References: `RFC1350 <https://datatracker.ietf.org/doc/html/rfc1350>`_ and `RFC2347 <https://datatracker.ietf.org/doc/html/rfc2347>`_ and `RFC2349 <https://datatracker.ietf.org/doc/html/rfc2349>`_
|
||||
|
||||
|
||||
.. _Proto 127:
|
||||
|
||||
`NDPI_PROTOCOL_MS_RPCH`
|
||||
=======================
|
||||
A Remote Procedure Call protocol over HTTP from Microsoft.
|
||||
|
||||
References: `Protocol Specs: <https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-rpch/c0f4c9c5-1a61-4d10-b8e2-005378d1d212>`_
|
||||
|
||||
|
||||
.. _Proto 149:
|
||||
|
||||
`NDPI_PROTOCOL_EGD`
|
||||
=========================
|
||||
Ethernet Global Data (EGD) is a communication protocol developed by GE Fanuc Automation for real-time data exchange between automation devices and control systems using standard Ethernet technology. It is widely adopted in industrial environments for its simplicity and reliability in data communication.
|
||||
|
||||
References: `Wikipedia <https://en.wikipedia.org/wiki/Ethernet_Global_Data_Protocol>`_
|
||||
|
||||
Notes:
|
||||
|
||||
- This dissector only works for data packets, not configuration commands.
|
||||
- IPv6 is not supported
|
||||
|
||||
|
||||
.. _Proto 182:
|
||||
|
||||
`NDPI_PROTOCOL_RESP`
|
||||
=======================
|
||||
Redis Serialization Protocol
|
||||
|
||||
References: `Protocol Specs: <https://redis.io/docs/reference/protocol-spec/>`_
|
||||
|
||||
|
||||
.. _Proto 186:
|
||||
|
||||
`NDPI_PROTOCOL_COD_MOBILE`
|
||||
=======================
|
||||
Call of Duty: Mobile is a free-to-play shooter game for iOS and Android devices. It has amassed over 650 million downloads worldwide, making it one of the most popular mobile games.
|
||||
|
||||
References: `Main site: <https://www.callofduty.com/mobile/>`_
|
||||
|
||||
|
||||
.. _Proto 201:
|
||||
|
||||
`NDPI_PROTOCOL_GOOGLE_MEET`
|
||||
===========================
|
||||
Google Meet is a video conferencing service from Google.
|
||||
|
||||
References: `Main site: <https://meet.google.com/>`_
|
||||
|
||||
|
||||
.. _Proto 235:
|
||||
|
||||
`NDPI_PROTOCOL_VALVE_SDR`
|
||||
===========================
|
||||
Steam Datagram Relay (SDR) is Valve's virtual private gaming network. Used in all modern games from Valve, but can also be used by developers via the Steamworks SDK for their games.
|
||||
|
||||
References: `Main site: <https://partner.steamgames.com/doc/features/multiplayer/steamdatagramrelay>`_
|
||||
|
||||
|
||||
.. _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>`_.
|
||||
References: `RFC3711 <https://datatracker.ietf.org/doc/html/rfc3711>`_
|
||||
|
||||
Notes:
|
||||
|
||||
@@ -25,7 +138,7 @@ Notes:
|
||||
=========================
|
||||
Opera VPN is a free VPN included with Opera Browser.
|
||||
|
||||
References: `Main site <https://www.opera.com/it/features/free-vpn>`_.
|
||||
References: `Main site <https://www.opera.com/it/features/free-vpn>`_
|
||||
|
||||
|
||||
.. _Proto 340:
|
||||
@@ -34,7 +147,7 @@ References: `Main site <https://www.opera.com/it/features/free-vpn>`_.
|
||||
=========================
|
||||
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/>`_.
|
||||
References: `Main site <https://store.epicgames.com/en-US/>`_ and `Fortnite <https://www.fortnite.com/>`_
|
||||
|
||||
|
||||
.. _Proto 341:
|
||||
@@ -43,7 +156,7 @@ References: `Main site <https://store.epicgames.com/en-US/>`_ and `Fortnite <htt
|
||||
==========================
|
||||
GeForce Now is the brand used by Nvidia for its cloud gaming service.
|
||||
|
||||
References: `Main site <https://www.nvidia.com/en-us/geforce-now/>`_.
|
||||
References: `Main site <https://www.nvidia.com/en-us/geforce-now/>`_
|
||||
|
||||
|
||||
.. _Proto 342:
|
||||
@@ -52,7 +165,7 @@ References: `Main site <https://www.nvidia.com/en-us/geforce-now/>`_.
|
||||
======================
|
||||
Generic web traffic from Nvidia sites.
|
||||
|
||||
References: `Main site <https://www.nvidia.com>`_.
|
||||
References: `Main site <https://www.nvidia.com>`_
|
||||
|
||||
|
||||
.. _Proto 343:
|
||||
@@ -61,7 +174,7 @@ References: `Main site <https://www.nvidia.com>`_.
|
||||
=======================
|
||||
Bitcoin is one of the most common crypto currencies.
|
||||
|
||||
References: `Main site <https://en.bitcoin.it/wiki/Protocol_documentation>`_.
|
||||
References: `Main site <https://en.bitcoin.it/wiki/Protocol_documentation>`_
|
||||
|
||||
Notes:
|
||||
|
||||
@@ -76,7 +189,7 @@ Notes:
|
||||
=========================
|
||||
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/>`_.
|
||||
References: `Main site <https://protonvpn.com/>`_
|
||||
|
||||
|
||||
.. _Proto 345:
|
||||
@@ -85,7 +198,7 @@ References: `Main site <https://protonvpn.com/>`_.
|
||||
======================
|
||||
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>`_.
|
||||
References: `Official site <https://thrift.apache.org>`_ and `Github <https://github.com/apache/thrift>`_
|
||||
|
||||
|
||||
.. _Proto 346:
|
||||
@@ -94,7 +207,7 @@ References: `Official site <https://thrift.apache.org>`_ and `Github <https://gi
|
||||
======================
|
||||
Roblox is an online game platform and game creation system.
|
||||
|
||||
References: `Main site <https://www.roblox.com/>`_.
|
||||
References: `Main site <https://www.roblox.com/>`_
|
||||
|
||||
Notes:
|
||||
|
||||
@@ -107,7 +220,7 @@ Notes:
|
||||
================================
|
||||
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>`_.
|
||||
References: `SLPv1 <https://datatracker.ietf.org/doc/html/rfc2165>`_ and `SLPv2 <https://datatracker.ietf.org/doc/html/rfc2608>`_
|
||||
|
||||
|
||||
.. _Proto 348:
|
||||
@@ -116,7 +229,7 @@ References: `SLPv1 <https://datatracker.ietf.org/doc/html/rfc2165>`_ and `SLPv2
|
||||
=======================
|
||||
Mullvad is a VPN service operated by Mullvad VPN AB, based in Sweden
|
||||
|
||||
References: `Main site <https://mullvad.net/>`_.
|
||||
References: `Main site <https://mullvad.net/>`_
|
||||
|
||||
|
||||
.. _Proto 349:
|
||||
@@ -125,7 +238,7 @@ References: `Main site <https://mullvad.net/>`_.
|
||||
=====================
|
||||
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>`_.
|
||||
References: `RFC <https://datatracker.ietf.org/doc/html/rfc9113>`_
|
||||
|
||||
Notes:
|
||||
|
||||
@@ -138,7 +251,7 @@ Notes:
|
||||
=======================
|
||||
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>`_.
|
||||
References: `Main site: <https://www.haproxy.org>`_
|
||||
|
||||
|
||||
.. _Proto 351:
|
||||
@@ -147,4 +260,599 @@ References: `Main site: <https://www.haproxy.org>`_.
|
||||
====================
|
||||
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>`_.
|
||||
References: `Protocol Specs: <https://www.dmtf.org/sites/default/files/standards/documents/DSP0114.pdf>`_
|
||||
|
||||
|
||||
.. _Proto 352:
|
||||
|
||||
`NDPI_PROTOCOL_CAN`
|
||||
===================
|
||||
Controller Area Network (CAN) is used extensively in automotive applications, with in excess of 400 million CAN enabled microcontrollers manufactured each year.
|
||||
|
||||
References: `Protocol Specs: <https://www.iso.org/standard/63648.html>`_
|
||||
|
||||
|
||||
.. _Proto 353:
|
||||
|
||||
`NDPI_PROTOCOL_PROTOBUF`
|
||||
========================
|
||||
Protocol Buffers (Protobuf) is a free and open-source cross-platform data format used to serialize structured data.
|
||||
|
||||
References: `Encoding: <https://protobuf.dev/programming-guides/encoding>`_
|
||||
|
||||
|
||||
.. _Proto 354:
|
||||
|
||||
`NDPI_PROTOCOL_ETHEREUM`
|
||||
=======================
|
||||
Ethereum is a decentralized, open-source blockchain with smart contract functionality.
|
||||
|
||||
References: `Main site <https://ethereum.org/en/developers/docs/intro-to-ethereum/>`_
|
||||
|
||||
Notes:
|
||||
|
||||
- same as Bitcoin, not each crypto exchange is a mining, it could be a normal transaction, sending or receving or even blockchain exploration.
|
||||
|
||||
|
||||
.. _Proto 355:
|
||||
|
||||
`NDPI_PROTOCOL_TELEGRAM_VOIP`
|
||||
============================
|
||||
Audio/video calls made using the telegram app.
|
||||
|
||||
References: `Wikipedia <https://en.wikipedia.org/wiki/telegram_(software)/>`_
|
||||
|
||||
|
||||
.. _Proto 356:
|
||||
|
||||
`NDPI_PROTOCOL_SINA_WEIBO`
|
||||
============================
|
||||
Chinese microblogging (weibo) website.
|
||||
|
||||
References: `Wikipedia <https://en.wikipedia.org/wiki/Sina_Weibo>`_
|
||||
|
||||
|
||||
.. _Proto 358:
|
||||
|
||||
`NDPI_PROTOCOL_PTPV2`
|
||||
============================
|
||||
IEEE 1588-2008 Precision Time Protocol (PTP) Version 2.
|
||||
|
||||
References: `Protocol Specs: <https://standards.ieee.org/ieee/1588/4355/>`_
|
||||
|
||||
|
||||
.. _Proto 359:
|
||||
|
||||
`NDPI_PROTOCOL_RTPS`
|
||||
============================
|
||||
Real-Time Publish Subscribe Protocol
|
||||
|
||||
References: `Protocol Specs: <https://www.omg.org/spec/DDSI-RTPS/>`_
|
||||
|
||||
|
||||
.. _Proto 360:
|
||||
|
||||
`NDPI_PROTOCOL_OPC_UA`
|
||||
============================
|
||||
IEC62541 OPC Unified Architecture
|
||||
|
||||
References: `Protocol Specs: <https://reference.opcfoundation.org/>`_
|
||||
|
||||
|
||||
.. _Proto 361:
|
||||
|
||||
`NDPI_PROTOCOL_S7COMM_PLUS`
|
||||
============================
|
||||
A proprietary protocol from Siemens used for data exchange between PLCs and access PLC data via SCADA systems.
|
||||
Completely different from classic S7Comm, but also uses TPKT/COTP as a transport.
|
||||
|
||||
References: `Unofficial description: <https://plc4x.apache.org/protocols/s7/s7comm-plus.html>`_
|
||||
|
||||
|
||||
.. _Proto 362:
|
||||
|
||||
`NDPI_PROTOCOL_FINS`
|
||||
============================
|
||||
Factory Interface Network Service (FINS) is a network protocol used by Omron PLCs.
|
||||
|
||||
References: `Protocol Specs: <https://assets.omron.eu/downloads/manual/en/v4/w421_cj1w-etn21_cs1w-etn21_ethernet_units_-_construction_of_applications_operation_manual_en.pdf>`_
|
||||
|
||||
|
||||
.. _Proto 363:
|
||||
|
||||
`NDPI_PROTOCOL_ETHERSIO`
|
||||
============================
|
||||
Ether-S-I/O is a proprietary protocol used by Saia-Burgess's PLCs.
|
||||
|
||||
References: `Wireshark wiki: <https://wiki.wireshark.org/EtherSIO.md>`_
|
||||
|
||||
|
||||
.. _Proto 364:
|
||||
|
||||
`NDPI_PROTOCOL_UMAS`
|
||||
============================
|
||||
UMAS is a proprietary Schneider Electric protocol based on Modbus. It's used in Modicon M580 and Modicon M340 CPU-based PLCs.
|
||||
|
||||
References: `Unofficial article: <https://ics-cert.kaspersky.com/publications/reports/2022/09/29/the-secrets-of-schneider-electrics-umas-protocol/>`_
|
||||
|
||||
|
||||
.. _Proto 365:
|
||||
|
||||
`NDPI_PROTOCOL_BECKHOFF_ADS`
|
||||
============================
|
||||
Automation Device Specification is the protocol used for interfacing with Beckhoff PLCs via TwinCAT.
|
||||
|
||||
References: `Protocol Specs: <https://infosys.beckhoff.com/english.php?content=../content/1033/tc3_ads_intro/115847307.html>`_
|
||||
|
||||
|
||||
.. _Proto 366:
|
||||
|
||||
`NDPI_PROTOCOL_ISO9506_1_MMS`
|
||||
============================
|
||||
The international standard MMS (Manufacturing Message Specification) is an OSI application layer messaging protocol origionally designed for the remote control and monitoring of devices such as Remote Terminal Units (RTU), Programmable Logic Controllers (PLC), Numerical Controllers (NC), or Robot Controllers (RC).
|
||||
|
||||
References: `Paid Specs: <https://www.iso.org/ru/standard/37079.html>`_
|
||||
|
||||
|
||||
.. _Proto 367:
|
||||
|
||||
`NDPI_PROTOCOL_IEEE_C37118`
|
||||
============================
|
||||
IEEE Standard for Synchrophasor Data Transfer for Power Systems
|
||||
|
||||
References: `Paid Specs: <https://standards.ieee.org/ieee/C37.118.1/4902/>`_
|
||||
|
||||
|
||||
.. _Proto 368:
|
||||
|
||||
`NDPI_PROTOCOL_ETHERSBUS`
|
||||
============================
|
||||
Ether-S-Bus is a proprietary protocol used for the communication with and between PLCs manufactured by Saia-Burgess Controls Ltd.
|
||||
|
||||
References: `Wireshark wiki: <https://wiki.wireshark.org/EtherSBus>`_
|
||||
|
||||
|
||||
.. _Proto 369:
|
||||
|
||||
`NDPI_PROTOCOL_MONERO`
|
||||
======================
|
||||
Monero is a private and decentralized cryptocurrency with focus on confidentiality and security.
|
||||
|
||||
|
||||
.. _Proto 370:
|
||||
|
||||
`NDPI_PROTOCOL_DCERPC`
|
||||
======================
|
||||
DCE/RPC is a specification for a remote procedure call mechanism that defines both APIs and an over-the-network protocol.
|
||||
|
||||
References: `Wireshark wiki: <https://wiki.wireshark.org/DCE/RPC>`_
|
||||
|
||||
|
||||
.. _Proto 371:
|
||||
|
||||
`NDPI_PROTOCOL_PROFINET_IO`
|
||||
===========================
|
||||
PROFINET/IO is a field bus protocol based on connectionless DCE/RPC.
|
||||
|
||||
References: `Protocol Specs: <https://www.profibus.com/download/profinet-specification>`_
|
||||
|
||||
|
||||
.. _Proto 372:
|
||||
|
||||
`NDPI_PROTOCOL_HISLIP`
|
||||
======================
|
||||
High-Speed LAN Instrument Protocol (HiSLIP) is a protocol for remote instrument control of LAN-based test and measurement instruments.
|
||||
|
||||
References: `Protocol Specs: <https://www.ivifoundation.org/downloads/Protocol%20Specifications/IVI-6.1_HiSLIP-2.0-2020-04-23.pdf>`_
|
||||
|
||||
|
||||
.. _Proto 373:
|
||||
|
||||
`NDPI_PROTOCOL_UFTP`
|
||||
====================
|
||||
Encrypted UDP based FTP with multicast.
|
||||
|
||||
References: `Protocol Specs: <https://uftp-multicast.sourceforge.net/protocol.txt>`_.
|
||||
|
||||
|
||||
.. _Proto 374:
|
||||
|
||||
`NDPI_PROTOCOL_OPENFLOW`
|
||||
========================
|
||||
OpenFlow protocol is a network protocol closely associated with Software-Defined Networking (SDN).
|
||||
|
||||
References: `Protocol Specs: <https://opennetworking.org/wp-content/uploads/2014/10/openflow-switch-v1.5.1.pdf>`_
|
||||
|
||||
|
||||
.. _Proto 375:
|
||||
|
||||
`NDPI_PROTOCOL_JSON_RPC`
|
||||
========================
|
||||
JSON-RPC is a remote procedure call protocol encoded in JSON.
|
||||
|
||||
References: `Protocol Specs: <https://www.jsonrpc.org/specification>`_
|
||||
|
||||
|
||||
.. _Proto 376:
|
||||
|
||||
`NDPI_PROTOCOL_WEBDAV`
|
||||
======================
|
||||
WebDAV is a set of extensions to the HTTP protocol that allows WebDAV clients to collaboratively edit and manage files on remote Web servers.
|
||||
|
||||
References: `RFC4918: <https://datatracker.ietf.org/doc/html/rfc4918>`_
|
||||
|
||||
Notes:
|
||||
|
||||
- WebDAV is almost always encrypted, i.e. transported over TLS.
|
||||
|
||||
|
||||
.. _Proto 377:
|
||||
|
||||
`NDPI_PROTOCOL_APACHE_KAFKA`
|
||||
============================
|
||||
Apache Kafka is a distributed event store and stream-processing platform.
|
||||
|
||||
References: `Official site <https://kafka.apache.org>`_ and `Github <https://github.com/apache/kafka>`_
|
||||
|
||||
|
||||
.. _Proto 378:
|
||||
|
||||
`NDPI_PROTOCOL_NOMACHINE`
|
||||
=========================
|
||||
NoMachine is a popular proprietary remote desktop software.
|
||||
|
||||
References: `Main site <https://www.nomachine.com/>`_
|
||||
|
||||
|
||||
.. _Proto 379:
|
||||
|
||||
`NDPI_PROTOCOL_IEC62056`
|
||||
============================
|
||||
IEC 62056-4-7 DLMS/COSEM is a transport layer for IP networks.
|
||||
|
||||
References: `Paid Specs: <https://webstore.iec.ch/publication/22487>`_
|
||||
|
||||
Notes:
|
||||
|
||||
- Wireshark is not able to recognize this protocol. Some old plugins/code (with some documentation) are available `here <https://github.com/bearxiong99/wireshark-dlms>` and `here <https://github.com/matousp/dlms-analysis/tree/master>`.
|
||||
|
||||
|
||||
.. _Proto 380:
|
||||
|
||||
`NDPI_PROTOCOL_HL7`
|
||||
=========================
|
||||
HL7 is a range of global standards for the transfer of clinical and administrative health data between applications.
|
||||
|
||||
References: `Main site <https://www.hl7.org/>`_
|
||||
|
||||
|
||||
.. _Proto 381:
|
||||
|
||||
`NDPI_PROTOCOL_CEPH`
|
||||
=========================
|
||||
Ceph is a scalable distributed storage system.
|
||||
|
||||
References: `Main site <https://ceph.io/en/>`_
|
||||
|
||||
|
||||
.. _Proto 382:
|
||||
|
||||
`NDPI_PROTOCOL_GOOGLE_CHAT`
|
||||
=========================
|
||||
Google Chat is an instant messaging service from Google, which replaced Hangouts.
|
||||
|
||||
References: `Main site <https://chat.google.com/>`_
|
||||
|
||||
|
||||
.. _Proto 383:
|
||||
|
||||
`NDPI_PROTOCOL_ROUGHTIME`
|
||||
=========================
|
||||
A protocol that aims to achieve rough time synchronization while detecting servers that provide inaccurate time and providing cryptographic proof of their malfeasance.
|
||||
|
||||
References: `IETF Draft <https://www.ietf.org/archive/id/draft-ietf-ntp-roughtime-08.html>`_
|
||||
|
||||
|
||||
.. _Proto 384:
|
||||
|
||||
`NDPI_PROTOCOL_PIA`
|
||||
=========================
|
||||
Private Internet Access (PIA) is a popular VPN service from Kape Technologies.
|
||||
|
||||
References: `Main site <https://www.privateinternetaccess.com/>`_
|
||||
|
||||
|
||||
.. _Proto 385:
|
||||
|
||||
`NDPI_PROTOCOL_KCP`
|
||||
===================
|
||||
KCP - A Fast and Reliable ARQ Protocol. It provides TCP-like stream support with low latency at the cost of bandwidth usage - used by lot's of Open Source / Third Party applications.
|
||||
|
||||
References: `Protocol Specs: <https://github.com/skywind3000/kcp/blob/master/protocol.txt>`_
|
||||
|
||||
|
||||
.. _Proto 386:
|
||||
|
||||
`NDPI_PROTOCOL_DOTA2`
|
||||
=========================
|
||||
Dota 2 is an extremely popular multiplayer MOBA game from Valve.
|
||||
|
||||
References: `Main site <https://www.dota2.com/>`_
|
||||
|
||||
|
||||
.. _Proto 387:
|
||||
|
||||
`NDPI_PROTOCOL_MUMBLE`
|
||||
=========================
|
||||
Mumble is a free, open source, low latency, high quality voice chat application.
|
||||
|
||||
References: `Main site <https://www.mumble.info/>`_
|
||||
|
||||
|
||||
.. _Proto 388:
|
||||
|
||||
`NDPI_PROTOCOL_YOJIMBO`
|
||||
=======================
|
||||
Yojimbo (netcode) is a secure connection-based client/server protocol built on top of UDP.
|
||||
|
||||
References: `Protocol Specs: <https://github.com/mas-bandwidth/netcode/blob/main/STANDARD.md>`_
|
||||
|
||||
|
||||
.. _Proto 389:
|
||||
|
||||
`NDPI_PROTOCOL_ELECTRONICARTS`
|
||||
=========================
|
||||
Electronic Arts is a leading publisher of games on Console, PC and Mobile.
|
||||
|
||||
References: `Main site <https://www.ea.com/>`_
|
||||
|
||||
Notes:
|
||||
|
||||
- Almost all of that traffic is related to their EA Origin game store.
|
||||
|
||||
|
||||
.. _Proto 390:
|
||||
|
||||
`NDPI_PROTOCOL_STOMP`
|
||||
========================
|
||||
STOMP is a simple interoperable protocol designed for asynchronous message passing between clients via mediating servers. Supported in ActiveMQ and RabbitMQ.
|
||||
|
||||
References: `Protocol Specs: <https://stomp.github.io/stomp-specification-1.2.html>`_
|
||||
|
||||
|
||||
.. _Proto 391:
|
||||
|
||||
`NDPI_PROTOCOL_RADMIN`
|
||||
=========================
|
||||
Radmin is remote access software for the Microsoft Windows platform.
|
||||
|
||||
References: `Main site <https://www.radmin.com/>`_
|
||||
|
||||
|
||||
.. _Proto 392:
|
||||
|
||||
`NDPI_PROTOCOL_RAFT`
|
||||
====================
|
||||
Raft is a consensus algorithm and protocol for managing a replicated log.
|
||||
|
||||
References: `C implementation <https://github.com/canonical/raft>`_ and `Paper <https://raft.github.io/raft.pdf>`_
|
||||
|
||||
|
||||
.. _Proto 394:
|
||||
|
||||
`NDPI_PROTOCOL_GEARMAN`
|
||||
====================
|
||||
Gearman is a network-based job-queuing system that was initially developed by Danga Interactive in order to process large volumes of jobs.
|
||||
|
||||
References: `Main site <http://gearman.org/>`_
|
||||
|
||||
|
||||
.. _Proto 395:
|
||||
|
||||
`NDPI_PROTOCOL_TENCENTGAMES`
|
||||
====================
|
||||
A protocol used by various games from Tencent (mostly mobile games).
|
||||
|
||||
References: `Main site <https://www.tencentgames.com/>`_
|
||||
|
||||
|
||||
.. _Proto 396:
|
||||
|
||||
`NDPI_PROTOCOL_GAIJIN`
|
||||
====================
|
||||
Protocols used in various games from Gaijin Entertainment.
|
||||
|
||||
References: `Main site <https://gaijin.net/>`_
|
||||
|
||||
|
||||
.. _Proto 397:
|
||||
|
||||
`NDPI_PROTOCOL_C1222`
|
||||
====================
|
||||
ANSI C12.22 (IEEE Std 1703) describe a protocol for transporting ANSI C12.19 table data over networks. It's mostly used to communicate with electric meters.
|
||||
|
||||
References: `Paid specs <https://www.nema.org/Standards/view/American-National-Standard-for-Protocol-Specification-for-Interfacing-to-Data-Communication-Networks/>`_
|
||||
|
||||
|
||||
.. _Proto 398:
|
||||
|
||||
`NDPI_PROTOCOL_HUAWEI`
|
||||
======================
|
||||
Generic Huawei traffic.
|
||||
|
||||
References: `Main site <https://www.huawei.com/>`_
|
||||
|
||||
|
||||
.. _Proto 399:
|
||||
|
||||
`NDPI_PROTOCOL_HUAWEI_CLOUD`
|
||||
============================
|
||||
Huawei Mobile Cloud.
|
||||
|
||||
References: `Main site <https://cloud.huawei.com/>`_
|
||||
|
||||
|
||||
.. _Proto 400:
|
||||
|
||||
`NDPI_PROTOCOL_DLEP`
|
||||
=====================
|
||||
The Dynamic Link ExchangeProtocol (DLEP) is a radio aware routing (RAR) protocol.
|
||||
|
||||
References: `RFC <https://datatracker.ietf.org/doc/html/rfc8175>`_
|
||||
|
||||
|
||||
.. _Proto 401:
|
||||
|
||||
`NDPI_PROTOCOL_BFD`
|
||||
=====================
|
||||
Bidirectional Forwarding Detection is a network protocol that is used to detect faults between two routers or switches.
|
||||
|
||||
References: `RFC <https://datatracker.ietf.org/doc/html/rfc5880>`_
|
||||
|
||||
|
||||
.. _Proto 402:
|
||||
|
||||
`NDPI_PROTOCOL_NETEASE_GAMES`
|
||||
============================
|
||||
Traffic of various NetEase games.
|
||||
|
||||
References: `Main site <https://www.neteasegames.com/>`_
|
||||
|
||||
|
||||
.. _Proto 403:
|
||||
|
||||
`NDPI_PROTOCOL_PATHOFEXILE`
|
||||
============================
|
||||
Path of Exile is a free-to-play online Action RPG.
|
||||
|
||||
References: `Main site <https://pathofexile.com/>`_
|
||||
|
||||
|
||||
.. _Proto 404:
|
||||
|
||||
`NDPI_PROTOCOL_GOOGLE_CALL`
|
||||
===========================
|
||||
Audio/video calls made by (any) Google applications (i.e Google Meet).
|
||||
|
||||
References: `Main site: <https://meet.google.com/>`_
|
||||
|
||||
Notes:
|
||||
|
||||
- nDPI usually uses different protocol ids for the generic application traffic and for its "realtime" traffic (examples: NDPI_PROTOCOL_MEET/NDPI_PROTOCOL_GOOGLE_CALL, NDPI_PROTOCOL_WHATSAPP/NDPI_PROTOCOL_WHATSAPP_CALL, ...)
|
||||
|
||||
|
||||
.. _Proto 405:
|
||||
|
||||
`NDPI_PROTOCOL_PFCP`
|
||||
=====================
|
||||
PFCP is a protocol used for communicating between control plane (CP) and user plane (UP) functions in 4G and 5G networks.
|
||||
|
||||
References: `Protocol Specs: <https://www.etsi.org/deliver/etsi_ts/129200_129299/129244/16.05.00_60/ts_129244v160500p.pdf>`_
|
||||
|
||||
|
||||
.. _Proto 406:
|
||||
|
||||
`NDPI_PROTOCOL_FLUTE`
|
||||
=====================
|
||||
File Delivery over Unidirectional Transport.
|
||||
|
||||
References: `RFC <https://datatracker.ietf.org/doc/html/rfc6726>`_
|
||||
|
||||
|
||||
.. _Proto 407:
|
||||
|
||||
`NDPI_PROTOCOL_LOLWILDRIFT`
|
||||
============================
|
||||
League of Legends: Wild Rift is a mobile MOBA game.
|
||||
|
||||
References: `Main site <https://wildrift.leagueoflegends.com/>`_
|
||||
|
||||
|
||||
.. _Proto 408:
|
||||
|
||||
`NDPI_PROTOCOL_TESO`
|
||||
============================
|
||||
The Elder Scrolls Online is a MMORPG set in the fantasy world of Tamriel.
|
||||
|
||||
References: `Main site <https://www.elderscrollsonline.com/>`_
|
||||
|
||||
|
||||
.. _Proto 409:
|
||||
|
||||
`NDPI_PROTOCOL_LDP`
|
||||
=====================
|
||||
The Label Distribution Protocol (LDP) is a routing protocol used to establish and maintain label-switched paths in a Multiprotocol Label Switching (MPLS) network.
|
||||
|
||||
References: `RFC <https://datatracker.ietf.org/doc/html/rfc5036>`_
|
||||
|
||||
|
||||
.. _Proto 410:
|
||||
|
||||
`NDPI_PROTOCOL_KNXNET_IP`
|
||||
=====================
|
||||
KNXnet/IP is a building automation protocol that enables the exchange of data and control information over IP networks, extending the KNX standard for home and building automation.
|
||||
|
||||
References: `Paid Specs: <https://webstore.ansi.org/standards/ds/dsiso225102019>`_
|
||||
|
||||
|
||||
.. _Proto 411:
|
||||
|
||||
`NDPI_PROTOCOL_BLUESKY`
|
||||
======================
|
||||
Bluesky, also known as Bluesky Social, is a decentralized microblogging social platform.
|
||||
|
||||
References: `Main site: <https://bsky.app/>`_
|
||||
|
||||
|
||||
.. _Proto 412:
|
||||
|
||||
`NDPI_PROTOCOL_MASTODON`
|
||||
=======================
|
||||
Mastodon is free and open-source software for running self-hosted social networking services. It has microblogging features similar to Twitter.
|
||||
|
||||
References: `Main site: <https://joinmastodon.org/>`_
|
||||
|
||||
|
||||
.. _Proto 413:
|
||||
|
||||
`NDPI_PROTOCOL_THREADS`
|
||||
======================
|
||||
Threads is an online social media and social networking service operated by Meta Platforms.
|
||||
|
||||
References: `Main site: <https://www.threads.net>`_
|
||||
|
||||
|
||||
.. _Proto 414:
|
||||
|
||||
`NDPI_PROTOCOL_VIBER_VOIP`
|
||||
=========================
|
||||
Audio/video calls made using the Viber app.
|
||||
|
||||
References: `Wikipedia <https://en.wikipedia.org/wiki/Viber>`_
|
||||
|
||||
|
||||
.. _Proto 415:
|
||||
|
||||
`NDPI_PROTOCOL_ZUG`
|
||||
=========================
|
||||
The ZUG protocol is part of the Casper 2.0 consensus model.
|
||||
|
||||
References: `Main Site <https://casperlabs.io>`_ and `Blog Post <https://casperlabs.io/blog/beyond-eth-30-theres-casper-20>`_
|
||||
|
||||
|
||||
.. _Proto 416:
|
||||
|
||||
`NDPI_PROTOCOL_JRMI`
|
||||
=========================
|
||||
The JRMI protocol is the Java Remote Method Invocation protocol.
|
||||
|
||||
References: `Oracle site <https://docs.oracle.com/en/java/javase/21/docs/specs/rmi/protocol.html>`_
|
||||
|
||||
|
||||
.. _Proto 417:
|
||||
|
||||
`NDPI_PROTOCOL_RIPE_ATLAS`
|
||||
==========================
|
||||
The RIPE Atlas probe protocol is used for the world's largest active Internet measurement network.
|
||||
|
||||
References: `Main Site <https://atlas.ripe.net/>`_ and `Documentation <https://ripe-atlas-tools.readthedocs.io/en/latest/index.html>`_
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
AR=@AR@
|
||||
CC=@CC@
|
||||
CXX=@CXX@
|
||||
ifneq ($(OS),Windows_NT)
|
||||
OS := $(shell uname)
|
||||
endif
|
||||
ifeq ($(OS),Darwin)
|
||||
CC=clang -fno-color-diagnostics
|
||||
endif
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# Format: name\tcategory_id
|
||||
internetbadguys.com 100
|
||||
144.139.247.220 100
|
||||
172.30.69.0/24 100
|
||||
[2001:1670:8:40a6:a08e:332b:aa69:18dc] 100
|
||||
[2001:db8:1::1]/127 100
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
#Format: <proto, param, value>
|
||||
#proto might be empty
|
||||
#Basic example of how to set nDPI configuration parameters via file
|
||||
#We set only some default values
|
||||
#See doc/configuration_parameters.md for a complete list and description of all the accepted knobs
|
||||
|
||||
packets_limit_per_flow,32
|
||||
ookla,dpi.aggressiveness,0x1
|
||||
tls,metadata.sha1_fingerprint,1
|
||||
|
||||
lru.bittorrent.ttl,0
|
||||
|
||||
|
||||
+965
-426
File diff suppressed because it is too large
Load Diff
@@ -188,8 +188,7 @@ static struct nDPI_workflow * init_workflow(char const * const file_or_device)
|
||||
printf("pcap_setfilter error: '%s'\n", pcap_geterr(workflow->pcap_handle));
|
||||
}
|
||||
|
||||
ndpi_init_prefs init_prefs = ndpi_no_prefs;
|
||||
workflow->ndpi_struct = ndpi_init_detection_module(init_prefs);
|
||||
workflow->ndpi_struct = ndpi_init_detection_module(NULL);
|
||||
if (workflow->ndpi_struct == NULL) {
|
||||
free_workflow(&workflow);
|
||||
return NULL;
|
||||
@@ -230,6 +229,7 @@ static void ndpi_flow_info_freer(void * const node)
|
||||
static void free_workflow(struct nDPI_workflow ** const workflow)
|
||||
{
|
||||
struct nDPI_workflow * const w = *workflow;
|
||||
size_t i;
|
||||
|
||||
if (w == NULL) {
|
||||
return;
|
||||
@@ -243,7 +243,7 @@ static void free_workflow(struct nDPI_workflow ** const workflow)
|
||||
if (w->ndpi_struct != NULL) {
|
||||
ndpi_exit_detection_module(w->ndpi_struct);
|
||||
}
|
||||
for(size_t i = 0; i < w->max_active_flows; i++) {
|
||||
for(i = 0; i < w->max_active_flows; i++) {
|
||||
ndpi_tdestroy(w->ndpi_flows_active[i], ndpi_flow_info_freer);
|
||||
}
|
||||
ndpi_free(w->ndpi_flows_active);
|
||||
@@ -272,6 +272,7 @@ static int setup_reader_threads(char const * const file_or_device)
|
||||
{
|
||||
char * file_or_default_device;
|
||||
char pcap_error_buffer[PCAP_ERRBUF_SIZE];
|
||||
int i;
|
||||
|
||||
if (reader_thread_count > MAX_READER_THREADS) {
|
||||
return 1;
|
||||
@@ -290,7 +291,7 @@ static int setup_reader_threads(char const * const file_or_device)
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < reader_thread_count; ++i) {
|
||||
for (i = 0; i < reader_thread_count; ++i) {
|
||||
reader_threads[i].workflow = init_workflow(file_or_default_device);
|
||||
if (reader_threads[i].workflow == NULL)
|
||||
{
|
||||
@@ -500,8 +501,10 @@ static int ndpi_workflow_node_cmp(void const * const A, void const * const B) {
|
||||
|
||||
static void check_for_idle_flows(struct nDPI_workflow * const workflow)
|
||||
{
|
||||
size_t idle_scan_index;
|
||||
|
||||
if (workflow->last_idle_scan_time + IDLE_SCAN_PERIOD < workflow->last_time) {
|
||||
for (size_t idle_scan_index = 0; idle_scan_index < workflow->max_active_flows; ++idle_scan_index) {
|
||||
for (idle_scan_index = 0; idle_scan_index < workflow->max_active_flows; ++idle_scan_index) {
|
||||
ndpi_twalk(workflow->ndpi_flows_active[idle_scan_index], ndpi_idle_scan_walker, workflow);
|
||||
|
||||
while (workflow->cur_idle_flows > 0) {
|
||||
@@ -530,7 +533,7 @@ static void ndpi_process_packet(uint8_t * const args,
|
||||
struct nDPI_reader_thread * const reader_thread =
|
||||
(struct nDPI_reader_thread *)args;
|
||||
struct nDPI_workflow * workflow;
|
||||
struct nDPI_flow_info flow = {};
|
||||
struct nDPI_flow_info flow;
|
||||
|
||||
size_t hashed_index;
|
||||
void * tree_result;
|
||||
@@ -551,6 +554,8 @@ static void ndpi_process_packet(uint8_t * const args,
|
||||
uint16_t type;
|
||||
uint32_t thread_index = INITIAL_THREAD_HASH; // generated with `dd if=/dev/random bs=1024 count=1 |& hd'
|
||||
|
||||
memset(&flow, '\0', sizeof(flow));
|
||||
|
||||
if (reader_thread == NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -736,24 +741,33 @@ static void ndpi_process_packet(uint8_t * const args,
|
||||
print_packet_info(reader_thread, header, l4_len, &flow);
|
||||
#endif
|
||||
|
||||
/* calculate flow hash for btree find, search(insert) */
|
||||
if (flow.l3_type == L3_IP) {
|
||||
if (ndpi_flowv4_flow_hash(flow.l4_protocol, flow.ip_tuple.v4.src, flow.ip_tuple.v4.dst,
|
||||
flow.src_port, flow.dst_port, 0, 0,
|
||||
(uint8_t *)&flow.hashval, sizeof(flow.hashval)) != 0)
|
||||
{
|
||||
uint64_t tmp[4] = {};
|
||||
|
||||
/* calculate flow hash for btree find, search(insert) */
|
||||
if (flow.l3_type == L3_IP) {
|
||||
if (ndpi_flowv4_flow_hash(flow.l4_protocol, flow.ip_tuple.v4.src, flow.ip_tuple.v4.dst,
|
||||
flow.src_port, flow.dst_port, 0, 0,
|
||||
(uint8_t *)&tmp[0], sizeof(tmp)) != 0)
|
||||
{
|
||||
flow.hashval = flow.ip_tuple.v4.src + flow.ip_tuple.v4.dst; // fallback
|
||||
flow.hashval = flow.ip_tuple.v4.src + flow.ip_tuple.v4.dst; // fallback
|
||||
} else {
|
||||
flow.hashval = tmp[0] + tmp[1] + tmp[2] + tmp[3];
|
||||
}
|
||||
} else if (flow.l3_type == L3_IP6) {
|
||||
if (ndpi_flowv6_flow_hash(flow.l4_protocol, &ip6->ip6_src, &ip6->ip6_dst,
|
||||
flow.src_port, flow.dst_port, 0, 0,
|
||||
(uint8_t *)&flow.hashval, sizeof(flow.hashval)) != 0)
|
||||
} else if (flow.l3_type == L3_IP6) {
|
||||
if (ndpi_flowv6_flow_hash(flow.l4_protocol, &ip6->ip6_src, &ip6->ip6_dst,
|
||||
flow.src_port, flow.dst_port, 0, 0,
|
||||
(uint8_t *)&tmp[0], sizeof(tmp)) != 0)
|
||||
{
|
||||
flow.hashval = flow.ip_tuple.v6.src[0] + flow.ip_tuple.v6.src[1];
|
||||
flow.hashval += flow.ip_tuple.v6.dst[0] + flow.ip_tuple.v6.dst[1];
|
||||
flow.hashval = flow.ip_tuple.v6.src[0] + flow.ip_tuple.v6.src[1];
|
||||
flow.hashval += flow.ip_tuple.v6.dst[0] + flow.ip_tuple.v6.dst[1];
|
||||
} else {
|
||||
flow.hashval = tmp[0] + tmp[1] + tmp[2] + tmp[3];
|
||||
}
|
||||
}
|
||||
|
||||
flow.hashval += flow.l4_protocol + flow.src_port + flow.dst_port;
|
||||
}
|
||||
flow.hashval += flow.l4_protocol + flow.src_port + flow.dst_port;
|
||||
|
||||
hashed_index = flow.hashval % workflow->max_active_flows;
|
||||
tree_result = ndpi_tfind(&flow, &workflow->ndpi_flows_active[hashed_index], ndpi_workflow_node_cmp);
|
||||
@@ -866,7 +880,7 @@ static void ndpi_process_packet(uint8_t * const args,
|
||||
flow_to_process->guessed_protocol =
|
||||
ndpi_detection_giveup(workflow->ndpi_struct,
|
||||
flow_to_process->ndpi_flow,
|
||||
1, &protocol_was_guessed);
|
||||
&protocol_was_guessed);
|
||||
if (protocol_was_guessed != 0) {
|
||||
printf("[%8llu, %d, %4d][GUESSED] protocol: %s | app protocol: %s | category: %s\n",
|
||||
workflow->packets_captured,
|
||||
@@ -886,8 +900,7 @@ static void ndpi_process_packet(uint8_t * const args,
|
||||
ip != NULL ? (uint8_t *)ip : (uint8_t *)ip6,
|
||||
ip_size, time_ms, NULL);
|
||||
|
||||
if (ndpi_is_protocol_detected(workflow->ndpi_struct,
|
||||
flow_to_process->detected_l7_protocol) != 0 &&
|
||||
if (ndpi_is_protocol_detected(flow_to_process->detected_l7_protocol) != 0 &&
|
||||
flow_to_process->detection_completed == 0)
|
||||
{
|
||||
if (flow_to_process->detected_l7_protocol.master_protocol != NDPI_PROTOCOL_UNKNOWN ||
|
||||
@@ -1019,7 +1032,9 @@ static void * processing_thread(void * const ndpi_thread_arg)
|
||||
|
||||
static int processing_threads_error_or_eof(void)
|
||||
{
|
||||
for (int i = 0; i < reader_thread_count; ++i) {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < reader_thread_count; ++i) {
|
||||
if (__sync_fetch_and_add(&reader_threads[i].workflow->error_or_eof, 0) == 0) {
|
||||
return 0;
|
||||
}
|
||||
@@ -1029,6 +1044,8 @@ static int processing_threads_error_or_eof(void)
|
||||
|
||||
static int start_reader_threads(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
#ifndef WIN32
|
||||
sigset_t thread_signal_set, old_signal_set;
|
||||
|
||||
@@ -1041,7 +1058,7 @@ static int start_reader_threads(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
for (int i = 0; i < reader_thread_count; ++i) {
|
||||
for (i = 0; i < reader_thread_count; ++i) {
|
||||
reader_threads[i].array_index = i;
|
||||
|
||||
if (reader_threads[i].workflow == NULL) {
|
||||
@@ -1067,6 +1084,7 @@ static int start_reader_threads(void)
|
||||
|
||||
static int stop_reader_threads(void)
|
||||
{
|
||||
int i;
|
||||
unsigned long long int total_packets_captured = 0;
|
||||
unsigned long long int total_packets_processed = 0;
|
||||
unsigned long long int total_l4_data_len = 0;
|
||||
@@ -1074,13 +1092,13 @@ static int stop_reader_threads(void)
|
||||
unsigned long long int total_flows_idle = 0;
|
||||
unsigned long long int total_flows_detected = 0;
|
||||
|
||||
for (int i = 0; i < reader_thread_count; ++i) {
|
||||
for (i = 0; i < reader_thread_count; ++i) {
|
||||
break_pcap_loop(&reader_threads[i]);
|
||||
}
|
||||
|
||||
printf("------------------------------------ Stopping reader threads\n");
|
||||
|
||||
for (int i = 0; i < reader_thread_count; ++i) {
|
||||
for (i = 0; i < reader_thread_count; ++i) {
|
||||
if (reader_threads[i].workflow == NULL) {
|
||||
continue;
|
||||
}
|
||||
@@ -1105,7 +1123,7 @@ static int stop_reader_threads(void)
|
||||
/* total packets captured: same value for all threads as packet2thread distribution happens later */
|
||||
total_packets_captured = reader_threads[0].workflow->packets_captured;
|
||||
|
||||
for (int i = 0; i < reader_thread_count; ++i) {
|
||||
for (i = 0; i < reader_thread_count; ++i) {
|
||||
if (reader_threads[i].workflow == NULL) {
|
||||
continue;
|
||||
}
|
||||
@@ -1137,7 +1155,7 @@ static void sighandler(int signum)
|
||||
int main(int argc, char ** argv)
|
||||
{
|
||||
if (argc == 0) {
|
||||
printf("usage: ndpiSimpleIntegration Mdevice name>\n");
|
||||
printf("usage: ndpiSimpleIntegration <device name>\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
+20
-2
@@ -27,6 +27,7 @@ host:"api-global.netflix.com"@Netflix
|
||||
# IP based Subprotocols
|
||||
# Format:
|
||||
# ip:<value>,ip:<value>,.....@<subproto>
|
||||
# ipv6:[<value>],ipv6:[<value>],.....@<subproto>
|
||||
|
||||
#
|
||||
# NOTES
|
||||
@@ -45,14 +46,29 @@ host:"api-global.netflix.com"@Netflix
|
||||
# detected as <L7 proto>.Google but only
|
||||
# as <L7 proto>
|
||||
#
|
||||
|
||||
ip:213.75.170.11/32:443@CustomProtocol
|
||||
ip:8.248.73.247:443@AmazonPrime
|
||||
ip:54.80.47.130@AmazonPrime
|
||||
|
||||
#You can specify a protocol Id. In that case you probably want to avoid conflict with internal ids.
|
||||
#You can use any number up to 65535
|
||||
|
||||
ip:3.3.3.3:443@CustomProtocolA
|
||||
ip:3.3.3.3:444@CustomProtocolB
|
||||
ip:3.3.3.3:446@CustomProtocolC=400
|
||||
ip:3.3.3.3:446@CustomProtocolC=800
|
||||
|
||||
ipv6:[3ffe:507:0:1:200:86ff:fe05:80da]@CustomProtocolD=1024
|
||||
ipv6:[247f:855b:5e16:3caf::]/64:100@CustomProtocolE=2048
|
||||
ipv6:[247f:855b:5e16:3caf::]/64@CustomProtocolF=2049
|
||||
ipv6:[fe80::76ac:b9ff:fe6c:c124]:12717@CustomProtocolG=2050
|
||||
ipv6:[fe80::76ac:b9ff:fe6c:c124]:12718@CustomProtocolH=65535
|
||||
ipv6:[fe80::76ac:b9ff:fe6c:c124]:12719@CustomProtocolI=65534
|
||||
|
||||
#
|
||||
# You can use symbolic IP addreses if you want
|
||||
#
|
||||
ip:www.ntop.org@ntop
|
||||
ipv6:www.ntop.org@ntop
|
||||
|
||||
#
|
||||
# Risk Exceptions
|
||||
@@ -67,6 +83,8 @@ ip:3.3.3.3:446@CustomProtocolC=400
|
||||
#ip_risk_mask:192.168.1.0/24=0
|
||||
ip_risk_mask:10.10.120.0/24=0
|
||||
ip_risk_mask:10.196.157.228=0
|
||||
ipv6_risk_mask:[fe80::356b:e047:3695:0]/112=0
|
||||
ipv6_risk_mask:[fe80::7c0:e74e:87c3:5d93]=0
|
||||
host_risk_mask:".home"=0
|
||||
|
||||
|
||||
|
||||
+48
-108
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* reader_util.c
|
||||
*
|
||||
* Copyright (C) 2011-23 - ntop.org
|
||||
* Copyright (C) 2011-24 - 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
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/ip.h>
|
||||
#endif
|
||||
#include <assert.h>
|
||||
|
||||
#include "reader_util.h"
|
||||
|
||||
@@ -73,18 +74,14 @@
|
||||
#include "reader_util.h"
|
||||
#include "ndpi_classify.h"
|
||||
|
||||
extern u_int8_t enable_protocol_guess, enable_flow_stats, enable_payload_analyzer;
|
||||
extern u_int8_t enable_flow_stats, enable_payload_analyzer;
|
||||
extern u_int8_t verbose, human_readeable_string_len;
|
||||
extern u_int8_t max_num_udp_dissected_pkts /* 24 */, max_num_tcp_dissected_pkts /* 80 */;
|
||||
static u_int32_t flow_id = 0;
|
||||
|
||||
u_int8_t enable_doh_dot_detection = 0;
|
||||
extern ndpi_init_prefs init_prefs;
|
||||
|
||||
extern int malloc_size_stats;
|
||||
extern struct ndpi_bin malloc_bins;
|
||||
extern int max_malloc_bins;
|
||||
extern int enable_malloc_bins;
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
@@ -118,7 +115,6 @@ u_int16_t max_pattern_len = 8;
|
||||
/* *********************************************************** */
|
||||
|
||||
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) {
|
||||
@@ -129,7 +125,7 @@ int ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
#ifdef DEBUG_PAYLOAD
|
||||
u_int16_t i;
|
||||
for(i=0; i<payload_len; i++)
|
||||
printf("%c", isprint(payload[i]) ? payload[i] : '.');
|
||||
printf("%c", ndpi_isprint(payload[i]) ? payload[i] : '.');
|
||||
printf("\n");
|
||||
#endif
|
||||
|
||||
@@ -198,7 +194,6 @@ int ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
/* *********************************************************** */
|
||||
|
||||
void ndpi_payload_analyzer(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) {
|
||||
u_int16_t i, j;
|
||||
@@ -219,7 +214,7 @@ 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) {
|
||||
if(ndpi_analyze_payload(flow, src_to_dst_direction, &payload[i], j, packet_id) == -1) {
|
||||
if(ndpi_analyze_payload(flow, &payload[i], j, packet_id) == -1) {
|
||||
LOG(NDPI_LOG_ERROR, "Error ndpi_analyze_payload (allocation failure)\n");
|
||||
}
|
||||
}
|
||||
@@ -247,7 +242,7 @@ static void print_payload_stat(struct payload_stats *p, FILE *out) {
|
||||
fprintf(out, "\t[");
|
||||
|
||||
for(i=0; i<p->pattern_len; i++) {
|
||||
fprintf(out, "%c", isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
fprintf(out, "%c", ndpi_isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
}
|
||||
|
||||
fprintf(out, "]");
|
||||
@@ -255,7 +250,7 @@ static void print_payload_stat(struct payload_stats *p, FILE *out) {
|
||||
fprintf(out, "[");
|
||||
|
||||
for(i=0; i<p->pattern_len; i++) {
|
||||
fprintf(out, "%s%02X", (i > 0) ? " " : "", isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
fprintf(out, "%s%02X", (i > 0) ? " " : "", ndpi_isprint(p->pattern[i]) ? p->pattern[i] : '.');
|
||||
}
|
||||
|
||||
fprintf(out, "]");
|
||||
@@ -336,45 +331,6 @@ void ndpi_free_flow_info_half(struct ndpi_flow_info *flow) {
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
extern u_int32_t current_ndpi_memory, max_ndpi_memory;
|
||||
|
||||
static u_int32_t __slot_malloc_bins(u_int64_t v)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* 0-2,3-4,5-8,9-16,17-32,33-64,65-128,129-256,257-512,513-1024,1025-2048,2049-4096,4097-8192,8193- */
|
||||
for(i=0; i < max_malloc_bins - 1; i++)
|
||||
if((1ULL << (i + 1)) >= v)
|
||||
return i;
|
||||
return i;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief ndpi_malloc wrapper function
|
||||
*/
|
||||
static void *ndpi_malloc_wrapper(size_t size) {
|
||||
current_ndpi_memory += size;
|
||||
|
||||
if(current_ndpi_memory > max_ndpi_memory)
|
||||
max_ndpi_memory = current_ndpi_memory;
|
||||
|
||||
if(enable_malloc_bins && malloc_size_stats)
|
||||
ndpi_inc_bin(&malloc_bins, __slot_malloc_bins(size), 1);
|
||||
|
||||
return(malloc(size)); /* Don't change to ndpi_malloc !!!!! */
|
||||
}
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
/**
|
||||
* @brief free wrapper function
|
||||
*/
|
||||
static void free_wrapper(void *freeable) {
|
||||
free(freeable); /* Don't change to ndpi_free !!!!! */
|
||||
}
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
static uint16_t ndpi_get_proto_id(struct ndpi_detection_module_struct *ndpi_mod, const char *name) {
|
||||
uint16_t proto_id;
|
||||
char *e;
|
||||
@@ -410,7 +366,7 @@ int parse_proto_name_list(char *str, NDPI_PROTOCOL_BITMASK *bitmask, int inverte
|
||||
else
|
||||
op = 0; /* Default action: remove from the bitmask */
|
||||
/* Use a temporary module with all protocols enabled */
|
||||
module = ndpi_init_detection_module(0);
|
||||
module = ndpi_init_detection_module(NULL);
|
||||
if(!module)
|
||||
return 1;
|
||||
NDPI_BITMASK_SET_ALL(all);
|
||||
@@ -449,24 +405,14 @@ int parse_proto_name_list(char *str, NDPI_PROTOCOL_BITMASK *bitmask, int inverte
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
extern char *_debug_protocols;
|
||||
|
||||
struct ndpi_workflow* ndpi_workflow_init(const struct ndpi_workflow_prefs * prefs,
|
||||
pcap_t * pcap_handle, int do_init_flows_root,
|
||||
ndpi_serialization_format serialization_format) {
|
||||
ndpi_serialization_format serialization_format,
|
||||
struct ndpi_global_context *g_ctx) {
|
||||
struct ndpi_detection_module_struct * module;
|
||||
struct ndpi_workflow * workflow;
|
||||
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);
|
||||
module = ndpi_init_detection_module(g_ctx);
|
||||
|
||||
if(module == NULL) {
|
||||
LOG(NDPI_LOG_ERROR, "global structure initialization failed\n");
|
||||
@@ -486,20 +432,6 @@ struct ndpi_workflow* ndpi_workflow_init(const struct ndpi_workflow_prefs * pref
|
||||
|
||||
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)) {
|
||||
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) {
|
||||
workflow->ndpi_flows_root = ndpi_calloc(workflow->prefs.num_roots, sizeof(void *));
|
||||
if(!workflow->ndpi_flows_root) {
|
||||
@@ -526,11 +458,11 @@ void ndpi_flow_info_freer(void *node) {
|
||||
/* ***************************************************** */
|
||||
|
||||
static void ndpi_free_flow_tls_data(struct ndpi_flow_info *flow) {
|
||||
|
||||
if(flow->dhcp_fingerprint) {
|
||||
ndpi_free(flow->dhcp_fingerprint);
|
||||
flow->dhcp_fingerprint = NULL;
|
||||
}
|
||||
|
||||
if(flow->dhcp_class_ident) {
|
||||
ndpi_free(flow->dhcp_class_ident);
|
||||
flow->dhcp_class_ident = NULL;
|
||||
@@ -545,6 +477,7 @@ static void ndpi_free_flow_tls_data(struct ndpi_flow_info *flow) {
|
||||
ndpi_free(flow->telnet.username);
|
||||
flow->telnet.username = NULL;
|
||||
}
|
||||
|
||||
if(flow->telnet.password) {
|
||||
ndpi_free(flow->telnet.password);
|
||||
flow->telnet.password = NULL;
|
||||
@@ -754,7 +687,6 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
ndpi_packet_tunnel tunnel_type,
|
||||
const struct ndpi_iphdr *iph,
|
||||
const struct ndpi_ipv6hdr *iph6,
|
||||
u_int16_t ip_offset,
|
||||
u_int16_t ipsize,
|
||||
u_int16_t l4_packet_len,
|
||||
u_int16_t l4_offset,
|
||||
@@ -1040,7 +972,6 @@ static struct ndpi_flow_info *get_ndpi_flow_info6(struct ndpi_workflow * workflo
|
||||
u_int16_t vlan_id,
|
||||
ndpi_packet_tunnel tunnel_type,
|
||||
const struct ndpi_ipv6hdr *iph6,
|
||||
u_int16_t ip_offset,
|
||||
u_int16_t ipsize,
|
||||
struct ndpi_tcphdr **tcph,
|
||||
struct ndpi_udphdr **udph,
|
||||
@@ -1069,7 +1000,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info6(struct ndpi_workflow * workflo
|
||||
iph.protocol = l4proto;
|
||||
|
||||
return(get_ndpi_flow_info(workflow, 6, vlan_id, tunnel_type,
|
||||
&iph, iph6, ip_offset, ipsize,
|
||||
&iph, iph6, ipsize,
|
||||
ip_len, l4ptr - (const u_int8_t *)iph6,
|
||||
tcph, udph, sport, dport,
|
||||
proto, payload,
|
||||
@@ -1148,11 +1079,13 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
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);
|
||||
u_int avail = sizeof(flow->ndpi_flow->protos.bittorrent.hash) * 2 + 1;
|
||||
flow->bittorent_hash = ndpi_malloc(avail);
|
||||
|
||||
if(flow->bittorent_hash) {
|
||||
|
||||
for(i=0, j = 0; i < sizeof(flow->ndpi_flow->protos.bittorrent.hash); i++) {
|
||||
sprintf(&flow->bittorent_hash[j], "%02x",
|
||||
snprintf(&flow->bittorent_hash[j], avail-j, "%02x",
|
||||
flow->ndpi_flow->protos.bittorrent.hash[i]);
|
||||
|
||||
j += 2;
|
||||
@@ -1326,6 +1259,8 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
flow->ssh_tls.notAfter = flow->ndpi_flow->protos.tls_quic.notAfter;
|
||||
ndpi_snprintf(flow->ssh_tls.ja3_client, sizeof(flow->ssh_tls.ja3_client), "%s",
|
||||
flow->ndpi_flow->protos.tls_quic.ja3_client);
|
||||
ndpi_snprintf(flow->ssh_tls.ja4_client, sizeof(flow->ssh_tls.ja4_client), "%s",
|
||||
flow->ndpi_flow->protos.tls_quic.ja4_client);
|
||||
ndpi_snprintf(flow->ssh_tls.ja3_server, sizeof(flow->ssh_tls.ja3_server), "%s",
|
||||
flow->ndpi_flow->protos.tls_quic.ja3_server);
|
||||
flow->ssh_tls.server_unsafe_cipher = flow->ndpi_flow->protos.tls_quic.server_unsafe_cipher;
|
||||
@@ -1380,6 +1315,12 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
}
|
||||
}
|
||||
|
||||
memcpy(&flow->stun.mapped_address, &flow->ndpi_flow->stun.mapped_address, sizeof(ndpi_address_port));
|
||||
memcpy(&flow->stun.peer_address, &flow->ndpi_flow->stun.peer_address, sizeof(ndpi_address_port));
|
||||
memcpy(&flow->stun.relayed_address, &flow->ndpi_flow->stun.relayed_address, sizeof(ndpi_address_port));
|
||||
memcpy(&flow->stun.response_origin, &flow->ndpi_flow->stun.response_origin, sizeof(ndpi_address_port));
|
||||
memcpy(&flow->stun.other_address, &flow->ndpi_flow->stun.other_address, sizeof(ndpi_address_port));
|
||||
|
||||
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
|
||||
@@ -1412,7 +1353,7 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
flow->detected_protocol,
|
||||
&flow->ndpi_flow_serializer) != 0) {
|
||||
LOG(NDPI_LOG_ERROR, "flow2json failed\n");
|
||||
exit(-1);
|
||||
return;
|
||||
}
|
||||
|
||||
ndpi_serialize_string_uint32(&flow->ndpi_flow_serializer, "detection_completed", flow->detection_completed);
|
||||
@@ -1423,6 +1364,9 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
||||
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 */
|
||||
|
||||
if(workflow->flow_callback != NULL)
|
||||
workflow->flow_callback(workflow, flow, workflow->flow_callback_userdata);
|
||||
|
||||
ndpi_free_flow_info_half(flow);
|
||||
}
|
||||
}
|
||||
@@ -1492,12 +1436,12 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
ndpi_packet_tunnel tunnel_type,
|
||||
const struct ndpi_iphdr *iph,
|
||||
struct ndpi_ipv6hdr *iph6,
|
||||
u_int16_t ip_offset,
|
||||
u_int16_t ipsize, u_int16_t rawsize,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet,
|
||||
pkt_timeval when,
|
||||
ndpi_risk *flow_risk) {
|
||||
ndpi_risk *flow_risk,
|
||||
struct ndpi_flow_info **flow_ext) {
|
||||
struct ndpi_flow_info *flow = NULL;
|
||||
struct ndpi_flow_struct *ndpi_flow = NULL;
|
||||
u_int8_t proto;
|
||||
@@ -1515,7 +1459,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
if(iph)
|
||||
flow = get_ndpi_flow_info(workflow, IPVERSION, vlan_id,
|
||||
tunnel_type, iph, NULL,
|
||||
ip_offset, ipsize,
|
||||
ipsize,
|
||||
ntohs(iph->tot_len) ? (ntohs(iph->tot_len) - (iph->ihl * 4)) : ipsize - (iph->ihl * 4) /* TSO */,
|
||||
iph->ihl * 4,
|
||||
&tcph, &udph, &sport, &dport,
|
||||
@@ -1523,7 +1467,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
&payload, &payload_len, &src_to_dst_direction, when);
|
||||
else
|
||||
flow = get_ndpi_flow_info6(workflow, vlan_id,
|
||||
tunnel_type, iph6, ip_offset, ipsize,
|
||||
tunnel_type, iph6, ipsize,
|
||||
&tcph, &udph, &sport, &dport,
|
||||
&proto,
|
||||
&payload, &payload_len, &src_to_dst_direction, when);
|
||||
@@ -1616,7 +1560,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
#endif
|
||||
|
||||
if(enable_payload_analyzer && (payload_len > 0))
|
||||
ndpi_payload_analyzer(flow, src_to_dst_direction,
|
||||
ndpi_payload_analyzer(flow,
|
||||
payload, payload_len,
|
||||
workflow->stats.ip_packet_count);
|
||||
|
||||
@@ -1675,7 +1619,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
}
|
||||
|
||||
if((!skip) && ((flow->src2dst_packets+flow->dst2src_packets) < 100)) {
|
||||
if(ndpi_has_human_readeable_string(workflow->ndpi_struct, (char*)packet, header->caplen,
|
||||
if(ndpi_has_human_readeable_string((char*)packet, header->caplen,
|
||||
human_readeable_string_len,
|
||||
flow->human_readeable_string_buffer,
|
||||
sizeof(flow->human_readeable_string_buffer)) == 1)
|
||||
@@ -1700,8 +1644,8 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
struct ndpi_flow_input_info input_info;
|
||||
|
||||
u_int enough_packets =
|
||||
(((proto == IPPROTO_UDP) && ((flow->src2dst_packets + flow->dst2src_packets) > max_num_udp_dissected_pkts))
|
||||
|| ((proto == IPPROTO_TCP) && ((flow->src2dst_packets + flow->dst2src_packets) > max_num_tcp_dissected_pkts))) ? 1 : 0;
|
||||
((proto == IPPROTO_UDP && (max_num_udp_dissected_pkts > 0 && flow->src2dst_packets + flow->dst2src_packets > max_num_udp_dissected_pkts)) ||
|
||||
(proto == IPPROTO_TCP && (max_num_tcp_dissected_pkts > 0 && flow->src2dst_packets + flow->dst2src_packets > max_num_tcp_dissected_pkts))) ? 1 : 0;
|
||||
|
||||
#if 0
|
||||
printf("%s()\n", __FUNCTION__);
|
||||
@@ -1728,23 +1672,17 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
if(enough_packets || (flow->detected_protocol.app_protocol != NDPI_PROTOCOL_UNKNOWN)) {
|
||||
if((!enough_packets)
|
||||
&& ndpi_extra_dissection_possible(workflow->ndpi_struct, ndpi_flow))
|
||||
; /* Wait for certificate fingerprint */
|
||||
; /* Wait for further metadata */
|
||||
else {
|
||||
/* New protocol detected or give up */
|
||||
flow->detection_completed = 1;
|
||||
|
||||
#if 0
|
||||
/* Check if we should keep checking extra packets */
|
||||
if(ndpi_flow && ndpi_flow->check_extra_packets)
|
||||
flow->check_extra_packets = 1;
|
||||
#endif
|
||||
|
||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
|
||||
u_int8_t proto_guessed;
|
||||
|
||||
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow,
|
||||
enable_protocol_guess, &proto_guessed);
|
||||
if(enable_protocol_guess) workflow->stats.guessed_flow_protocols++;
|
||||
&proto_guessed);
|
||||
if(proto_guessed) workflow->stats.guessed_flow_protocols++;
|
||||
}
|
||||
|
||||
process_ndpi_collected_info(workflow, flow);
|
||||
@@ -1765,6 +1703,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
#endif
|
||||
|
||||
*flow_risk = flow->risk;
|
||||
*flow_ext = flow;
|
||||
|
||||
return(flow->detected_protocol);
|
||||
}
|
||||
@@ -1851,10 +1790,9 @@ static uint32_t ndpi_is_valid_gre_tunnel(const struct pcap_pkthdr *header,
|
||||
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
|
||||
13 through 15 are reserved for the Version field. Bits 9 through
|
||||
12 are reserved for future use and MUST be transmitted as zero.
|
||||
*/
|
||||
if(NDPI_GRE_IS_FLAGS(grehdr->flags))
|
||||
@@ -1915,7 +1853,8 @@ static uint32_t ndpi_is_valid_gre_tunnel(const struct pcap_pkthdr *header,
|
||||
struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet,
|
||||
ndpi_risk *flow_risk) {
|
||||
ndpi_risk *flow_risk,
|
||||
struct ndpi_flow_info **flow) {
|
||||
/*
|
||||
* Declare pointers to packet headers
|
||||
*/
|
||||
@@ -1964,6 +1903,7 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
u_int8_t vlan_packet = 0;
|
||||
|
||||
*flow_risk = 0 /* NDPI_NO_RISK */;
|
||||
*flow = NULL;
|
||||
|
||||
/* Increment raw packet counter */
|
||||
workflow->stats.raw_packet_count++;
|
||||
@@ -2438,9 +2378,9 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
|
||||
/* process the packet */
|
||||
return(packet_processing(workflow, time_ms, vlan_id, tunnel_type, iph, iph6,
|
||||
ip_offset, header->caplen - ip_offset,
|
||||
header->caplen - ip_offset,
|
||||
header->caplen, header, packet, header->ts,
|
||||
flow_risk));
|
||||
flow_risk, flow));
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
+24
-6
@@ -273,7 +273,7 @@ typedef struct ndpi_flow_info {
|
||||
client_hassh[33], server_hassh[33], *server_names,
|
||||
*advertised_alpns, *negotiated_alpn, *tls_supported_versions,
|
||||
*tls_issuerDN, *tls_subjectDN,
|
||||
ja3_client[33], ja3_server[33],
|
||||
ja3_client[33], ja3_server[33], ja4_client[37],
|
||||
sha1_cert_fingerprint[20];
|
||||
u_int8_t sha1_cert_fingerprint_set;
|
||||
struct tls_heuristics browser_heuristics;
|
||||
@@ -295,10 +295,16 @@ typedef struct ndpi_flow_info {
|
||||
} ssh_tls;
|
||||
|
||||
struct {
|
||||
char url[256], request_content_type[64], content_type[64], user_agent[256], server[128], nat_ip[32], filename[256];
|
||||
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;
|
||||
|
||||
struct {
|
||||
ndpi_address_port mapped_address, peer_address,
|
||||
relayed_address, response_origin, other_address;
|
||||
} stun;
|
||||
|
||||
struct {
|
||||
char *username, *password;
|
||||
} telnet;
|
||||
@@ -374,12 +380,16 @@ typedef struct ndpi_workflow {
|
||||
struct ndpi_workflow_prefs prefs;
|
||||
struct ndpi_stats stats;
|
||||
|
||||
ndpi_workflow_callback_ptr flow_callback;
|
||||
void * flow_callback_userdata;
|
||||
|
||||
/* outside referencies */
|
||||
pcap_t *pcap_handle;
|
||||
|
||||
/* allocated by prefs */
|
||||
void **ndpi_flows_root;
|
||||
struct ndpi_detection_module_struct *ndpi_struct;
|
||||
struct ndpi_global_context *g_ctx;
|
||||
u_int32_t num_allocated_flows;
|
||||
|
||||
/* CSV,TLV,JSON serialization interface */
|
||||
@@ -388,7 +398,7 @@ typedef struct ndpi_workflow {
|
||||
|
||||
|
||||
/* TODO: remove wrappers parameters and use ndpi global, when their initialization will be fixed... */
|
||||
struct ndpi_workflow * ndpi_workflow_init(const struct ndpi_workflow_prefs * prefs, pcap_t * pcap_handle, int do_init_flows_root, ndpi_serialization_format serialization_format);
|
||||
struct ndpi_workflow * ndpi_workflow_init(const struct ndpi_workflow_prefs * prefs, pcap_t * pcap_handle, int do_init_flows_root, ndpi_serialization_format serialization_format, struct ndpi_global_context *g_ctx);
|
||||
|
||||
|
||||
/* workflow main free function */
|
||||
@@ -406,7 +416,15 @@ void ndpi_free_flow_info_half(struct ndpi_flow_info *flow);
|
||||
struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet,
|
||||
ndpi_risk *flow_risk);
|
||||
ndpi_risk *flow_risk,
|
||||
struct ndpi_flow_info **flow);
|
||||
|
||||
|
||||
/* Flow callback for completed flows, before the flow memory will be freed. */
|
||||
static inline void ndpi_workflow_set_flow_callback(struct ndpi_workflow * workflow, ndpi_workflow_callback_ptr callback, void * userdata) {
|
||||
workflow->flow_callback = callback;
|
||||
workflow->flow_callback_userdata = userdata;
|
||||
}
|
||||
|
||||
int ndpi_is_datalink_supported(int datalink_type);
|
||||
|
||||
@@ -418,12 +436,12 @@ void ndpi_flow_info_freer(void *node);
|
||||
const char* print_cipher_id(u_int32_t cipher);
|
||||
int parse_proto_name_list(char *str, NDPI_PROTOCOL_BITMASK *bitmask, int inverted_logic);
|
||||
|
||||
extern int nDPI_LogLevel;
|
||||
extern int reader_log_level;
|
||||
|
||||
#if defined(NDPI_ENABLE_DEBUG_MESSAGES) && !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
|
||||
#define LOG(log_level, args...) \
|
||||
{ \
|
||||
if(log_level <= nDPI_LogLevel) \
|
||||
if(log_level <= reader_log_level) \
|
||||
printf(args); \
|
||||
}
|
||||
#else
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
################################################################
|
||||
#
|
||||
# Listingdate,SHA1,Listingreason
|
||||
#The first entry (and only the first one) is fake. It is used to trigger the risk in the tests
|
||||
1970-01-01 00:00:00,0DDB34F875632C7E1EC09D75827F82D2336DFEB6, Fake
|
||||
2022-07-02 07:02:11,3784422d67a6ae0c82d60eeaf3850960a9896cb2,AsyncRAT C&C
|
||||
2022-07-01 18:28:10,a0d78b3ddb27cd4f110a0292cab800beadaf9bd2,AsyncRAT C&C
|
||||
2022-07-01 09:44:14,4c319ec8b5a66a256a0137d70cd0f9a76bb23fd7,AsyncRAT C&C
|
||||
@@ -4878,4 +4880,4 @@
|
||||
2014-05-04 08:10:31,86d6aade4ba1414a91b1e7fb3cdd7d503692f410,Shylock C&C
|
||||
2014-05-04 08:10:26,5afc236d1dd00c9c45457b75226b501b815a59c7,Shylock C&C
|
||||
2014-05-04 08:09:56,b08a4939fb88f375a2757eaddc47b1fb8b554439,Shylock C&C
|
||||
# END (4871) entries
|
||||
# END (4871) entries
|
||||
|
||||
|
+275
-58
@@ -1,16 +1,18 @@
|
||||
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
|
||||
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 fuzz_is_stun_udp fuzz_is_stun_tcp
|
||||
#Alghoritms
|
||||
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
|
||||
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 fuzz_alg_shoco
|
||||
#Data structures
|
||||
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
|
||||
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_fuse 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
|
||||
bin_PROGRAMS += fuzz_filecfg_protocols fuzz_filecfg_categories fuzz_filecfg_malicious_sha1 fuzz_filecfg_malicious_ja3 fuzz_filecfg_risk_domains fuzz_filecfg_config fuzz_filecfg_category
|
||||
#Reader utils
|
||||
bin_PROGRAMS += fuzz_readerutils_workflow fuzz_readerutils_parseprotolist
|
||||
#Mutators
|
||||
bin_PROGRAMS += fuzz_ndpi_reader_pl7m fuzz_ndpi_reader_pl7m_64k fuzz_ndpi_reader_pl7m_simplest fuzz_ndpi_reader_pl7m_internal fuzz_ndpi_reader_pl7m_simplest_internal
|
||||
|
||||
fuzz_process_packet_SOURCES = fuzz_process_packet.c fuzz_common_code.c
|
||||
fuzz_process_packet_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
@@ -65,7 +67,7 @@ fuzz_ndpi_reader_payload_analyzer_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTO
|
||||
$(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_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_quic_get_crypto_data_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_quic_get_crypto_data_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -78,8 +80,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)
|
||||
fuzz_config_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_config_CXXFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_config_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_config_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_config_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -183,7 +185,7 @@ fuzz_alg_jitter_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(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_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_alg_crc32_md5_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_crc32_md5_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -208,6 +210,19 @@ 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_shoco_SOURCES = fuzz_alg_shoco.cpp
|
||||
fuzz_alg_shoco_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -I ../src/lib/third_party/include/
|
||||
fuzz_alg_shoco_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_alg_shoco_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_alg_shoco_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_alg_shoco_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_alg_shoco_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_alg_shoco_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)
|
||||
fuzz_alg_ses_des_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
@@ -328,20 +343,20 @@ 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)
|
||||
fuzz_ds_bitmap64_fuse_SOURCES = fuzz_ds_bitmap64_fuse.cpp fuzz_common_code.c
|
||||
fuzz_ds_bitmap64_fuse_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_bitmap64_fuse_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_ds_bitmap64_fuse_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ds_bitmap64_fuse_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)
|
||||
fuzz_ds_bitmap64_fuse_CXXFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_bitmap64_fuse_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ds_bitmap64_fuse_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ds_bitmap64_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
fuzz_ds_bitmap64_fuse_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_bitmap64_fuse_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)
|
||||
@@ -387,7 +402,7 @@ fuzz_binaryfusefilter_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(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_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_tls_certificate_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_tls_certificate_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -412,6 +427,32 @@ 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_is_stun_udp_SOURCES = fuzz_is_stun.c fuzz_common_code.c
|
||||
fuzz_is_stun_udp_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_is_stun_udp_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_is_stun_udp_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_is_stun_udp_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_is_stun_udp_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_is_stun_udp_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_is_stun_udp_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_is_stun_tcp_SOURCES = fuzz_is_stun.c fuzz_common_code.c
|
||||
fuzz_is_stun_tcp_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION -DSTUN_TCP
|
||||
fuzz_is_stun_tcp_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_is_stun_tcp_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_is_stun_tcp_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_is_stun_tcp_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_is_stun_tcp_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_is_stun_tcp_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/
|
||||
@@ -473,7 +514,7 @@ fuzz_gcrypt_cipher_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(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_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_protocols_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_protocols_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -485,9 +526,87 @@ 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_filecfg_categories_SOURCES = fuzz_filecfg_categories.c fuzz_common_code.c
|
||||
fuzz_filecfg_categories_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_categories_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_categories_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_categories_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_categories_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_categories_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_categories_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_malicious_sha1_SOURCES = fuzz_filecfg_malicious_sha1.c fuzz_common_code.c
|
||||
fuzz_filecfg_malicious_sha1_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_malicious_sha1_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_malicious_sha1_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_malicious_sha1_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_malicious_sha1_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_malicious_sha1_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_malicious_sha1_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_malicious_ja3_SOURCES = fuzz_filecfg_malicious_ja3.c fuzz_common_code.c
|
||||
fuzz_filecfg_malicious_ja3_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_malicious_ja3_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_malicious_ja3_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_malicious_ja3_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_malicious_ja3_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_malicious_ja3_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_malicious_ja3_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_risk_domains_SOURCES = fuzz_filecfg_risk_domains.c fuzz_common_code.c
|
||||
fuzz_filecfg_risk_domains_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_risk_domains_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_risk_domains_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_risk_domains_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_risk_domains_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_risk_domains_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_risk_domains_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_config_SOURCES = fuzz_filecfg_config.c fuzz_common_code.c
|
||||
fuzz_filecfg_config_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_config_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_config_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_config_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_config_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_config_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_config_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_filecfg_category_SOURCES = fuzz_filecfg_category.c fuzz_common_code.c
|
||||
fuzz_filecfg_category_CFLAGS = -I../src/lib/ @NDPI_CFLAGS@ $(CXXFLAGS) -DNDPI_LIB_COMPILATION
|
||||
fuzz_filecfg_category_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_filecfg_category_LDFLAGS = $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_filecfg_category_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_filecfg_category_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_filecfg_category_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_filecfg_category_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_CXXFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_readerutils_workflow_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
|
||||
fuzz_readerutils_workflow_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_readerutils_workflow_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
@@ -515,53 +634,127 @@ fuzz_readerutils_parseprotolist_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOL
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_readerutils_parseprotolist_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_pl7m_simplest_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c ../src/lib/third_party/src/fuzz/pl7m.c
|
||||
fuzz_ndpi_reader_pl7m_simplest_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -I../src/lib/third_party/include/ -DENABLE_PCAP_L7_MUTATOR -DPL7M_USE_SIMPLEST_MUTATOR
|
||||
fuzz_ndpi_reader_pl7m_simplest_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_pl7m_simplest_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_pl7m_simplest_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_pl7m_simplest_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_pl7m_simplest_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_pl7m_simplest_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c ../src/lib/third_party/src/fuzz/pl7m.c
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -I../src/lib/third_party/include/ -DENABLE_PCAP_L7_MUTATOR -DPL7M_USE_SIMPLEST_MUTATOR -DPL7M_USE_INTERNAL_FUZZER_MUTATE
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_pl7m_simplest_internal_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_pl7m_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c ../src/lib/third_party/src/fuzz/pl7m.c
|
||||
fuzz_ndpi_reader_pl7m_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -I../src/lib/third_party/include/ -DENABLE_PCAP_L7_MUTATOR
|
||||
fuzz_ndpi_reader_pl7m_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_pl7m_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_pl7m_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_pl7m_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_pl7m_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_pl7m_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_pl7m_64k_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c ../src/lib/third_party/src/fuzz/pl7m.c
|
||||
fuzz_ndpi_reader_pl7m_64k_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -I../src/lib/third_party/include/ -DENABLE_PCAP_L7_MUTATOR -DPL7M_USE_64K_PACKETS
|
||||
fuzz_ndpi_reader_pl7m_64k_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_pl7m_64k_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_pl7m_64k_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_pl7m_64k_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_pl7m_64k_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_pl7m_64k_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_pl7m_internal_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c ../src/lib/third_party/src/fuzz/pl7m.c
|
||||
fuzz_ndpi_reader_pl7m_internal_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -I../src/lib/third_party/include/ -DENABLE_PCAP_L7_MUTATOR -DPL7M_USE_INTERNAL_FUZZER_MUTATE
|
||||
fuzz_ndpi_reader_pl7m_internal_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
|
||||
fuzz_ndpi_reader_pl7m_internal_LDFLAGS = $(PCAP_LIB) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_pl7m_internal_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_pl7m_internal_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_pl7m_internal_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_pl7m_internal_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
|
||||
|
||||
|
||||
# required for Google oss-fuzz
|
||||
# see https://github.com/google/oss-fuzz/tree/master/projects/ndpi
|
||||
testpcaps := $(wildcard ../tests/cfgs/default/pcap/*.pcap*)
|
||||
|
||||
fuzz_ndpi_reader_seed_corpus.zip: $(testpcaps)
|
||||
zip -j fuzz_ndpi_reader_seed_corpus.zip $(testpcaps)
|
||||
testpcaps.zip: $(testpcaps)
|
||||
zip -j testpcaps.zip $(testpcaps)
|
||||
|
||||
fuzz_ndpi_reader_alloc_fail_seed_corpus.zip: $(testpcaps)
|
||||
zip -j fuzz_ndpi_reader_alloc_fail_seed_corpus.zip $(testpcaps)
|
||||
fuzz_ndpi_reader_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip: $(testpcaps)
|
||||
zip -j fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip $(testpcaps)
|
||||
fuzz_ndpi_reader_alloc_fail_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_pl7m_simplest_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_pl7m_simplest_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_pl7m_simplest_internal_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_pl7m_simplest_internal_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_pl7m_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_pl7m_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_pl7m_64k_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_pl7m_64k_seed_corpus.zip
|
||||
|
||||
fuzz_ndpi_reader_pl7m_internal_seed_corpus.zip: testpcaps.zip
|
||||
cp testpcaps.zip fuzz_ndpi_reader_pl7m_internal_seed_corpus.zip
|
||||
|
||||
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)
|
||||
|
||||
files_corpus_fuzz_community_id := $(wildcard corpus/fuzz_community_id/*)
|
||||
|
||||
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_is_stun_udp := $(wildcard corpus/fuzz_is_stun_udp/*)
|
||||
fuzz_is_stun_udp_seed_corpus.zip: $(files_corpus_fuzz_is_stun_udp)
|
||||
zip -j fuzz_is_stun_udp_seed_corpus.zip $(files_corpus_fuzz_is_stun_udp)
|
||||
|
||||
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_is_stun_tcp := $(wildcard corpus/fuzz_is_stun_tcp/*)
|
||||
fuzz_is_stun_tcp_seed_corpus.zip: $(files_corpus_fuzz_is_stun_tcp)
|
||||
zip -j fuzz_is_stun_tcp_seed_corpus.zip $(files_corpus_fuzz_is_stun_tcp)
|
||||
|
||||
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)
|
||||
@@ -582,10 +775,6 @@ 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)
|
||||
|
||||
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)
|
||||
@@ -606,6 +795,30 @@ 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_filecfg_categories := $(wildcard corpus/fuzz_filecfg_categories/*)
|
||||
fuzz_filecfg_categories_seed_corpus.zip: $(files_corpus_fuzz_filecfg_categories)
|
||||
zip -j fuzz_filecfg_categories_seed_corpus.zip $(files_corpus_fuzz_filecfg_categories)
|
||||
|
||||
files_corpus_fuzz_filecfg_malicious_sha1 := $(wildcard corpus/fuzz_filecfg_malicious_sha1/*)
|
||||
fuzz_filecfg_malicious_sha1_seed_corpus.zip: $(files_corpus_fuzz_filecfg_malicious_sha1)
|
||||
zip -j fuzz_filecfg_malicious_sha1_seed_corpus.zip $(files_corpus_fuzz_filecfg_malicious_sha1)
|
||||
|
||||
files_corpus_fuzz_filecfg_malicious_ja3 := $(wildcard corpus/fuzz_filecfg_malicious_ja3/*)
|
||||
fuzz_filecfg_malicious_ja3_seed_corpus.zip: $(files_corpus_fuzz_filecfg_malicious_ja3)
|
||||
zip -j fuzz_filecfg_malicious_ja3_seed_corpus.zip $(files_corpus_fuzz_filecfg_malicious_ja3)
|
||||
|
||||
files_corpus_fuzz_filecfg_risk_domains := $(wildcard corpus/fuzz_filecfg_risk_domains/*)
|
||||
fuzz_filecfg_risk_domains_seed_corpus.zip: $(files_corpus_fuzz_filecfg_risk_domains)
|
||||
zip -j fuzz_filecfg_risk_domains_seed_corpus.zip $(files_corpus_fuzz_filecfg_risk_domains)
|
||||
|
||||
files_corpus_fuzz_filecfg_config := $(wildcard corpus/fuzz_filecfg_config/*)
|
||||
fuzz_filecfg_config_seed_corpus.zip: $(files_corpus_fuzz_filecfg_config)
|
||||
zip -j fuzz_filecfg_config_seed_corpus.zip $(files_corpus_fuzz_filecfg_config)
|
||||
|
||||
files_corpus_fuzz_filecfg_category := $(wildcard corpus/fuzz_filecfg_category/*)
|
||||
fuzz_filecfg_category_seed_corpus.zip: $(files_corpus_fuzz_filecfg_category)
|
||||
zip -j fuzz_filecfg_category_seed_corpus.zip $(files_corpus_fuzz_filecfg_category)
|
||||
|
||||
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)
|
||||
@@ -614,15 +827,15 @@ files_corpus_fuzz_readerutils_parseprotolist := $(wildcard corpus/fuzz_readerut
|
||||
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_bitmap64_fuse := $(wildcard corpus/fuzz_ds_bitmap64_fuse/*)
|
||||
fuzz_ds_bitmap64_fuse_seed_corpus.zip: $(files_corpus_fuzz_ds_bitmap64_fuse)
|
||||
zip -j fuzz_ds_bitmap64_fuse_seed_corpus.zip $(files_corpus_fuzz_ds_bitmap64_fuse)
|
||||
|
||||
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
|
||||
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_alg_ses_des_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_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_fuse_seed_corpus.zip fuzz_ds_domain_classify_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_is_stun_udp_seed_corpus.zip fuzz_is_stun_tcp_seed_corpus.zip fuzz_ndpi_reader_pl7m_simplest_seed_corpus.zip fuzz_ndpi_reader_pl7m_seed_corpus.zip fuzz_ndpi_reader_pl7m_64k_seed_corpus.zip fuzz_ndpi_reader_pl7m_simplest_internal_seed_corpus.zip fuzz_ndpi_reader_pl7m_internal_seed_corpus.zip
|
||||
cp corpus/fuzz_*seed_corpus.zip .
|
||||
|
||||
#Create dictionaries exactly as expected by oss-fuzz.
|
||||
@@ -643,6 +856,7 @@ distdir:
|
||||
-o -name '*.cpp' \
|
||||
-o -name '*.options' \
|
||||
-o -name 'ipv4_addresses.txt' \
|
||||
-o -name 'ipv6_addresses.txt' \
|
||||
-o -name 'bd_param.txt' \
|
||||
-o -name 'splt_param.txt' \
|
||||
-o -name 'random_list.list' \
|
||||
@@ -651,9 +865,16 @@ distdir:
|
||||
-o -path './corpus/fuzz_*.zip' \
|
||||
-o -path './corpus/fuzz_quic_get_crypto_data/*' \
|
||||
-o -path './corpus/fuzz_filecfg_protocols/*' \
|
||||
-o -path './corpus/fuzz_filecfg_categories/*' \
|
||||
-o -path './corpus/fuzz_filecfg_malicious_sha1/*' \
|
||||
-o -path './corpus/fuzz_filecfg_malicious_ja3/*' \
|
||||
-o -path './corpus/fuzz_filecfg_risk_domains/*' \
|
||||
-o -path './corpus/fuzz_filecfg_config/*' \
|
||||
-o -path './corpus/fuzz_filecfg_category/*' \
|
||||
-o -path './corpus/fuzz_readerutils_workflow/*' \
|
||||
-o -path './corpus/fuzz_readerutils_parseprotolist/*' \
|
||||
-o -path './corpus/fuzz_config/*' \
|
||||
-o -path './corpus/fuzz_is_stun_udp/*' \
|
||||
-o -path './corpus/fuzz_is_stun_tcp/*' \
|
||||
-o -path './corpus/fuzz_serialization/*' \
|
||||
-o -path './corpus/fuzz_community_id/*' \
|
||||
-o -path './corpus/fuzz_libinjection/*' \
|
||||
@@ -663,14 +884,10 @@ distdir:
|
||||
-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_bitmap64_fuse/*' \
|
||||
-o -path './corpus/fuzz_ds_domain_classify/*' \
|
||||
-o -path './corpus/fuzz_ds_ptree/*' \
|
||||
-o -path './corpus/fuzz_ds_patricia/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}'
|
||||
-o -path './corpus/fuzz_ds_ptree/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}'
|
||||
|
||||
all: corpus dictionaries
|
||||
|
||||
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.
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.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user