Compare commits
1659
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75898a4f9e | ||
|
|
f40aaaf369 | ||
|
|
f578353756 | ||
|
|
d22bcc96cf | ||
|
|
eb8102fb2a | ||
|
|
a17eeb9060 | ||
|
|
12e6e04c0e | ||
|
|
64929a75e0 | ||
|
|
02de8e10ca | ||
|
|
c2d8955c18 | ||
|
|
e9721eb4ce | ||
|
|
88f3519ab3 | ||
|
|
031cd04b7c | ||
|
|
d5d2a7e3f3 | ||
|
|
2051e51380 | ||
|
|
c92e0d13fd | ||
|
|
05d93790e4 | ||
|
|
32e4922c5a | ||
|
|
d4d82c27a5 | ||
|
|
addc775811 | ||
|
|
b68a3707f6 | ||
|
|
b0c4d01734 | ||
|
|
2c1b7cf1bd | ||
|
|
656323c334 | ||
|
|
8e1a3f5cdc | ||
|
|
58538b7d19 | ||
|
|
d0dbcf6dd6 | ||
|
|
8413faf2ef | ||
|
|
204f3ddff5 | ||
|
|
044ed14b4f | ||
|
|
51e86346d3 | ||
|
|
8e7a707be1 | ||
|
|
837ce7306b | ||
|
|
05dfae6430 | ||
|
|
d29a0241ee | ||
|
|
cbf1be5789 | ||
|
|
5f99433ee7 | ||
|
|
27bad14738 | ||
|
|
362baa6321 | ||
|
|
60a9f6610d | ||
|
|
0259ff58e1 | ||
|
|
d700ab3994 | ||
|
|
e6d206fd15 | ||
|
|
a263ac9024 | ||
|
|
87c43450f3 | ||
|
|
8ba1baace1 | ||
|
|
ff1cc1fa41 | ||
|
|
ea9177cc93 | ||
|
|
1385f05713 | ||
|
|
dcac633878 | ||
|
|
fdef6f3545 | ||
|
|
d0052fd5b2 | ||
|
|
bcce122665 | ||
|
|
6a7139bb24 | ||
|
|
b5b4512022 | ||
|
|
d81bc1add6 | ||
|
|
753b5dde16 | ||
|
|
9189aee83b | ||
|
|
4cc4efa228 | ||
|
|
ad8318e247 | ||
|
|
91e3292e6b | ||
|
|
98a81cb163 | ||
|
|
3a6ba7fa12 | ||
|
|
37abe0daea | ||
|
|
1c0e617d80 | ||
|
|
8db084ab06 | ||
|
|
ea4240055d | ||
|
|
5ac870074b | ||
|
|
7086197047 | ||
|
|
8ca13bc46a | ||
|
|
842c00e681 | ||
|
|
4c776501a6 | ||
|
|
7d5a0e1f04 | ||
|
|
a1014e8895 | ||
|
|
601928cc8e | ||
|
|
5a3956fe27 | ||
|
|
df14d225f6 | ||
|
|
fe5aa7ebca | ||
|
|
41d35fc7d0 | ||
|
|
799a6abfe6 | ||
|
|
8ed6409b35 | ||
|
|
3f49062db9 | ||
|
|
3cca5af8c3 | ||
|
|
7051acc0b5 | ||
|
|
580859a47d | ||
|
|
5d2551ff3e | ||
|
|
cefb667d8b | ||
|
|
8575a07113 | ||
|
|
460ff3c7ab | ||
|
|
029448759b | ||
|
|
448265a151 | ||
|
|
7da4abe6ad | ||
|
|
638624869a | ||
|
|
647c7d59bb | ||
|
|
f597086386 | ||
|
|
dd75060932 | ||
|
|
8bf95b6198 | ||
|
|
adab0139c2 | ||
|
|
bf9dbd6ccf | ||
|
|
e998fc28d1 | ||
|
|
1810281d7f | ||
|
|
f0325f713a | ||
|
|
5b27dfdd0c | ||
|
|
c17463539f | ||
|
|
2e8aa9f08e | ||
|
|
487d915262 | ||
|
|
5e1bb0dbc1 | ||
|
|
363ab2259c | ||
|
|
b94e13da43 | ||
|
|
97b80a8838 | ||
|
|
b8307eb855 | ||
|
|
46ba657562 | ||
|
|
4570dbfece | ||
|
|
35fd4ddb27 | ||
|
|
fe1e2c241f | ||
|
|
af3ce74e02 | ||
|
|
93003d0523 | ||
|
|
519ba7a9d5 | ||
|
|
b23cfd6b84 | ||
|
|
7a1147d733 | ||
|
|
d62ae567d1 | ||
|
|
23ec82b59d | ||
|
|
fef199ad45 | ||
|
|
b23781e807 | ||
|
|
da2684dbe1 | ||
|
|
7e9354ef23 | ||
|
|
f4421314b0 | ||
|
|
59ac73b37f | ||
|
|
115888ef7a | ||
|
|
248d756e99 | ||
|
|
9f431f9218 | ||
|
|
d87bdf9302 | ||
|
|
3a76786121 | ||
|
|
8e93f48c43 | ||
|
|
673d8b7fac | ||
|
|
1f921562d1 | ||
|
|
34a98abcc0 | ||
|
|
b501239d3f | ||
|
|
ebf89f46e3 | ||
|
|
019a64630b | ||
|
|
98a9afc40c | ||
|
|
13cbd1e4ae | ||
|
|
b31fde4bbb | ||
|
|
46ec91ca4b | ||
|
|
8090765a64 | ||
|
|
aa856735c0 | ||
|
|
9edddee0b7 | ||
|
|
d5cac570d6 | ||
|
|
0e363d0ca6 | ||
|
|
8c2c388d54 | ||
|
|
8fcb49af25 | ||
|
|
dfa9dd66c0 | ||
|
|
56a3a33bc0 | ||
|
|
8f74d5733d | ||
|
|
4ead6d6594 | ||
|
|
8da5f42fa0 | ||
|
|
2722861d6e | ||
|
|
95dfbdc64a | ||
|
|
c2156a5161 | ||
|
|
5b6ffad278 | ||
|
|
d3fb1fb25a | ||
|
|
79b89d2866 | ||
|
|
07d9fa7f96 | ||
|
|
00b2763399 | ||
|
|
e16675b700 | ||
|
|
ea10b8e757 | ||
|
|
57e28e03ee | ||
|
|
2ae4c6675d | ||
|
|
e71df49b3e | ||
|
|
6904935934 | ||
|
|
a828ac0191 | ||
|
|
c4b19fd6c5 | ||
|
|
02dc8d5feb | ||
|
|
32bd3d7a59 | ||
|
|
da87cc3157 | ||
|
|
69f140878c | ||
|
|
4b1cae2c2b | ||
|
|
7d843f4d17 | ||
|
|
95263fc32e | ||
|
|
1c405e382a | ||
|
|
b26539d65a | ||
|
|
6719fa30f9 | ||
|
|
21e2e57614 | ||
|
|
439558f6a3 | ||
|
|
0956badd11 | ||
|
|
a9ca47fcdb | ||
|
|
1c1be5a0d1 | ||
|
|
2723ac70ce | ||
|
|
3cd1ec5c9a | ||
|
|
a279423bff | ||
|
|
a3ba9253ef | ||
|
|
c450caae94 | ||
|
|
36af97a14c | ||
|
|
af5d792c08 | ||
|
|
8e2cd9ff43 | ||
|
|
88dd3ebd62 | ||
|
|
d9fc4d52e9 | ||
|
|
a688e36b51 | ||
|
|
f83d0b18c6 | ||
|
|
66178e37cc | ||
|
|
1740042cbb | ||
|
|
f6242f0e46 | ||
|
|
0a182c6d18 | ||
|
|
53b2b08aeb | ||
|
|
9c521c5ddd | ||
|
|
847eb7b180 | ||
|
|
d90b333363 | ||
|
|
f66cd5aabc | ||
|
|
4b4dcabeda | ||
|
|
879cec94b2 | ||
|
|
9f4f228832 | ||
|
|
b568c26989 | ||
|
|
29315cee6d | ||
|
|
f452dabd92 | ||
|
|
64fb40d21e | ||
|
|
6e1dcba9dd | ||
|
|
ebf18a0c61 | ||
|
|
a268952068 | ||
|
|
acd05b171e | ||
|
|
69ca98ca35 | ||
|
|
46e97d5da3 | ||
|
|
9f3e3e8456 | ||
|
|
91d132ea3d | ||
|
|
3fd3153089 | ||
|
|
a8ad99aca5 | ||
|
|
7744c225f9 | ||
|
|
e2e0303099 | ||
|
|
802254327a | ||
|
|
9d8717a0c7 | ||
|
|
9d35364ef1 | ||
|
|
051bdb1957 | ||
|
|
96c193cf79 | ||
|
|
23c0721538 | ||
|
|
35f1c362b9 | ||
|
|
12abcd516b | ||
|
|
014fdd9a02 | ||
|
|
9d8967236e | ||
|
|
6511db8941 | ||
|
|
b8d406b1f8 | ||
|
|
ce02359953 | ||
|
|
24fea66a26 | ||
|
|
d658ac9e61 | ||
|
|
f75984633b | ||
|
|
20fed83e0f | ||
|
|
f72b402aa2 | ||
|
|
4f794aec22 | ||
|
|
fd6a5bc1cd | ||
|
|
5be9370cd2 | ||
|
|
ccb30a04ad | ||
|
|
fb04dbbc47 | ||
|
|
f1dd8bc8c5 | ||
|
|
0c80e6ee3b | ||
|
|
e308e59002 | ||
|
|
1c60c22893 | ||
|
|
db707e0829 | ||
|
|
540326f3ff | ||
|
|
94bf7b0130 | ||
|
|
030f3f3d48 | ||
|
|
de25ba7d0b | ||
|
|
9bbcc2548e | ||
|
|
055422503c | ||
|
|
c0b34555c2 | ||
|
|
b4edb75824 | ||
|
|
dfb9e8ec1f | ||
|
|
c17a21359b | ||
|
|
6e8f268873 | ||
|
|
4b8c8608d1 | ||
|
|
503e3bb495 | ||
|
|
513c857631 | ||
|
|
f7b91b46fa | ||
|
|
143fcf0b0e | ||
|
|
ae89831055 | ||
|
|
8f53c231df | ||
|
|
974c1cc681 | ||
|
|
c08693fda5 | ||
|
|
08698c65e5 | ||
|
|
2d68f8f635 | ||
|
|
2860e3af15 | ||
|
|
be35d423b4 | ||
|
|
cf9c0b96b8 | ||
|
|
ea6332e004 | ||
|
|
392ce44573 | ||
|
|
05d7400563 | ||
|
|
ea30fcb5de | ||
|
|
3068306b60 | ||
|
|
0d2d44f1b6 | ||
|
|
07615903e2 | ||
|
|
2c263bc726 | ||
|
|
4a6c525db8 | ||
|
|
93a4a4387a | ||
|
|
f39e3c98f0 | ||
|
|
317d3ffd3e | ||
|
|
b24f5c4c0a | ||
|
|
d6a97219ea | ||
|
|
3669c14afd | ||
|
|
ece5d3e199 | ||
|
|
2cdf7ce806 | ||
|
|
2effa57d8a | ||
|
|
b68b45f3bb | ||
|
|
b2e89e6736 | ||
|
|
1010520cc4 | ||
|
|
f028cce209 | ||
|
|
fbfa54eee6 | ||
|
|
ff67e09101 | ||
|
|
76e6c38459 | ||
|
|
243104a8c2 | ||
|
|
1f4523e331 | ||
|
|
b5f3facf7c | ||
|
|
8566288e43 | ||
|
|
8de62c6d34 | ||
|
|
0cd0905400 | ||
|
|
56d87186f7 | ||
|
|
ebfb5e7f01 | ||
|
|
d805611fcb | ||
|
|
9742dcc45c | ||
|
|
f38a8bd7a5 | ||
|
|
3c66ca236b | ||
|
|
70a926088f | ||
|
|
6b69e7ebbc | ||
|
|
0b53bc2aab | ||
|
|
ecdf7df454 | ||
|
|
3034e53d00 | ||
|
|
2350daa2dc | ||
|
|
d710b8291d | ||
|
|
485e56d855 | ||
|
|
38c0d927a9 | ||
|
|
94a68451df | ||
|
|
17c26911fb | ||
|
|
ca68beda85 | ||
|
|
2f5766d2f5 | ||
|
|
39800c88fa | ||
|
|
678fbcdfd6 | ||
|
|
d9af1562f0 | ||
|
|
e29e14b7aa | ||
|
|
c9d8efc2a4 | ||
|
|
1a62f4c799 | ||
|
|
2a137100da | ||
|
|
6a9f5e4f7c | ||
|
|
fd0591b4fc | ||
|
|
48758d28ea | ||
|
|
14f514134d | ||
|
|
63670927e7 | ||
|
|
23594f0365 | ||
|
|
b2c24558c5 | ||
|
|
46d96e7f32 | ||
|
|
ffd20ebdf9 | ||
|
|
da37f2444f | ||
|
|
073e3a027b | ||
|
|
0ddc3a0052 | ||
|
|
38e4910636 | ||
|
|
4247dd8322 | ||
|
|
55364ef0b4 | ||
|
|
60aaa80570 | ||
|
|
0b9e46e65a | ||
|
|
64fab4a478 | ||
|
|
3506a07864 | ||
|
|
d318285cae | ||
|
|
1479c0a278 | ||
|
|
43ddbfdfba | ||
|
|
801c9481cb | ||
|
|
2beecdc8af | ||
|
|
605d548d4a | ||
|
|
0da76fdac6 | ||
|
|
597d6e5d60 | ||
|
|
67c72a8cb5 | ||
|
|
07c54f9992 | ||
|
|
16ca69733a | ||
|
|
40550073ef | ||
|
|
52893d99f6 | ||
|
|
86a3dc5bea | ||
|
|
5afa3ad818 | ||
|
|
af2a44ae5f | ||
|
|
241af016e9 | ||
|
|
16dc0ec29e | ||
|
|
29d9c2d2c8 | ||
|
|
669b7579ff | ||
|
|
a4f8d913ea | ||
|
|
dc5b4cbde0 | ||
|
|
b0bf66c436 | ||
|
|
c793e16050 | ||
|
|
b6eef17e54 | ||
|
|
374a24a1fb | ||
|
|
cbb0b864a2 | ||
|
|
61066fb106 | ||
|
|
4ceff1dc77 | ||
|
|
0271e29097 | ||
|
|
fcb50dec70 | ||
|
|
db5cd92fe1 | ||
|
|
3085d8e4ff | ||
|
|
9c3bfeca80 | ||
|
|
f6038c358a | ||
|
|
3108c75059 | ||
|
|
811d7a39b5 | ||
|
|
030e9dddb7 | ||
|
|
2dce6cd525 | ||
|
|
8fa5c31996 | ||
|
|
ee35834be6 | ||
|
|
e5c2c400ef | ||
|
|
bbbc5fdbae | ||
|
|
3874f0e0e0 | ||
|
|
83ae5b7256 | ||
|
|
c02b00e0ce | ||
|
|
07d9e4f9ba | ||
|
|
e9519c9aca | ||
|
|
329eff069e | ||
|
|
246ec53bcf | ||
|
|
cd65da69d3 | ||
|
|
068c1b1f22 | ||
|
|
b7e666e465 | ||
|
|
c5e16b4ff7 | ||
|
|
3d9285f1be | ||
|
|
c375782b96 | ||
|
|
8e7b1ea7a1 | ||
|
|
e90c5c7c32 | ||
|
|
7dfbfff743 | ||
|
|
da22aa5fc7 | ||
|
|
a183b2ab9b | ||
|
|
adfe6b763c | ||
|
|
9ed94a722c | ||
|
|
7037e79604 | ||
|
|
1edf5c49d6 | ||
|
|
baddfbb6c3 | ||
|
|
fb64346e28 | ||
|
|
50be0b0049 | ||
|
|
08f32f2e0e | ||
|
|
0a4fbb8cfb | ||
|
|
9dfd0d0071 | ||
|
|
17235d234e | ||
|
|
db16a987c5 | ||
|
|
f7f705406f | ||
|
|
cd765c08d6 | ||
|
|
ee15c6149d | ||
|
|
ae803c8b51 | ||
|
|
e5e69d0f7a | ||
|
|
b69177be2f | ||
|
|
f8503da9e9 | ||
|
|
39ae57e6a3 | ||
|
|
c9b37b92f5 | ||
|
|
4a09b4efa0 | ||
|
|
fd646bd05f | ||
|
|
6a1b8baa00 | ||
|
|
2ccd2c204b | ||
|
|
263547e77d | ||
|
|
86e34fbf6d | ||
|
|
84f66b4d6b | ||
|
|
7855e0318d | ||
|
|
48282369e2 | ||
|
|
7d63149ced | ||
|
|
427002d14f | ||
|
|
4148c5e065 | ||
|
|
c120cca662 | ||
|
|
7344bf65bc | ||
|
|
6f79b78f71 | ||
|
|
a70fd6ed3b | ||
|
|
bd0fd6cf8d | ||
|
|
0bf809f8e5 | ||
|
|
44259ab2b9 | ||
|
|
328016895f | ||
|
|
780dc8d1e7 | ||
|
|
4d746dabe9 | ||
|
|
097127c31d | ||
|
|
c2ebbb15ad | ||
|
|
f965983c23 | ||
|
|
8d8e61b256 | ||
|
|
0b702c20d3 | ||
|
|
473a5d1d0b | ||
|
|
65b428899d | ||
|
|
6769168d89 | ||
|
|
4d5ca2c473 | ||
|
|
e8cae3cff9 | ||
|
|
019b51bb17 | ||
|
|
e2be7daed6 | ||
|
|
1b73f7372e | ||
|
|
b1a6c6b895 | ||
|
|
e603549967 | ||
|
|
3bdec5ae5f | ||
|
|
25cd2a23a6 | ||
|
|
97badc574b | ||
|
|
493bffb3e0 | ||
|
|
c2b2692e65 | ||
|
|
db5f3b38b7 | ||
|
|
da0889d3ba | ||
|
|
94eee66a7b | ||
|
|
748df7972a | ||
|
|
a766de7b94 | ||
|
|
711ba99eaa | ||
|
|
32d25bfdaf | ||
|
|
287015ffdc | ||
|
|
f4c24663fc | ||
|
|
9f2dabbda4 | ||
|
|
4f370fe7c4 | ||
|
|
9483c842b5 | ||
|
|
c1f9f05d33 | ||
|
|
cf47ba234a | ||
|
|
98f2d3a73c | ||
|
|
c1baf1516d | ||
|
|
369dc65c1a | ||
|
|
4ec3e6c064 | ||
|
|
81e97d7515 | ||
|
|
32ab88a26e | ||
|
|
afdae85b30 | ||
|
|
63c4eaae9b | ||
|
|
4e876a4543 | ||
|
|
7b54d028a3 | ||
|
|
9cba06a080 | ||
|
|
794f7fa124 | ||
|
|
d3b4b81d6f | ||
|
|
1bee9d85a4 | ||
|
|
fa15e170b4 | ||
|
|
b75838b771 | ||
|
|
d665df64e2 | ||
|
|
e84563f971 | ||
|
|
a60854bae6 | ||
|
|
7b690d8b2d | ||
|
|
0c1322a718 | ||
|
|
b40732d8a5 | ||
|
|
db8497778d | ||
|
|
dea883a25d | ||
|
|
81a2f54dd7 | ||
|
|
c2c01b618b | ||
|
|
fb863c6bfb | ||
|
|
7ce478a58b | ||
|
|
3bbb0cd329 | ||
|
|
56ca71bda9 | ||
|
|
498571354d | ||
|
|
3924257f32 | ||
|
|
817aa54214 | ||
|
|
97fc94c7e8 | ||
|
|
9ec711aa90 | ||
|
|
9c2c04d8ce | ||
|
|
4f399356a6 | ||
|
|
45ff2a3f5a | ||
|
|
58f0f29113 | ||
|
|
da5e5a3e2a | ||
|
|
17d531e3db | ||
|
|
0d223ada3f | ||
|
|
890e8644ac | ||
|
|
1bab8a1c22 | ||
|
|
24bb0b7f53 | ||
|
|
803b13a7a8 | ||
|
|
7841145d9c | ||
|
|
efdac78ddc | ||
|
|
74825ffc6e | ||
|
|
1b8f7ed101 | ||
|
|
9cf016c5f1 | ||
|
|
47a4507d9e | ||
|
|
779d9a6e51 | ||
|
|
ac17e0bea7 | ||
|
|
4d95dae2ae | ||
|
|
6c3cbe50e2 | ||
|
|
a2b163beca | ||
|
|
c8a1767465 | ||
|
|
40be74c629 | ||
|
|
df5cf59787 | ||
|
|
d26349e082 | ||
|
|
7add3acc53 | ||
|
|
1c1a18d12f | ||
|
|
92bd223c34 | ||
|
|
9d53c3c3b8 | ||
|
|
906d7fe0c1 | ||
|
|
cd78740caf | ||
|
|
626ee52049 | ||
|
|
7a93994802 | ||
|
|
1bb10863e4 | ||
|
|
924bc9698b | ||
|
|
9aba94713c | ||
|
|
00beac6b1a | ||
|
|
8c2ffc5b37 | ||
|
|
a845e99720 | ||
|
|
8cda02bb14 | ||
|
|
3e259aac98 | ||
|
|
2aec630202 | ||
|
|
c6acf97bfb | ||
|
|
e9195589d2 | ||
|
|
b2cbe76e71 | ||
|
|
4227be7989 | ||
|
|
e282e43279 | ||
|
|
2f15ce706f | ||
|
|
70ee793ff3 | ||
|
|
7806eb5f5b | ||
|
|
9d1340a8e7 | ||
|
|
7a2bcd9c39 | ||
|
|
fe513014a8 | ||
|
|
3c05d4551d | ||
|
|
4976d93d4e | ||
|
|
1e933e8b02 | ||
|
|
942a71c7eb | ||
|
|
7fd135a8c9 | ||
|
|
34ad06fef5 | ||
|
|
8f45f51e6c | ||
|
|
9f72b15fff | ||
|
|
6fe9535881 | ||
|
|
5fc9d41eb0 | ||
|
|
933351840d | ||
|
|
83fdfe24d0 | ||
|
|
d4c093e828 | ||
|
|
c0ec78885d | ||
|
|
a55c410202 | ||
|
|
e675be1a83 | ||
|
|
f07a329447 | ||
|
|
2ceff3e214 | ||
|
|
dcb6fde0c9 | ||
|
|
e67604a583 | ||
|
|
40896d3d44 | ||
|
|
5a0f609086 | ||
|
|
2972e29097 | ||
|
|
dd80ec869a | ||
|
|
1714d7aa52 | ||
|
|
90e08b3568 | ||
|
|
080e23e30e | ||
|
|
edce5a8c1f | ||
|
|
c8ccf33f07 | ||
|
|
ee979ac14a | ||
|
|
3eb9907dd7 | ||
|
|
fdf8dd724f | ||
|
|
37121a9b58 | ||
|
|
bbaf9147b6 | ||
|
|
9796fdc0e9 | ||
|
|
e0a058af67 | ||
|
|
80e9826040 | ||
|
|
bf7dcd63c3 | ||
|
|
b287dccecf | ||
|
|
cb34c6b233 | ||
|
|
fd94270507 | ||
|
|
03cf975c07 | ||
|
|
428661c00b | ||
|
|
5c52c00ea4 | ||
|
|
f89f25c118 | ||
|
|
d4ae8a5f16 | ||
|
|
7234f36949 | ||
|
|
2efc09a20e | ||
|
|
3fa61a394b | ||
|
|
582a01303f | ||
|
|
97fb50e837 | ||
|
|
a3da5604a3 | ||
|
|
af6c86de28 | ||
|
|
34984f1aec | ||
|
|
83bbb4cb69 | ||
|
|
ff4f32ff48 | ||
|
|
33d761a55a | ||
|
|
2bd89be3e2 | ||
|
|
5cad39f0e8 | ||
|
|
3be263aafc | ||
|
|
452ba1f339 | ||
|
|
ec15089208 | ||
|
|
af661bd652 | ||
|
|
4613515635 | ||
|
|
2009361b89 | ||
|
|
f027ab1ae7 | ||
|
|
fa26c62b0c | ||
|
|
0faba29351 | ||
|
|
2701cc9491 | ||
|
|
88fc9232ff | ||
|
|
0703ab5ac5 | ||
|
|
418ea234ae | ||
|
|
3e99b73635 | ||
|
|
6dbe81588f | ||
|
|
2b6a639192 | ||
|
|
9e87645022 | ||
|
|
626fcf1418 | ||
|
|
5b11c2ffc5 | ||
|
|
8486eb08ea | ||
|
|
ce4f4fbe2f | ||
|
|
3422574c17 | ||
|
|
b3138d5e3e | ||
|
|
0bf2ca56a8 | ||
|
|
b97360d931 | ||
|
|
579dd7dff9 | ||
|
|
ff89a14b49 | ||
|
|
b5b2260f2e | ||
|
|
39b1ad3087 | ||
|
|
c68ea3067b | ||
|
|
4e538b1e4d | ||
|
|
5c8c2d843a | ||
|
|
ea957687e1 | ||
|
|
c84ed5a712 | ||
|
|
ab2a011cf9 | ||
|
|
d86d632fe6 | ||
|
|
87d228f78e | ||
|
|
a7a4bf32d3 | ||
|
|
e20c4acbde | ||
|
|
daf15e70bf | ||
|
|
daa1171593 | ||
|
|
dc5fecfc92 | ||
|
|
79e1ec9f50 | ||
|
|
902a1c7b4c | ||
|
|
5b88867084 | ||
|
|
4749e61bdb | ||
|
|
4f230943cf | ||
|
|
6186e1ab01 | ||
|
|
9fe8bf018a | ||
|
|
e082134a0d | ||
|
|
cedbf3b636 | ||
|
|
5f6fd8d2a5 | ||
|
|
cbb755666e | ||
|
|
1d024ece7a | ||
|
|
77db14fd7a | ||
|
|
5a40f9b7fd | ||
|
|
931f51bd77 | ||
|
|
283588a37b | ||
|
|
812505b56b | ||
|
|
98d9f524f9 | ||
|
|
0023a96f80 | ||
|
|
9f7b1c84f2 | ||
|
|
e1047b324b | ||
|
|
10738a0ca3 | ||
|
|
fe312ffbe1 | ||
|
|
24f2cd6fc1 | ||
|
|
cbabbd5865 | ||
|
|
da5208ee68 | ||
|
|
bccf1c433a | ||
|
|
cc7593fe5a | ||
|
|
5571ce114d | ||
|
|
4dd887e516 | ||
|
|
a3e06da2a8 | ||
|
|
dc21079851 | ||
|
|
5987ec6014 | ||
|
|
757b0c602f | ||
|
|
498b346219 | ||
|
|
3e66bbc5bc | ||
|
|
3ba7667887 | ||
|
|
fd943d6000 | ||
|
|
691778df33 | ||
|
|
81c3f5813c | ||
|
|
fdf402d027 | ||
|
|
f0014a5a24 | ||
|
|
53a5be3399 | ||
|
|
f389969c0b | ||
|
|
dc02afa3ea | ||
|
|
d1fb41a161 | ||
|
|
ef16591f3f | ||
|
|
29dd45838d | ||
|
|
798bb6e2e1 | ||
|
|
2332cbfefe | ||
|
|
a58a135758 | ||
|
|
634457615c | ||
|
|
cb825766ea | ||
|
|
8b01056b21 | ||
|
|
f6c7a33177 | ||
|
|
daae1cc9b1 | ||
|
|
499c80535b | ||
|
|
9fb3a57a71 | ||
|
|
257ec7cc5f | ||
|
|
73c7ccdb65 | ||
|
|
cffb11fbc9 | ||
|
|
23421b47d9 | ||
|
|
1cab9fe838 | ||
|
|
27ea04c08e | ||
|
|
5c225b8a2e | ||
|
|
4961241c62 | ||
|
|
843204299c | ||
|
|
09cd95d54a | ||
|
|
1d3bef41a4 | ||
|
|
e21fe5d594 | ||
|
|
9133955219 | ||
|
|
acb74905a5 | ||
|
|
ed3fff554a | ||
|
|
7ebe6a0c82 | ||
|
|
87333aa68c | ||
|
|
e593319ba0 | ||
|
|
812a3e7099 | ||
|
|
1097f5488d | ||
|
|
b90410e335 | ||
|
|
deed27cbef | ||
|
|
ea001b439a | ||
|
|
14e5adc7c2 | ||
|
|
81012b3201 | ||
|
|
406aa12468 | ||
|
|
2c2bb11c9b | ||
|
|
1bd63d68a5 | ||
|
|
bf5e9b7b0b | ||
|
|
7fe9dddf65 | ||
|
|
6d7f3976f3 | ||
|
|
65d526d8f6 | ||
|
|
56eeb965bf | ||
|
|
c4d476cc58 | ||
|
|
23b0b8625d | ||
|
|
558983c99c | ||
|
|
c8d6f2845f | ||
|
|
1a115cac5a | ||
|
|
11401edfe7 | ||
|
|
239842b821 | ||
|
|
606ff10ecf | ||
|
|
d37b69ce9c | ||
|
|
226a9abf22 | ||
|
|
f26096ee4c | ||
|
|
2b3ef7e762 | ||
|
|
d62526f9ed | ||
|
|
e66d7216b8 | ||
|
|
fbc59c5f81 | ||
|
|
32dc9e3225 | ||
|
|
b4468239b9 | ||
|
|
95c1282ef4 | ||
|
|
a7b0457753 | ||
|
|
7da7ae622b | ||
|
|
a95cfcc989 | ||
|
|
a65c959940 | ||
|
|
d328c3bccc | ||
|
|
8368568443 | ||
|
|
c223bb1f10 | ||
|
|
c7efd0892f | ||
|
|
ae9429408b | ||
|
|
0ce56d5714 | ||
|
|
509cfcb556 | ||
|
|
3b203d57e9 | ||
|
|
68d66b780c | ||
|
|
f94d6cca7d | ||
|
|
382217887b | ||
|
|
537c11a985 | ||
|
|
bdc0719e76 | ||
|
|
fc82cdfa4a | ||
|
|
e98b994a39 | ||
|
|
a58c838c4c | ||
|
|
f91f2c57ef | ||
|
|
68b7986d9b | ||
|
|
ead0325deb | ||
|
|
0b819badd2 | ||
|
|
3754e6dd12 | ||
|
|
da029607a0 | ||
|
|
803dc6ff77 | ||
|
|
65a629304c | ||
|
|
51cfdfb0d8 | ||
|
|
53108c9ff1 | ||
|
|
82a186e096 | ||
|
|
e467fe9aa6 | ||
|
|
7a1940e1f7 | ||
|
|
6b7c56c909 | ||
|
|
470d30ac23 | ||
|
|
7e87bfd039 | ||
|
|
ab9ccf9eb9 | ||
|
|
15ec013af8 | ||
|
|
748f10c0d6 | ||
|
|
8181d63a95 | ||
|
|
d0e7e69552 | ||
|
|
0558d641f2 | ||
|
|
ac46a4dd58 | ||
|
|
fb56b042c0 | ||
|
|
6298ecc271 | ||
|
|
a26fe08aa6 | ||
|
|
5b2c0f68fe | ||
|
|
e695dd6ead | ||
|
|
953571e3d8 | ||
|
|
01455c3188 | ||
|
|
a5210af823 | ||
|
|
9e42b525ec | ||
|
|
02d69b72f5 | ||
|
|
c998e2e9ef | ||
|
|
a3a85106a1 | ||
|
|
75302a10bd | ||
|
|
2ab0433aca | ||
|
|
e272db0f7f | ||
|
|
3580765ba3 | ||
|
|
cb79d89f83 | ||
|
|
2e178d0f05 | ||
|
|
edf0b171e2 | ||
|
|
148506ede8 | ||
|
|
c0a08d9ca2 | ||
|
|
4802987178 | ||
|
|
1cd7cf9990 | ||
|
|
4830755fac | ||
|
|
124545e1ed | ||
|
|
af01e61c89 | ||
|
|
9400a3b9ef | ||
|
|
6e314ea6d7 | ||
|
|
dfd962a8bc | ||
|
|
cfcbfe1e8f | ||
|
|
0e54f87b18 | ||
|
|
9f5e5b90e5 | ||
|
|
d619ba0857 | ||
|
|
fbea243e56 | ||
|
|
d062386656 | ||
|
|
d2f04f5bdf | ||
|
|
42c8d3ac27 | ||
|
|
d53563ab46 | ||
|
|
3d5f0ee315 | ||
|
|
ecdb7cdc55 | ||
|
|
fd38b752c4 | ||
|
|
64804a2a24 | ||
|
|
b603cb4530 | ||
|
|
8f2c7c0638 | ||
|
|
044ba7697a | ||
|
|
e6bd64b3ea | ||
|
|
56db916833 | ||
|
|
12cf0c4763 | ||
|
|
0a92e0f532 | ||
|
|
e6f9177fdb | ||
|
|
c3f6a4a57a | ||
|
|
653c209253 | ||
|
|
0974075fa0 | ||
|
|
53e1ee3475 | ||
|
|
46affea055 | ||
|
|
0ffe5cf1ff | ||
|
|
d023f9bf2d | ||
|
|
b2832cee8e | ||
|
|
960aa77b6d | ||
|
|
58daa5ed7d | ||
|
|
437e8bd706 | ||
|
|
1a5c7daaf6 | ||
|
|
c1ba4764b5 | ||
|
|
7cb3cb7353 | ||
|
|
604abaf81c | ||
|
|
8b157bb13f | ||
|
|
a8c71dcd20 | ||
|
|
363a8f6282 | ||
|
|
5b314cf1c3 | ||
|
|
02783bd7c6 | ||
|
|
d5c918d258 | ||
|
|
6b044335cd | ||
|
|
cbe20d3740 | ||
|
|
21bc84e837 | ||
|
|
203359ed7f | ||
|
|
24a26a2e94 | ||
|
|
0a7521060a | ||
|
|
6b5a9aa992 | ||
|
|
2dfdaa4d70 | ||
|
|
f2504494fe | ||
|
|
256858d2e5 | ||
|
|
10873bfe35 | ||
|
|
e939f1c1d1 | ||
|
|
b2c8cb655c | ||
|
|
4bdbf02c2d | ||
|
|
f83b2a0940 | ||
|
|
76ec74cbf1 | ||
|
|
8ae5da1472 | ||
|
|
d8067cdc1d | ||
|
|
67dbcb7375 | ||
|
|
3180f279c8 | ||
|
|
1982e6cef9 | ||
|
|
d2f0a8d493 | ||
|
|
37cb113c45 | ||
|
|
04a97fa72b | ||
|
|
8897aa6acb | ||
|
|
c247a9d191 | ||
|
|
4fd7e5734a | ||
|
|
3dbf7bbabb | ||
|
|
8f20e482ce | ||
|
|
329a33ed59 | ||
|
|
77edf1f680 | ||
|
|
7f510c10fe | ||
|
|
a559ba20b1 | ||
|
|
b19bfa1e20 | ||
|
|
6a22bee2ca | ||
|
|
e45237a93f | ||
|
|
a62cf10233 | ||
|
|
1361c8fbdf | ||
|
|
f2a5bbef17 | ||
|
|
016d568c2b | ||
|
|
02609114d3 | ||
|
|
53ea3481ea | ||
|
|
59b8399923 | ||
|
|
3b06d2191c | ||
|
|
e9df2b187c | ||
|
|
bc1b266174 | ||
|
|
b0c68dc29b | ||
|
|
c839dcb74c | ||
|
|
05aa27e477 | ||
|
|
7c788f0779 | ||
|
|
5099646938 | ||
|
|
277b4a060a | ||
|
|
17f560a1cd | ||
|
|
194cdcf581 | ||
|
|
7de9fd7170 | ||
|
|
0e9918464b | ||
|
|
ce40155377 | ||
|
|
4dc60f151d | ||
|
|
937dcb38ea | ||
|
|
4170eb3a1d | ||
|
|
c3a5650071 | ||
|
|
62fa0908a3 | ||
|
|
d2c0b9872d | ||
|
|
3709e673d9 | ||
|
|
0b62c0ad45 | ||
|
|
0ed679e795 | ||
|
|
b706730e10 | ||
|
|
bd83847027 | ||
|
|
d3348ff730 | ||
|
|
e29032085d | ||
|
|
19dbcaa3a9 | ||
|
|
3f56b2476a | ||
|
|
8246467022 | ||
|
|
90c28e9d63 | ||
|
|
64513b1c0e | ||
|
|
e8d501158e | ||
|
|
d92015a092 | ||
|
|
5c2e495792 | ||
|
|
421f819b8a | ||
|
|
ab9246f51f | ||
|
|
e2e05cd499 | ||
|
|
bdcc6dc173 | ||
|
|
f9716c5139 | ||
|
|
bae36d2e25 | ||
|
|
cbda4c2af1 | ||
|
|
f678486393 | ||
|
|
518df786ed | ||
|
|
16da3f58cc | ||
|
|
cf0ca7db51 | ||
|
|
0d8a161d15 | ||
|
|
487110693c | ||
|
|
3287dfbff4 | ||
|
|
ac1f7d71dd | ||
|
|
a716d5a317 | ||
|
|
7e3fd16b0d | ||
|
|
e152e687a5 | ||
|
|
10e560a508 | ||
|
|
2fc68a441d | ||
|
|
64ed0ac6b3 | ||
|
|
ce79626679 | ||
|
|
8f4e8d8254 | ||
|
|
62c9766cc1 | ||
|
|
f0013e826e | ||
|
|
5fd79567f0 | ||
|
|
11e9fd8cef | ||
|
|
2b0945b88d | ||
|
|
23780a655d | ||
|
|
9f83bf4624 | ||
|
|
00e639d513 | ||
|
|
659f75138c | ||
|
|
d7c2ced475 | ||
|
|
2e01a1fe53 | ||
|
|
e687a73cb2 | ||
|
|
6966e0d19b | ||
|
|
7d9ed162c7 | ||
|
|
848c9db4fb | ||
|
|
16fe2574b1 | ||
|
|
c3c975a51a | ||
|
|
a265b50a66 | ||
|
|
67a1455619 | ||
|
|
844e2bab3b | ||
|
|
b1583cc29e | ||
|
|
0f9107bef3 | ||
|
|
068611e8ba | ||
|
|
1f417fe67d | ||
|
|
8186b72c11 | ||
|
|
4c0cc80771 | ||
|
|
9c8c165a2c | ||
|
|
84ce1861a2 | ||
|
|
990d06d10c | ||
|
|
3e1c811780 | ||
|
|
b96b618443 | ||
|
|
65bdd0de9a | ||
|
|
086c511a11 | ||
|
|
c5fffce96c | ||
|
|
d457b07f9f | ||
|
|
a0a8149833 | ||
|
|
241cfb319b | ||
|
|
9b80c6314d | ||
|
|
3d21c33409 | ||
|
|
b3c88a7e24 | ||
|
|
886d575157 | ||
|
|
2a8f9c3a81 | ||
|
|
2cbad47d7b | ||
|
|
eb154bac69 | ||
|
|
ab178e62f5 | ||
|
|
bc4c48fa0b | ||
|
|
5d5d056849 | ||
|
|
f1ad951bf6 | ||
|
|
d0436e7b29 | ||
|
|
2616dcb424 | ||
|
|
eb6afa17c0 | ||
|
|
77409a3833 | ||
|
|
49a02c9b96 | ||
|
|
1bf23dc2a8 | ||
|
|
fce2cd9817 | ||
|
|
2c4495e483 | ||
|
|
6781485c42 | ||
|
|
d27e7e2786 | ||
|
|
68f6310222 | ||
|
|
c328452687 | ||
|
|
536b520750 | ||
|
|
8b8fd25626 | ||
|
|
e98eb294c7 | ||
|
|
b1270fc7bb | ||
|
|
9eb1676b4b | ||
|
|
aea91781aa | ||
|
|
9a6f6d9fe4 | ||
|
|
e4e40e3c70 | ||
|
|
84aeee49bd | ||
|
|
6011790d79 | ||
|
|
2acffb4163 | ||
|
|
b837f3753d | ||
|
|
d043cd2ac7 | ||
|
|
dbf8c24ecb | ||
|
|
c50709a8d0 | ||
|
|
1231b81839 | ||
|
|
d2fe21ddff | ||
|
|
2134f83948 | ||
|
|
3d3cae1f20 | ||
|
|
1e8a43d51e | ||
|
|
e7c0ac37d8 | ||
|
|
385e848a0f | ||
|
|
9f42a4482a | ||
|
|
fdeecf5d41 | ||
|
|
51ac583d83 | ||
|
|
e226f99e4e | ||
|
|
f73dc61ff8 | ||
|
|
90547c4fd2 | ||
|
|
c6e832be18 | ||
|
|
cce8a6026f | ||
|
|
419160f351 | ||
|
|
3c4a959c1e | ||
|
|
800deb3f54 | ||
|
|
49f5beab84 | ||
|
|
a6fe581d48 | ||
|
|
ff1234cce3 | ||
|
|
32665e6417 | ||
|
|
b2f7a52f98 | ||
|
|
4ebc8d54f4 | ||
|
|
9c3e623bb4 | ||
|
|
e1b7005c2b | ||
|
|
398e9718ea | ||
|
|
a0be9ea639 | ||
|
|
fbe87ed640 | ||
|
|
23af4d8211 | ||
|
|
bfc3a00e6c | ||
|
|
40f55e2d06 | ||
|
|
3e044a759b | ||
|
|
5c38e7b126 | ||
|
|
32c61d3ea1 | ||
|
|
ea80c4dacc | ||
|
|
7f66f1053f | ||
|
|
734305e111 | ||
|
|
3369716fc3 | ||
|
|
cdf61de129 | ||
|
|
786ea3c0f9 | ||
|
|
9a899c54c9 | ||
|
|
2148568347 | ||
|
|
5c6c64ed1d | ||
|
|
b99ef159ed | ||
|
|
a9ce7ccb83 | ||
|
|
b715467da6 | ||
|
|
63173e7360 | ||
|
|
d398b0aba6 | ||
|
|
8ff68a58f2 | ||
|
|
f55391f99d | ||
|
|
a262f8dd29 | ||
|
|
c6ca6ec712 | ||
|
|
1ec160d4c9 | ||
|
|
6b8234d938 | ||
|
|
b6db991710 | ||
|
|
6ff9b8b90e | ||
|
|
e781ddfa43 | ||
|
|
a0d8ce4159 | ||
|
|
974abaa275 | ||
|
|
ccea4669de | ||
|
|
db36294dcb | ||
|
|
b13780c6e0 | ||
|
|
6d00b59bb8 | ||
|
|
72b05fed75 | ||
|
|
e2d2ca5fe0 | ||
|
|
d43cfe1ead | ||
|
|
11004de056 | ||
|
|
f3faaec9d8 | ||
|
|
8350b7269f | ||
|
|
6bce0c4a9c | ||
|
|
4bda18a079 | ||
|
|
46499a53aa | ||
|
|
57ef7c1276 | ||
|
|
b8867642fc | ||
|
|
e902478bd3 | ||
|
|
b50635cb89 | ||
|
|
cbb31fa204 | ||
|
|
20bac32e1f | ||
|
|
f394102b80 | ||
|
|
dc375aed81 | ||
|
|
c85f7de2c1 | ||
|
|
ac3a618458 | ||
|
|
6081e46ad9 | ||
|
|
c990d6bbd9 | ||
|
|
4ad12dcd19 | ||
|
|
dea4f784e2 | ||
|
|
20c3d90163 | ||
|
|
7053721aae | ||
|
|
adcb05d213 | ||
|
|
11639dcc8b | ||
|
|
44dd09b438 | ||
|
|
7280fc7d31 | ||
|
|
e93ccab279 | ||
|
|
5294945554 | ||
|
|
9ca87a620a | ||
|
|
b54863edc6 | ||
|
|
065d0c7e9f | ||
|
|
e2fcb942e8 | ||
|
|
cfdf832d3a | ||
|
|
098c4228fb | ||
|
|
79a0cfbcdb | ||
|
|
e923ca4f17 | ||
|
|
95ba3fa142 | ||
|
|
2fcc4f3e73 | ||
|
|
1657686eb4 | ||
|
|
c0835968af | ||
|
|
4b2fbdb277 | ||
|
|
2ce4adf09d | ||
|
|
1777841ec1 | ||
|
|
f570eccf81 | ||
|
|
67dfddd065 | ||
|
|
9a4d01cb26 | ||
|
|
5c758d4564 | ||
|
|
fc531334ae | ||
|
|
5a018e0bc0 | ||
|
|
f8fb1f838c | ||
|
|
7b16c68e92 | ||
|
|
af2dc0860c | ||
|
|
acd3db13f8 | ||
|
|
c8a867bf29 | ||
|
|
17c49b2e6d | ||
|
|
9bdc021f98 | ||
|
|
c65025f7b0 | ||
|
|
ea32d535eb | ||
|
|
92c769f206 | ||
|
|
343ee0c9b6 | ||
|
|
8b1c68aed3 | ||
|
|
929cbbb7fc | ||
|
|
22e323528e | ||
|
|
52533c3b66 | ||
|
|
563215a05e | ||
|
|
4ac60d88d7 | ||
|
|
3e2e616507 | ||
|
|
da7e595fcf | ||
|
|
829a284d48 | ||
|
|
c0d9dc9969 | ||
|
|
cc15389729 | ||
|
|
edd4f2e37d | ||
|
|
8205f2c6f1 | ||
|
|
dd9db5d0b7 | ||
|
|
9590b18fdd | ||
|
|
7cb7a12f96 | ||
|
|
5ce5bae99d | ||
|
|
8fdef484f6 | ||
|
|
65e842effa | ||
|
|
2c43b61798 | ||
|
|
a1ac31062d | ||
|
|
06b05e21c6 | ||
|
|
3f460ad5a9 | ||
|
|
e9e647f043 | ||
|
|
e8c84f3c5d | ||
|
|
f3161309ff | ||
|
|
ef1b8e36a0 | ||
|
|
79634a6789 | ||
|
|
d8ec0a9229 | ||
|
|
bc1b4885de | ||
|
|
4b71727661 | ||
|
|
cc39ef0946 | ||
|
|
e47c0c3e49 | ||
|
|
81d3fc8a24 | ||
|
|
cc51253007 | ||
|
|
a4d797f832 | ||
|
|
6ed8ccfa46 | ||
|
|
c4f513f6e7 | ||
|
|
4ea8eaf103 | ||
|
|
00ed2653fe | ||
|
|
179b93d625 | ||
|
|
3e43e77b1c | ||
|
|
b66606bc16 | ||
|
|
b6ac750e21 | ||
|
|
936a95e10e | ||
|
|
13e8354f37 | ||
|
|
0fe7f16ecf | ||
|
|
784f4e4bba | ||
|
|
1e616b227b | ||
|
|
4830aa9a14 | ||
|
|
5f26149938 | ||
|
|
1891f687b6 | ||
|
|
41b75485eb | ||
|
|
1a3f2b3f0d | ||
|
|
5b7a08bac3 | ||
|
|
e814cd0b9e | ||
|
|
709a87c8d4 | ||
|
|
4e8055742e | ||
|
|
3979c28cac | ||
|
|
e6813846b8 | ||
|
|
165decdf6c | ||
|
|
4441bc7033 | ||
|
|
a015cb7f48 | ||
|
|
5c7e0a0319 | ||
|
|
c43bec826d | ||
|
|
a3b564eb92 | ||
|
|
1b9955e9ef | ||
|
|
5da363cbde | ||
|
|
53119e71f4 | ||
|
|
fcc9c76249 | ||
|
|
f29f9bbb38 | ||
|
|
04b543caa9 | ||
|
|
3f9383c343 | ||
|
|
0d2f8f4498 | ||
|
|
53e64df8e2 | ||
|
|
f97be61e8b | ||
|
|
9604386698 | ||
|
|
7b2d9adbdf | ||
|
|
d592902553 | ||
|
|
08ca25c9c8 | ||
|
|
e5a95cf92e | ||
|
|
1a2b8a98a6 | ||
|
|
0d0d6893fc | ||
|
|
3b185a00fa | ||
|
|
a00ad9fc92 | ||
|
|
b96e6a9e2d | ||
|
|
ea1ea99ce1 | ||
|
|
e99a0abfba | ||
|
|
361ab030bc | ||
|
|
33d17dbf1f | ||
|
|
8a09ca2180 | ||
|
|
1bbb992ca6 | ||
|
|
4dd51a165c | ||
|
|
8365afee8d | ||
|
|
0961caec1b | ||
|
|
1bf9351a67 | ||
|
|
3cb0b3fc7b | ||
|
|
ffb1b9c14f | ||
|
|
82817c1cac | ||
|
|
173a04007f | ||
|
|
83d5627c4d | ||
|
|
6f8a01ca18 | ||
|
|
5b6526cc5a | ||
|
|
5e24b32467 | ||
|
|
2f14b8abbf | ||
|
|
74715b12b0 | ||
|
|
7415af5086 | ||
|
|
85776a532d | ||
|
|
bb2f35fe79 | ||
|
|
1290706fad | ||
|
|
4e7fa82aff | ||
|
|
796472cf84 | ||
|
|
a455e0d8d4 | ||
|
|
55c4108d8b | ||
|
|
2ef19c7e49 | ||
|
|
e27022b698 | ||
|
|
153c77c2cd | ||
|
|
6693151052 | ||
|
|
1915a63cf2 | ||
|
|
c496c7975f | ||
|
|
8dbe7818eb | ||
|
|
1df5b453cb | ||
|
|
0b5e5a5f82 | ||
|
|
f47be6ef60 | ||
|
|
f592b9fc31 | ||
|
|
6b1f158322 | ||
|
|
99748cddcc | ||
|
|
e2cd89e354 | ||
|
|
e5f6f68cd6 | ||
|
|
e2ad6bf79f | ||
|
|
ef9f395cb6 | ||
|
|
e6f8a66197 | ||
|
|
5656a41f69 | ||
|
|
96ed31874d | ||
|
|
db91837647 | ||
|
|
6c9fbc2ddb | ||
|
|
7237f7081f | ||
|
|
54f90c7556 | ||
|
|
43890b31fc | ||
|
|
b1282da542 | ||
|
|
22e431ca67 | ||
|
|
b1bd7d6f8c | ||
|
|
6c1d236a03 | ||
|
|
89d548f9d3 | ||
|
|
fde4380422 | ||
|
|
aaa686b9fe | ||
|
|
03b0aa7185 | ||
|
|
518dbbc96b | ||
|
|
59f683858b | ||
|
|
c339211ac7 | ||
|
|
93582a4204 | ||
|
|
5bb53cf995 | ||
|
|
05ef62781f | ||
|
|
d283538146 | ||
|
|
a99754d88b | ||
|
|
de16b01bb2 | ||
|
|
47669abd44 | ||
|
|
ab3833a708 | ||
|
|
dc8d582b18 | ||
|
|
a035763afd | ||
|
|
0c4fada265 | ||
|
|
ddf0066c11 | ||
|
|
476fbbfe4e | ||
|
|
2ec41c1732 | ||
|
|
6a98aec2ca | ||
|
|
e91123e17a | ||
|
|
e2ffcd7229 | ||
|
|
efa96da3e0 | ||
|
|
b9ae650146 | ||
|
|
72edc508eb | ||
|
|
81649d9979 | ||
|
|
7efe1f06ee | ||
|
|
85155d5899 | ||
|
|
d088a968a9 | ||
|
|
efef99cbad | ||
|
|
f3b0878a37 | ||
|
|
c856e0a563 | ||
|
|
2c672a4ea2 | ||
|
|
0cb4bae275 | ||
|
|
2ade0be365 | ||
|
|
f2f2dbe381 | ||
|
|
60eee5f9e9 | ||
|
|
4a6b0d7de5 | ||
|
|
f41ffe136a | ||
|
|
1d155ab2eb | ||
|
|
396f794bf4 | ||
|
|
97bdfe295d | ||
|
|
5241c9f3cf | ||
|
|
91da00f470 | ||
|
|
c7260b6436 | ||
|
|
c51405e99b | ||
|
|
2aea4da9ad | ||
|
|
d3be349fa0 | ||
|
|
92ad057332 | ||
|
|
d2b2aba6e8 | ||
|
|
c1d31bb409 | ||
|
|
181ec4992b | ||
|
|
60337330bf | ||
|
|
af0fd3b96d | ||
|
|
e7cf989c7a | ||
|
|
2a1313ffd5 | ||
|
|
140ed9887b | ||
|
|
b2c00b3b24 | ||
|
|
70d0566480 | ||
|
|
067c3dad44 | ||
|
|
be2934f9ad | ||
|
|
2993d9d37e | ||
|
|
bae75c8f9b | ||
|
|
b6be0eebf6 | ||
|
|
d63e000a45 | ||
|
|
fd963538f3 | ||
|
|
c09284ba27 | ||
|
|
622519e90e | ||
|
|
f1e5ed4766 | ||
|
|
a3abbc3ebb | ||
|
|
8df6b5c1bf | ||
|
|
9cbf25a76f | ||
|
|
923ba84f65 | ||
|
|
ea7e7c753b | ||
|
|
5429063546 | ||
|
|
54deb1302d | ||
|
|
f15aed6c46 | ||
|
|
e9dd5985b3 | ||
|
|
669fdf6b5f | ||
|
|
21504c8492 | ||
|
|
12adb25665 | ||
|
|
5259ba2bcb | ||
|
|
babb1c864c | ||
|
|
582da8d4bb | ||
|
|
1537669178 | ||
|
|
b0cfe0b9cc | ||
|
|
30305cf4fa | ||
|
|
219951760f | ||
|
|
0ee451040d | ||
|
|
22c2568c27 | ||
|
|
6e6b825e92 | ||
|
|
8c63f25478 | ||
|
|
977751efdb | ||
|
|
771a6e9aab | ||
|
|
2b4554ad44 | ||
|
|
9e72884c7b | ||
|
|
71b2c19cf2 | ||
|
|
6d929bf4cc | ||
|
|
de9b2b202e | ||
|
|
b31337db4a | ||
|
|
8f8ca40f63 | ||
|
|
b98373f390 | ||
|
|
8e6640605a | ||
|
|
9c5a4a6d1f | ||
|
|
e240bbd4a4 | ||
|
|
f7e7ef2f30 | ||
|
|
875b1e0dd5 | ||
|
|
6a4324f451 | ||
|
|
de37d08c24 | ||
|
|
00827903ef | ||
|
|
023830f5ab | ||
|
|
c2169b3dca | ||
|
|
01444f79e1 | ||
|
|
ecdece83fe | ||
|
|
d7478c6ed3 | ||
|
|
b467005fac | ||
|
|
b7b12d5b4e | ||
|
|
952215c0ac | ||
|
|
3e5db956a8 | ||
|
|
a62f90073a | ||
|
|
6789d41993 | ||
|
|
4b4f4be3a5 | ||
|
|
40294f3aed | ||
|
|
67a1a07ac1 | ||
|
|
cdf197ccfe | ||
|
|
6ff6c2e5af | ||
|
|
cf0c8be63d | ||
|
|
1d56c9aa1b | ||
|
|
ab2f3cefc8 | ||
|
|
3cbdbc1db5 | ||
|
|
90ca91caa8 | ||
|
|
1f24adc9cd | ||
|
|
a1f7ab776e | ||
|
|
f639c237a1 | ||
|
|
46ebf541e1 | ||
|
|
53910f0737 | ||
|
|
31f62c5cf5 | ||
|
|
7117f0532c | ||
|
|
c6b427c252 | ||
|
|
b0f9f76b79 | ||
|
|
8689d3293a | ||
|
|
51fdd12d23 | ||
|
|
24110acafc | ||
|
|
f6f242b899 | ||
|
|
e8c738282d | ||
|
|
c0ed50d5b0 | ||
|
|
f48c7ab8e6 | ||
|
|
adcb82d2b5 | ||
|
|
6ac83ce7eb | ||
|
|
b9ae0f8888 | ||
|
|
7b4d335944 | ||
|
|
9bf05c3534 | ||
|
|
1075283d8e | ||
|
|
77ea1c25bd | ||
|
|
6373c355cf | ||
|
|
225826ce83 | ||
|
|
0c3989b40f | ||
|
|
4a2525241f | ||
|
|
ed5b04791e | ||
|
|
71b28e0774 | ||
|
|
33d6f2d52f | ||
|
|
e4f01976a6 | ||
|
|
0a33e439bd | ||
|
|
f948f3525f | ||
|
|
396e72f4fe | ||
|
|
d31a29bf6a | ||
|
|
405e2f8dd0 | ||
|
|
a98c0a81be | ||
|
|
2f83375eec | ||
|
|
2b9b996148 | ||
|
|
48f3104774 | ||
|
|
b8571475c9 | ||
|
|
ff83bfbad0 | ||
|
|
dd307af215 | ||
|
|
58a784e342 | ||
|
|
89b3b085af | ||
|
|
e6c3c0139a | ||
|
|
aad896c2a8 | ||
|
|
1a6a9593fb | ||
|
|
6cb40ac75e | ||
|
|
50591238e5 | ||
|
|
291acb9459 | ||
|
|
47c2ad1b5f | ||
|
|
6491568e15 | ||
|
|
28ac30d827 | ||
|
|
db74459ca2 | ||
|
|
d2bc3ea209 | ||
|
|
cd9d456994 | ||
|
|
06befec642 | ||
|
|
579f1b05db | ||
|
|
7e41309fa9 | ||
|
|
3091dc3c48 | ||
|
|
01bf295a19 | ||
|
|
f88648fbc8 | ||
|
|
18b9589e50 | ||
|
|
9847c2ccbb | ||
|
|
335b336968 | ||
|
|
70eb619b86 | ||
|
|
b3b8feabf1 | ||
|
|
d9cf798753 | ||
|
|
cbb2eb8c8f | ||
|
|
6474125c93 | ||
|
|
5100cc0eae | ||
|
|
49ed41142c | ||
|
|
659649d2e9 | ||
|
|
5246656ae0 | ||
|
|
f828dfc202 | ||
|
|
591158bb92 | ||
|
|
667e77c609 | ||
|
|
a499f369a5 | ||
|
|
fbf6bd2be8 | ||
|
|
212598b45e | ||
|
|
8b0e735f67 | ||
|
|
d9c963061b | ||
|
|
30b72eae64 | ||
|
|
475f54e9d1 | ||
|
|
34dfe7d375 | ||
|
|
06789406ad | ||
|
|
1ebc510bcb | ||
|
|
90ffa1fc2c | ||
|
|
f942cef2f1 | ||
|
|
7fce8f02d2 | ||
|
|
3986a951d8 | ||
|
|
22356fa69b | ||
|
|
e00b06926e | ||
|
|
dc9409ae12 | ||
|
|
3b1047b0c8 | ||
|
|
2b4321b5c3 | ||
|
|
6b16ad709e | ||
|
|
3407db11cd | ||
|
|
326a2fb7ed | ||
|
|
eef175e579 | ||
|
|
7989b8d969 | ||
|
|
9af00fdb4c | ||
|
|
6c2cfb34f7 | ||
|
|
5171309c43 | ||
|
|
c77ec63ed8 | ||
|
|
30afa082e4 | ||
|
|
ea64f8b0da | ||
|
|
e2310751f1 | ||
|
|
47b5e45f13 | ||
|
|
31275398aa | ||
|
|
c1166c37d1 | ||
|
|
5420b6359b | ||
|
|
5e47871256 | ||
|
|
1585503809 | ||
|
|
60636a9a88 | ||
|
|
fcf4b25bc3 | ||
|
|
0efc4a706d | ||
|
|
fb7416cb9d | ||
|
|
32c62faa78 | ||
|
|
363deeb23d | ||
|
|
131f68117b | ||
|
|
05cef1d69a | ||
|
|
71ef54f561 | ||
|
|
f9c217e42a | ||
|
|
36c1b72118 | ||
|
|
6dd42d19f7 | ||
|
|
5d3ac78250 | ||
|
|
f56b083bc3 | ||
|
|
79be44ddea | ||
|
|
dcdd7562f4 | ||
|
|
66b759ca69 | ||
|
|
529492e81f | ||
|
|
1076455c01 | ||
|
|
2d486aeed8 | ||
|
|
00c35e48a2 | ||
|
|
8380b505f4 | ||
|
|
564d622cc9 | ||
|
|
a067350098 | ||
|
|
50216991bd | ||
|
|
3707553906 | ||
|
|
b8fec1e3ce | ||
|
|
979330392e | ||
|
|
11898f0268 | ||
|
|
78176d2b7b | ||
|
|
64633939e0 | ||
|
|
f717be19cb | ||
|
|
9c6c15cd6b | ||
|
|
3adccc98f7 | ||
|
|
79f3199339 | ||
|
|
23042b3c9a | ||
|
|
e819899221 | ||
|
|
b92541a08e | ||
|
|
c54a8f8cfa | ||
|
|
3b5f32f261 | ||
|
|
7798b964fe | ||
|
|
44e2e0beea | ||
|
|
32a9b8fd14 | ||
|
|
5a7f58d23f | ||
|
|
6aaca82d0e | ||
|
|
07a81f5e15 | ||
|
|
c9a2eb54c1 | ||
|
|
8a59581668 | ||
|
|
5950ad7ef8 | ||
|
|
4b720c4f3c | ||
|
|
480791a057 | ||
|
|
076bd3d1f4 | ||
|
|
d8e4111a9d | ||
|
|
9c1029ff6c | ||
|
|
56f14ebee4 | ||
|
|
aa5d06bb1a | ||
|
|
025ca46981 | ||
|
|
5281fcf3cd |
@@ -0,0 +1,17 @@
|
||||
version: 3.1.{build}
|
||||
branches:
|
||||
only:
|
||||
- dev
|
||||
environment:
|
||||
matrix:
|
||||
- COMPILER: mingw
|
||||
MINGW_DIR: c:\msys64\mingw32
|
||||
|
||||
before_build:
|
||||
- set Path=%MINGW_DIR%\bin;%Path%
|
||||
|
||||
build_script:
|
||||
- set Path=%MINGW_DIR%\bin;c:\msys64\usr\bin;
|
||||
- bash autogen.sh
|
||||
- cd src/lib
|
||||
- make
|
||||
@@ -0,0 +1,3 @@
|
||||
*.sh -crlf
|
||||
*.ac -crlf
|
||||
*.am -crlf
|
||||
@@ -0,0 +1,23 @@
|
||||
name: CIFuzz
|
||||
on: [pull_request]
|
||||
jobs:
|
||||
Fuzzing:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Build Fuzzers
|
||||
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
|
||||
with:
|
||||
oss-fuzz-project-name: 'ndpi'
|
||||
dry-run: false
|
||||
- name: Run Fuzzers
|
||||
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
|
||||
with:
|
||||
oss-fuzz-project-name: 'ndpi'
|
||||
fuzz-seconds: 600
|
||||
dry-run: false
|
||||
- name: Upload Crash
|
||||
uses: actions/upload-artifact@v1
|
||||
if: failure()
|
||||
with:
|
||||
name: artifacts
|
||||
path: ./out/artifacts
|
||||
+38
-33
@@ -1,51 +1,56 @@
|
||||
*.[oa]
|
||||
*~
|
||||
*o.cmd
|
||||
*.lo
|
||||
*.obj
|
||||
*o.cmd
|
||||
*.ko
|
||||
*.swp
|
||||
*.in
|
||||
*.la
|
||||
.libs
|
||||
.dirstamp
|
||||
/aclocal.m4
|
||||
/autom4te.cache/
|
||||
.autotools
|
||||
.cproject
|
||||
.project
|
||||
.settings
|
||||
stamp-h1
|
||||
/configure
|
||||
/configure.ac
|
||||
compile
|
||||
/compile
|
||||
/config.guess
|
||||
/config.h
|
||||
/config.h.in
|
||||
/config.sub
|
||||
/config.log
|
||||
/config.status
|
||||
/config.sub
|
||||
/configure
|
||||
/configure.ac
|
||||
/configure.tmp
|
||||
.cproject
|
||||
/depcomp
|
||||
/install-sh
|
||||
/ltmain.sh
|
||||
/missing
|
||||
/Makefile
|
||||
/libndpi.pc
|
||||
/libtool
|
||||
/src/lib/Makefile
|
||||
/src/include/Makefile
|
||||
/example/ndpiReader
|
||||
.dirstamp
|
||||
/example/.deps/
|
||||
/example/Makefile
|
||||
/aclocal.m4
|
||||
/example/ndpiReader
|
||||
/example/Makefile.dpdk
|
||||
/example/build
|
||||
*.in
|
||||
/install-sh
|
||||
*.ko
|
||||
*.la
|
||||
/libndpi.pc
|
||||
.libs
|
||||
/libtool
|
||||
*.lo
|
||||
/ltmain.sh
|
||||
/m4/libtool.m4
|
||||
/m4/lt~obsolete.m4
|
||||
/m4/ltoptions.m4
|
||||
/m4/ltsugar.m4
|
||||
/m4/ltversion.m4
|
||||
/m4/lt~obsolete.m4
|
||||
/autom4te.cache/
|
||||
/compile
|
||||
/example/.deps/
|
||||
/Makefile
|
||||
/missing
|
||||
*.[o]
|
||||
*.obj
|
||||
*o.cmd
|
||||
*o.cmd
|
||||
.project
|
||||
.settings
|
||||
/src/include/Makefile
|
||||
/src/include/ndpi_config.h
|
||||
/src/include/ndpi_define.h
|
||||
/src/lib/.deps/
|
||||
/src/lib/Makefile
|
||||
/src/lib/protocols/.deps/
|
||||
/src/lib/third_party/src/.deps/
|
||||
/src/include/ndpi_define.h
|
||||
stamp-h1
|
||||
*.swp
|
||||
/test-driver
|
||||
/tests/Makefile
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
/**
|
||||
* @name Suspicious packet->payload based integer arithmetic
|
||||
* @description An arithmetic operation influenced array access is suspicious
|
||||
* if it uses an integer value that is likely to be network-controlled, and
|
||||
* may require a closer manual audit.
|
||||
* @kind problem
|
||||
* @problem.severity warning
|
||||
* @id cpp/packet-payload-integer-arithmetic
|
||||
* @tags audit security
|
||||
*/
|
||||
|
||||
import cpp
|
||||
|
||||
import semmle.code.cpp.dataflow.TaintTracking
|
||||
import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
|
||||
|
||||
/** A source of an integer value that is likely to come from the network.
|
||||
* This is produced by an invocation of a macro of the form `ntoh*` or `get_u_int*_t`,
|
||||
* called with `packet->payload` as an argument.
|
||||
*/
|
||||
|
||||
class NetworkMacro extends Macro {
|
||||
NetworkMacro() { this.getName().regexpMatch("^ntoh(ll|l|s)") }
|
||||
}
|
||||
|
||||
class NetworkIntegerSource extends Expr {
|
||||
NetworkIntegerSource() {
|
||||
exists(MacroInvocation mi |
|
||||
this = mi.getExpr() and
|
||||
mi.getUnexpandedArgument(0).regexpMatch(".*packet->payload.*") |
|
||||
// catch all get_u_int*_t(x)
|
||||
mi.getMacroName().regexpMatch("^get_u_int(64|32|16|8)_t") and
|
||||
// dedup ntoh*(get_u_int*_t(x)) since we'll catch those in the next case
|
||||
not mi.getOutermostMacroAccess().getMacro() instanceof NetworkMacro
|
||||
or
|
||||
// catch all ntoh*(x) ... this will also catch the nested cases
|
||||
mi.getMacro() instanceof NetworkMacro
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
class ArithmeticOperation extends Operation {
|
||||
ArithmeticOperation() {
|
||||
this instanceof UnaryArithmeticOperation or this instanceof BinaryArithmeticOperation
|
||||
}
|
||||
}
|
||||
|
||||
class NetworkToArrayAccess extends TaintTracking::Configuration {
|
||||
NetworkToArrayAccess() { this = "NetworkToArrayAccess" }
|
||||
|
||||
override predicate isSource(DataFlow::Node source) {
|
||||
source.asExpr() instanceof NetworkIntegerSource
|
||||
}
|
||||
|
||||
override predicate isSink(DataFlow::Node sink) {
|
||||
exists(ArrayExpr ae | sink.asExpr() = ae.getArrayOffset())
|
||||
}
|
||||
}
|
||||
|
||||
class NetworkToArithmetic extends TaintTracking::Configuration {
|
||||
NetworkToArithmetic() { this = "NetworkToArithmetic" }
|
||||
|
||||
override predicate isSource(DataFlow::Node source) {
|
||||
source.asExpr() instanceof NetworkIntegerSource
|
||||
}
|
||||
|
||||
override predicate isSink(DataFlow::Node sink) {
|
||||
exists (Assignment assign |
|
||||
sink.asExpr() = assign.getRValue().(ArithmeticOperation) or
|
||||
sink.asExpr() = assign.(AssignArithmeticOperation)
|
||||
) or
|
||||
exists(LocalVariable var |
|
||||
sink.asExpr() = var.getInitializer().getExpr().(ArithmeticOperation)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// find audit candidates based on suspicious network integer use
|
||||
from NetworkIntegerSource source, Expr sink1, Expr sink2, NetworkToArithmetic config1, NetworkToArrayAccess config2
|
||||
where config1.hasFlow(DataFlow::exprNode(source), DataFlow::exprNode(sink1))
|
||||
// or this if you want integer arithmeric _OR_ array accesses
|
||||
and config2.hasFlow(DataFlow::exprNode(source), DataFlow::exprNode(sink2))
|
||||
select source, "Suspicious use of network integer arithmetic."
|
||||
+186
-21
@@ -1,38 +1,203 @@
|
||||
language: c
|
||||
|
||||
os:
|
||||
- osx
|
||||
- linux
|
||||
|
||||
compiler:
|
||||
- clang
|
||||
- gcc
|
||||
|
||||
matrix:
|
||||
exclude:
|
||||
# osx use always clang for build...
|
||||
- os: osx
|
||||
compiler: gcc
|
||||
include:
|
||||
- os: osx
|
||||
compiler: clang
|
||||
|
||||
install:
|
||||
#macos
|
||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
|
||||
#linux
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update || true; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install build-essential; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev libtool autoconf automake autogen; fi
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
dist: bionic
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
|
||||
- os: linux
|
||||
compiler: clang
|
||||
dist: bionic
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
dist: bionic
|
||||
arch: arm64
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
|
||||
- os: linux
|
||||
compiler: clang
|
||||
dist: bionic
|
||||
arch: arm64
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
|
||||
# Targets below have been disabled as we have no way
|
||||
# to debug on tsuch platforms at the moment
|
||||
# - os: linux
|
||||
# compiler: gcc
|
||||
# dist: bionic
|
||||
# arch: s390x
|
||||
# addons:
|
||||
# apt:
|
||||
# packages:
|
||||
# - libpcap-dev
|
||||
# - libjson-c-dev
|
||||
# - autogen
|
||||
#
|
||||
# - os: linux
|
||||
# compiler: clang
|
||||
# dist: bionic
|
||||
# arch: s390x
|
||||
# addons:
|
||||
# apt:
|
||||
# packages:
|
||||
# - libpcap-dev
|
||||
# - libjson-c-dev
|
||||
# - autogen
|
||||
|
||||
- os: linux
|
||||
compiler: gcc-8
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-8
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
env:
|
||||
- MATRIX_EVAL="CC=gcc-8"
|
||||
|
||||
- os: linux
|
||||
compiler: gcc-9
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-9
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
env:
|
||||
- MATRIX_EVAL="CC=gcc-9"
|
||||
|
||||
- os: linux
|
||||
compiler: clang-8
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-8
|
||||
packages:
|
||||
- clang-8
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
env:
|
||||
- MATRIX_EVAL="CC=clang-8"
|
||||
|
||||
- os: linux
|
||||
compiler: clang-7
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-7
|
||||
packages:
|
||||
- clang-7
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
env:
|
||||
- MATRIX_EVAL="CC=clang-7"
|
||||
|
||||
- name: fuzza
|
||||
env: CXXFLAGS="-g3 -O0 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize=fuzzer-no-link" CFLAGS="-g3 -O0 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize=fuzzer-no-link" LDFLAGS="-g3 -O0 -fsanitize=address" QA_FUZZ=asan CC=clang-7 && CXX=clang++-7 ASAN_SYMBOLIZER_PATH=/usr/local/clang-7.0.0/bin/llvm-symbolizer
|
||||
os: linux
|
||||
compiler: clang-7
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-7
|
||||
packages:
|
||||
- clang-7
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
- name: fuzzm
|
||||
env: CXXFLAGS="-g3 -O0 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=memory -fsanitize=fuzzer-no-link" CFLAGS="-g3 -O0 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=memory -fsanitize=fuzzer-no-link" LDFLAGS="-g3 -O0 -fsanitize=memory" QA_FUZZ=msan CC=clang && CXX=clang++
|
||||
os: linux
|
||||
compiler: clang
|
||||
dist: bionic
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
- name: fuzzu
|
||||
env: CXXFLAGS="-g3 -Og -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=undefined -fsanitize=fuzzer-no-link -fno-sanitize=alignment" CFLAGS="-g3 -Og -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=undefined -fno-sanitize-recover=undefined,integer -fsanitize=fuzzer-no-link -fno-sanitize=alignment" LDFLAGS="-g3 -Og -fsanitize=undefined -fno-sanitize=alignment" QA_FUZZ=ubsan CC=clang-7 && CXX=clang++-7
|
||||
os: linux
|
||||
compiler: clang-7
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-7
|
||||
packages:
|
||||
- clang-7
|
||||
- libpcap-dev
|
||||
- libgcrypt20-dev
|
||||
- libjson-c-dev
|
||||
- autogen
|
||||
|
||||
|
||||
before_install:
|
||||
- eval "${MATRIX_EVAL}"
|
||||
|
||||
before_script:
|
||||
- ./autogen.sh
|
||||
# - lcov --directory . --zerocounters
|
||||
|
||||
script:
|
||||
- ./configure
|
||||
- if [ -n "$QA_FUZZ" ]; then ./configure --enable-fuzztargets ; else ./configure ; fi
|
||||
- make
|
||||
- make -C example ndpiSimpleIntegration
|
||||
- make dist
|
||||
|
||||
after_script:
|
||||
#after_script:
|
||||
- cd tests
|
||||
- ./do.sh
|
||||
- ./do-unit.sh
|
||||
|
||||
#after_success:
|
||||
#- cd ${TRAVIS_BUILD_DIR}
|
||||
|
||||
+356
-2
@@ -1,5 +1,359 @@
|
||||
# CHANGELOG
|
||||
|
||||
#### nDPI 3.4 (October 2020)
|
||||
|
||||
## New Features
|
||||
* Completely reworked and extended QUIC dissector
|
||||
* Added flow risk concept to move nDPI towards result interpretation
|
||||
* Added ndpi_dpi2json() API call
|
||||
* Added DGA risk for names that look like a DGA
|
||||
* Added HyperLogLog cardinality estimator API calls
|
||||
* Added ndpi_bin_XXX API calls to handle bin handling
|
||||
* Fully fuzzy tested code that has greatly improved reliability and robustness
|
||||
|
||||
## New Supported Protocols and Services
|
||||
* QUIC
|
||||
* SMBv1
|
||||
* WebSocket
|
||||
* TLS: added ESNI support
|
||||
* SOAP
|
||||
* DNScrypt
|
||||
|
||||
## Improvements
|
||||
* Python CFFI bindings
|
||||
* Various TLS extensions and fixes including extendede metadata support
|
||||
* Added various pcap files for testing corner cases in protocols
|
||||
* Various improvements in JSON/Binary data serialization
|
||||
* CiscoVPN
|
||||
* H323
|
||||
* MDNS
|
||||
* MySQL 8
|
||||
* IEC 60870-5-104
|
||||
* DoH/DoT dissection improvements
|
||||
* Office365 renamed to Microsoft365
|
||||
* Major protocol dissection improvement in particular with unknwon traffic
|
||||
* Improvement in Telegram v6 protocol support
|
||||
* HTTP improvements to detect file download/upload and binary files
|
||||
* BitTorrent and WhatsApp dissection improvement
|
||||
* Spotify
|
||||
* Added detection of malformed packets
|
||||
* Fuzzy testing support has been greatly improved
|
||||
* SSH code cleanup
|
||||
|
||||
## Fixes
|
||||
* Fixed various memory leaks and race conditions in protocol decoding
|
||||
* NATS, CAPWAP dissector
|
||||
* Removed HyperScan support that greatly simplified the code
|
||||
* ARM platform fixes on memory alignment
|
||||
* Wireshark extcap support
|
||||
* DPDK support
|
||||
* OpenWRT, OpenBSD support
|
||||
* MINGW compiler support
|
||||
|
||||
## MISC
|
||||
* Created demo app for nDPI newcomers
|
||||
* Removed obsolete pplive and pando protocols
|
||||
|
||||
#### nDPI 3.2 (February 2020)
|
||||
|
||||
## New Features
|
||||
* New API calls
|
||||
* Protocol detection: ndpi_is_protocol_detected
|
||||
* Categories: ndpi_load_categories_file / ndpi_load_category
|
||||
* JSON/TLV serialization: ndpi_serialize_string_boolean / ndpi_serialize_uint32_boolean
|
||||
* Patricia tree: ndpi_load_ipv4_ptree
|
||||
* Module initialization: ndpi_init_detection_module / ndpi_finalize_initalization
|
||||
* Base64 encoding: ndpi_base64_encode
|
||||
* JSON exprot: ndpi_flow2json
|
||||
* Print protocol: ndpi_get_l4_proto_name / ndpi_get_l4_proto_info
|
||||
* Libfuzz integration
|
||||
* Implemented Community ID hash (API call ndpi_flowv6_flow_hash and ndpi_flowv4_flow_hash)
|
||||
* Detection of RCE in HTTP GET requests via PCRE
|
||||
* Integration of the libinjection library to detect SQL injections and XSS type attacks in HTTP requests
|
||||
|
||||
## New Supported Protocols and Services
|
||||
* TLS
|
||||
* Added ALPN support
|
||||
* Added export of supported version in TLS header
|
||||
* Added Telnet dissector with metadata extraction
|
||||
* Added Zabbix dissector
|
||||
* Added POP3/IMAP metadata extraction
|
||||
* Added FTP user/password extraction
|
||||
* Added NetBIOS metadata extraction
|
||||
* Added Kerberos metadata extraction
|
||||
* Implemented SQL Injection and XSS attack detection
|
||||
* Host-based detection improvements and changes
|
||||
* Added Microsoft range
|
||||
* Added twitch.tv website
|
||||
* Added brasilbandalarga.com.br and .eaqbr.com.br as EAQ
|
||||
* Added 20.180.0.0/14, 20.184.0.0/13 range as Skype
|
||||
* Added 52.84.0.0/14 range as Amazon
|
||||
* Added ^pastebin.com
|
||||
* Changed 13.64.0.0/11 range from Skype to Microsoft
|
||||
* Refreshed Whatsapp server list, added *whatsapp-*.fbcdn.net IPs
|
||||
* Added public DNSoverHTTPS servers
|
||||
|
||||
## Improvements
|
||||
* Reworked and improved the TLS dissector
|
||||
* Reworked Kerberos dissector
|
||||
* Improved DNS response decoding
|
||||
* Support for DNS continuous flow dissection
|
||||
* Improved Python bindings
|
||||
* Improved Ethereum support
|
||||
* Improved categories detection with streaming and HTTP
|
||||
* Support for IP-based detection to compute the application protocol
|
||||
* Renamed protocol 104 to IEC60870 (more meaningful)
|
||||
* Added failed authentication support with FTP
|
||||
* Renamed DNSoverHTTPS to handle bot DoH and DoT
|
||||
* Implemented stacked DPI decoding
|
||||
* Improvements for CapWAP and Bloomberg
|
||||
* Improved SMB dissection
|
||||
* Improved SSH dissection
|
||||
* Added capwap support
|
||||
* Modified API signatures for ndpi_ssl_version2str / ndpi_detection_giveup
|
||||
* Removed ndpi_pref_http_dont_dissect_response / ndpi_pref_dns_dont_dissect_response (replaced by ndpi_extra_dissection_possible)
|
||||
|
||||
## Fixes
|
||||
* Fixed memory invalid access in SMTP and leaks in TLS
|
||||
* Fixed a few memory leaks
|
||||
* Fixrd invalid memory access in a few protocol dissectors (HTTP, memcached, Citrix, STUN, DNS, Amazon Video, TLS, Viber)
|
||||
* Fixed IPv6 address format across the various platforms/distributions
|
||||
* Fixed infinite loop in ndpi_workflow_process_packet
|
||||
* Fixed SHA1 certificate detection
|
||||
* Fixed custom protocol detection
|
||||
* Fixed SMTP dissection (including email)
|
||||
* Fixed Telnet dissection and invalid password report
|
||||
* Fixed invalid category matching in HTTP
|
||||
* Fixed Skype and STUN false positives
|
||||
* Fixed SQL Injection detection
|
||||
* Fixed invalid SMBv1 detection
|
||||
* Fixed SSH dissection
|
||||
* Fixed ndpi_ssl_version2str
|
||||
* Fixed ndpi_extra_dissection_possible
|
||||
* Fixed out of bounds read in ndpi_match_custom_category
|
||||
|
||||
## Misc
|
||||
* ndpiReader
|
||||
* CSV output enhancements
|
||||
* Added tunnelling decapsulation
|
||||
* Improved HTTP reporting
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
#### nDPI 3.0 (October 2019)
|
||||
|
||||
## New Features
|
||||
* nDPI now reports the protocol ASAP even when specific fields have not yet been dissected because such packets have not yet been observed. This is important for inline applications that can immediately act on traffic. Applications that need full dissection need to call the new API function ndpi_extra_dissection_possible() to check if metadata dissection has been completely performed or if there is more to read before declaring it completed.
|
||||
* TLS (formerly identified as SSL in nDPI v2.x) is now dissected more deeply, certificate validity is extracted as well certificate SHA-1.
|
||||
* nDPIreader can now export data in CSV format with option `-C`
|
||||
* Implemented Sequence of Packet Length and Time (SPLT) and Byte Distribution (BD) as specified by Cisco Joy (https://github.com/cisco/joy). This allows malware activities on encrypted TLS streams. Read more at https://blogs.cisco.com/security/detecting-encrypted-malware-traffic-without-decryption
|
||||
* Available as library and in `ndpiReader` with option `-J`
|
||||
* Promoted usage of protocol categories rather than protocol identifiers in order to classify protocols. This allows application protocols to be clustered in families and thus better managed by users/developers rather than using hundred of protocols unknown to most of the people.
|
||||
* Added Inter-Arrival Time (IAT) calculation used to detect protocol misbehaviour (e.g. slow-DoS detection)
|
||||
* Added data analysis features for computign metrics such as entropy, average, stddev, variance on a single and consistent place that will prevent when possible. This should ease traffic analysis on monitoring/security applications. New API calls have been implemented such as ndpi_data_XXX() to handle these calculations.
|
||||
* Initial release of Python bindings available under nDPI/python.
|
||||
* Implemented search of human readable strings for promoting data exfiltration detection
|
||||
* Available as library and in `ndpiReader` with option `-e`
|
||||
* Fingerprints
|
||||
* JA3 (https://github.com/salesforce/ja3)
|
||||
* HASSH (https://github.com/salesforce/hassh)
|
||||
* DHCP
|
||||
* Implemented a library to serialize/deserialize data in both Type-Length-Value (TLV) and JSON format
|
||||
* Used by nProbe/ntopng to exchange data via ZMQ
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
* DTLS (i.e. TLS over UDP)
|
||||
* Hulu
|
||||
* TikTok/Musical.ly
|
||||
* WhatsApp Video
|
||||
* DNSoverHTTPS
|
||||
* Datasaver
|
||||
* Line protocol
|
||||
* Google Duo and Hangout merged
|
||||
* WireGuard VPN
|
||||
* IMO
|
||||
* Zoom.us
|
||||
|
||||
## Improvements
|
||||
|
||||
* TLS
|
||||
* Organizations
|
||||
* Ciphers
|
||||
* Certificate analysis
|
||||
* Added PUBLISH/SUBSCRIBE methods to SIP
|
||||
* Implemented STUN cache to enhance matching of STUN-based protocols
|
||||
* Dissection improvements
|
||||
* Viber
|
||||
* WhatsApp
|
||||
* AmazonVideo
|
||||
* SnapChat
|
||||
* FTP
|
||||
* QUIC
|
||||
* OpenVPN support for UDP-based VPNs
|
||||
* Facebook Messenger mobile
|
||||
* Various improvements for STUN, Hangout and Duo
|
||||
* Added new categories: CUSTOM_CATEGORY_ANTIMALWARE, NDPI_PROTOCOL_CATEGORY_MUSIC, NDPI_PROTOCOL_CATEGORY_VIDEO, NDPI_PROTOCOL_CATEGORY_SHOPPING, NDPI_PROTOCOL_CATEGORY_PRODUCTIVITY and NDPI_PROTOCOL_CATEGORY_FILE_SHARING
|
||||
* Added NDPI_PROTOCOL_DANGEROUS classification
|
||||
|
||||
## Fixes
|
||||
|
||||
* Fixed the dissection of certain invalid DNS responses
|
||||
* Fixed Spotify dissection
|
||||
* Fixed false positives with FTP and FTP_DATA
|
||||
* Fix to discard STUN over TCP flows
|
||||
* Fixed MySQL dissector
|
||||
* Fix category detection due to missing initialization
|
||||
* Fix DNS rsp_addr missing in some tiny responses
|
||||
* Various hardening fixes
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
#### nDPI 2.8 (March 2019)
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
* Added Modbus over TCP dissector
|
||||
|
||||
## Improvements
|
||||
|
||||
* Wireshark Lua plugin compatibility with Wireshark 3
|
||||
* Improved MDNS dissection
|
||||
* Improved HTTP response code handling
|
||||
* Full dissection of HTTP responses
|
||||
|
||||
## Fixes
|
||||
|
||||
* Fixed false positive mining detection
|
||||
* Fixed invalid TCP DNS dissection
|
||||
* Releasing buffers upon `realloc` failures
|
||||
* ndpiReader: Prevents references after free
|
||||
* Endianness fixes
|
||||
* Fixed IPv6 HTTP traffic dissection
|
||||
* Fixed H.323 detection
|
||||
|
||||
## Other
|
||||
|
||||
* Disabled ookla statistics which need to be improved
|
||||
* Support for custom protocol files of arbitrary length
|
||||
* Update radius.c to RFC2865
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
#### nDPI 2.6 (December 2018)
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
* New Bitcoin, Ethereum, ZCash, Monero dissectors all identified as Mining
|
||||
* New Signal.org dissector
|
||||
* New Nest Log Sink dissector
|
||||
* New UPnP dissector
|
||||
* Added support for SMBv1 traffic, split from SMBv23
|
||||
|
||||
## Improvements
|
||||
|
||||
* Improved Skype detection, merged Skype call in/out into Skype Call
|
||||
* Improved heuristics for Skype, Teredo, Netbios
|
||||
* Improved SpeedTest (Ookla) detection
|
||||
* Improved WhatsApp detection
|
||||
* Improved WeChat detection
|
||||
* Improved Facebook Messenger detection
|
||||
* Improved Messenger/Hangout detection
|
||||
* Improved SSL detection, prevent false positives
|
||||
* Improved guess for UDP protocols
|
||||
* Improved STUN detection
|
||||
* Added more Ubuntu servers
|
||||
* Added missing categorization with giveup/guess
|
||||
* Optimizations for TCP flows that do not start with a SYN packet (early giveup)
|
||||
|
||||
## Fixes
|
||||
|
||||
* Fixed eDonkey false positives
|
||||
* Fixed Dropbox dissector
|
||||
* Fixed Spotify dissector
|
||||
* Fixed custom protocol loading
|
||||
* Fixed missing Application Data packet for TLS
|
||||
* Fixed buffer overflows
|
||||
* Fixed custom categories match by IP
|
||||
* Fixed category field not accounted in ndpi_get_proto_category
|
||||
* Fixed null pointer dereference in ndpi_detection_process_packet
|
||||
* Fixed compilation on Mac
|
||||
|
||||
## Other
|
||||
|
||||
* Deb and RPM packages: ndpi with shared libraries and binaries, ndpi-dev with headers and static libraries
|
||||
* Protocols now have an optional subprotocol: Spotify cannot have subprotocols, DNS can (DNS.Spotify)
|
||||
* New API functions:
|
||||
* ndpi_fill_ip_protocol_category to handle ICMP flows category
|
||||
* ndpi_flowv4_flow_hash and ndpi_flowv6_flow_hash to support the Community ID Flow Hashing (https://github.com/corelight/community-id-spec)
|
||||
* ndpi_protocol2id to print the protocol as ID
|
||||
* ndpi_get_custom_category_match to search host in custom categories
|
||||
* Changed ndpi_detection_giveup API: guess is now part of the call
|
||||
* Added DPDK support to ndpiReader
|
||||
* Removed Musical.ly protocol (service no longer used)
|
||||
* Custom categories have now priority over protocol related categories
|
||||
* Improved clang support
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
#### nDPI 2.4 (August 2018)
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
* Showmax.com
|
||||
* Musical.ly
|
||||
* RapidVideo
|
||||
* VidTO streaming service
|
||||
* Apache JServ Protocol
|
||||
* Facebook Messenger
|
||||
* FacebookZero protocol
|
||||
|
||||
## Improvements
|
||||
|
||||
* Improved YouTube support
|
||||
* Improved Netflix support
|
||||
* Updated Google Hangout detection
|
||||
* Updated Twitter address range
|
||||
* Updated Viber ports, subnet and domain
|
||||
* Updated AmazonVideo detection
|
||||
* Updated list of FaceBook sites
|
||||
* Initial Skype in/out support
|
||||
* Improved Tor detection
|
||||
* Improved hyperscan support and category definition
|
||||
* Custom categories loading, extended ndpiReader (`-c <file>`) for loading name-based categories
|
||||
|
||||
## Fixes
|
||||
|
||||
* Fixes for Instagram flows classified as Facebook
|
||||
* Fixed Spotify detection
|
||||
* Fixed minimum packet payload length for SSDP
|
||||
* Fixed length check in MSN, x-steam-sid, Tor certificate name
|
||||
* Increase client's maximum payload length for SSH
|
||||
* Fixed end-of-line bounds handling
|
||||
* Fixed substring matching
|
||||
* Fix for handling IP address based custom categories
|
||||
* Repaired wrong timestamp calculation
|
||||
* Fixed memory leak
|
||||
* Optimized memory usage
|
||||
|
||||
## Other/Changes
|
||||
|
||||
* New API calls:
|
||||
* `ndpi_set_detection_preferences()`
|
||||
* `ndpi_load_hostname_category()`
|
||||
* `ndpi_enable_loaded_categories()`
|
||||
* `ndpi_fill_protocol_category()`
|
||||
* `ndpi_process_extra_packet()`
|
||||
* Skype CallIn/CallOut are now set as Skype.SkypeCallOut Skype.SkypeCallIn
|
||||
* Added support for SMTPS on port 587
|
||||
* Changed RTP from VoIP to Media category
|
||||
* Added site unavailable category
|
||||
* Added custom categories CUSTOM_CATEGORY_MINING, CUSTOM_CATEGORY_MALWARE, CUSTOM_CATEGORY_ADVERTISEMENT, CUSTOM_CATEGORY_BANNED_SITE
|
||||
* Implemented hash-based categories
|
||||
* Converted some not popular protocols to NDPI_PROTOCOL_GENERIC with category detection
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
#### nDPI 2.2.2 (April 2018)
|
||||
|
||||
## Main New Features
|
||||
@@ -95,7 +449,7 @@
|
||||
* Ubiquity AirControl 2
|
||||
* HEP (Extensible Encapsulation Protocol)
|
||||
* WhatsApp Voice vs WhatsApp (chat, no voice)
|
||||
* Viber
|
||||
* Viber
|
||||
* Wechat
|
||||
* Github
|
||||
* Hotmail
|
||||
@@ -124,7 +478,7 @@
|
||||
* Improved HTTP subprotocol matching
|
||||
* Implemented DHCP host name extraction
|
||||
* Updated Facebook detection by ip server ranges
|
||||
* Updated Twitter networks
|
||||
* Updated Twitter networks
|
||||
* Improved Microsoft detection
|
||||
* Enhanced Google detection
|
||||
* Improved BT-uTP protocol dissection
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
# How to contribute
|
||||
|
||||
Please keep all code, comments, issues and pull requests in English, otherwise they will be **removed**.
|
||||
|
||||
## Found a bug?
|
||||
|
||||
- First, check there are no already open issues for the bug. See [here](https://github.com/ntop/nDPI/issues).
|
||||
- If there is not open issue addressing the bug, [open a new one](https://github.com/ntop/nDPI/issues/new).
|
||||
- Make sure to include a **descriptive and clear title and description**, including the **version of nDPI** being used.
|
||||
- Try to include steps to reproduce the bug.
|
||||
- If applicable, try to provide a stacktrace.
|
||||
- Providing a simple test case which shows the bug would help resolve the issue faster.
|
||||
|
||||
## Written a new protocol dissector?
|
||||
|
||||
- Ensure you have followed the guide in the [README](https://github.com/ntop/nDPI#how-to-add-a-new-protocol-dissector).
|
||||
- Open a new pull request with a **clear, descriptive** title.
|
||||
- Ensure the pull request passes CI testing. Any pull request which fails CI will be **ignored**.
|
||||
- If possible, add a new test for the new protocol. See [existing tests](https://github.com/ntop/nDPI/tree/dev/tests) for examples.
|
||||
|
||||
## Written a fix for a bug?
|
||||
|
||||
- Open a new pull request with a **clear, descriptive** title.
|
||||
- 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**.
|
||||
|
||||
Finally, thank you for your contributions.
|
||||
+8
-2
@@ -1,8 +1,14 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
SUBDIRS = src/lib @EXTRA_TARGETS@
|
||||
|
||||
SUBDIRS = src/lib example tests
|
||||
if BUILD_FUZZTARGETS
|
||||
SUBDIRS += fuzz
|
||||
endif
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libndpi.pc
|
||||
|
||||
EXTRA_DIST = libndpi.sym autogen.sh
|
||||
EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md README.protocols autogen.sh configure.seed wireshark python windows utils packages doc/nDPI_QuickStartGuide.pages doc/nDPI_QuickStartGuide.pdf example/MacOS example/Win32
|
||||
|
||||
changelog:
|
||||
git log --since={`curl -s https://github.com/ntop/ndpi/releases | grep datetime | head -n1 | egrep -o "[0-9]+\-[0-9]+\-[0-9]+"`} --name-only --pretty=format:" - %s" | grep "^ " > Changelog.latest
|
||||
|
||||
@@ -2,10 +2,13 @@
|
||||
# nDPI
|
||||
|
||||
[](https://travis-ci.org/ntop/nDPI)
|
||||
[](https://lgtm.com/projects/g/ntop/nDPI/context:cpp)
|
||||
[](https://lgtm.com/projects/g/ntop/nDPI/alerts)
|
||||
[](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:ndpi)
|
||||
|
||||
## What is nDPI ?
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
### How To Compile nDPI
|
||||
|
||||
@@ -34,28 +37,20 @@ The entire procedure of adding new protocols in detail:
|
||||
5. Choose (do not change anything) a selection bitmask from: src/include/ndpi_define.h
|
||||
6. Add a new entry in ndpi_set_protocol_detection_bitmask2 in: src/lib/ndpi_main.c
|
||||
7. Set protocol default ports in ndpi_init_protocol_defaults in: src/lib/ndpi_main.c
|
||||
8. Add the new protocol file to: src/lib/Makefile.am
|
||||
9. ./autogen.sh
|
||||
10. ./configure
|
||||
11. make
|
||||
12. make check
|
||||
8. ./autogen.sh
|
||||
9. make
|
||||
10. make check
|
||||
|
||||
### How to use nDPI to Block Selected Traffic
|
||||
You can use nDPI to selectively block selected Internet traffic by embedding it onto an application (remember that nDPI is just a library). Both [ntopng](https://github.com/ntop/ntopng) and [nProbe cento](http://www.ntop.org/products/netflow/nprobe-cento/) can do this.
|
||||
|
||||
You can use nDPI to selectively block selected Internet traffic by embedding it onto an application (remember that nDPI us just a library). Both [ntopng](https://github.com/ntop/ntopng) and [nProbe cento](http://www.ntop.org/products/netflow/nprobe-cento/) can do this.
|
||||
### nDPI-Related Projects
|
||||
- [nfstream](https://github.com/aouinizied/nfstream)
|
||||
|
||||
### DISCLAIMER
|
||||
While we do our best to detect network protocols, we cannot guarantee that our software is error free and 100% accurate in protocol detection. Please make sure that you respect the privacy of users and you have proper authorization to listen, capture and inspect network traffic.
|
||||
|
||||
### Creating A Source File Tar Ball
|
||||
|
||||
If you want to distribute a source tar file of nDPI do:
|
||||
|
||||
- make dist
|
||||
|
||||
To ensure that a tar file includes all necessary files and to run tests on distribution do:
|
||||
|
||||
- make distcheck
|
||||
nDPI is a registered trademark in the US and EU.
|
||||
|
||||
[ntopng_logo]: https://camo.githubusercontent.com/0f789abcef232035c05e0d2e82afa3cc3be46485/687474703a2f2f7777772e6e746f702e6f72672f77702d636f6e74656e742f75706c6f6164732f323031312f30382f6e746f706e672d69636f6e2d313530783135302e706e67
|
||||
|
||||
|
||||
+5
-4
@@ -5,17 +5,18 @@ Prerequisites
|
||||
- GNU autotools/libtool
|
||||
- libpcap or PF_RING (optional but recommended)
|
||||
- apt-get install libjson-c-dev (for JSON support)
|
||||
- libgcrypt20-dev (for QUIC support)
|
||||
|
||||
On Ubuntu/Debian
|
||||
- apt-get install build-essential
|
||||
- apt-get install git autoconf automake autogen libpcap-dev libtool
|
||||
- apt-get install git autoconf automake autogen libpcap-dev libtool libgcrypt20-dev
|
||||
|
||||
On Fedora/CentOS
|
||||
- yum groupinstall "Development tools"
|
||||
- yum install git autoconf automake autogen libpcap-devel libtool
|
||||
- yum install git autoconf automake autogen libpcap-devel libtool libgcrypt-devel
|
||||
|
||||
On MacOSX (using http://brew.sh)
|
||||
brew install autoconf automake libtool git
|
||||
brew install autoconf automake libtool git libgcrypt
|
||||
|
||||
On FreeBSD
|
||||
- pkg install autoconf automake libtool gmake git
|
||||
- pkg install autoconf automake libtool gmake git libgcrypt
|
||||
|
||||
+19
-5
@@ -1,21 +1,28 @@
|
||||
#!/bin/sh
|
||||
|
||||
NDPI_MAJOR="2"
|
||||
NDPI_MINOR="2"
|
||||
NDPI_PATCH="2"
|
||||
NDPI_MAJOR="3"
|
||||
NDPI_MINOR="4"
|
||||
NDPI_PATCH="0"
|
||||
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
||||
|
||||
rm -f configure config.h config.h.in src/lib/Makefile.in
|
||||
rm -f configure config.h config.h.in
|
||||
|
||||
AUTOCONF=$(command -v autoconf)
|
||||
AUTOMAKE=$(command -v automake)
|
||||
LIBTOOL=$(command -v libtool)
|
||||
LIBTOOLIZE=$(command -v libtoolize)
|
||||
AUTORECONF=$(command -v autoreconf)
|
||||
PKG_CONFIG=$(command -v pkg-config)
|
||||
FUZZY=
|
||||
|
||||
if test -z $AUTOCONF; then
|
||||
echo "autoconf is missing: please install it and try again"
|
||||
exit
|
||||
else
|
||||
V=`autoconf --version | head -1 | cut -d ' ' -f 4`
|
||||
if [ "$V" = '2.63' ]; then
|
||||
FUZZY="dnl> "
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -z $AUTOMAKE; then
|
||||
@@ -33,11 +40,17 @@ if test -z $AUTORECONF; then
|
||||
exit
|
||||
fi
|
||||
|
||||
if test -z $PKG_CONFIG; then
|
||||
echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again"
|
||||
exit
|
||||
fi
|
||||
|
||||
cat configure.seed | sed \
|
||||
-e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \
|
||||
-e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \
|
||||
-e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \
|
||||
-e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
|
||||
-e "s/@FUZZY@/$FUZZY/g" \
|
||||
> configure.ac
|
||||
|
||||
autoreconf -ivf
|
||||
@@ -45,4 +58,5 @@ cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define
|
||||
cat configure.tmp > configure
|
||||
|
||||
chmod +x configure
|
||||
./configure $*
|
||||
./configure $@
|
||||
|
||||
|
||||
+149
-67
@@ -1,15 +1,43 @@
|
||||
AC_INIT([libndpi], [@NDPI_VERSION_SHORT@])
|
||||
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
AM_INIT_AUTOMAKE([foreign subdir-objects])
|
||||
|
||||
EXTRA_TARGETS="example tests tests/unit"
|
||||
AC_ARG_WITH(only-libndpi, AS_HELP_STRING([--with-only-libndpi], [Build only libndpi (no examples, tests etc)]))
|
||||
AS_IF([test "${with_only_libndpi+set}" = set],[
|
||||
EXTRA_TARGETS=""
|
||||
])
|
||||
|
||||
AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer]))
|
||||
AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no])
|
||||
AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"])
|
||||
|
||||
AS_IF([test "${with_sanitizer+set}" = set],[
|
||||
CFLAGS="${CFLAGS} -g3 -O0 -Wno-unused-value -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer"
|
||||
LDFLAGS="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak"
|
||||
])
|
||||
|
||||
LT_INIT
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
SYSTEM=`uname -s`
|
||||
if test $SYSTEM = "Darwin"; then
|
||||
dnl> AC_PROG_CC(clang gcc)
|
||||
AM_PROG_CC_C_O(clang gcc)
|
||||
AC_PROG_CXX(clang++ g++)
|
||||
AC_PROG_CC_STDC(clang gcc)
|
||||
else
|
||||
dnl> AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CC_STDC
|
||||
fi
|
||||
AC_LANG_WERROR
|
||||
AX_PTHREAD
|
||||
|
||||
NDPI_VERSION_SHORT="@NDPI_VERSION_SHORT@"
|
||||
NDPI_MAJOR="@NDPI_MAJOR@"
|
||||
NDPI_MINOR="@NDPI_MINOR@"
|
||||
NDPI_PATCH="@NDPI_PATCH@"
|
||||
@@ -18,30 +46,52 @@ AC_DEFINE_UNQUOTED(NDPI_MAJOR_RELEASE, "${NDPI_MAJOR}", [nDPI major release])
|
||||
AC_DEFINE_UNQUOTED(NDPI_MINOR_RELEASE, "${NDPI_MINOR}", [nDPI minor release])
|
||||
AC_DEFINE_UNQUOTED(NDPI_PATCH_LEVEL, "${NDPI_PATCH}", [nDPI patch level])
|
||||
|
||||
if test -d ".git"; then :
|
||||
# .git as directory in a cloned repo
|
||||
# .git as file in submodule based integration
|
||||
if test -d ".git" || test -f ".git" ; then :
|
||||
GIT_TAG=`git log -1 --format=%h`
|
||||
GIT_DATE=`git log -1 --format=%cd`
|
||||
#
|
||||
# On CentOS 6 `git rev-list HEAD --count` does not work
|
||||
#
|
||||
#
|
||||
#
|
||||
GIT_NUM=`git log --pretty=oneline | wc -l | tr -d '[[:space:]]'`
|
||||
GIT_RELEASE="${PACKAGE_VERSION}-${GIT_NUM}-${GIT_TAG}"
|
||||
|
||||
A=`git log src/include/ndpi_typedefs.h|wc -l`
|
||||
B=`git log src/include/ndpi_protocol_ids.h|wc -l`
|
||||
C=`git log src/include/ndpi_api.h.in|wc -l`
|
||||
NDPI_API_VERSION=$((A+B+C))
|
||||
else
|
||||
GIT_RELEASE="${PACKAGE_VERSION}"
|
||||
GIT_DATE=`date`
|
||||
GIT_DATE=`date -u -r CHANGELOG.md`
|
||||
NDPI_API_VERSION=`date +%s | cut -c7-10`
|
||||
fi
|
||||
|
||||
NDPI_API_VERSION=`echo $NDPI_API_VERSION | sed 's/^0*//'`
|
||||
|
||||
AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT Release])
|
||||
AC_DEFINE_UNQUOTED(NDPI_GIT_DATE, "${GIT_DATE}", [Last GIT change])
|
||||
|
||||
AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h])
|
||||
dnl> used by json-c
|
||||
JSONC_INC=`pkg-config --cflags json-c`
|
||||
CFLAGS="${CFLAGS} ${JSONC_INC}"
|
||||
|
||||
AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h json.h])
|
||||
|
||||
ADDITIONAL_LIBS=
|
||||
PCAP_HOME=$HOME/PF_RING/userland
|
||||
|
||||
if test -d $PCAP_HOME; then :
|
||||
echo -n ""
|
||||
DPDK_TARGET=
|
||||
AC_MSG_CHECKING([DPDK (used by ndpiReader)])
|
||||
if test -d $HOME/DPDK; then :
|
||||
AC_MSG_RESULT(yes)
|
||||
DPDK_TARGET=dpdk
|
||||
else
|
||||
AC_MSG_RESULT([no (missing $HOME/DPDK)])
|
||||
fi
|
||||
|
||||
if ! test -d $PCAP_HOME; then :
|
||||
PCAP_HOME=`pwd`/../../PF_RING/userland
|
||||
fi
|
||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||
@@ -51,83 +101,115 @@ else
|
||||
AC_CHECK_LIB([numa], [numa_available], [LIBNUMA="-lnuma"])
|
||||
fi
|
||||
|
||||
MACHINE=`uname -m`
|
||||
|
||||
HS_LIB=
|
||||
HS_INC=
|
||||
AC_ARG_WITH(hyperscan, [ --with-hyperscan Enable Intel Hyperscan (if available)])
|
||||
CUSTOM_NDPI=
|
||||
|
||||
if test "${with_hyperscan}" == "yes"; then :
|
||||
AC_CHECK_LIB([hs], [hs_compile_multi], AC_DEFINE_UNQUOTED(HAVE_HYPERSCAN, 1, [Intel Hyperscan is present]))
|
||||
HS_INC=`pkg-config --cflags libhs`
|
||||
HS_LIB=`pkg-config --libs libhs`
|
||||
if test -d ../nDPI-custom; then :
|
||||
CUSTOM_NDPI="-DCUSTOM_NDPI_PROTOCOLS"
|
||||
AC_MSG_RESULT([Compiling with custom nDPI protocols])
|
||||
fi
|
||||
|
||||
if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
||||
echo "Using libpcap from $PCAP_HOME"
|
||||
PCAP_INC="-I $PCAP_HOME/libpcap"
|
||||
PCAP_LIB="$PCAP_HOME/libpcap/libpcap.a $PCAP_HOME/lib/libpfring.a $LIBNUMA `$PCAP_HOME/lib/pfring_config --libs`"
|
||||
|
||||
AC_CHECK_LIB([rt], [clock_gettime], [PCAP_LIB="$PCAP_LIB -lrt"])
|
||||
AC_CHECK_LIB([nl], [nl_handle_alloc], [PCAP_LIB="$PCAP_LIB -lnl"])
|
||||
# The dlopen() function is in libdl on GLIBC-based systems
|
||||
# and in the C library for *BSD systems
|
||||
AC_CHECK_LIB([dl], [dlopen, dlsym], [DL_LIB="-ldl"],
|
||||
[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],
|
||||
[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ])
|
||||
else
|
||||
AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"])
|
||||
|
||||
if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
|
||||
echo ""
|
||||
echo "ERROR: Missing libpcap(-dev) library required to compile the example application"
|
||||
echo "ERROR: Please install it and try again"
|
||||
exit
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl> https://github.com/json-c/json-c
|
||||
AC_ARG_ENABLE([json-c],
|
||||
AS_HELP_STRING([--disable-json-c], [Disable json-c support]))
|
||||
|
||||
AS_IF([test "x$enable_json_c" != "xno"], [
|
||||
PKG_CONFIG_PATH=/usr/local/share/pkgconfig:$PKG_CONFIG_PATH
|
||||
pkg-config --exists json-c
|
||||
AS_IF([test "$?" == "0"],
|
||||
[
|
||||
CFLAGS="$CFLAGS $(pkg-config --cflags json-c)"
|
||||
LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)"
|
||||
AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present]))
|
||||
],
|
||||
[
|
||||
JSONC_HOME="$HOME/json-c"
|
||||
if test -d "$JSONC_HOME"; then :
|
||||
CFLAGS="$CFLAGS -I $JSONC_HOME"
|
||||
LDFLAGS="$LDFLAGS $JSONC_HOME/.libs/libjson-c.a"
|
||||
AC_MSG_RESULT([Found json-c in $JSONC_HOME])
|
||||
AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present])
|
||||
fi
|
||||
])
|
||||
])
|
||||
case "$host" in
|
||||
*-*-mingw32*|*-*-msys)
|
||||
CFLAGS="${CFLAGS} -DOS_WIN32"
|
||||
LDFLAGS="${LDFLAGS} -lws2_32 -lucrtbase"
|
||||
BUILD_MINGW=1
|
||||
;;
|
||||
*)
|
||||
if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
||||
echo "Using libpcap from $PCAP_HOME"
|
||||
PCAP_INC="-I $PCAP_HOME/libpcap"
|
||||
PCAP_LIB="$PCAP_HOME/libpcap/libpcap.a $PCAP_HOME/lib/libpfring.a $LIBNUMA `$PCAP_HOME/lib/pfring_config --libs`"
|
||||
AC_CHECK_LIB([rt], [clock_gettime], [PCAP_LIB="$PCAP_LIB -lrt"])
|
||||
AC_CHECK_LIB([nl], [nl_handle_alloc], [PCAP_LIB="$PCAP_LIB -lnl"])
|
||||
# The dlopen() function is in libdl on GLIBC-based systems
|
||||
# and in the C library for *BSD systems
|
||||
AC_CHECK_LIB([dl], [dlopen, dlsym], [DL_LIB="-ldl"],[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ])
|
||||
else
|
||||
AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"])
|
||||
if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
|
||||
echo ""
|
||||
echo "ERROR: Missing libpcap(-dev) library required to compile the example application"
|
||||
echo "ERROR: Please install it and try again"
|
||||
exit
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_ARG_ENABLE([debug-messages],
|
||||
AS_HELP_STRING([--enable-debug-messages], [Define NDPI_ENABLE_DEBUG_MESSAGES=1]), [
|
||||
AC_DEFINE(NDPI_ENABLE_DEBUG_MESSAGES, 1, [Enable ndpi_debug_messages]) ])
|
||||
|
||||
@FUZZY@ AS_IF([test "x$enable_fuzztargets" = "xyes"], [
|
||||
@FUZZY@ AC_PROG_CXX
|
||||
@FUZZY@ AC_LANG_PUSH(C++)
|
||||
@FUZZY@ tmp_saved_flags=$[]_AC_LANG_PREFIX[]FLAGS
|
||||
@FUZZY@ AX_CHECK_COMPILE_FLAG([-fsanitize=fuzzer],,
|
||||
@FUZZY@ [AC_MSG_ERROR([--enable-fuzztargets requires -fsanitize=fuzzer which is only supported by LLVM])],
|
||||
@FUZZY@ [-Werror])
|
||||
@FUZZY@ AS_IF([test "x$LIB_FUZZING_ENGINE" = "x"], [
|
||||
@FUZZY@ LIB_FUZZING_ENGINE=-fsanitize=fuzzer
|
||||
@FUZZY@ AC_SUBST(LIB_FUZZING_ENGINE)
|
||||
@FUZZY@ ])
|
||||
@FUZZY@ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $LIB_FUZZING_ENGINE"
|
||||
@FUZZY@ AC_MSG_CHECKING([whether $CXX accepts $LIB_FUZZING_ENGINE])
|
||||
@FUZZY@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||
@FUZZY@ #include <sys/types.h>
|
||||
@FUZZY@ extern "C" int LLVMFuzzerTestOneInput(const unsigned char *Data, size_t Size);
|
||||
@FUZZY@ extern "C" int LLVMFuzzerTestOneInput(const unsigned char *Data, size_t Size) {
|
||||
@FUZZY@ (void)Data;
|
||||
@FUZZY@ (void)Size;
|
||||
@FUZZY@ return 0;
|
||||
@FUZZY@ }
|
||||
@FUZZY@ ]])],
|
||||
@FUZZY@ [ AC_MSG_RESULT(yes)
|
||||
@FUZZY@ has_sanitizefuzzer=yes],
|
||||
@FUZZY@ [ AC_MSG_RESULT(no) ]
|
||||
@FUZZY@ )
|
||||
@FUZZY@ _AC_LANG_PREFIX[]FLAGS=$tmp_saved_flags
|
||||
@FUZZY@ AC_LANG_POP()
|
||||
@FUZZY@ ])
|
||||
AM_CONDITIONAL([HAS_FUZZLDFLAGS], [test "x$has_sanitizefuzzer" = "xyes"])
|
||||
|
||||
AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np]))
|
||||
|
||||
AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h])
|
||||
dnl> GCRYPT
|
||||
AC_ARG_ENABLE([gcrypt],
|
||||
[AS_HELP_STRING([--disable-gcrypt], [Avoid compiling with libgcrypt/libgpg-error, even if they are present. QUIC sub-classification may be missing])],
|
||||
[:],
|
||||
[AC_CHECK_LIB(gcrypt, gcry_cipher_checktag)
|
||||
AC_CHECK_LIB(gpg-error, gpg_strerror_r)])
|
||||
if test "x$ac_cv_lib_gcrypt_gcry_cipher_checktag" = xyes; then :
|
||||
ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lgcrypt"
|
||||
fi
|
||||
|
||||
dnl> PCRE
|
||||
AC_ARG_WITH(pcre, [ --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"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
AC_CONFIG_FILES([Makefile example/Makefile example/Makefile.dpdk tests/Makefile tests/unit/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile python/Makefile fuzz/Makefile src/include/ndpi_api.h])
|
||||
AC_CONFIG_HEADERS(src/include/ndpi_config.h)
|
||||
AC_SUBST(GIT_RELEASE)
|
||||
AC_SUBST(NDPI_MAJOR)
|
||||
AC_SUBST(NDPI_MINOR)
|
||||
AC_SUBST(NDPI_PATCH)
|
||||
AC_SUBST(SVN_DATE)
|
||||
AC_SUBST(JSON_C_LIB)
|
||||
AC_SUBST(NDPI_VERSION_SHORT)
|
||||
AC_SUBST(PCAP_INC)
|
||||
AC_SUBST(PCAP_LIB)
|
||||
AC_SUBST(ADDITIONAL_LIBS)
|
||||
AC_SUBST(DL_LIB)
|
||||
AC_SUBST(HS_LIB)
|
||||
AC_SUBST(HS_INC)
|
||||
AC_SUBST(DPDK_TARGET)
|
||||
AC_SUBST(HAVE_PTHREAD_SETAFFINITY_NP)
|
||||
|
||||
AC_SUBST(CUSTOM_NDPI)
|
||||
AC_SUBST(NDPI_API_VERSION)
|
||||
AC_SUBST(EXTRA_TARGETS)
|
||||
AC_SUBST(BUILD_MINGW)
|
||||
AC_OUTPUT
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -7,17 +7,27 @@
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
E32F1ECB20844620005739B7 /* whatsapp.c in Sources */ = {isa = PBXBuildFile; fileRef = E32F1ECA20844620005739B7 /* whatsapp.c */; };
|
||||
E35D5510228BA70600A80DED /* ajp.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D5506228BA70400A80DED /* ajp.c */; };
|
||||
E35D5511228BA70600A80DED /* snmp_proto.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D5507228BA70400A80DED /* snmp_proto.c */; };
|
||||
E35D5512228BA70600A80DED /* modbus.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D5508228BA70400A80DED /* modbus.c */; };
|
||||
E35D5513228BA70600A80DED /* ookla.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D5509228BA70400A80DED /* ookla.c */; };
|
||||
E35D5514228BA70600A80DED /* upnp.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D550A228BA70400A80DED /* upnp.c */; };
|
||||
E35D5515228BA70600A80DED /* memcached.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D550B228BA70500A80DED /* memcached.c */; };
|
||||
E35D5516228BA70600A80DED /* mdns_proto.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D550C228BA70500A80DED /* mdns_proto.c */; };
|
||||
E35D5517228BA70600A80DED /* fbzero.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D550D228BA70500A80DED /* fbzero.c */; };
|
||||
E35D5518228BA70600A80DED /* nest_log_sink.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D550E228BA70500A80DED /* nest_log_sink.c */; };
|
||||
E35D5519228BA70600A80DED /* mining.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D550F228BA70600A80DED /* mining.c */; };
|
||||
E35D551D228BA80000A80DED /* sha1-fast.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D551B228BA80000A80DED /* sha1-fast.c */; };
|
||||
E35D551E228BA80000A80DED /* ht_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = E35D551C228BA80000A80DED /* ht_hash.c */; };
|
||||
E35D551F228BA88700A80DED /* ndpi_patricia.c in Sources */ = {isa = PBXBuildFile; fileRef = E395430820255354000BBA0D /* ndpi_patricia.c */; };
|
||||
E3953F5420254989000BBA0D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E3953F5320254989000BBA0D /* AppDelegate.m */; };
|
||||
E3953F5720254989000BBA0D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3953F5620254989000BBA0D /* ViewController.m */; };
|
||||
E3953F5920254989000BBA0D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E3953F5820254989000BBA0D /* Assets.xcassets */; };
|
||||
E3953F5C2025498A000BBA0D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E3953F5A2025498A000BBA0D /* Main.storyboard */; };
|
||||
E3953F5F2025498A000BBA0D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E3953F5E2025498A000BBA0D /* main.m */; };
|
||||
E395430B20255354000BBA0D /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = E39540A520255353000BBA0D /* Makefile.am */; };
|
||||
E395430C20255354000BBA0D /* ndpi_define.h.in in Resources */ = {isa = PBXBuildFile; fileRef = E39540A720255353000BBA0D /* ndpi_define.h.in */; };
|
||||
E395431720255354000BBA0D /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = E39540BC20255353000BBA0D /* Makefile */; };
|
||||
E395431820255354000BBA0D /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = E39540BD20255353000BBA0D /* Makefile.am */; };
|
||||
E395431920255354000BBA0D /* Makefile.in in Resources */ = {isa = PBXBuildFile; fileRef = E39540BE20255353000BBA0D /* Makefile.in */; };
|
||||
E395431A20255354000BBA0D /* Makefile.simple in Resources */ = {isa = PBXBuildFile; fileRef = E39540BF20255353000BBA0D /* Makefile.simple */; };
|
||||
E395431B20255354000BBA0D /* ndpi_content_match.c.inc in Sources */ = {isa = PBXBuildFile; fileRef = E39540C020255353000BBA0D /* ndpi_content_match.c.inc */; };
|
||||
E395431C20255354000BBA0D /* ndpi_main.c in Sources */ = {isa = PBXBuildFile; fileRef = E39540C120255353000BBA0D /* ndpi_main.c */; };
|
||||
E39543A320255354000BBA0D /* afp.c in Sources */ = {isa = PBXBuildFile; fileRef = E395414B20255353000BBA0D /* afp.c */; };
|
||||
@@ -59,7 +69,6 @@
|
||||
E39543C720255354000BBA0D /* edonkey.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417120255353000BBA0D /* edonkey.c */; };
|
||||
E39543C820255354000BBA0D /* fasttrack.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417220255353000BBA0D /* fasttrack.c */; };
|
||||
E39543C920255354000BBA0D /* fiesta.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417320255353000BBA0D /* fiesta.c */; };
|
||||
E39543CA20255354000BBA0D /* filetopia.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417420255353000BBA0D /* filetopia.c */; };
|
||||
E39543CB20255354000BBA0D /* fix.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417520255353000BBA0D /* fix.c */; };
|
||||
E39543CC20255354000BBA0D /* florensia.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417620255353000BBA0D /* florensia.c */; };
|
||||
E39543CD20255354000BBA0D /* ftp_control.c in Sources */ = {isa = PBXBuildFile; fileRef = E395417720255353000BBA0D /* ftp_control.c */; };
|
||||
@@ -89,10 +98,8 @@
|
||||
E39544ED20255354000BBA0D /* mail_pop.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429720255354000BBA0D /* mail_pop.c */; };
|
||||
E39544EE20255354000BBA0D /* mail_smtp.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429820255354000BBA0D /* mail_smtp.c */; };
|
||||
E39544EF20255354000BBA0D /* maplestory.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429920255354000BBA0D /* maplestory.c */; };
|
||||
E39544F020255354000BBA0D /* mdns.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429A20255354000BBA0D /* mdns.c */; };
|
||||
E39544F120255354000BBA0D /* megaco.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429B20255354000BBA0D /* megaco.c */; };
|
||||
E39544F220255354000BBA0D /* mgcp.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429C20255354000BBA0D /* mgcp.c */; };
|
||||
E39544F320255354000BBA0D /* mms.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429D20255354000BBA0D /* mms.c */; };
|
||||
E39544F420255354000BBA0D /* mpegts.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429E20255354000BBA0D /* mpegts.c */; };
|
||||
E39544F520255354000BBA0D /* mqtt.c in Sources */ = {isa = PBXBuildFile; fileRef = E395429F20255354000BBA0D /* mqtt.c */; };
|
||||
E39544F620255354000BBA0D /* msn.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542A020255354000BBA0D /* msn.c */; };
|
||||
@@ -133,9 +140,7 @@
|
||||
E395451920255354000BBA0D /* skype.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C320255354000BBA0D /* skype.c */; };
|
||||
E395451A20255354000BBA0D /* smb.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C420255354000BBA0D /* smb.c */; };
|
||||
E395451B20255354000BBA0D /* smpp.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C520255354000BBA0D /* smpp.c */; };
|
||||
E395451C20255354000BBA0D /* snmp.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C620255354000BBA0D /* snmp.c */; };
|
||||
E395451D20255354000BBA0D /* socks45.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C720255354000BBA0D /* socks45.c */; };
|
||||
E395451E20255354000BBA0D /* socrates.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C820255354000BBA0D /* socrates.c */; };
|
||||
E395451F20255354000BBA0D /* someip.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542C920255354000BBA0D /* someip.c */; };
|
||||
E395452020255354000BBA0D /* sopcast.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542CA20255354000BBA0D /* sopcast.c */; };
|
||||
E395452120255354000BBA0D /* soulseek.c in Sources */ = {isa = PBXBuildFile; fileRef = E39542CB20255354000BBA0D /* soulseek.c */; };
|
||||
@@ -187,6 +192,20 @@
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
E32F1ECA20844620005739B7 /* whatsapp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = whatsapp.c; sourceTree = "<group>"; };
|
||||
E35D5506228BA70400A80DED /* ajp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ajp.c; sourceTree = "<group>"; };
|
||||
E35D5507228BA70400A80DED /* snmp_proto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snmp_proto.c; sourceTree = "<group>"; };
|
||||
E35D5508228BA70400A80DED /* modbus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modbus.c; sourceTree = "<group>"; };
|
||||
E35D5509228BA70400A80DED /* ookla.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ookla.c; sourceTree = "<group>"; };
|
||||
E35D550A228BA70400A80DED /* upnp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = upnp.c; sourceTree = "<group>"; };
|
||||
E35D550B228BA70500A80DED /* memcached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memcached.c; sourceTree = "<group>"; };
|
||||
E35D550C228BA70500A80DED /* mdns_proto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdns_proto.c; sourceTree = "<group>"; };
|
||||
E35D550D228BA70500A80DED /* fbzero.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fbzero.c; sourceTree = "<group>"; };
|
||||
E35D550E228BA70500A80DED /* nest_log_sink.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nest_log_sink.c; sourceTree = "<group>"; };
|
||||
E35D550F228BA70600A80DED /* mining.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mining.c; sourceTree = "<group>"; };
|
||||
E35D551A228BA7DF00A80DED /* ht_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ht_hash.h; sourceTree = "<group>"; };
|
||||
E35D551B228BA80000A80DED /* sha1-fast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sha1-fast.c"; sourceTree = "<group>"; };
|
||||
E35D551C228BA80000A80DED /* ht_hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ht_hash.c; sourceTree = "<group>"; };
|
||||
E3953F4F20254989000BBA0D /* ndpiExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ndpiExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
E3953F5220254989000BBA0D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
|
||||
E3953F5320254989000BBA0D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
|
||||
@@ -210,7 +229,6 @@
|
||||
E39540BC20255353000BBA0D /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
|
||||
E39540BD20255353000BBA0D /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
|
||||
E39540BE20255353000BBA0D /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
|
||||
E39540BF20255353000BBA0D /* Makefile.simple */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.simple; sourceTree = "<group>"; };
|
||||
E39540C020255353000BBA0D /* ndpi_content_match.c.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = ndpi_content_match.c.inc; sourceTree = "<group>"; };
|
||||
E39540C120255353000BBA0D /* ndpi_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ndpi_main.c; sourceTree = "<group>"; };
|
||||
E395414B20255353000BBA0D /* afp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = afp.c; sourceTree = "<group>"; };
|
||||
@@ -253,7 +271,6 @@
|
||||
E395417120255353000BBA0D /* edonkey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = edonkey.c; sourceTree = "<group>"; };
|
||||
E395417220255353000BBA0D /* fasttrack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fasttrack.c; sourceTree = "<group>"; };
|
||||
E395417320255353000BBA0D /* fiesta.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fiesta.c; sourceTree = "<group>"; };
|
||||
E395417420255353000BBA0D /* filetopia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filetopia.c; sourceTree = "<group>"; };
|
||||
E395417520255353000BBA0D /* fix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fix.c; sourceTree = "<group>"; };
|
||||
E395417620255353000BBA0D /* florensia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = florensia.c; sourceTree = "<group>"; };
|
||||
E395417720255353000BBA0D /* ftp_control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftp_control.c; sourceTree = "<group>"; };
|
||||
@@ -283,10 +300,8 @@
|
||||
E395429720255354000BBA0D /* mail_pop.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mail_pop.c; sourceTree = "<group>"; };
|
||||
E395429820255354000BBA0D /* mail_smtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mail_smtp.c; sourceTree = "<group>"; };
|
||||
E395429920255354000BBA0D /* maplestory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maplestory.c; sourceTree = "<group>"; };
|
||||
E395429A20255354000BBA0D /* mdns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdns.c; sourceTree = "<group>"; };
|
||||
E395429B20255354000BBA0D /* megaco.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = megaco.c; sourceTree = "<group>"; };
|
||||
E395429C20255354000BBA0D /* mgcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mgcp.c; sourceTree = "<group>"; };
|
||||
E395429D20255354000BBA0D /* mms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mms.c; sourceTree = "<group>"; };
|
||||
E395429E20255354000BBA0D /* mpegts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpegts.c; sourceTree = "<group>"; };
|
||||
E395429F20255354000BBA0D /* mqtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mqtt.c; sourceTree = "<group>"; };
|
||||
E39542A020255354000BBA0D /* msn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msn.c; sourceTree = "<group>"; };
|
||||
@@ -327,9 +342,7 @@
|
||||
E39542C320255354000BBA0D /* skype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = skype.c; sourceTree = "<group>"; };
|
||||
E39542C420255354000BBA0D /* smb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smb.c; sourceTree = "<group>"; };
|
||||
E39542C520255354000BBA0D /* smpp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smpp.c; sourceTree = "<group>"; };
|
||||
E39542C620255354000BBA0D /* snmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snmp.c; sourceTree = "<group>"; };
|
||||
E39542C720255354000BBA0D /* socks45.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socks45.c; sourceTree = "<group>"; };
|
||||
E39542C820255354000BBA0D /* socrates.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socrates.c; sourceTree = "<group>"; };
|
||||
E39542C920255354000BBA0D /* someip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = someip.c; sourceTree = "<group>"; };
|
||||
E39542CA20255354000BBA0D /* sopcast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sopcast.c; sourceTree = "<group>"; };
|
||||
E39542CB20255354000BBA0D /* soulseek.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = soulseek.c; sourceTree = "<group>"; };
|
||||
@@ -480,7 +493,6 @@
|
||||
E39540BC20255353000BBA0D /* Makefile */,
|
||||
E39540BD20255353000BBA0D /* Makefile.am */,
|
||||
E39540BE20255353000BBA0D /* Makefile.in */,
|
||||
E39540BF20255353000BBA0D /* Makefile.simple */,
|
||||
E39540C020255353000BBA0D /* ndpi_content_match.c.inc */,
|
||||
E39540C120255353000BBA0D /* ndpi_main.c */,
|
||||
E39540C220255353000BBA0D /* protocols */,
|
||||
@@ -528,7 +540,6 @@
|
||||
E395417120255353000BBA0D /* edonkey.c */,
|
||||
E395417220255353000BBA0D /* fasttrack.c */,
|
||||
E395417320255353000BBA0D /* fiesta.c */,
|
||||
E395417420255353000BBA0D /* filetopia.c */,
|
||||
E395417520255353000BBA0D /* fix.c */,
|
||||
E395417620255353000BBA0D /* florensia.c */,
|
||||
E395417720255353000BBA0D /* ftp_control.c */,
|
||||
@@ -558,10 +569,8 @@
|
||||
E395429720255354000BBA0D /* mail_pop.c */,
|
||||
E395429820255354000BBA0D /* mail_smtp.c */,
|
||||
E395429920255354000BBA0D /* maplestory.c */,
|
||||
E395429A20255354000BBA0D /* mdns.c */,
|
||||
E395429B20255354000BBA0D /* megaco.c */,
|
||||
E395429C20255354000BBA0D /* mgcp.c */,
|
||||
E395429D20255354000BBA0D /* mms.c */,
|
||||
E395429E20255354000BBA0D /* mpegts.c */,
|
||||
E395429F20255354000BBA0D /* mqtt.c */,
|
||||
E39542A020255354000BBA0D /* msn.c */,
|
||||
@@ -602,9 +611,7 @@
|
||||
E39542C320255354000BBA0D /* skype.c */,
|
||||
E39542C420255354000BBA0D /* smb.c */,
|
||||
E39542C520255354000BBA0D /* smpp.c */,
|
||||
E39542C620255354000BBA0D /* snmp.c */,
|
||||
E39542C720255354000BBA0D /* socks45.c */,
|
||||
E39542C820255354000BBA0D /* socrates.c */,
|
||||
E39542C920255354000BBA0D /* someip.c */,
|
||||
E39542CA20255354000BBA0D /* sopcast.c */,
|
||||
E39542CB20255354000BBA0D /* soulseek.c */,
|
||||
@@ -644,6 +651,17 @@
|
||||
E39542ED20255354000BBA0D /* yahoo.c */,
|
||||
E39542EE20255354000BBA0D /* zattoo.c */,
|
||||
E39542EF20255354000BBA0D /* zeromq.c */,
|
||||
E32F1ECA20844620005739B7 /* whatsapp.c */,
|
||||
E35D5506228BA70400A80DED /* ajp.c */,
|
||||
E35D550D228BA70500A80DED /* fbzero.c */,
|
||||
E35D550C228BA70500A80DED /* mdns_proto.c */,
|
||||
E35D550B228BA70500A80DED /* memcached.c */,
|
||||
E35D550F228BA70600A80DED /* mining.c */,
|
||||
E35D5508228BA70400A80DED /* modbus.c */,
|
||||
E35D550E228BA70500A80DED /* nest_log_sink.c */,
|
||||
E35D5509228BA70400A80DED /* ookla.c */,
|
||||
E35D5507228BA70400A80DED /* snmp_proto.c */,
|
||||
E35D550A228BA70400A80DED /* upnp.c */,
|
||||
);
|
||||
path = protocols;
|
||||
sourceTree = "<group>";
|
||||
@@ -672,6 +690,7 @@
|
||||
E39542F120255354000BBA0D /* include */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E35D551A228BA7DF00A80DED /* ht_hash.h */,
|
||||
E39542F220255354000BBA0D /* actypes.h */,
|
||||
E39542F320255354000BBA0D /* ahocorasick.h */,
|
||||
E39542F420255354000BBA0D /* libcache.h */,
|
||||
@@ -685,6 +704,8 @@
|
||||
E39542F820255354000BBA0D /* src */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
E35D551C228BA80000A80DED /* ht_hash.c */,
|
||||
E35D551B228BA80000A80DED /* sha1-fast.c */,
|
||||
E395430020255354000BBA0D /* ahocorasick.c */,
|
||||
E395430120255354000BBA0D /* libcache.c */,
|
||||
E395430820255354000BBA0D /* ndpi_patricia.c */,
|
||||
@@ -766,14 +787,10 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
E395430C20255354000BBA0D /* ndpi_define.h.in in Resources */,
|
||||
E395431A20255354000BBA0D /* Makefile.simple in Resources */,
|
||||
E395430B20255354000BBA0D /* Makefile.am in Resources */,
|
||||
E395431920255354000BBA0D /* Makefile.in in Resources */,
|
||||
E3953F5920254989000BBA0D /* Assets.xcassets in Resources */,
|
||||
E39547942026B2AA000BBA0D /* capture.pcap in Resources */,
|
||||
E395455D202558E6000BBA0D /* protos.txt in Resources */,
|
||||
E3953F5C2025498A000BBA0D /* Main.storyboard in Resources */,
|
||||
E395431820255354000BBA0D /* Makefile.am in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -784,20 +801,20 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
E39544F320255354000BBA0D /* mms.c in Sources */,
|
||||
E39544F220255354000BBA0D /* mgcp.c in Sources */,
|
||||
E39543B420255354000BBA0D /* checkmk.c in Sources */,
|
||||
E39543D720255354000BBA0D /* http.c in Sources */,
|
||||
E39543A420255354000BBA0D /* aimini.c in Sources */,
|
||||
E39543DD20255354000BBA0D /* jabber.c in Sources */,
|
||||
E35D5510228BA70600A80DED /* ajp.c in Sources */,
|
||||
E395452820255354000BBA0D /* steam.c in Sources */,
|
||||
E39543C720255354000BBA0D /* edonkey.c in Sources */,
|
||||
E39543B520255354000BBA0D /* ciscovpn.c in Sources */,
|
||||
E35D5511228BA70600A80DED /* snmp_proto.c in Sources */,
|
||||
E39543B120255354000BBA0D /* bittorrent.c in Sources */,
|
||||
E395452E20255354000BBA0D /* telegram.c in Sources */,
|
||||
E39543DA20255354000BBA0D /* icecast.c in Sources */,
|
||||
E395450620255354000BBA0D /* postgres.c in Sources */,
|
||||
E395451E20255354000BBA0D /* socrates.c in Sources */,
|
||||
E395450B20255354000BBA0D /* quic.c in Sources */,
|
||||
E39543A820255354000BBA0D /* armagetron.c in Sources */,
|
||||
E39543D120255354000BBA0D /* gtp.c in Sources */,
|
||||
@@ -808,7 +825,6 @@
|
||||
E395452620255354000BBA0D /* starcraft.c in Sources */,
|
||||
E39543B620255354000BBA0D /* citrix.c in Sources */,
|
||||
E395451320255354000BBA0D /* rtsp.c in Sources */,
|
||||
E39543CA20255354000BBA0D /* filetopia.c in Sources */,
|
||||
E39544F120255354000BBA0D /* megaco.c in Sources */,
|
||||
E39543A920255354000BBA0D /* flash.c in Sources */,
|
||||
E39544F820255354000BBA0D /* mysql.c in Sources */,
|
||||
@@ -829,10 +845,12 @@
|
||||
E395451420255354000BBA0D /* rx.c in Sources */,
|
||||
E39543DC20255354000BBA0D /* irc.c in Sources */,
|
||||
E395450320255354000BBA0D /* oscar.c in Sources */,
|
||||
E35D551D228BA80000A80DED /* sha1-fast.c in Sources */,
|
||||
E39543BC20255354000BBA0D /* dcerpc.c in Sources */,
|
||||
E395454020255355000BBA0D /* world_of_warcraft.c in Sources */,
|
||||
E39543A620255354000BBA0D /* apple_push.c in Sources */,
|
||||
E395451920255354000BBA0D /* skype.c in Sources */,
|
||||
E35D551E228BA80000A80DED /* ht_hash.c in Sources */,
|
||||
E39543AC20255354000BBA0D /* popo.c in Sources */,
|
||||
E39543BF20255354000BBA0D /* diameter.c in Sources */,
|
||||
E39544FF20255354000BBA0D /* ntp.c in Sources */,
|
||||
@@ -844,7 +862,6 @@
|
||||
E39544EC20255354000BBA0D /* mail_imap.c in Sources */,
|
||||
E395450C20255354000BBA0D /* radius.c in Sources */,
|
||||
E395455F202558E6000BBA0D /* ndpiReader.c in Sources */,
|
||||
E395451C20255354000BBA0D /* snmp.c in Sources */,
|
||||
E395452520255354000BBA0D /* ssl.c in Sources */,
|
||||
E39543D420255354000BBA0D /* halflife2_and_mods.c in Sources */,
|
||||
E39544F920255354000BBA0D /* netbios.c in Sources */,
|
||||
@@ -867,11 +884,13 @@
|
||||
E395450D20255354000BBA0D /* rdp.c in Sources */,
|
||||
E39544EA20255354000BBA0D /* lisp.c in Sources */,
|
||||
E39544EF20255354000BBA0D /* maplestory.c in Sources */,
|
||||
E35D5519228BA70600A80DED /* mining.c in Sources */,
|
||||
E39544EB20255354000BBA0D /* lotus_notes.c in Sources */,
|
||||
E395451F20255354000BBA0D /* someip.c in Sources */,
|
||||
E39543DF20255354000BBA0D /* kerberos.c in Sources */,
|
||||
E39543A720255354000BBA0D /* applejuice.c in Sources */,
|
||||
E395452020255354000BBA0D /* sopcast.c in Sources */,
|
||||
E35D5517228BA70600A80DED /* fbzero.c in Sources */,
|
||||
E39543AD20255354000BBA0D /* secondlife.c in Sources */,
|
||||
E395450720255354000BBA0D /* pplive.c in Sources */,
|
||||
E395453120255354000BBA0D /* tftp.c in Sources */,
|
||||
@@ -880,6 +899,7 @@
|
||||
E39543D620255354000BBA0D /* hep.c in Sources */,
|
||||
E39543E020255354000BBA0D /* kontiki.c in Sources */,
|
||||
E39544FA20255354000BBA0D /* netflow.c in Sources */,
|
||||
E35D5513228BA70600A80DED /* ookla.c in Sources */,
|
||||
E395454220255355000BBA0D /* xdmcp.c in Sources */,
|
||||
E39544F720255354000BBA0D /* mssql_tds.c in Sources */,
|
||||
E395451A20255354000BBA0D /* smb.c in Sources */,
|
||||
@@ -887,11 +907,12 @@
|
||||
E395450520255354000BBA0D /* pcanywhere.c in Sources */,
|
||||
E39547902026A51A000BBA0D /* ahocorasick.c in Sources */,
|
||||
E395452320255354000BBA0D /* ssdp.c in Sources */,
|
||||
E35D5518228BA70600A80DED /* nest_log_sink.c in Sources */,
|
||||
E395431B20255354000BBA0D /* ndpi_content_match.c.inc in Sources */,
|
||||
E395450120255354000BBA0D /* openvpn.c in Sources */,
|
||||
E395453920255354000BBA0D /* vhua.c in Sources */,
|
||||
E39544F020255354000BBA0D /* mdns.c in Sources */,
|
||||
E39543C920255354000BBA0D /* fiesta.c in Sources */,
|
||||
E35D5514228BA70600A80DED /* upnp.c in Sources */,
|
||||
E395454120255355000BBA0D /* xbox.c in Sources */,
|
||||
E395453D20255355000BBA0D /* warcraft3.c in Sources */,
|
||||
E39543D220255354000BBA0D /* guildwars.c in Sources */,
|
||||
@@ -899,12 +920,14 @@
|
||||
E395450E20255354000BBA0D /* redis_net.c in Sources */,
|
||||
E395455420255355000BBA0D /* node.c in Sources */,
|
||||
E39543CE20255354000BBA0D /* ftp_data.c in Sources */,
|
||||
E35D551F228BA88700A80DED /* ndpi_patricia.c in Sources */,
|
||||
E395451D20255354000BBA0D /* socks45.c in Sources */,
|
||||
E395451820255354000BBA0D /* skinny.c in Sources */,
|
||||
E395453620255354000BBA0D /* tvuplayer.c in Sources */,
|
||||
E39543CC20255354000BBA0D /* florensia.c in Sources */,
|
||||
E3953F5720254989000BBA0D /* ViewController.m in Sources */,
|
||||
E39544F520255354000BBA0D /* mqtt.c in Sources */,
|
||||
E35D5516228BA70600A80DED /* mdns_proto.c in Sources */,
|
||||
E39543C220255354000BBA0D /* dns.c in Sources */,
|
||||
E39543B920255354000BBA0D /* corba.c in Sources */,
|
||||
E39543B320255354000BBA0D /* btlib.c in Sources */,
|
||||
@@ -924,6 +947,7 @@
|
||||
E395453E20255355000BBA0D /* whoisdas.c in Sources */,
|
||||
E39543BB20255354000BBA0D /* csgo.c in Sources */,
|
||||
E395450A20255354000BBA0D /* qq.c in Sources */,
|
||||
E35D5512228BA70600A80DED /* modbus.c in Sources */,
|
||||
E395431C20255354000BBA0D /* ndpi_main.c in Sources */,
|
||||
E39543BD20255354000BBA0D /* dhcp.c in Sources */,
|
||||
E395454520255355000BBA0D /* zeromq.c in Sources */,
|
||||
@@ -932,6 +956,7 @@
|
||||
E395451120255354000BBA0D /* rtmp.c in Sources */,
|
||||
E39544FE20255354000BBA0D /* non_tcp_udp.c in Sources */,
|
||||
E39543C020255354000BBA0D /* directconnect.c in Sources */,
|
||||
E35D5515228BA70600A80DED /* memcached.c in Sources */,
|
||||
E39543D020255354000BBA0D /* gnutella.c in Sources */,
|
||||
E39543D320255354000BBA0D /* h323.c in Sources */,
|
||||
E395453720255354000BBA0D /* ubntac2.c in Sources */,
|
||||
@@ -947,6 +972,7 @@
|
||||
E395454420255355000BBA0D /* zattoo.c in Sources */,
|
||||
E39544FD20255354000BBA0D /* noe.c in Sources */,
|
||||
E395451620255354000BBA0D /* shoutcast.c in Sources */,
|
||||
E32F1ECB20844620005739B7 /* whatsapp.c in Sources */,
|
||||
E395455E202558E6000BBA0D /* ndpi_util.c in Sources */,
|
||||
E3953F5420254989000BBA0D /* AppDelegate.m in Sources */,
|
||||
E39543C520255354000BBA0D /* dropbox.c in Sources */,
|
||||
@@ -1083,6 +1109,7 @@
|
||||
"$(inherited)",
|
||||
"APP_HAS_OWN_MAIN=1",
|
||||
"NDPI_LOG_DEBUG2=NDPI_LOG_DEBUG2_XCODE_PROJ",
|
||||
NDPI_LIB_COMPILATION,
|
||||
);
|
||||
INFOPLIST_FILE = ndpiExample/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||
@@ -1101,6 +1128,7 @@
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"APP_HAS_OWN_MAIN=1",
|
||||
"NDPI_LOG_DEBUG2=NDPI_LOG_DEBUG2_XCODE_PROJ",
|
||||
NDPI_LIB_COMPILATION,
|
||||
);
|
||||
INFOPLIST_FILE = ndpiExample/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
bin_PROGRAMS = ndpiReader
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/lib/third_party/include @PCAP_INC@ @HS_INC@
|
||||
AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage
|
||||
|
||||
LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ @DL_LIB@ @HS_LIB@ -lm
|
||||
AM_LDFLAGS = -static @DL_LIB@ @HS_LIB@
|
||||
|
||||
ndpiReader_SOURCES = ndpiReader.c ndpi_util.c ndpi_util.h uthash.h
|
||||
|
||||
ndpiReader.o: ndpiReader.c
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
#
|
||||
# Run 'make -f Makefile.dpdk' to compile the DPDK examples
|
||||
#
|
||||
# See http://core.dpdk.org/doc/quick-start/ for DPDK installation and setup
|
||||
#
|
||||
ifeq ($(RTE_SDK),)
|
||||
#$(error "Please define RTE_SDK environment variable")
|
||||
RTE_SDK = $(HOME)/DPDK
|
||||
RTE_TARGET = build
|
||||
endif
|
||||
|
||||
# Default target, can be overridden by command line or environment
|
||||
RTE_TARGET ?= x86_64-native-linuxapp-gcc
|
||||
|
||||
include $(RTE_SDK)/mk/rte.vars.mk
|
||||
|
||||
APP = ndpiReader.dpdk
|
||||
LIBNDPI = $(PWD)/../src/lib/libndpi.a
|
||||
|
||||
SRCS-y := reader_util.c intrusion_detection.c ndpiReader.c
|
||||
|
||||
CFLAGS += -g
|
||||
CFLAGS += -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-unused-parameter -I $(PWD)/../src/include @CFLAGS@ -DUSE_DPDK
|
||||
LDLIBS = $(LIBNDPI) @PCAP_LIB@ @LIBS@ -lpthread -lm @LDFLAGS@
|
||||
|
||||
include $(RTE_SDK)/mk/rte.extapp.mk
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
CC=@CC@
|
||||
CXX=@CXX@
|
||||
BUILD_MINGW=@BUILD_MINGW@
|
||||
SRCHOME=../src
|
||||
CFLAGS=-g -fPIC -DPIC -I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@
|
||||
LIBNDPI=$(SRCHOME)/lib/libndpi.a
|
||||
LDFLAGS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ -lpthread -lm @LDFLAGS@
|
||||
HEADERS=intrusion_detection.h reader_util.h $(SRCHOME)/include/ndpi_api.h \
|
||||
$(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
|
||||
OBJS=ndpiReader.o reader_util.o intrusion_detection.o
|
||||
PREFIX?=@prefix@
|
||||
|
||||
ifneq ($(BUILD_MINGW),)
|
||||
all:
|
||||
@echo 'Examples disabled due to mingw build.'
|
||||
|
||||
else
|
||||
|
||||
all: ndpiReader @DPDK_TARGET@
|
||||
|
||||
EXECUTABLE_SOURCES := ndpiReader.c ndpiSimpleIntegration.c
|
||||
COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c ))
|
||||
|
||||
libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI)
|
||||
ar rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o)
|
||||
|
||||
ndpiReader: libndpiReader.a $(LIBNDPI) ndpiReader.o
|
||||
$(CC) $(CFLAGS) ndpiReader.o libndpiReader.a -o $@ $(LDFLAGS)
|
||||
|
||||
ndpiSimpleIntegration: ndpiSimpleIntegration.o
|
||||
$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
|
||||
|
||||
%.o: %.c $(HEADERS) Makefile
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
install: ndpiReader
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/bin/
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi
|
||||
cp ndpiReader $(DESTDIR)$(PREFIX)/bin/
|
||||
cp protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt
|
||||
cp mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt
|
||||
[ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
||||
[ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
||||
|
||||
dpdk:
|
||||
make -f Makefile.dpdk
|
||||
|
||||
check:
|
||||
cppcheck --template='{file}:{line}:{severity}:{message}' --quiet --enable=all --force -I$(SRCHOME)/include *.c
|
||||
|
||||
clean:
|
||||
/bin/rm -f *.o ndpiReader ndpiReader.dpdk
|
||||
/bin/rm -f .*.dpdk.cmd .*.o.cmd *.dpdk.map .*.o.d
|
||||
/bin/rm -f _install _postbuild _postinstall _preinstall
|
||||
/bin/rm -rf build
|
||||
|
||||
distdir:
|
||||
cp categories.txt mining_hosts.txt protos.txt README.DPDK '$(distdir)/'
|
||||
find . -maxdepth 1 -type f -name '*.c' -o -name '*.h' -o -name '*.py' | xargs -I'{}' cp '{}' '$(distdir)/{}'
|
||||
|
||||
distclean: clean
|
||||
/bin/rm -f Makefile.dpdk
|
||||
/bin/rm -f Makefile
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,31 @@
|
||||
Prerequisites
|
||||
-------------
|
||||
|
||||
You need to install and compile DPDK in your HOME directory as explained in
|
||||
See http://core.dpdk.org/doc/quick-start/ for DPDK installation and setup
|
||||
|
||||
Once DPDK is built make sure to create a symbolic link
|
||||
|
||||
$ cd
|
||||
$ ln -s dpdk-18.08 DPDK
|
||||
|
||||
so the build process will use the DPDK directory letting you have multiple
|
||||
DPDK versions available on your system
|
||||
|
||||
|
||||
Build
|
||||
-----
|
||||
Everything will happen automagically but if you want to do it by hand
|
||||
do: make -f Makefile.dpdk
|
||||
|
||||
|
||||
Run Application
|
||||
---------------
|
||||
Supposing to capture packets from device eno1 you can start the
|
||||
application as follows:
|
||||
|
||||
sudo ./build/ndpiReader -c 1 --vdev=net_pcap0,iface=eno1 -- -v 1
|
||||
|
||||
NOTE:
|
||||
- ndpiReader without DPDK support sits in this directory
|
||||
- ndpiReader with DPDK support can be found inside the ./build directory
|
||||
@@ -0,0 +1,3 @@
|
||||
# Format: name\tcategory_id
|
||||
internetbadguys.com 100
|
||||
144.139.247.220 100
|
||||
@@ -0,0 +1,462 @@
|
||||
/*
|
||||
* intrusion_detection.c
|
||||
*
|
||||
* Copyright (C) 2011-20 - 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
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "intrusion_detection.h"
|
||||
|
||||
double normalize(ndpi_norm_value* tresholds){
|
||||
if(tresholds->upper_bound != tresholds->lower_bound){
|
||||
tresholds->norm_value = (tresholds->value - tresholds->lower_bound) / (tresholds->upper_bound - tresholds->lower_bound);
|
||||
}else{
|
||||
if(tresholds->value > tresholds->upper_bound){
|
||||
tresholds->norm_value = 1 + (tresholds->value - tresholds->lower_bound) / tresholds->upper_bound;
|
||||
}else{
|
||||
tresholds->norm_value = 1 - (tresholds->value - tresholds->lower_bound) / tresholds->upper_bound;
|
||||
}
|
||||
|
||||
}
|
||||
if(tresholds->norm_value >= 0){
|
||||
return tresholds->norm_value * tresholds->weight;
|
||||
}
|
||||
else{
|
||||
return (1 - tresholds->norm_value) * tresholds->weight;
|
||||
}
|
||||
}
|
||||
|
||||
double get_flow_score(ndpi_norm_value* scores, int n_metrics){
|
||||
double flow_score = 0;
|
||||
for(int i=0; i<n_metrics; i++){
|
||||
flow_score += normalize(&scores[i]);
|
||||
}
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
double Ddos_score(struct ndpi_flow_info* flow){
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* pktlen_c_to_s_avg */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 70.0;
|
||||
scores[i].upper_bound = 263.4799999999999;
|
||||
scores[i].weight = 0.21257330032661592;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_c_to_s);
|
||||
|
||||
/* pktlen_s_to_c_max */
|
||||
i++;
|
||||
scores[i].lower_bound = 90.0;
|
||||
scores[i].upper_bound = 2974.0;
|
||||
scores[i].weight = 0.21073785073559176;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 72.7;
|
||||
scores[i].upper_bound = 1130.4199999999996;
|
||||
scores[i].weight = 0.21257330032661592;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_stddev */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 906.0;
|
||||
scores[i].weight = 0.20990954527912953;
|
||||
scores[i].value = ndpi_data_stddev(flow->pktlen_s_to_c);
|
||||
|
||||
/* fin */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.07710300166602348;
|
||||
scores[i].value = flow->fin_count;
|
||||
|
||||
/* s_to_c_fin */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.07710300166602348;
|
||||
scores[i].value = flow->dst2src_fin_count;
|
||||
|
||||
// sum = 1.0
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Dos_goldeneye_score(struct ndpi_flow_info* flow){
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* pktlen_s_to_c_max */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 74.0;
|
||||
scores[i].upper_bound = 3292.6699999999764;
|
||||
scores[i].weight = 0.3123007140611667;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_s_to_c);
|
||||
/* pktlen_s_to_c_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 68.7;
|
||||
scores[i].upper_bound = 1354.0569999999987;
|
||||
scores[i].weight = 0.23802038891633356;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_stddev */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 959.4469999999993;
|
||||
scores[i].weight = 0.3111779763775991;
|
||||
scores[i].value = ndpi_data_stddev(flow->pktlen_s_to_c);
|
||||
|
||||
/* syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.0464364305923564;
|
||||
scores[i].value = flow->syn_count;
|
||||
|
||||
/* c_to_s_syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 1.0;
|
||||
scores[i].weight = 0.04562805946018772;
|
||||
scores[i].value = flow->src2dst_syn_count;
|
||||
|
||||
/* s_to_c_syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.0464364305923564;
|
||||
scores[i].value = flow->dst2src_syn_count;
|
||||
|
||||
// sum = 0.9999999999999998
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Dos_hulk_score(struct ndpi_flow_info* flow){
|
||||
double f = (double)flow->first_seen_ms/1000.0, l = (double)flow->last_seen_ms/1000.0;
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* duration */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 539.40668006422;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = (l - f);
|
||||
|
||||
/* src2dst_packets */
|
||||
i++;
|
||||
scores[i].lower_bound = 2.0;
|
||||
scores[i].upper_bound = 41.0;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = flow->src2dst_packets;
|
||||
|
||||
/* dst2src_packets */
|
||||
i++;
|
||||
scores[i].lower_bound = 2.0;
|
||||
scores[i].upper_bound = 45.0;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = flow->dst2src_packets;
|
||||
|
||||
/* src2dst_bytes */
|
||||
i++;
|
||||
scores[i].lower_bound = 146.0;
|
||||
scores[i].upper_bound = 6306.300000000001;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = flow->src2dst_bytes;
|
||||
|
||||
/* ack */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 82.0;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = flow->ack_count;
|
||||
|
||||
/* syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = flow->syn_count;
|
||||
|
||||
// sum = 0.9999999999999999
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Dos_slow_score(struct ndpi_flow_info* flow){
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* pktlen_s_to_c_max */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 90.0;
|
||||
scores[i].upper_bound = 3135.0;
|
||||
scores[i].weight = 0.1760747755022144;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 80.37100000000001;
|
||||
scores[i].upper_bound = 1292.5900000000008;
|
||||
scores[i].weight = 0.17600137023171597;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_s_to_c);
|
||||
|
||||
/* dst2src_bytes */
|
||||
i++;
|
||||
scores[i].lower_bound = 262.0;
|
||||
scores[i].upper_bound = 53227.80000000002;
|
||||
scores[i].weight = 0.16919914849886225;
|
||||
scores[i].value = flow->dst2src_bytes;
|
||||
|
||||
/* syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.168000195747388;
|
||||
scores[i].value = flow->syn_count;
|
||||
|
||||
/* c_to_s_syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 1.0;
|
||||
scores[i].weight = 0.14272431427243143;
|
||||
scores[i].value = flow->src2dst_syn_count;
|
||||
|
||||
/* s_to_c_syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.168000195747388;
|
||||
scores[i].value = flow->dst2src_syn_count;
|
||||
|
||||
// sum = 1.0
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Ftp_patator_score(struct ndpi_flow_info* flow){
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* iat_flow_min */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 24.0;
|
||||
scores[i].weight = 0.002732919254658385;
|
||||
scores[i].value = ndpi_data_min(flow->iat_flow);
|
||||
|
||||
/* pktlen_s_to_c_max */
|
||||
i++;
|
||||
scores[i].lower_bound = 90.0;
|
||||
scores[i].upper_bound = 3393.0;
|
||||
scores[i].weight = 0.007453416149068323;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 81.3;
|
||||
scores[i].upper_bound = 1315.021;
|
||||
scores[i].weight = 0.9833540372670807;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_s_to_c);
|
||||
|
||||
/* dst2src_bytes */
|
||||
i++;
|
||||
scores[i].lower_bound = 256.0;
|
||||
scores[i].upper_bound = 56434.0;
|
||||
scores[i].weight = 0.0034782608695652175;
|
||||
scores[i].value = flow->dst2src_bytes;
|
||||
|
||||
/* fin */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.0014906832298136647;
|
||||
scores[i].value = flow->fin_count;
|
||||
|
||||
/* rst */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.0014906832298136647;
|
||||
scores[i].value = flow->rst_count;
|
||||
|
||||
// sum = 1.0
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Hearthbleed_score(struct ndpi_flow_info* flow){
|
||||
double f = (double)flow->first_seen_ms/1000.0, l = (double)flow->last_seen_ms/1000.0;
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* iat_flow_max */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 595213.3999999999;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = ndpi_data_max(flow->iat_flow);
|
||||
|
||||
/* iat_flow_stddev */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 245377.74799999973;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = ndpi_data_stddev(flow->iat_flow);
|
||||
|
||||
/* pktlen_s_to_c_max */
|
||||
i++;
|
||||
scores[i].lower_bound = 74.0;
|
||||
scores[i].upper_bound = 3380.0;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 70.0;
|
||||
scores[i].upper_bound = 1344.6399999999996;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_stddev */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 944.6399999999996;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = ndpi_data_stddev(flow->pktlen_s_to_c);
|
||||
|
||||
/* duration */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 711.6677598000391;
|
||||
scores[i].weight = 0.16666666666666666;
|
||||
scores[i].value = (l - f);
|
||||
|
||||
// sum = 0.9999999999999999
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Infiltration_score(struct ndpi_flow_info* flow){
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* pktlen_c_to_s_max */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 72.0;
|
||||
scores[i].upper_bound = 1840.739999999998;
|
||||
scores[i].weight = 0.11937557392102846;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_c_to_s);
|
||||
|
||||
/* pktlen_c_to_s_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 70.0;
|
||||
scores[i].upper_bound = 296.56599999999816;
|
||||
scores[i].weight = 0.12526782981328435;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_c_to_s);
|
||||
|
||||
/* pktlen_s_to_c_max */
|
||||
i++;
|
||||
scores[i].lower_bound = 90.0;
|
||||
scores[i].upper_bound = 3496.1399999999776;
|
||||
scores[i].weight = 0.13927150290786652;
|
||||
scores[i].value = ndpi_data_max(flow->pktlen_s_to_c);
|
||||
|
||||
/* pktlen_s_to_c_avg */
|
||||
i++;
|
||||
scores[i].lower_bound = 72.6;
|
||||
scores[i].upper_bound = 1367.7959999999991;
|
||||
scores[i].weight = 0.12182430364248545;
|
||||
scores[i].value = ndpi_data_average(flow->pktlen_s_to_c);
|
||||
|
||||
/* src2dst_bytes */
|
||||
i++;
|
||||
scores[i].lower_bound = 144.0;
|
||||
scores[i].upper_bound = 7847.69999999999;
|
||||
scores[i].weight = 0.12059993878175697;
|
||||
scores[i].value = flow->src2dst_bytes;
|
||||
|
||||
/* dst2src_bytes */
|
||||
i++;
|
||||
scores[i].lower_bound = 236.0;
|
||||
scores[i].upper_bound = 74486.7799999998;
|
||||
scores[i].weight = 0.3736608509335782;
|
||||
scores[i].value = flow->dst2src_bytes;
|
||||
|
||||
// sum = 1.0
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
|
||||
double Ssh_patator_score(struct ndpi_flow_info* flow){
|
||||
int n_metrics = 6;
|
||||
ndpi_norm_value* scores = malloc(n_metrics * sizeof(ndpi_norm_value));
|
||||
/* fin */
|
||||
int i = 0;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.0033738191632928477;
|
||||
scores[i].value = flow->fin_count;
|
||||
|
||||
/* psh */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 30.0;
|
||||
scores[i].weight = 0.33076923076923076;
|
||||
scores[i].value = flow->psh_count;
|
||||
|
||||
/* c_to_s_syn */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 1.0;
|
||||
scores[i].weight = 0.0004048582995951417;
|
||||
scores[i].value = flow->src2dst_syn_count;
|
||||
|
||||
/* c_to_s_psh */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 12.0;
|
||||
scores[i].weight = 0.33130904183535764;
|
||||
scores[i].value = flow->src2dst_psh_count;
|
||||
|
||||
/* s_to_c_fin */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 2.0;
|
||||
scores[i].weight = 0.0033738191632928477;
|
||||
scores[i].value = flow->dst2src_fin_count;
|
||||
|
||||
/* s_to_c_psh */
|
||||
i++;
|
||||
scores[i].lower_bound = 0.0;
|
||||
scores[i].upper_bound = 30.0;
|
||||
scores[i].weight = 0.33076923076923076;
|
||||
scores[i].value = flow->dst2src_psh_count;
|
||||
|
||||
// sum = 1.0
|
||||
double flow_score = get_flow_score(scores, n_metrics);
|
||||
free(scores);
|
||||
return flow_score;
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* intrusion_detection.h
|
||||
*
|
||||
* Copyright (C) 2011-19 - 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
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _INTRUSION_DETECTION_H_
|
||||
#define _INTRUSION_DETECTION_H_
|
||||
|
||||
/*
|
||||
Code to detect attacks reported in
|
||||
|
||||
https://www.unb.ca/cic/datasets/ids-2017.html
|
||||
https://www.unb.ca/cic/datasets/ids-2018.html
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "reader_util.h"
|
||||
#include "ndpi_api.h"
|
||||
|
||||
typedef struct norm_values{
|
||||
double upper_bound;
|
||||
double lower_bound;
|
||||
double weight;
|
||||
double value;
|
||||
double norm_value;
|
||||
}ndpi_norm_value;
|
||||
|
||||
double normalize(ndpi_norm_value* tresholds);
|
||||
|
||||
double get_flow_score(ndpi_norm_value* scores, int n_metrics);
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
double Ddos_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Dos_goldeneye_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Dos_hulk_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Dos_slow_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Ftp_patator_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Hearthbleed_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Infiltration_score(struct ndpi_flow_info* flow);
|
||||
|
||||
double Ssh_patator_score(struct ndpi_flow_info* flow);
|
||||
|
||||
#endif /* _INTRUSION_DETECTION_H_ */
|
||||
@@ -0,0 +1,262 @@
|
||||
# NoCoin Filter List
|
||||
# Blocking Web Browser Bitcoin Mining
|
||||
#
|
||||
# Homepage: https://github.com/hoshsadiq/adblock-nocoin-list/
|
||||
# Contribute: https://github.com/hoshsadiq/adblock-nocoin-list/issues
|
||||
# Changelog: https://github.com/hoshsadiq/adblock-nocoin-list/commits/master/hosts.txt
|
||||
# License: https://mit-license.org/
|
||||
#
|
||||
# Last modified: 24 April 2018
|
||||
#
|
||||
|
||||
cnhv.co 99
|
||||
coin-hive.com 99
|
||||
coinhive.com 99
|
||||
authedmine.com 99
|
||||
gus.host 99
|
||||
load.jsecoin.com 99
|
||||
miner.pr0gramm.com 99
|
||||
minemytraffic.com 99
|
||||
ppoi.org 99
|
||||
projectpoi.com 99
|
||||
crypto-loot.com 99
|
||||
coinerra.com 99
|
||||
coin-have.com 99
|
||||
minero.pw 99
|
||||
minero-proxy-01.now.sh 99
|
||||
minero-proxy-02.now.sh 99
|
||||
minero-proxy-03.now.sh 99
|
||||
api.inwemo.com 99
|
||||
rocks.io 99
|
||||
adminer.com 99
|
||||
ad-miner.com 99
|
||||
jsccnn.com 99
|
||||
jscdndel.com 99
|
||||
coinhiveproxy.com 99
|
||||
coinblind.com 99
|
||||
coinnebula.com 99
|
||||
monerominer.rocks 99
|
||||
cdn.cloudcoins.co 99
|
||||
coinlab.biz 99
|
||||
go.megabanners.cf 99
|
||||
baiduccdn1.com 99
|
||||
wsp.marketgid.com 99
|
||||
papoto.com 99
|
||||
flare-analytics.com 99
|
||||
www.sparechange.io 99
|
||||
static.sparechange.io 99
|
||||
miner.nablabee.com 99
|
||||
m.anyfiles.ovh 99
|
||||
www.freecontent.bid 99
|
||||
www.freecontent.loan 99
|
||||
www.freecontent.win 99
|
||||
www.cryptonoter.com 99
|
||||
www.mutuza.win 99
|
||||
cryweb.github.io 99
|
||||
crywebber.github.io 99
|
||||
crypto-webminer.com 99
|
||||
cdn.adless.io 99
|
||||
hegrinhar.com 99
|
||||
verresof.com 99
|
||||
hemnes.win 99
|
||||
tidafors.xyz 99
|
||||
moneone.ga 99
|
||||
plexcoin.info 99
|
||||
www.monkeyminer.net 99
|
||||
go2.mercy.ga 99
|
||||
coinpirate.cf 99
|
||||
d.cpufan.club 99
|
||||
krb.devphp.org.ua 99
|
||||
nfwebminer.com 99
|
||||
cfcdist.gdn 99
|
||||
node.cfcdist.gdn 99
|
||||
webxmr.com 99
|
||||
xmr.mining.best 99
|
||||
webminepool.com 99
|
||||
webminepool.tk 99
|
||||
hive.tubetitties.com 99
|
||||
playerassets.info 99
|
||||
tokyodrift.ga 99
|
||||
webassembly.stream 99
|
||||
okeyletsgo.ml 99
|
||||
candid.zone 99
|
||||
webmine.pro 99
|
||||
andlache.com 99
|
||||
bablace.com 99
|
||||
bewaslac.com 99
|
||||
biberukalap.com 99
|
||||
bowithow.com 99
|
||||
butcalve.com 99
|
||||
evengparme.com 99
|
||||
gridiogrid.com 99
|
||||
hatcalter.com 99
|
||||
kedtise.com 99
|
||||
ledinund.com 99
|
||||
nathetsof.com 99
|
||||
renhertfo.com 99
|
||||
rintindown.com 99
|
||||
sparnove.com 99
|
||||
witthethim.com 99
|
||||
1q2w3.fun 99
|
||||
1q2w3.me 99
|
||||
cryptoloot.pro 99
|
||||
bjorksta.men 99
|
||||
crypto.csgocpu.com 99
|
||||
noblock.pro 99
|
||||
miner.cryptobara.com 99
|
||||
digger.cryptobara.com 99
|
||||
dev.cryptobara.com 99
|
||||
reservedoffers.club 99
|
||||
mine.torrent.pw 99
|
||||
host.d-ns.ga 99
|
||||
abc.pema.cl 99
|
||||
mine.nahnoji.cz 99
|
||||
webmine.cz 99
|
||||
intactoffers.club 99
|
||||
analytics.blue 99
|
||||
smectapop12.pl 99
|
||||
berserkpl.net.pl 99
|
||||
hodlers.party 99
|
||||
hodling.faith 99
|
||||
chainblock.science 99
|
||||
minescripts.info 99
|
||||
cdn.minescripts.info 99
|
||||
miner.nablabee.com 99
|
||||
wss.nablabee.com 99
|
||||
clickwith.bid 99
|
||||
dronml.ml 99
|
||||
niematego.tk 99
|
||||
tulip18.com 99
|
||||
p.estream.to 99
|
||||
didnkinrab.com 99
|
||||
ledhenone.com 99
|
||||
losital.ru 99
|
||||
mebablo.com 99
|
||||
moonsade.com 99
|
||||
nebabrop.com 99
|
||||
pearno.com 99
|
||||
rintinwa.com 99
|
||||
willacrit.com 99
|
||||
www2.adfreetv.ch 99
|
||||
minr.pw 99
|
||||
new.minr.pw 99
|
||||
test.minr.pw 99
|
||||
staticsfs.host 99
|
||||
cdn-code.host 99
|
||||
g-content.bid 99
|
||||
ad.g-content.bid 99
|
||||
cdn.static-cnt.bid 99
|
||||
cnt.statistic.date 99
|
||||
cdn.jquery-uim.download 99
|
||||
cdn-jquery.host 99
|
||||
p1.interestingz.pw 99
|
||||
kippbeak.cf 99
|
||||
pasoherb.gq 99
|
||||
axoncoho.tk 99
|
||||
depttake.ga 99
|
||||
flophous.cf 99
|
||||
pr0gram.org 99
|
||||
authedmine.eu 99
|
||||
www.monero-miner.com 99
|
||||
www.datasecu.download 99
|
||||
www.jquery-cdn.download 99
|
||||
www.etzbnfuigipwvs.ru 99
|
||||
www.terethat.ru 99
|
||||
freshrefresher.com 99
|
||||
api.pzoifaum.info 99
|
||||
ws.pzoifaum.info 99
|
||||
api.bhzejltg.info 99
|
||||
ws.bhzejltg.info 99
|
||||
d.cfcnet.top 99
|
||||
vip.cfcnet.top 99
|
||||
eu.cfcnet.top 99
|
||||
as.cfcnet.top 99
|
||||
us.cfcnet.top 99
|
||||
eu.cfcdist.loan 99
|
||||
as.cfcdist.loan 99
|
||||
us.cfcdist.loan 99
|
||||
gustaver.ddns.net 99
|
||||
worker.salon.com 99
|
||||
s2.appelamule.com 99
|
||||
mepirtedic.com 99
|
||||
cdn.streambeam.io 99
|
||||
adzjzewsma.cf 99
|
||||
ffinwwfpqi.gq 99
|
||||
ininmacerad.pro 99
|
||||
mhiobjnirs.gq 99
|
||||
open-hive-server-1.pp.ua 99
|
||||
pool.hws.ru 99
|
||||
pool.etn.spacepools.org 99
|
||||
api.aalbbh84.info 99
|
||||
www.aymcsx.ru 99
|
||||
aeros01.tk 99
|
||||
aeros02.tk 99
|
||||
aeros03.tk 99
|
||||
aeros04.tk 99
|
||||
aeros05.tk 99
|
||||
aeros06.tk 99
|
||||
aeros07.tk 99
|
||||
aeros08.tk 99
|
||||
aeros09.tk 99
|
||||
aeros10.tk 99
|
||||
aeros11.tk 99
|
||||
aeros12.tk 99
|
||||
npcdn1.now.sh 99
|
||||
mxcdn2.now.sh 99
|
||||
sxcdn6.now.sh 99
|
||||
mxcdn1.now.sh 99
|
||||
sxcdn02.now.sh 99
|
||||
sxcdn4.now.sh 99
|
||||
jqcdn2.herokuapp.com 99
|
||||
sxcdn1.herokuapp.com 99
|
||||
sxcdn5.herokuapp.com 99
|
||||
wpcdn1.herokuapp.com 99
|
||||
jqcdn01.herokuapp.com 99
|
||||
jqcdn03.herokuapp.com 99
|
||||
1q2w3.website 99
|
||||
video.videos.vidto.me 99
|
||||
video.streaming.estream.to 99
|
||||
eth-pocket.de 99
|
||||
xvideosharing.site 99
|
||||
bestcoinsignals.com 99
|
||||
eucsoft.com 99
|
||||
traviilo.com 99
|
||||
wasm24.ru 99
|
||||
xmr.cool 99
|
||||
api.netflare.info 99
|
||||
cdnjs.cloudflane.com 99
|
||||
www.cloudflane.com 99
|
||||
hide.ovh 99
|
||||
graftpool.ovh 99
|
||||
encoding.ovh 99
|
||||
altavista.ovh 99
|
||||
scaleway.ovh 99
|
||||
nexttime.ovh 99
|
||||
never.ovh 99
|
||||
2giga.download 99
|
||||
support.2giga.link 99
|
||||
webminerpool.com 99
|
||||
minercry.pt 99
|
||||
adplusplus.fr 99
|
||||
|
||||
# Does not seem to work anymore, but keeping it here just in case it gets revived
|
||||
azvjudwr.info 99
|
||||
jroqvbvw.info 99
|
||||
jyhfuqoh.info 99
|
||||
kdowqlpt.info 99
|
||||
xbasfbno.info 99
|
||||
|
||||
# These were Obfuscated
|
||||
1beb2a44.space 99
|
||||
300ca0d0.space 99
|
||||
310ca263.space 99
|
||||
320ca3f6.space 99
|
||||
330ca589.space 99
|
||||
340ca71c.space 99
|
||||
360caa42.space 99
|
||||
370cabd5.space 99
|
||||
3c0cb3b4.space 99
|
||||
3d0cb547.space 99
|
||||
|
||||
imageshack.us 99
|
||||
img265.imageshack.us 99
|
||||
Executable
+136
@@ -0,0 +1,136 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (C) 2019 - ntop.org
|
||||
#
|
||||
# nDPI is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# nDPI is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
#
|
||||
# Usage
|
||||
#
|
||||
# 1) Generate a CSV file using the ndpiReader tool. Example:
|
||||
# ./ndpiReader -C sample.json -i sample.pcap
|
||||
#
|
||||
# 2) Open Google Chrome and type in the URL 'chrome://tracing/'
|
||||
#
|
||||
# 3) Inside Chrome click on 'Load' or drop sample.json in the
|
||||
# Chrome window to visualize the output
|
||||
#
|
||||
|
||||
import sys
|
||||
import json
|
||||
|
||||
protos = {}
|
||||
lastId = 1
|
||||
|
||||
def get_timestamp(seen):
|
||||
tok = seen.split(".")
|
||||
return int(tok[0]) * 1000 + int(tok[1])
|
||||
|
||||
def get_record(toks, csv_fields):
|
||||
global protos
|
||||
global lastId
|
||||
|
||||
if len(toks) < 11:
|
||||
return None
|
||||
|
||||
record = dict()
|
||||
ndpiProtocol = toks[10]
|
||||
|
||||
ndpi_protos = ndpiProtocol.split(".")
|
||||
if(len(ndpi_protos) == 1):
|
||||
app_proto = ndpi_protos[0]
|
||||
else:
|
||||
app_proto = ndpi_protos[1]
|
||||
|
||||
id = protos.get(ndpiProtocol)
|
||||
if(id == None):
|
||||
lastId = lastId + 1
|
||||
protos[ndpiProtocol] = lastId
|
||||
id = lastId
|
||||
#print(ndpiProtocol+"="+str(id))
|
||||
|
||||
ip_address = toks[5]
|
||||
server_name = toks[11]
|
||||
record["cat"] = "flow"
|
||||
record["pid"] = ip_address
|
||||
record["tid"] = ndpiProtocol # id
|
||||
record["ts"] = get_timestamp(toks[2])
|
||||
record["ph"] = "X"
|
||||
record["name"] = app_proto
|
||||
|
||||
if(server_name == ""):
|
||||
args = {}
|
||||
else:
|
||||
args = { "name": server_name }
|
||||
record["args"] = args
|
||||
record["dur"] = get_timestamp(toks[3]) - record["ts"]
|
||||
|
||||
# if we do not have the legend we just return
|
||||
if csv_fields is None:
|
||||
return record
|
||||
|
||||
# Otherwise we just add everything we find as a string
|
||||
if(0):
|
||||
idx = 0
|
||||
for tok in toks:
|
||||
name = csv_fields[idx]
|
||||
idx += 1
|
||||
record["args"][name] = str(tok)
|
||||
|
||||
return record
|
||||
|
||||
def get_record_dict(filename):
|
||||
csv_fields = None
|
||||
records = []
|
||||
fin = open(filename, "r");
|
||||
for line in fin:
|
||||
line = line.replace("\n","")
|
||||
|
||||
# Get the legend if present
|
||||
if line[0] == '#':
|
||||
csv_fields = []
|
||||
line = line.replace("#", "")
|
||||
toks = line.split(",")
|
||||
for tok in toks:
|
||||
csv_fields.append(tok)
|
||||
continue
|
||||
|
||||
toks = line.split(",")
|
||||
flow_id = int(toks[0])
|
||||
record = get_record(toks, csv_fields)
|
||||
if record is None:
|
||||
print("Error while parsing " + line)
|
||||
continue
|
||||
|
||||
records.append(record)
|
||||
|
||||
json_dict = dict()
|
||||
json_dict["traceEvents"] = records
|
||||
|
||||
return json_dict
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) != 3:
|
||||
print("ndpi2json <csv_file> <json_file>")
|
||||
sys.exit(0)
|
||||
|
||||
record_dict = get_record_dict(sys.argv[1])
|
||||
#print(record_dict)
|
||||
#json_string = json.dumps(json_dict)
|
||||
#print(json_string)
|
||||
|
||||
with open(sys.argv[2], 'w') as fp:
|
||||
json.dump(record_dict, fp)
|
||||
print("Written " + str(len(record_dict["traceEvents"])) + " records")
|
||||
+1754
-1376
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
-1061
File diff suppressed because it is too large
Load Diff
@@ -1,185 +0,0 @@
|
||||
/*
|
||||
* ndpi_util.h
|
||||
*
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* This module contains routines to help setup a simple nDPI program.
|
||||
*
|
||||
* If you concern about performance or have to integrate nDPI in your
|
||||
* application, you could need to reimplement them yourself.
|
||||
*
|
||||
* WARNING: this API is unstable! Use it at your own risk!
|
||||
*/
|
||||
#ifndef __NDPI_UTIL_H__
|
||||
#define __NDPI_UTIL_H__
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#define MAX_NUM_READER_THREADS 16
|
||||
#define IDLE_SCAN_PERIOD 10 /* msec (use TICK_RESOLUTION = 1000) */
|
||||
#define MAX_IDLE_TIME 30000
|
||||
#define IDLE_SCAN_BUDGET 1024
|
||||
#define NUM_ROOTS 512
|
||||
#define MAX_EXTRA_PACKETS_TO_CHECK 7
|
||||
#define MAX_NDPI_FLOWS 200000000
|
||||
#define TICK_RESOLUTION 1000
|
||||
#define MAX_NUM_IP_ADDRESS 5 /* len of ip address array */
|
||||
#define UPDATED_TREE 1
|
||||
#define AGGRESSIVE_PERCENT 95.00
|
||||
#define DIR_SRC 10
|
||||
#define DIR_DST 20
|
||||
#define PORT_ARRAY_SIZE 20
|
||||
#define HOST_ARRAY_SIZE 20
|
||||
#define FLOWS_PACKETS_THRESHOLD 0.9
|
||||
#define FLOWS_PERCENT_THRESHOLD 1.0
|
||||
#define FLOWS_PERCENT_THRESHOLD_2 0.2
|
||||
#define FLOWS_THRESHOLD 1000
|
||||
#define PKTS_PERCENT_THRESHOLD 0.1
|
||||
#define MAX_TABLE_SIZE_1 4096
|
||||
#define MAX_TABLE_SIZE_2 8192
|
||||
#define INIT_VAL -1
|
||||
|
||||
// flow tracking
|
||||
typedef struct ndpi_flow_info {
|
||||
u_int32_t hashval;
|
||||
u_int32_t src_ip;
|
||||
u_int32_t dst_ip;
|
||||
u_int16_t src_port;
|
||||
u_int16_t dst_port;
|
||||
u_int8_t detection_completed, protocol, bidirectional, check_extra_packets;
|
||||
u_int16_t vlan_id;
|
||||
struct ndpi_flow_struct *ndpi_flow;
|
||||
char src_name[48], dst_name[48];
|
||||
u_int8_t ip_version;
|
||||
u_int64_t last_seen;
|
||||
u_int64_t src2dst_bytes, dst2src_bytes;
|
||||
u_int32_t src2dst_packets, dst2src_packets;
|
||||
|
||||
// result only, not used for flow identification
|
||||
ndpi_protocol detected_protocol;
|
||||
|
||||
char info[96];
|
||||
char host_server_name[192];
|
||||
char bittorent_hash[41];
|
||||
|
||||
struct {
|
||||
char client_info[48], server_info[48];
|
||||
} ssh_ssl;
|
||||
|
||||
void *src_id, *dst_id;
|
||||
} ndpi_flow_info_t;
|
||||
|
||||
|
||||
// flow statistics info
|
||||
typedef struct ndpi_stats {
|
||||
u_int32_t guessed_flow_protocols;
|
||||
u_int64_t raw_packet_count;
|
||||
u_int64_t ip_packet_count;
|
||||
u_int64_t total_wire_bytes, total_ip_bytes, total_discarded_bytes;
|
||||
u_int64_t protocol_counter[NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS + 1];
|
||||
u_int64_t protocol_counter_bytes[NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS + 1];
|
||||
u_int32_t protocol_flows[NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS + 1];
|
||||
u_int32_t ndpi_flow_count;
|
||||
u_int64_t tcp_count, udp_count;
|
||||
u_int64_t mpls_count, pppoe_count, vlan_count, fragmented_count;
|
||||
u_int64_t packet_len[6];
|
||||
u_int16_t max_packet_len;
|
||||
} ndpi_stats_t;
|
||||
|
||||
|
||||
// flow preferences
|
||||
typedef struct ndpi_workflow_prefs {
|
||||
u_int8_t decode_tunnels;
|
||||
u_int8_t quiet_mode;
|
||||
u_int32_t num_roots;
|
||||
u_int32_t max_ndpi_flows;
|
||||
} ndpi_workflow_prefs_t;
|
||||
|
||||
struct ndpi_workflow;
|
||||
|
||||
/** workflow, flow, user data */
|
||||
typedef void (*ndpi_workflow_callback_ptr) (struct ndpi_workflow *, struct ndpi_flow_info *, void *);
|
||||
|
||||
|
||||
// workflow main structure
|
||||
typedef struct ndpi_workflow {
|
||||
u_int64_t last_time;
|
||||
|
||||
struct ndpi_workflow_prefs prefs;
|
||||
struct ndpi_stats stats;
|
||||
|
||||
ndpi_workflow_callback_ptr __flow_detected_callback;
|
||||
void * __flow_detected_udata;
|
||||
ndpi_workflow_callback_ptr __flow_giveup_callback;
|
||||
void * __flow_giveup_udata;
|
||||
|
||||
/* outside referencies */
|
||||
pcap_t *pcap_handle;
|
||||
|
||||
/* allocated by prefs */
|
||||
void **ndpi_flows_root;
|
||||
struct ndpi_detection_module_struct *ndpi_struct;
|
||||
u_int32_t num_allocated_flows;
|
||||
} ndpi_workflow_t;
|
||||
|
||||
|
||||
/* 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);
|
||||
|
||||
|
||||
/* workflow main free function */
|
||||
void ndpi_workflow_free(struct ndpi_workflow * workflow);
|
||||
|
||||
|
||||
/** Free flow_info ndpi support structures but not the flow_info itself
|
||||
*
|
||||
* TODO remove! Half freeing things is bad!
|
||||
*/
|
||||
void ndpi_free_flow_info_half(struct ndpi_flow_info *flow);
|
||||
|
||||
|
||||
/* Process a packet and update the workflow */
|
||||
struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet);
|
||||
|
||||
|
||||
/* flow callbacks for complete detected flow
|
||||
(ndpi_flow_info will be freed right after) */
|
||||
static inline void ndpi_workflow_set_flow_detected_callback(struct ndpi_workflow * workflow, ndpi_workflow_callback_ptr callback, void * udata) {
|
||||
workflow->__flow_detected_callback = callback;
|
||||
workflow->__flow_detected_udata = udata;
|
||||
}
|
||||
|
||||
/* flow callbacks for sufficient detected flow
|
||||
(ndpi_flow_info will be freed right after) */
|
||||
static inline void ndpi_workflow_set_flow_giveup_callback(struct ndpi_workflow * workflow, ndpi_workflow_callback_ptr callback, void * udata) {
|
||||
workflow->__flow_giveup_callback = callback;
|
||||
workflow->__flow_giveup_udata = udata;
|
||||
}
|
||||
|
||||
/* compare two nodes in workflow */
|
||||
int ndpi_workflow_node_cmp(const void *a, const void *b);
|
||||
void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_flow_info *flow);
|
||||
u_int32_t ethernet_crc32(const void* data, size_t n_bytes);
|
||||
void ndpi_flow_info_freer(void *node);
|
||||
|
||||
extern int nDPI_LogLevel;
|
||||
|
||||
#endif
|
||||
+23
-6
@@ -10,15 +10,32 @@ tcp:3000@ntop
|
||||
# Format:
|
||||
# host:"<value>",host:"<value>",.....@<subproto>
|
||||
|
||||
host:"googlesyndication.com"@Google
|
||||
host:"venere.com"@Venere
|
||||
host:"kataweb.it",host:"repubblica.it"@Repubblica
|
||||
host:"ntop"@ntop
|
||||
host:"disneyplus.com"host:"cdn.registerdisney.go.com",host:"disney-portal.my.onetrust.com",host:"disneyplus.bn5x.net",host:"disney-plus.net"@DisneyPlus
|
||||
host:"*.lvlt.dash.us.aiv-cdn.net.c.footprint.net"@AmazonVideo
|
||||
host:"api-global.netflix.com"@Netflix
|
||||
# IP based Subprotocols
|
||||
# Format:
|
||||
# ip:<value>,ip:<value>,.....@<subproto>
|
||||
|
||||
ip:213.75.170.11@CustomProtocol
|
||||
|
||||
#
|
||||
# NOTES
|
||||
# 1) the port of a custom protocol is optional but if
|
||||
# specified it must match the port.
|
||||
# 2) you can specify up to 1 port per IP address
|
||||
# 3) if you specify a custom ip:<IP>:<PORT> rule,
|
||||
# even if the <PORT> doesn't match the <IP>
|
||||
# (if best match during the search) will
|
||||
# have priority as best match. Example if
|
||||
# you specify a <Google IP>:<port 9999> and
|
||||
# in your traffic have match for such IP but
|
||||
# with a port other than 9999, the IP address
|
||||
# begin a best match will hve preference over
|
||||
# <Google IP> so this protocol will not be
|
||||
# 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
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,351 @@
|
||||
/*
|
||||
* ndpi_util.h
|
||||
*
|
||||
* Copyright (C) 2011-19 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* This module contains routines to help setup a simple nDPI program.
|
||||
*
|
||||
* If you concern about performance or have to integrate nDPI in your
|
||||
* application, you could need to reimplement them yourself.
|
||||
*
|
||||
* WARNING: this API is just a demo od nDPI usage: Use it at your own risk!
|
||||
*/
|
||||
#ifndef __NDPI_UTIL_H__
|
||||
#define __NDPI_UTIL_H__
|
||||
|
||||
#include "uthash.h"
|
||||
#include <pcap.h>
|
||||
#include "ndpi_includes.h"
|
||||
#include "ndpi_classify.h"
|
||||
#include "ndpi_typedefs.h"
|
||||
|
||||
#ifdef USE_DPDK
|
||||
#include <rte_eal.h>
|
||||
#include <rte_ether.h>
|
||||
#include <rte_ethdev.h>
|
||||
#include <rte_cycles.h>
|
||||
#include <rte_lcore.h>
|
||||
#include <rte_mbuf.h>
|
||||
|
||||
#define RX_RING_SIZE 128
|
||||
#define TX_RING_SIZE 512
|
||||
#define NUM_MBUFS 8191
|
||||
#define MBUF_CACHE_SIZE 250
|
||||
#define BURST_SIZE 32
|
||||
#define PREFETCH_OFFSET 3
|
||||
|
||||
extern int dpdk_port_init(int port, struct rte_mempool *mbuf_pool);
|
||||
extern int dpdk_port_deinit(int port);
|
||||
#endif
|
||||
|
||||
/* ETTA Spec defiintions for feature readiness */
|
||||
#define ETTA_MIN_PACKETS 10
|
||||
#define ETTA_MIN_OCTETS 4000
|
||||
/** maximum line length */
|
||||
#define LINEMAX 512
|
||||
#define MAX_BYTE_COUNT_ARRAY_LENGTH 256
|
||||
#define MAX_NUM_PKTS 10
|
||||
|
||||
#define MAX_NUM_READER_THREADS 16
|
||||
#define IDLE_SCAN_PERIOD 10 /* msec (use TICK_RESOLUTION = 1000) */
|
||||
#define MAX_IDLE_TIME 30000
|
||||
#define IDLE_SCAN_BUDGET 1024
|
||||
#define NUM_ROOTS 512
|
||||
#define MAX_EXTRA_PACKETS_TO_CHECK 7
|
||||
#define MAX_NDPI_FLOWS 200000000
|
||||
#define TICK_RESOLUTION 1000
|
||||
#define MAX_NUM_IP_ADDRESS 5 /* len of ip address array */
|
||||
#define UPDATED_TREE 1
|
||||
#define AGGRESSIVE_PERCENT 95.00
|
||||
#define DIR_SRC 10
|
||||
#define DIR_DST 20
|
||||
#define PORT_ARRAY_SIZE 20
|
||||
#define HOST_ARRAY_SIZE 20
|
||||
#define FLOWS_PACKETS_THRESHOLD 0.9
|
||||
#define FLOWS_PERCENT_THRESHOLD 1.0
|
||||
#define FLOWS_PERCENT_THRESHOLD_2 0.2
|
||||
#define FLOWS_THRESHOLD 1000
|
||||
#define PKTS_PERCENT_THRESHOLD 0.1
|
||||
#define MAX_TABLE_SIZE_1 4096
|
||||
#define MAX_TABLE_SIZE_2 8192
|
||||
#define INIT_VAL -1
|
||||
|
||||
|
||||
// inner hash table (ja3 -> security state)
|
||||
typedef struct ndpi_ja3_info {
|
||||
char * ja3;
|
||||
ndpi_cipher_weakness unsafe_cipher;
|
||||
UT_hash_handle hh;
|
||||
} ndpi_ja3_info;
|
||||
|
||||
// external hash table (host ip -> <ip string, hash table ja3c, hash table ja3s>)
|
||||
// used to aggregate ja3 fingerprints by hosts
|
||||
typedef struct ndpi_host_ja3_fingerprints {
|
||||
u_int32_t ip;
|
||||
char *ip_string;
|
||||
char *dns_name;
|
||||
ndpi_ja3_info *host_client_info_hasht;
|
||||
ndpi_ja3_info *host_server_info_hasht;
|
||||
|
||||
UT_hash_handle hh;
|
||||
} ndpi_host_ja3_fingerprints;
|
||||
|
||||
|
||||
//inner hash table
|
||||
typedef struct ndpi_ip_dns{
|
||||
u_int32_t ip;
|
||||
char *ip_string;
|
||||
char *dns_name; //server name if any;
|
||||
UT_hash_handle hh;
|
||||
} ndpi_ip_dns;
|
||||
|
||||
//hash table ja3 -> <host, ip, security>, used to aggregate host by ja3 fingerprints
|
||||
typedef struct ndpi_ja3_fingerprints_host{
|
||||
char *ja3; //key
|
||||
ndpi_cipher_weakness unsafe_cipher;
|
||||
ndpi_ip_dns *ipToDNS_ht;
|
||||
UT_hash_handle hh;
|
||||
} ndpi_ja3_fingerprints_host;
|
||||
|
||||
struct flow_metrics {
|
||||
float entropy, average, stddev;
|
||||
};
|
||||
|
||||
struct ndpi_entropy {
|
||||
// Entropy fields
|
||||
pkt_timeval src2dst_last_pkt_time, dst2src_last_pkt_time, flow_last_pkt_time;
|
||||
u_int16_t src2dst_pkt_len[MAX_NUM_PKTS]; /*!< array of packet appdata lengths */
|
||||
pkt_timeval src2dst_pkt_time[MAX_NUM_PKTS]; /*!< array of arrival times */
|
||||
u_int16_t dst2src_pkt_len[MAX_NUM_PKTS]; /*!< array of packet appdata lengths */
|
||||
pkt_timeval dst2src_pkt_time[MAX_NUM_PKTS]; /*!< array of arrival times */
|
||||
pkt_timeval src2dst_start; /*!< first packet arrival time */
|
||||
pkt_timeval dst2src_start; /*!< first packet arrival time */
|
||||
u_int32_t src2dst_opackets; /*!< non-zero packet counts */
|
||||
u_int32_t dst2src_opackets; /*!< non-zero packet counts */
|
||||
u_int16_t src2dst_pkt_count; /*!< packet counts */
|
||||
u_int16_t dst2src_pkt_count; /*!< packet counts */
|
||||
u_int32_t src2dst_l4_bytes; /*!< packet counts */
|
||||
u_int32_t dst2src_l4_bytes; /*!< packet counts */
|
||||
u_int32_t src2dst_byte_count[MAX_BYTE_COUNT_ARRAY_LENGTH]; /*!< number of occurences of each byte */
|
||||
u_int32_t dst2src_byte_count[MAX_BYTE_COUNT_ARRAY_LENGTH]; /*!< number of occurences of each byte */
|
||||
u_int32_t src2dst_num_bytes;
|
||||
u_int32_t dst2src_num_bytes;
|
||||
double src2dst_bd_mean;
|
||||
double src2dst_bd_variance;
|
||||
double dst2src_bd_mean;
|
||||
double dst2src_bd_variance;
|
||||
float score;
|
||||
};
|
||||
|
||||
// flow tracking
|
||||
typedef struct ndpi_flow_info {
|
||||
u_int32_t flow_id;
|
||||
u_int32_t hashval;
|
||||
u_int32_t src_ip;
|
||||
u_int32_t dst_ip;
|
||||
u_int16_t src_port;
|
||||
u_int16_t dst_port;
|
||||
u_int8_t detection_completed, protocol, bidirectional, check_extra_packets;
|
||||
u_int16_t vlan_id;
|
||||
ndpi_packet_tunnel tunnel_type;
|
||||
struct ndpi_flow_struct *ndpi_flow;
|
||||
char src_name[48], dst_name[48];
|
||||
u_int8_t ip_version;
|
||||
u_int32_t cwr_count, src2dst_cwr_count, dst2src_cwr_count;
|
||||
u_int32_t ece_count, src2dst_ece_count, dst2src_ece_count;
|
||||
u_int32_t urg_count, src2dst_urg_count, dst2src_urg_count;
|
||||
u_int32_t ack_count, src2dst_ack_count, dst2src_ack_count;
|
||||
u_int32_t psh_count, src2dst_psh_count, dst2src_psh_count;
|
||||
u_int32_t syn_count, src2dst_syn_count, dst2src_syn_count;
|
||||
u_int32_t fin_count, src2dst_fin_count, dst2src_fin_count;
|
||||
u_int32_t rst_count, src2dst_rst_count, dst2src_rst_count;
|
||||
u_int32_t c_to_s_init_win, s_to_c_init_win;
|
||||
u_int64_t first_seen_ms, last_seen_ms;
|
||||
u_int64_t src2dst_bytes, dst2src_bytes;
|
||||
u_int64_t src2dst_goodput_bytes, dst2src_goodput_bytes;
|
||||
u_int32_t src2dst_packets, dst2src_packets;
|
||||
u_int32_t has_human_readeable_strings;
|
||||
char human_readeable_string_buffer[32];
|
||||
|
||||
// result only, not used for flow identification
|
||||
ndpi_protocol detected_protocol;
|
||||
|
||||
// Flow data analysis
|
||||
struct ndpi_analyze_struct *iat_c_to_s, *iat_s_to_c, *iat_flow,
|
||||
*pktlen_c_to_s, *pktlen_s_to_c;
|
||||
|
||||
char info[160];
|
||||
char flow_extra_info[16];
|
||||
char host_server_name[240];
|
||||
char bittorent_hash[41];
|
||||
char dhcp_fingerprint[48];
|
||||
ndpi_risk risk;
|
||||
|
||||
struct {
|
||||
u_int16_t ssl_version;
|
||||
char client_requested_server_name[64], server_info[64],
|
||||
client_hassh[33], server_hassh[33], *server_names,
|
||||
*tls_alpn, *tls_supported_versions,
|
||||
*tls_issuerDN, *tls_subjectDN,
|
||||
ja3_client[33], ja3_server[33],
|
||||
sha1_cert_fingerprint[20];
|
||||
u_int8_t sha1_cert_fingerprint_set;
|
||||
struct {
|
||||
u_int16_t cipher_suite;
|
||||
char *esni;
|
||||
} encrypted_sni;
|
||||
time_t notBefore, notAfter;
|
||||
u_int16_t server_cipher;
|
||||
ndpi_cipher_weakness client_unsafe_cipher, server_unsafe_cipher;
|
||||
} ssh_tls;
|
||||
|
||||
struct {
|
||||
char url[256], content_type[64], user_agent[128];
|
||||
u_int response_status_code;
|
||||
} http;
|
||||
|
||||
struct {
|
||||
char username[32], password[32];
|
||||
} telnet;
|
||||
|
||||
void *src_id, *dst_id;
|
||||
|
||||
struct ndpi_entropy entropy;
|
||||
struct ndpi_entropy last_entropy;
|
||||
|
||||
/* Payload lenght bins */
|
||||
#ifdef DIRECTION_BINS
|
||||
struct ndpi_bin payload_len_bin_src2dst, payload_len_bin_dst2src;
|
||||
#else
|
||||
struct ndpi_bin payload_len_bin;
|
||||
#endif
|
||||
} ndpi_flow_info_t;
|
||||
|
||||
|
||||
// flow statistics info
|
||||
typedef struct ndpi_stats {
|
||||
u_int32_t guessed_flow_protocols;
|
||||
u_int64_t raw_packet_count;
|
||||
u_int64_t ip_packet_count;
|
||||
u_int64_t total_wire_bytes, total_ip_bytes, total_discarded_bytes;
|
||||
u_int64_t protocol_counter[NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS + 1];
|
||||
u_int64_t protocol_counter_bytes[NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS + 1];
|
||||
u_int32_t protocol_flows[NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS + 1];
|
||||
u_int32_t ndpi_flow_count;
|
||||
u_int64_t tcp_count, udp_count;
|
||||
u_int64_t mpls_count, pppoe_count, vlan_count, fragmented_count;
|
||||
u_int64_t packet_len[6];
|
||||
u_int16_t max_packet_len;
|
||||
} ndpi_stats_t;
|
||||
|
||||
|
||||
// flow preferences
|
||||
typedef struct ndpi_workflow_prefs {
|
||||
u_int8_t decode_tunnels;
|
||||
u_int8_t quiet_mode;
|
||||
u_int32_t num_roots;
|
||||
u_int32_t max_ndpi_flows;
|
||||
} ndpi_workflow_prefs_t;
|
||||
|
||||
struct ndpi_workflow;
|
||||
|
||||
/** workflow, flow, user data */
|
||||
typedef void (*ndpi_workflow_callback_ptr) (struct ndpi_workflow *, struct ndpi_flow_info *, void *);
|
||||
|
||||
|
||||
// workflow main structure
|
||||
typedef struct ndpi_workflow {
|
||||
u_int64_t last_time;
|
||||
|
||||
struct ndpi_workflow_prefs prefs;
|
||||
struct ndpi_stats stats;
|
||||
|
||||
ndpi_workflow_callback_ptr __flow_detected_callback;
|
||||
void * __flow_detected_udata;
|
||||
ndpi_workflow_callback_ptr __flow_giveup_callback;
|
||||
void * __flow_giveup_udata;
|
||||
|
||||
/* outside referencies */
|
||||
pcap_t *pcap_handle;
|
||||
|
||||
/* allocated by prefs */
|
||||
void **ndpi_flows_root;
|
||||
struct ndpi_detection_module_struct *ndpi_struct;
|
||||
u_int32_t num_allocated_flows;
|
||||
} ndpi_workflow_t;
|
||||
|
||||
|
||||
/* 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);
|
||||
|
||||
|
||||
/* workflow main free function */
|
||||
void ndpi_workflow_free(struct ndpi_workflow * workflow);
|
||||
|
||||
|
||||
/** Free flow_info ndpi support structures but not the flow_info itself
|
||||
*
|
||||
* TODO remove! Half freeing things is bad!
|
||||
*/
|
||||
void ndpi_free_flow_info_half(struct ndpi_flow_info *flow);
|
||||
|
||||
|
||||
/* Process a packet and update the workflow */
|
||||
struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet,
|
||||
FILE * csv_fp);
|
||||
|
||||
|
||||
/* flow callbacks for complete detected flow
|
||||
(ndpi_flow_info will be freed right after) */
|
||||
static inline void ndpi_workflow_set_flow_detected_callback(struct ndpi_workflow * workflow, ndpi_workflow_callback_ptr callback, void * udata) {
|
||||
workflow->__flow_detected_callback = callback;
|
||||
workflow->__flow_detected_udata = udata;
|
||||
}
|
||||
|
||||
/* flow callbacks for sufficient detected flow
|
||||
(ndpi_flow_info will be freed right after) */
|
||||
static inline void ndpi_workflow_set_flow_giveup_callback(struct ndpi_workflow * workflow, ndpi_workflow_callback_ptr callback, void * udata) {
|
||||
workflow->__flow_giveup_callback = callback;
|
||||
workflow->__flow_giveup_udata = udata;
|
||||
}
|
||||
|
||||
/* compare two nodes in workflow */
|
||||
int ndpi_workflow_node_cmp(const void *a, const void *b);
|
||||
void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_flow_info *flow, FILE * csv_fp);
|
||||
u_int32_t ethernet_crc32(const void* data, size_t n_bytes);
|
||||
void ndpi_flow_info_free_data(struct ndpi_flow_info *flow);
|
||||
void ndpi_flow_info_freer(void *node);
|
||||
const char* print_cipher_id(u_int32_t cipher);
|
||||
float ndpi_flow_get_byte_count_entropy(const uint32_t byte_count[256], unsigned int num_bytes);
|
||||
|
||||
extern int nDPI_LogLevel;
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
#define LOG(log_level, args...) \
|
||||
{ \
|
||||
if(log_level <= nDPI_LogLevel) \
|
||||
printf(args); \
|
||||
}
|
||||
#else
|
||||
#define LOG(...) {}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,43 @@
|
||||
bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_with_main
|
||||
|
||||
fuzz_process_packet_SOURCES = fuzz_process_packet.c
|
||||
fuzz_process_packet_CFLAGS =
|
||||
fuzz_process_packet_LDADD = ../src/lib/libndpi.a
|
||||
fuzz_process_packet_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_process_packet_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_process_packet_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_process_packet_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_process_packet_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_SOURCES = fuzz_ndpi_reader.c
|
||||
fuzz_ndpi_reader_CFLAGS = -I../example/
|
||||
fuzz_ndpi_reader_LDADD = ../src/lib/libndpi.a
|
||||
fuzz_ndpi_reader_LDFLAGS = ../example/libndpiReader.a $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS)
|
||||
if HAS_FUZZLDFLAGS
|
||||
fuzz_ndpi_reader_CFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
fuzz_ndpi_reader_LDFLAGS += $(LIB_FUZZING_ENGINE)
|
||||
endif
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
fuzz_ndpi_reader_with_main_SOURCES = fuzz_ndpi_reader.c
|
||||
fuzz_ndpi_reader_with_main_CFLAGS = -I../example/ -DBUILD_MAIN
|
||||
fuzz_ndpi_reader_with_main_LDADD = ../src/lib/libndpi.a
|
||||
fuzz_ndpi_reader_with_main_LDFLAGS = ../example/libndpiReader.a $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS)
|
||||
# force usage of CXX for linker
|
||||
fuzz_ndpi_reader_with_main_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(fuzz_ndpi_reader_with_main_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
# required for Google oss-fuzz
|
||||
# see https://github.com/google/oss-fuzz/tree/master/projects/ndpi
|
||||
testpcaps := $(wildcard ../tests/pcap/*.pcap)
|
||||
|
||||
fuzz_ndpi_reader_seed_corpus.zip: $(testpcaps)
|
||||
zip -r fuzz_ndpi_reader_seed_corpus.zip $(testpcaps)
|
||||
@@ -0,0 +1,163 @@
|
||||
#include "reader_util.h"
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#include <pcap/pcap.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
||||
struct ndpi_workflow_prefs *prefs = NULL;
|
||||
|
||||
int nDPI_LogLevel = 0;
|
||||
char *_debug_protocols = NULL;
|
||||
u_int32_t current_ndpi_memory = 0, max_ndpi_memory = 0;
|
||||
u_int8_t enable_protocol_guess = 1, enable_payload_analyzer = 0;
|
||||
u_int8_t enable_joy_stats = 0;
|
||||
u_int8_t human_readeable_string_len = 5;
|
||||
u_int8_t max_num_udp_dissected_pkts = 16 /* 8 is enough for most protocols, Signal requires more */, max_num_tcp_dissected_pkts = 80 /* due to telnet */;
|
||||
|
||||
int bufferToFile(const char * name, const uint8_t *Data, size_t Size) {
|
||||
FILE * fd;
|
||||
if (remove(name) != 0) {
|
||||
if (errno != ENOENT) {
|
||||
perror("remove failed");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
fd = fopen(name, "wb");
|
||||
if (fd == NULL) {
|
||||
perror("open failed");
|
||||
return -2;
|
||||
}
|
||||
if (fwrite (Data, 1, Size, fd) != Size) {
|
||||
fclose(fd);
|
||||
return -3;
|
||||
}
|
||||
fclose(fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
||||
pcap_t * pkts;
|
||||
const u_char *pkt;
|
||||
struct pcap_pkthdr *header;
|
||||
int r;
|
||||
char errbuf[PCAP_ERRBUF_SIZE];
|
||||
NDPI_PROTOCOL_BITMASK all;
|
||||
char * pcap_path = tempnam("/tmp", "fuzz-ndpi-reader");
|
||||
|
||||
if (prefs == NULL) {
|
||||
prefs = calloc(sizeof(struct ndpi_workflow_prefs), 1);
|
||||
if (prefs == NULL) {
|
||||
//should not happen
|
||||
return 1;
|
||||
}
|
||||
prefs->decode_tunnels = 1;
|
||||
prefs->num_roots = 16;
|
||||
prefs->max_ndpi_flows = 1024;
|
||||
prefs->quiet_mode = 0;
|
||||
}
|
||||
bufferToFile(pcap_path, Data, Size);
|
||||
|
||||
pkts = pcap_open_offline(pcap_path, errbuf);
|
||||
if (pkts == NULL) {
|
||||
remove(pcap_path);
|
||||
free(pcap_path);
|
||||
return 0;
|
||||
}
|
||||
struct ndpi_workflow * workflow = ndpi_workflow_init(prefs, pkts);
|
||||
// enable all protocols
|
||||
NDPI_BITMASK_SET_ALL(all);
|
||||
ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all);
|
||||
memset(workflow->stats.protocol_counter, 0,
|
||||
sizeof(workflow->stats.protocol_counter));
|
||||
memset(workflow->stats.protocol_counter_bytes, 0,
|
||||
sizeof(workflow->stats.protocol_counter_bytes));
|
||||
memset(workflow->stats.protocol_flows, 0,
|
||||
sizeof(workflow->stats.protocol_flows));
|
||||
ndpi_finalize_initalization(workflow->ndpi_struct);
|
||||
|
||||
r = pcap_next_ex(pkts, &header, &pkt);
|
||||
while (r > 0) {
|
||||
if(header->caplen >= 42 /* ARP+ size */) {
|
||||
/* allocate an exact size buffer to check overflows */
|
||||
uint8_t *packet_checked = malloc(header->caplen);
|
||||
|
||||
if(packet_checked) {
|
||||
memcpy(packet_checked, pkt, header->caplen);
|
||||
ndpi_workflow_process_packet(workflow, header, packet_checked, NULL);
|
||||
free(packet_checked);
|
||||
}
|
||||
}
|
||||
|
||||
r = pcap_next_ex(pkts, &header, &pkt);
|
||||
}
|
||||
ndpi_workflow_free(workflow);
|
||||
pcap_close(pkts);
|
||||
|
||||
remove(pcap_path);
|
||||
free(pcap_path);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef BUILD_MAIN
|
||||
int main(int argc, char ** argv)
|
||||
{
|
||||
FILE * pcap_file;
|
||||
long pcap_file_size;
|
||||
uint8_t * pcap_buffer;
|
||||
int test_retval;
|
||||
|
||||
if (argc != 2) {
|
||||
fprintf(stderr, "usage: %s: [pcap-file]\n",
|
||||
(argc > 0 ? argv[0] : "fuzz_ndpi_reader_with_main"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
pcap_file = fopen(argv[1], "r");
|
||||
if (pcap_file == NULL) {
|
||||
perror("fopen failed");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (fseek(pcap_file, 0, SEEK_END) != 0) {
|
||||
perror("fseek(SEEK_END) failed");
|
||||
fclose(pcap_file);
|
||||
return 1;
|
||||
}
|
||||
|
||||
pcap_file_size = ftell(pcap_file);
|
||||
if (pcap_file_size < 0) {
|
||||
perror("ftell failed");
|
||||
fclose(pcap_file);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (fseek(pcap_file, 0, SEEK_SET) != 0) {
|
||||
perror("fseek(0, SEEK_SET) failed");
|
||||
fclose(pcap_file);
|
||||
return 1;
|
||||
}
|
||||
|
||||
pcap_buffer = malloc(pcap_file_size);
|
||||
if (pcap_buffer == NULL) {
|
||||
perror("malloc failed");
|
||||
fclose(pcap_file);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (fread(pcap_buffer, sizeof(*pcap_buffer), pcap_file_size, pcap_file) != pcap_file_size) {
|
||||
perror("fread failed");
|
||||
fclose(pcap_file);
|
||||
return 1;
|
||||
}
|
||||
|
||||
test_retval = LLVMFuzzerTestOneInput(pcap_buffer, pcap_file_size);
|
||||
fclose(pcap_file);
|
||||
free(pcap_buffer);
|
||||
|
||||
return test_retval;
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,28 @@
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
||||
struct ndpi_detection_module_struct *ndpi_info_mod = NULL;
|
||||
struct ndpi_id_struct *src;
|
||||
struct ndpi_id_struct *dst;
|
||||
|
||||
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
||||
if (ndpi_info_mod == NULL) {
|
||||
ndpi_info_mod = ndpi_init_detection_module(ndpi_no_prefs);
|
||||
NDPI_PROTOCOL_BITMASK all;
|
||||
NDPI_BITMASK_SET_ALL(all);
|
||||
ndpi_set_protocol_detection_bitmask2(ndpi_info_mod, &all);
|
||||
src = ndpi_malloc(SIZEOF_ID_STRUCT);
|
||||
dst = ndpi_malloc(SIZEOF_ID_STRUCT);
|
||||
}
|
||||
|
||||
struct ndpi_flow_struct *ndpi_flow = ndpi_flow_malloc(SIZEOF_FLOW_STRUCT);
|
||||
memset(ndpi_flow, 0, SIZEOF_FLOW_STRUCT);
|
||||
memset(src, 0, SIZEOF_ID_STRUCT);
|
||||
memset(dst, 0, SIZEOF_ID_STRUCT);
|
||||
ndpi_detection_process_packet(ndpi_info_mod, ndpi_flow, Data, Size, 0, src, dst);
|
||||
ndpi_free_flow(ndpi_flow);
|
||||
|
||||
return 0;
|
||||
}
|
||||
+2
-2
@@ -6,5 +6,5 @@ includedir=@includedir@
|
||||
Name: libndpi
|
||||
Description: deep packet inspection library
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lndpi
|
||||
Cflags: -I${includedir}/libndpi-@VERSION@
|
||||
Libs: -L${libdir} -lndpi @ADDITIONAL_LIBS@
|
||||
Cflags: -I${includedir}/ndpi
|
||||
|
||||
-66
@@ -1,66 +0,0 @@
|
||||
ndpi_dump_protocols
|
||||
ndpi_strnstr
|
||||
ndpi_detection_giveup
|
||||
ndpi_get_proto_name
|
||||
ndpi_free
|
||||
ndpi_flow_free
|
||||
ndpi_guess_undetected_protocol
|
||||
ndpi_tfind
|
||||
ndpi_tsearch
|
||||
ndpi_set_protocol_detection_bitmask2
|
||||
ndpi_detection_get_sizeof_ndpi_id_struct
|
||||
ndpi_detection_get_sizeof_ndpi_flow_struct
|
||||
ndpi_load_protocols_file
|
||||
ndpi_tdestroy
|
||||
ndpi_exit_detection_module
|
||||
ndpi_l4_detection_process_packet
|
||||
ndpi_detection_process_packet
|
||||
ndpi_twalk
|
||||
ndpi_tdelete
|
||||
ndpi_revision
|
||||
ndpi_init_detection_module
|
||||
ndpi_get_num_supported_protocols
|
||||
ndpi_set_proto_defaults
|
||||
ndpi_get_protocol_id
|
||||
ndpi_get_category_id
|
||||
ndpi_find_port_based_protocol
|
||||
ndpi_get_http_method
|
||||
ndpi_get_http_url
|
||||
ndpi_get_http_content_type
|
||||
ndpi_free_flow
|
||||
ndpi_get_proto_breed
|
||||
ndpi_get_proto_breed_name
|
||||
ndpi_get_proto_by_id
|
||||
ndpi_get_proto_by_name
|
||||
ndpi_get_protocol_id_master_proto
|
||||
ndpi_guess_protocol_id
|
||||
ndpi_protocol2name
|
||||
ndpi_get_lower_proto
|
||||
ndpi_is_proto
|
||||
ndpi_malloc
|
||||
ndpi_calloc
|
||||
ndpi_set_detected_protocol
|
||||
ndpi_match_string_subprotocol
|
||||
ndpi_init_automa
|
||||
ndpi_free_automa
|
||||
ndpi_add_string_value_to_automa
|
||||
ndpi_add_string_to_automa
|
||||
ndpi_finalize_automa
|
||||
ndpi_match_string
|
||||
ndpi_match_string_id
|
||||
set_ndpi_malloc
|
||||
set_ndpi_flow_malloc
|
||||
set_ndpi_free
|
||||
set_ndpi_flow_free
|
||||
set_ndpi_debug_function
|
||||
ndpi_category_str
|
||||
ndpi_get_proto_category
|
||||
ndpi_netbios_name_interpret
|
||||
ndpi_category_set_name
|
||||
ndpi_category_get_name
|
||||
ndpi_is_custom_category
|
||||
ndpi_is_subprotocol_informative
|
||||
ndpi_set_proto_category
|
||||
ndpi_get_api_version
|
||||
ndpi_network_ptree_match
|
||||
ndpi_check_flow_func
|
||||
@@ -0,0 +1,53 @@
|
||||
# ===========================================================================
|
||||
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# Check whether the given FLAG works with the current language's compiler
|
||||
# or gives an error. (Warnings, however, are ignored)
|
||||
#
|
||||
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
|
||||
# success/failure.
|
||||
#
|
||||
# If EXTRA-FLAGS is defined, it is added to the current language's default
|
||||
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
|
||||
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
|
||||
# force the compiler to issue an error when a bad flag is given.
|
||||
#
|
||||
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
|
||||
#
|
||||
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
|
||||
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
|
||||
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
|
||||
#
|
||||
# Copying and distribution of this file, with or without modification, are
|
||||
# permitted in any medium without royalty provided the copyright notice
|
||||
# and this notice are preserved. This file is offered as-is, without any
|
||||
# warranty.
|
||||
|
||||
#serial 6
|
||||
|
||||
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
|
||||
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
|
||||
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
|
||||
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
|
||||
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
|
||||
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
|
||||
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
|
||||
[AS_VAR_SET(CACHEVAR,[yes])],
|
||||
[AS_VAR_SET(CACHEVAR,[no])])
|
||||
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
|
||||
AS_VAR_IF(CACHEVAR,yes,
|
||||
[m4_default([$2], :)],
|
||||
[m4_default([$3], :)])
|
||||
AS_VAR_POPDEF([CACHEVAR])dnl
|
||||
])dnl AX_CHECK_COMPILE_FLAGS
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
ubuntu
|
||||
@@ -0,0 +1 @@
|
||||
/usr/local/lib
|
||||
@@ -0,0 +1,57 @@
|
||||
#
|
||||
# Copyright (C) 2018-20 - ntop.org
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libndpi
|
||||
PKG_VERSION:=17022020
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/ntop/nDPI.git
|
||||
PKG_SOURCE_VERSION:=1f921562d1d7962f1d23ca5b59c25f9b65073460
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_PROTO:=git
|
||||
|
||||
PKG_MAINTAINER:=Luca Deri <deri@ntop.org>
|
||||
PKG_LICENSE:=GPL3
|
||||
PKG_BUILD_DEPENDS:=
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
# autogen fix
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/libndpi
|
||||
SECTION:=network
|
||||
CATEGORY:=Network
|
||||
TITLE:=nDPI Deep Packet Inspection Library
|
||||
URL:=https://www.ntop.org
|
||||
endef
|
||||
|
||||
define Package/libndpi/description
|
||||
Open and Extensible GPLv3 Deep Packet Inspection Library
|
||||
endef
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--with-only-libndpi
|
||||
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
( cd $(PKG_BUILD_DIR); ./autogen.sh )
|
||||
$(call Build/Configure/Default)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(STAGING_DIR)/usr/local/include/libndpi
|
||||
$(CP) $(PKG_BUILD_DIR)/src/include/* $(STAGING_DIR)/usr/local/include/libndpi
|
||||
$(INSTALL_DIR) $(STAGING_DIR)/usr/local/lib
|
||||
$(CP) $(PKG_BUILD_DIR)/src/lib/libndpi.* $(STAGING_DIR)/usr/local/lib
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libndpi))
|
||||
@@ -0,0 +1,25 @@
|
||||
Howto Compile lindpi on OpenWRT
|
||||
-------------------------------
|
||||
|
||||
cd myopenwrt_directory
|
||||
mkdir package/network/services/libndpi
|
||||
cd package/network/services/libndpi
|
||||
cp ~/nDPI/packages/openwrt/Makefile .
|
||||
cd myopenwrt_directory
|
||||
make menuconfig
|
||||
|
||||
Go under network and select
|
||||
|
||||
<M> libndpi.............................. nDPI Deep Packet Inspection Library
|
||||
|
||||
|
||||
Build Commands
|
||||
--------------
|
||||
|
||||
If you want to build just libndpi do:
|
||||
make -j1 V=s package/network/services/libndpi/clean
|
||||
make -j1 V=s package/network/services/libndpi/compile
|
||||
|
||||
Other Documents
|
||||
---------------
|
||||
https://openwrt.org/packages/pkgdata/libndpi
|
||||
@@ -0,0 +1,38 @@
|
||||
#
|
||||
# RPM Build Process
|
||||
#
|
||||
APPL=ndpi
|
||||
PLATFORM=@PLATFORM@
|
||||
GIT_REVISION=@GIT_REVISION@
|
||||
PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||
PACKAGE=$(APPL)-$(PACKAGE_VERSION)-$(GIT_REVISION).$(PLATFORM).rpm
|
||||
DEV_PACKAGE=$(APPL)-dev-$(PACKAGE_VERSION)-$(GIT_REVISION).$(PLATFORM).rpm
|
||||
PACKAGE_PATH=$(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)
|
||||
|
||||
package: build-rpm
|
||||
|
||||
build-src:
|
||||
cd ../..; ./autogen.sh; ./configure; make clean; make
|
||||
|
||||
cleanup-rpm:
|
||||
rm -rf $(HOME)/rpmbuild/BUILD/ndpi* $(HOME)/rpmbuild/SOURCES/ndpi*
|
||||
|
||||
build-rpm: build-src cleanup-rpm
|
||||
-rm -rf ndpi-@PACKAGE_VERSION@
|
||||
mkdir -p ndpi-@PACKAGE_VERSION@/packages
|
||||
cp ndpi.spec.in ndpi-@PACKAGE_VERSION@/packages
|
||||
cp ../../Makefile.* ../../libtool ../../configure* ../../config.* ../../install-sh ../../autogen.sh ndpi-@PACKAGE_VERSION@
|
||||
cp -rf ../../src ndpi-@PACKAGE_VERSION@
|
||||
cp ../../CHANGELOG.md ../../COPYING ndpi-@PACKAGE_VERSION@
|
||||
\rm -f ndpi-@PACKAGE_VERSION@/config.status
|
||||
mkdir -p $(HOME)/rpmbuild/SOURCES
|
||||
tar cvfz $(HOME)/rpmbuild/SOURCES/ndpi-@PACKAGE_VERSION@.tgz ndpi-@PACKAGE_VERSION@
|
||||
@rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)
|
||||
@rpmbuild -bb ./$(APPL).spec --define "buildnumber $(GIT_REVISION)"
|
||||
@if [[ $EUID -ne 0 ]]; then @RPM_SIGN_CMD@ $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE); fi
|
||||
@if [[ $EUID -ne 0 ]]; then @RPM_SIGN_CMD@ $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(DEV_PACKAGE); fi
|
||||
@echo ""
|
||||
@echo "Package contents:"
|
||||
@rpm -qpl $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)
|
||||
@echo "The package is now available in $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)"
|
||||
|
||||
+2881
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,55 @@
|
||||
AC_INIT([Makefile.in], 1.0)
|
||||
|
||||
DATE=`date -R`
|
||||
KERNEL=`uname -r`
|
||||
PLATFORM=`uname -p`
|
||||
MACHINE=`uname -m`
|
||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||
|
||||
EXTN=""
|
||||
if test $MACHINE = "x86_64"; then
|
||||
EXTN="amd64"
|
||||
else
|
||||
if test $SHORT_MACHINE = "aar"; then
|
||||
EXTN="arm64"
|
||||
else
|
||||
if test $SHORT_MACHINE = "arm"; then
|
||||
EXTN="armhf"
|
||||
else
|
||||
if test $SHORT_MACHINE = "mip"; then
|
||||
EXTN="mips"
|
||||
else
|
||||
EXTN="i386"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
PACKAGE_VERSION=`../version.sh --release`
|
||||
MAJOR_RELEASE=`../version.sh --major-release`
|
||||
GIT_REVISION=`../version.sh --revision`
|
||||
|
||||
CENTOS_RELEASE=`cat /etc/centos-release | cut -d ' ' -f 3|cut -d '.' -f 1`
|
||||
if test $CENTOS_RELEASE = "release"; then
|
||||
CENTOS_RELEASE=`cat /etc/centos-release | cut -d ' ' -f 4|cut -d '.' -f 1`
|
||||
fi
|
||||
|
||||
RPM_SIGN_CMD="rpm --addsign"
|
||||
if test "$CENTOS_RELEASE" -ne 8; then
|
||||
RPM_SIGN_CMD="./rpm-sign.exp"
|
||||
fi
|
||||
|
||||
AC_CONFIG_FILES([Makefile ndpi.spec])
|
||||
|
||||
AC_SUBST(PACKAGE_VERSION)
|
||||
AC_SUBST(PLATFORM)
|
||||
AC_SUBST(MACHINE)
|
||||
AC_SUBST(EXTN)
|
||||
AC_SUBST(DATE)
|
||||
AC_SUBST(KERNEL)
|
||||
AC_SUBST(GIT_REVISION)
|
||||
AC_SUBST(MAJOR_RELEASE)
|
||||
AC_SUBST(RPM_SIGN_CMD)
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
Summary: L7 DPI library
|
||||
Name: ndpi
|
||||
Version: @PACKAGE_VERSION@
|
||||
Release: %{buildnumber}
|
||||
License: LGPL
|
||||
Group: Networking/Utilities
|
||||
URL: http://www.ntop.org/products/deep-packet-inspection/ndpi/
|
||||
Source: ndpi-%{version}.tgz
|
||||
Packager: Luca Deri <deri@ntop.org>
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
%{?el7:Requires: glibc >= 2.3.4 numactl coreutils }
|
||||
%{?el6:Requires: glibc >= 2.3.4 numactl coreutils }
|
||||
AutoReqProv: no
|
||||
|
||||
%define debug_package %{nil}
|
||||
|
||||
%description
|
||||
nDPI Open and Extensible LGPLv3 Deep Packet Inspection Library.
|
||||
|
||||
%package dev
|
||||
Summary: Header files and development libraries for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description dev
|
||||
This package contains the header files and development libraries
|
||||
for %{name}. If you like to develop programs using %{name},
|
||||
you will need to install %{name}-dev.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
|
||||
# Execution order:
|
||||
# install: pre -> (copy) -> post
|
||||
# upgrade: pre -> (copy) -> post -> preun (old) -> (delete old) -> postun (old)
|
||||
# un-install: preun -> (delete) -> postun
|
||||
|
||||
%pre
|
||||
|
||||
%post
|
||||
|
||||
%build
|
||||
PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
||||
|
||||
%define includedir /usr/local/include/ndpi
|
||||
%define libdir /usr/local/lib
|
||||
%define bindir /usr/local/bin
|
||||
|
||||
%install
|
||||
PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
||||
if [ -d $RPM_BUILD_ROOT ]; then
|
||||
\rm -rf $RPM_BUILD_ROOT
|
||||
fi
|
||||
mkdir -p $RPM_BUILD_ROOT%{includedir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{libdir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{bindir}
|
||||
cd $HOME/nDPI; make DESTDIR=$RPM_BUILD_ROOT install;
|
||||
rm $RPM_BUILD_ROOT%{libdir}/libndpi.so
|
||||
rm $RPM_BUILD_ROOT%{libdir}/libndpi.so.?
|
||||
cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so.@MAJOR_RELEASE@; cd -
|
||||
cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so; cd -
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
|
||||
cp $HOME/nDPI/packages/etc/ld.so.conf.d/ndpi.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d
|
||||
rm -rf $RPM_BUILD_ROOT/usr/local/sbin/ndpi
|
||||
strip $RPM_BUILD_ROOT%{bindir}/*
|
||||
rm -fr %{buildroot}%{includedir}/ndpi_win32.h
|
||||
#sed -i -e "s/#include \"ndpi_win32.h\"//g" %{buildroot}%{includedir}/ndpi_main.h
|
||||
|
||||
%clean
|
||||
rm -fr $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
|
||||
/usr/local/lib/libndpi.so
|
||||
/usr/local/lib/libndpi.so.@MAJOR_RELEASE@
|
||||
/usr/local/lib/libndpi.so.@PACKAGE_VERSION@
|
||||
/usr/local/bin/ndpiReader
|
||||
/usr/local/share/ndpi/ndpiCustomCategory.txt
|
||||
/usr/local/share/ndpi/ndpiProtos.txt
|
||||
/etc/ld.so.conf.d/ndpi.conf
|
||||
%{libdir}/pkgconfig/libndpi.pc
|
||||
|
||||
%preun
|
||||
|
||||
%files dev
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%{includedir}
|
||||
%{libdir}/libndpi.a
|
||||
|
||||
%changelog
|
||||
* Mon Nov 19 2018 Alfredo Cardigliano <cardigliano@ntop.org> 2.5
|
||||
- Initial package version
|
||||
Executable
+10
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/expect -f
|
||||
|
||||
### rpm-sign.exp -- Sign RPMs by sending the passphrase.
|
||||
|
||||
spawn rpm --addsign {*}$argv
|
||||
expect -exact "Enter pass phrase: "
|
||||
send -- "\r"
|
||||
expect eof
|
||||
|
||||
## end of rpm-sign.exp
|
||||
@@ -1,42 +0,0 @@
|
||||
#
|
||||
# Change it according to your setup
|
||||
#
|
||||
NDPI_HOME=$(PWD)/../..
|
||||
NDPI_BUILD=${NDPI_HOME}/packages/ubuntu
|
||||
|
||||
all: clean ndpi
|
||||
|
||||
ndpi:
|
||||
\rm -rf ./usr ./debian/tmp ./debian/ndpi-dev
|
||||
mkdir -p ./usr/local ./debian/ndpi-dev
|
||||
mkdir -p ./usr/local/ndpi/lib ./usr/local/ndpi/bin ./ndpi-dev/usr/local/include/ndpi/
|
||||
cd ${NDPI_HOME}; ./autogen.sh; ./configure; make
|
||||
cp $(NDPI_HOME)/lib/libndpi.a $(NDPI_HOME)/lib/libndpi.so* ./usr/local/ndpi/lib/
|
||||
cp $(NDPI_HOME)/example/ndpiReader ./usr/local/ndpi/bin/
|
||||
cp $(NDPI_HOME)/src/include/*.h ndpi-dev/usr/local/include/ndpi/
|
||||
-rm -fr ndpi-dev/usr/local/include/nprobe/ndpi/.svn ndpi-dev/usr/local/include/ndpi/Makefile* ndpi-dev/usr/local/include/ndpi/ndpi_win32.h* ndpi-dev/usr/local/include/ndpi/include
|
||||
-find ./usr/local/lib -name "*.la" -exec /bin/rm {} ';'
|
||||
@echo
|
||||
@find . -name "*~" -exec /bin/rm {} ';'
|
||||
dpkg-buildpackage -rfakeroot -d -us -uc
|
||||
dpkg-sig --sign builder -k 7921DF34 ../ndpi*deb
|
||||
@\rm -f ../ndpi*dsc ../ndpi*.gz ../ndpi*changes
|
||||
@/bin/mv ../ndpi*deb .
|
||||
@echo
|
||||
@echo "Package built."
|
||||
@/bin/ls ndpi*deb
|
||||
@echo "-------------------------------"
|
||||
-dpkg --contents ndpi*amd64.deb
|
||||
@echo "-------------------------------"
|
||||
@echo "-------------------------------"
|
||||
-dpkg --contents ndpi*all.deb
|
||||
@echo "-------------------------------"
|
||||
|
||||
distclean:
|
||||
echo "dummy distclean"
|
||||
|
||||
install:
|
||||
echo "dummy install"
|
||||
|
||||
clean:
|
||||
-rm -rf *~ *deb debian/tmp ./usr
|
||||
+17
-13
@@ -7,29 +7,33 @@ NDPI_BUILD=${NDPI_HOME}/packages/ubuntu
|
||||
all: clean ndpi
|
||||
|
||||
ndpi:
|
||||
\rm -rf ./usr ./debian/tmp ./debian/ndpi-dev
|
||||
mkdir -p ./usr/local ./debian/ndpi-dev
|
||||
mkdir -p ./usr/local/ndpi/lib ./usr/local/ndpi/bin ./ndpi-dev/usr/local/include/ndpi/
|
||||
\rm -rf ./debian/ndpi-tmp ./debian/ndpi-dev-tmp ./debian/ndpi ./debian/ndpi-dev
|
||||
mkdir -p ./debian/ndpi-tmp ./debian/ndpi-dev-tmp
|
||||
mkdir -p ./debian/ndpi-tmp/usr/local/lib ./debian/ndpi-tmp/usr/local/bin
|
||||
mkdir -p ./debian/ndpi-dev-tmp/usr/local/lib ./debian/ndpi-dev-tmp/usr/local/include/ndpi
|
||||
cd ${NDPI_HOME}; ./autogen.sh; ./configure; make
|
||||
cp $(NDPI_HOME)/lib/libndpi.a $(NDPI_HOME)/lib/libndpi.so* ./usr/local/ndpi/lib/
|
||||
cp $(NDPI_HOME)/example/ndpiReader ./usr/local/ndpi/bin/
|
||||
cp $(NDPI_HOME)/src/include/*.h ndpi-dev/usr/local/include/ndpi/
|
||||
-rm -fr ndpi-dev/usr/local/include/nprobe/ndpi/.svn ndpi-dev/usr/local/include/ndpi/Makefile* ndpi-dev/usr/local/include/ndpi/ndpi_win32.h* ndpi-dev/usr/local/include/ndpi/include
|
||||
-find ./usr/local/lib -name "*.la" -exec /bin/rm {} ';'
|
||||
cp $(NDPI_HOME)/src/lib/libndpi.so.@NDPI_VERS@ ./debian/ndpi-tmp/usr/local/lib/
|
||||
cd ./debian/ndpi-tmp/usr/local/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so; cd -
|
||||
cd ./debian/ndpi-tmp/usr/local/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so.@MAJOR_RELEASE@; cd -
|
||||
cp $(NDPI_HOME)/src/lib/libndpi.a ./debian/ndpi-dev-tmp/usr/local/lib/
|
||||
cp $(NDPI_HOME)/example/ndpiReader ./debian/ndpi-tmp/usr/local/bin/
|
||||
cp $(NDPI_HOME)/src/include/*.h ./debian/ndpi-dev-tmp/usr/local/include/ndpi/
|
||||
-rm -fr ./debian/ndpi-dev-tmp/usr/local/include/ndpi/ndpi_win32.h*
|
||||
@echo
|
||||
@find . -name "*~" -exec /bin/rm {} ';'
|
||||
@find ./debian/ndpi-tmp -name "*~" -exec /bin/rm {} ';'
|
||||
@find ./debian/ndpi-dev-tmp -name "*~" -exec /bin/rm {} ';'
|
||||
dpkg-buildpackage -rfakeroot -d -us -uc
|
||||
dpkg-sig --sign builder -k 7921DF34 ../ndpi*deb
|
||||
dpkg-sig --sign builder -k D1EB60BE ../ndpi*deb
|
||||
@\rm -f ../ndpi*dsc ../ndpi*.gz ../ndpi*changes
|
||||
@/bin/mv ../ndpi*deb .
|
||||
@echo
|
||||
@echo "Package built."
|
||||
@/bin/ls ndpi*deb
|
||||
@echo "-------------------------------"
|
||||
-dpkg --contents ndpi*amd64.deb
|
||||
-dpkg --contents ndpi_*.deb
|
||||
@echo "-------------------------------"
|
||||
@echo "-------------------------------"
|
||||
-dpkg --contents ndpi*all.deb
|
||||
-dpkg --contents ndpi-dev_*.deb
|
||||
@echo "-------------------------------"
|
||||
|
||||
distclean:
|
||||
@@ -39,4 +43,4 @@ install:
|
||||
echo "dummy install"
|
||||
|
||||
clean:
|
||||
-rm -rf *~ *deb debian/tmp ./usr
|
||||
-rm -rf *~ *deb ./usr ./debian/ndpi ./debian/ndpi-dev ./debian/ndpi-tmp ./debian/ndpi-dev-tmp
|
||||
|
||||
Vendored
+42
-25
@@ -583,13 +583,12 @@ PACKAGE_URL=''
|
||||
|
||||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
PFRING_SVN_RELEASE
|
||||
SVN_RELEASE
|
||||
MAJOR_RELEASE
|
||||
GIT_REVISION
|
||||
KERNEL
|
||||
DATE
|
||||
EXTN
|
||||
MACHINE
|
||||
PFRING_VERS
|
||||
NDPI_VERS
|
||||
target_alias
|
||||
host_alias
|
||||
@@ -610,6 +609,7 @@ infodir
|
||||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
@@ -674,6 +674,7 @@ datadir='${datarootdir}'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
@@ -926,6 +927,15 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@@ -1063,7 +1073,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@@ -1216,6 +1226,7 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
@@ -1670,20 +1681,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
NDPI_VERS=`cat ../../config.h | grep -w VERSION | cut -d \" -f 2`
|
||||
PFRING_VERS=`cat $HOME/PF_RING/kernel/linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
|
||||
SVN_RELEASE=`svn info ../.. | grep "^Revision"|cut -d " " -f 2`
|
||||
PFRING_SVN_RELEASE=`svn info $HOME/PF_RING | grep "^Revision"|cut -d " " -f 2`
|
||||
MACHINE=`uname -m`
|
||||
|
||||
if test $MACHINE = "x86_64"; then
|
||||
EXTN="amd64"
|
||||
else
|
||||
EXTN="i386"
|
||||
fi
|
||||
|
||||
DATE=`date -R`
|
||||
KERNEL=`uname -r`
|
||||
MACHINE=`uname -m`
|
||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||
|
||||
EXTN=""
|
||||
if test $MACHINE = "x86_64"; then
|
||||
EXTN="amd64"
|
||||
else
|
||||
if test $SHORT_MACHINE = "aar"; then
|
||||
EXTN="arm64"
|
||||
else
|
||||
if test $SHORT_MACHINE = "arm"; then
|
||||
EXTN="armhf"
|
||||
else
|
||||
if test $SHORT_MACHINE = "mip"; then
|
||||
EXTN="mips"
|
||||
else
|
||||
EXTN="i386"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
NDPI_VERS=`../version.sh --release`
|
||||
MAJOR_RELEASE=`../version.sh --major-release`
|
||||
GIT_REVISION=`../version.sh --revision`
|
||||
|
||||
ac_config_files="$ac_config_files Makefile debian/changelog debian/files debian/control"
|
||||
|
||||
|
||||
|
||||
@@ -1694,15 +1720,6 @@ KERNEL=`uname -r`
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files debian/changelog"
|
||||
|
||||
ac_config_files="$ac_config_files debian/files"
|
||||
|
||||
ac_config_files="$ac_config_files debian/control"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
|
||||
@@ -1,32 +1,41 @@
|
||||
AC_INIT([Makefile.in], 1.0)
|
||||
|
||||
NDPI_VERS=`cat ../../config.h | grep -w VERSION | cut -d \" -f 2`
|
||||
PFRING_VERS=`cat $HOME/PF_RING/kernel/linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
|
||||
SVN_RELEASE=`svn info ../.. | grep "^Revision"|cut -d " " -f 2`
|
||||
PFRING_SVN_RELEASE=`svn info $HOME/PF_RING | grep "^Revision"|cut -d " " -f 2`
|
||||
MACHINE=`uname -m`
|
||||
|
||||
if test $MACHINE = "x86_64"; then
|
||||
EXTN="amd64"
|
||||
else
|
||||
EXTN="i386"
|
||||
fi
|
||||
|
||||
DATE=`date -R`
|
||||
KERNEL=`uname -r`
|
||||
MACHINE=`uname -m`
|
||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||
|
||||
EXTN=""
|
||||
if test $MACHINE = "x86_64"; then
|
||||
EXTN="amd64"
|
||||
else
|
||||
if test $SHORT_MACHINE = "aar"; then
|
||||
EXTN="arm64"
|
||||
else
|
||||
if test $SHORT_MACHINE = "arm"; then
|
||||
EXTN="armhf"
|
||||
else
|
||||
if test $SHORT_MACHINE = "mip"; then
|
||||
EXTN="mips"
|
||||
else
|
||||
EXTN="i386"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
NDPI_VERS=`../version.sh --release`
|
||||
MAJOR_RELEASE=`../version.sh --major-release`
|
||||
GIT_REVISION=`../version.sh --revision`
|
||||
|
||||
AC_CONFIG_FILES([Makefile debian/changelog debian/files debian/control])
|
||||
|
||||
AC_SUBST(NDPI_VERS)
|
||||
AC_SUBST(PFRING_VERS)
|
||||
AC_SUBST(MACHINE)
|
||||
AC_SUBST(EXTN)
|
||||
AC_SUBST(DATE)
|
||||
AC_SUBST(KERNEL)
|
||||
AC_SUBST(SVN_RELEASE)
|
||||
AC_SUBST(PFRING_SVN_RELEASE)
|
||||
|
||||
AC_CONFIG_FILES(Makefile)
|
||||
AC_CONFIG_FILES(debian/changelog)
|
||||
AC_CONFIG_FILES(debian/files)
|
||||
AC_CONFIG_FILES(debian/control)
|
||||
AC_SUBST(GIT_REVISION)
|
||||
AC_SUBST(MAJOR_RELEASE)
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
This directory contains the files needed to build the package
|
||||
named 'nprobe' for the Debian GNU/Linux distribution.
|
||||
named 'ndpi' for the Debian GNU/Linux distribution.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
ndpi (@NDPI_VERS@-@SVN_RELEASE@) stable; urgency=high
|
||||
ndpi (@NDPI_VERS@-@GIT_REVISION@) stable; urgency=high
|
||||
* Last packaged version
|
||||
|
||||
-- Luca Deri <deri@ntop.org> @DATE@
|
||||
|
||||
@@ -1 +1 @@
|
||||
1
|
||||
9
|
||||
|
||||
@@ -2,27 +2,25 @@ Source: ndpi
|
||||
Section: free
|
||||
Priority: optional
|
||||
Maintainer: Luca Deri <deri@ntop.org>
|
||||
Standards-Version: @NDPI_VERSION@
|
||||
Standards-Version: @NDPI_VERS@
|
||||
Build-Depends:
|
||||
Build-Conflicts:
|
||||
|
||||
Package: ndpi
|
||||
Architecture: @EXTN@
|
||||
Depends: pfring (=@PFRING_VERS@-@PFRING_SVN_RELEASE@), libnuma
|
||||
Depends: libnuma1
|
||||
Recommends:
|
||||
Suggests:
|
||||
Pre-Depends:
|
||||
Conflicts:
|
||||
Provides:
|
||||
Replaces:
|
||||
Description: A network probe.
|
||||
Description: A L7 DPI library.
|
||||
|
||||
Package: ndpi-dev
|
||||
Section: libdevel
|
||||
Architecture: all
|
||||
Architecture: @EXTN@
|
||||
Depends: ndpi (= ${binary:Version}), ${misc:Depends}
|
||||
Conflicts:
|
||||
Description: development library and header files for ndpi
|
||||
Headers, static libraries, and documentation for the ndpi library
|
||||
|
||||
Description: Development library and header files for ndpi
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
usr/local/ndpi
|
||||
|
||||
@@ -17,18 +17,7 @@ esac
|
||||
|
||||
umask 022
|
||||
|
||||
# Update shared libs
|
||||
echo "/usr/local/lib\n" > /etc/ld.so.conf.d/nprobe.conf
|
||||
echo "Rebuilding ld cache..."
|
||||
/sbin/ldconfig
|
||||
|
||||
echo "Adding the nprobe startup script"
|
||||
update-rc.d nprobe defaults 93 >/dev/null
|
||||
|
||||
echo "Making the /etc/nprobe directory..."
|
||||
mkdir -p /etc/nprobe/
|
||||
|
||||
echo "Making the /var/log/nprobe directory..."
|
||||
mkdir -p /var/log/nprobe
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -2,12 +2,6 @@
|
||||
|
||||
set -e
|
||||
|
||||
#\/bin/rm /etc/ld.so.conf.d/nprobe.conf
|
||||
/sbin/ldconfig
|
||||
|
||||
# Not needed: upstart does it
|
||||
if [ "$1" = "purge" ] ; then
|
||||
update-rc.d nprobe remove >/dev/null
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# preinst script for nbox
|
||||
# preinst script
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
@@ -13,9 +13,6 @@ set -e
|
||||
|
||||
case "$1" in
|
||||
install|upgrade)
|
||||
if test -f /usr/local/sbin/nprobe; then
|
||||
rm /usr/local/sbin/nprobe
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
@@ -30,6 +27,4 @@ esac
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -1,14 +1,10 @@
|
||||
#!/bin/sh -e
|
||||
|
||||
# Only shut the daemon down if we're really removing the package. If this is
|
||||
# an upgrade, we will instead do a restart in the postinst... this keeps nprobe
|
||||
# from being left shut down for a long time, which could pose problems.
|
||||
case "$1" in
|
||||
upgrade)
|
||||
;;
|
||||
*)
|
||||
/etc/init.d/nprobe stop
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
exit 0
|
||||
|
||||
@@ -1,16 +1,7 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
# export DH_VERBOSE=1
|
||||
|
||||
#
|
||||
# debian/compat
|
||||
# We should use at least compatibility version 5
|
||||
# but this requires the whole building process
|
||||
# to be remade and this is something we leave
|
||||
# to when we will have more time
|
||||
# http://www.tin.org/bin/man.cgi?section=7&topic=debhelper
|
||||
#
|
||||
export DH_VERBOSE=1
|
||||
|
||||
package=ndpi
|
||||
|
||||
@@ -37,20 +28,20 @@ binary-indep: build install
|
||||
binary-arch: build install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_prep
|
||||
#dh_clean -k
|
||||
dh_installdirs
|
||||
dh_installinit
|
||||
dh_installman
|
||||
# install the files into debian/tmp.
|
||||
cp -r ./usr/ ./debian/tmp
|
||||
cp -r ./ndpi-dev/* ./debian/ndpi-dev/
|
||||
-find ./debian/tmp -name .svn -exec /bin/rm -rf {} ';'
|
||||
-find ./debian/tmp -executable -type f |xargs strip
|
||||
dh_link
|
||||
dh_strip
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_installdeb
|
||||
mkdir -p ./debian/ndpi ./debian/ndpi-dev
|
||||
cp -r ./debian/ndpi-tmp/* ./debian/ndpi/
|
||||
cp -r ./debian/ndpi-dev-tmp/* ./debian/ndpi-dev/
|
||||
-find ./debian/ndpi -executable -type f | xargs strip
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
Executable
+46
@@ -0,0 +1,46 @@
|
||||
#!/bin/bash
|
||||
|
||||
SCRIPTPATH="$(cd "$(dirname "$0")"; pwd -P)"
|
||||
RELEASE="$(cd ${SCRIPTPATH}; cat ../configure.ac|grep C_INIT|cut -c 21-|rev|cut -c 3-|rev)"
|
||||
MAJOR_RELEASE="$(cd ${SCRIPTPATH}; cat ../configure.ac|grep C_INIT|cut -c 21-|rev|cut -c 3-|rev|cut -d. -f1)"
|
||||
REVISION="$(cd ${SCRIPTPATH}; git rev-list --all |wc -l | tr -d '[[:space:]]')"
|
||||
|
||||
get_release() {
|
||||
echo "${RELEASE}"
|
||||
exit 0
|
||||
}
|
||||
|
||||
get_major_release() {
|
||||
echo "${MAJOR_RELEASE}"
|
||||
exit 0
|
||||
}
|
||||
|
||||
get_revision() {
|
||||
echo "${REVISION}"
|
||||
exit 0
|
||||
}
|
||||
|
||||
get_version() {
|
||||
echo "${RELEASE}-${REVISION}"
|
||||
exit 0
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
--release)
|
||||
get_release;
|
||||
;;
|
||||
--major-release)
|
||||
get_major_release;
|
||||
;;
|
||||
--revision)
|
||||
get_revision;
|
||||
;;
|
||||
--version)
|
||||
get_version;
|
||||
;;
|
||||
*)
|
||||
echo "Usage: ${0} {--release|--major-release|--revision|--version}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -0,0 +1,26 @@
|
||||
CC=@CC@
|
||||
CFLAGS=-I. -I../src/include -I./src/lib/third_party/include @CFLAGS@ @CUSTOM_NDPI@ -shared
|
||||
#LIBNDPI=../src/lib/libndpi.so.@NDPI_VERSION_SHORT@
|
||||
LIBNDPI=../src/lib/libndpi.a
|
||||
LDFLAGS=$(CFILE) $(LIBNDPI) -lpcap @ADDITIONAL_LIBS@
|
||||
SHARE = -soname,ndpi_wrap
|
||||
SO=ndpi_wrap.so
|
||||
OBJS = ndpi_wrap.o
|
||||
CFILE = ndpi_wrap.c
|
||||
PIC = -fPIC
|
||||
PREFIX?=/usr/local
|
||||
.PHONY: all
|
||||
|
||||
UNAME_S := $(shell uname -s)
|
||||
ifeq ($(UNAME_S),Darwin)#do something for linux
|
||||
SHARE=-install_name,ndpiReader.so
|
||||
endif
|
||||
|
||||
all: $(SO)
|
||||
|
||||
$(SO): $(CFILE) $(LIBNDPI) Makefile
|
||||
$(CC) $(CFLAGS) -Wl,$(SHARE) -o $@ $(PIC) $(LDFLAGS)
|
||||
# ln -s $(LIBNDPI) .
|
||||
|
||||
clean:
|
||||
/bin/rm -f $(SO)
|
||||
@@ -0,0 +1,43 @@
|
||||
nDPI Python bindings
|
||||
--------------------
|
||||
|
||||
This directory contains the Python3 bindings for nDPI. We provide both cffi and ctypes based bindings.
|
||||
|
||||
**cffi bindings**
|
||||
|
||||
Files:
|
||||
|
||||
* ndpi.py
|
||||
|
||||
Example (using `nfstream <https://github.com/aouinizied/nfstream>`_ package):
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
pip3 install nfstream
|
||||
python3 flow_printer.py <interface>
|
||||
python3 flow_printer.py <pcap_file>
|
||||
|
||||
Code courtesy:
|
||||
|
||||
* Zied Aouini
|
||||
|
||||
**ctypes bindings**
|
||||
|
||||
Files:
|
||||
|
||||
* ndpi_typestruct.py
|
||||
* ndpi_wrap.c
|
||||
* Makefile.in
|
||||
|
||||
Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
pip3 install scapy
|
||||
python3 ndpi_example.py <interface>
|
||||
python3 ndpi_example.py <pcap_file>
|
||||
|
||||
Code courtesy:
|
||||
|
||||
* Massimo Puddu
|
||||
* Zied Aouini
|
||||
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
------------------------------------------------------------------------------------------------------------------------
|
||||
flow_printer.py
|
||||
Copyright (C) 2019-20 - NFStream Developers
|
||||
This file is part of NFStream, a Flexible Network Data Analysis Framework (https://www.nfstream.org/).
|
||||
NFStream is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
|
||||
version.
|
||||
NFStream is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
||||
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
You should have received a copy of the GNU Lesser General Public License along with NFStream.
|
||||
If not, see <http://www.gnu.org/licenses/>.
|
||||
------------------------------------------------------------------------------------------------------------------------
|
||||
"""
|
||||
|
||||
from nfstream import NFStreamer
|
||||
import sys
|
||||
|
||||
# Example must run with nfstream >= 6.1.1
|
||||
path = sys.argv[1]
|
||||
flow_streamer = NFStreamer(source=path, statistical_analysis=False, performance_report=1)
|
||||
result = {}
|
||||
try:
|
||||
for flow in flow_streamer:
|
||||
print(flow)
|
||||
try:
|
||||
result[flow.application_name] += flow.bidirectional_packets
|
||||
except KeyError:
|
||||
result[flow.application_name] = flow.bidirectional_packets
|
||||
print("\nSummary (Application Name: Packets):")
|
||||
print(result)
|
||||
except KeyboardInterrupt:
|
||||
print("\nSummary (Application Name: Packets):")
|
||||
print(result)
|
||||
print("Terminated.")
|
||||
+1459
File diff suppressed because it is too large
Load Diff
Executable
+273
@@ -0,0 +1,273 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
file: ndpi_example.py
|
||||
This file is part of nDPI.
|
||||
|
||||
Copyright (C) 2011-19 - ntop.org
|
||||
Copyright (C) 2019 - Zied Aouini <aouinizied@gmail.com> (Incremental improvements)
|
||||
|
||||
nDPI is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
|
||||
nDPI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
||||
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with nDPI.
|
||||
If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from ndpi_typestruct import *
|
||||
from ctypes import *
|
||||
from scapy.all import *
|
||||
import sys
|
||||
|
||||
# ------- return type & pcapstruct to declare -------
|
||||
|
||||
|
||||
class WorkFlow(Structure):
|
||||
_fields_ = [("src_ip", c_uint32),
|
||||
("dst_ip", c_uint32),
|
||||
("src_port", c_uint16),
|
||||
("dst_port", c_uint16),
|
||||
("protocol", c_uint8),
|
||||
("packets", c_uint32),
|
||||
("detected_protocol", NDPIProtocol),
|
||||
("detection_completed", c_uint8),
|
||||
("id", c_uint32),
|
||||
("src_id", POINTER(NDPIIdStruct)),
|
||||
("dst_id", POINTER(NDPIIdStruct)),
|
||||
("flow", POINTER(NDPIFlowStruct))]
|
||||
|
||||
|
||||
CMCFUN = CFUNCTYPE(c_int, c_void_p, c_void_p)
|
||||
GUESS = CFUNCTYPE(None, c_void_p, c_int32, c_int, c_void_p)
|
||||
FREE = CFUNCTYPE(None, c_void_p)
|
||||
|
||||
|
||||
def node_proto_guess_walker(nodo, which, depth, user_data):
|
||||
global ndpi_info_mod
|
||||
|
||||
flow = cast(nodo, POINTER(POINTER(WorkFlow))).contents.contents
|
||||
if which == 0 or which == 3: # execute only preorder operation of the tree
|
||||
if flow.detection_completed == 0: # order for tree operation
|
||||
flow.detected_protocol = ndpi.ndpi_detection_giveup(ndpi_info_mod,
|
||||
flow.flow,
|
||||
1,
|
||||
cast(addressof(c_uint8(0)), POINTER(c_uint8)))
|
||||
count_protocol[flow.detected_protocol.app_protocol] += flow.packets
|
||||
|
||||
|
||||
def py_cmp_fun(a, b):
|
||||
fa = cast(a, POINTER(WorkFlow))
|
||||
fb = cast(b, POINTER(WorkFlow))
|
||||
|
||||
if fa.contents.src_ip < fb.contents.src_ip: return -1
|
||||
elif fa.contents.src_ip > fb.contents.src_ip: return 1
|
||||
if fa.contents.src_port < fb.contents.src_port: return -1
|
||||
elif fa.contents.src_port > fb.contents.src_port: return 1
|
||||
if fa.contents.dst_ip < fb.contents.dst_ip: return -1
|
||||
elif fa.contents.dst_ip > fb.contents.dst_ip: return 1
|
||||
if fa.contents.dst_port < fb.contents.dst_port: return -1
|
||||
elif fa.contents.dst_port > fb.contents.dst_port: return 1
|
||||
if fa.contents.protocol < fb.contents.protocol: return -1
|
||||
elif fa.contents.protocol > fb.contents.protocol: return 1
|
||||
return 0
|
||||
|
||||
|
||||
def freer(a):
|
||||
pass
|
||||
|
||||
|
||||
cmp_func = CMCFUN(py_cmp_fun)
|
||||
guess_walker = GUESS(node_proto_guess_walker)
|
||||
free_walk = FREE(freer)
|
||||
|
||||
# --------------------------------------
|
||||
|
||||
# number of analyzed packet
|
||||
packet_number = 0
|
||||
flow_count = 0
|
||||
max_num_udp_dissected_pkts = 16
|
||||
max_num_tcp_dissected_pkts = 10
|
||||
flows_root = c_void_p(None)
|
||||
flows_root_ref = pointer(flows_root)
|
||||
count_protocol = (c_int32 * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + ndpi.ndpi_wrap_ndpi_max_num_custom_protocols() + 1))()
|
||||
lista = [] # used to avoid impropriate memory deallocation from python
|
||||
|
||||
|
||||
# check ndpi version
|
||||
if ndpi.ndpi_get_api_version() != ndpi.ndpi_wrap_get_api_version():
|
||||
print("nDPI Library version mismatch: please make sure this code and the nDPI library are in sync\n")
|
||||
sys.exit(-1)
|
||||
|
||||
# create data structure of ndpi
|
||||
ndpi_info_mod = ndpi.ndpi_init_detection_module()
|
||||
if ndpi_info_mod is None:
|
||||
sys.exit(-1)
|
||||
else:
|
||||
ndpi_ndpi_finalize_initalization(ndpi_info_mod)
|
||||
|
||||
|
||||
def ip2int(ip):
|
||||
"""
|
||||
Convert an IP string to long and then c_uint32
|
||||
"""
|
||||
packedIP = socket.inet_aton(ip)
|
||||
return int(struct.unpack("!I", packedIP)[0])
|
||||
|
||||
|
||||
def get_flow(pkt):
|
||||
global flows_root
|
||||
global flows_root_ref
|
||||
global flow_count
|
||||
|
||||
ip_packet = pkt[1]
|
||||
ip_protocol = ip_packet.proto
|
||||
transport_packet = None
|
||||
|
||||
if ip_protocol == 6 or ip_protocol == 17:
|
||||
transport_packet = pkt[2]
|
||||
if transport_packet is not None:
|
||||
# to avoid two nodes in one binary tree for a flow
|
||||
ip_src = ip2int(ip_packet.src)
|
||||
ip_dst = ip2int(ip_packet.dst)
|
||||
src_port = transport_packet.sport
|
||||
dst_port = transport_packet.dport
|
||||
else:
|
||||
return None
|
||||
# set flows to correct type and data
|
||||
ndpi_flow = pointer(NDPIFlowStruct())
|
||||
memset(ndpi_flow, 0, sizeof(NDPIFlowStruct))
|
||||
if ip_src > ip_dst:
|
||||
flow = WorkFlow(ip_src, ip_dst, src_port, dst_port, int(ip_packet.proto), 0, NDPIProtocol(), 0, 0,
|
||||
pointer(NDPIIdStruct()), pointer(NDPIIdStruct()), ndpi_flow)
|
||||
else:
|
||||
flow = WorkFlow(ip_dst, ip_src, dst_port, src_port, int(ip_packet.proto), 0, NDPIProtocol(), 0, 0,
|
||||
pointer(NDPIIdStruct()), pointer(NDPIIdStruct()), ndpi_flow)
|
||||
flow_ref = pointer(flow)
|
||||
res = ndpi.ndpi_tfind(flow_ref, flows_root_ref, cmp_func)
|
||||
if res is None:
|
||||
ndpi.ndpi_tsearch(flow_ref, pointer(flows_root), cmp_func) # add
|
||||
lista.append(flow)
|
||||
flow_count += 1
|
||||
return pointer(flow)
|
||||
flow = cast(res, POINTER(POINTER(WorkFlow))).contents
|
||||
return flow
|
||||
|
||||
|
||||
def packetcaptured(pkt):
|
||||
global packet_number
|
||||
global ndpi_info_mod
|
||||
|
||||
flow = None
|
||||
h = PcapPktHdr()
|
||||
|
||||
# getting flow
|
||||
try:
|
||||
flow = get_flow(pkt)
|
||||
except AttributeError:
|
||||
pass # ignore packet
|
||||
if flow is None: return
|
||||
|
||||
# filling pcap_pkthdr
|
||||
h.len = h.caplen = len(pkt)
|
||||
h.ts.tv_sec = int(pkt["IP"].time/1000000)
|
||||
h.ts.tv_usec = int(pkt["IP"].time)
|
||||
|
||||
# real work
|
||||
if int(pkt[1].frag) == 0: # not fragmented packet
|
||||
flow.contents.packets += 1
|
||||
packet_number += 1
|
||||
# get ndpi_iphdr address
|
||||
iphdr_addr = cast(c_char_p(pkt[1].build()), c_void_p)
|
||||
ndpi_flow = flow.contents.flow
|
||||
|
||||
if flow.contents.detection_completed is 0:
|
||||
flow.contents.detected_protocol = ndpi.ndpi_detection_process_packet(ndpi_info_mod,
|
||||
ndpi_flow,
|
||||
cast(iphdr_addr, POINTER(c_uint8)),
|
||||
int(pkt[1].len),
|
||||
h.ts.tv_usec,
|
||||
flow.contents.src_id,
|
||||
flow.contents.dst_id)
|
||||
|
||||
flow1 = flow.contents.detected_protocol
|
||||
|
||||
valid = False
|
||||
|
||||
if flow.contents.protocol == 6: valid = flow.contents.packets > max_num_tcp_dissected_pkts
|
||||
elif flow.contents.protocol == 17: valid = flow.contents.packets > max_num_udp_dissected_pkts
|
||||
|
||||
# should we continue anylizing packet or not?
|
||||
if valid or flow1.app_protocol is not 0:
|
||||
if valid or flow1.master_protocol is not 91: # or # 91 is NDPI_PROTOCOL_TLS
|
||||
flow.contents.detection_completed = 1 # protocol found
|
||||
if flow1.app_protocol is 0:
|
||||
flow.contents.detected_protocol = ndpi.ndpi_detection_giveup(ndpi_info_mod,
|
||||
ndpi_flow,
|
||||
1,
|
||||
cast(addressof(c_uint8(0)),
|
||||
POINTER(c_uint8)))
|
||||
|
||||
|
||||
def result():
|
||||
global flows_root_ref
|
||||
global ndpi_info_mod
|
||||
print('\nnumber of analyzed packet: ' + str(packet_number))
|
||||
print('number of flows: ' + str(flow_count))
|
||||
|
||||
ndpi.ndpi_twalk(flows_root_ref.contents, guess_walker, None)
|
||||
|
||||
print('\nDetected protocols:')
|
||||
for i in range(0, ndpi.ndpi_get_num_supported_protocols(ndpi_info_mod)):
|
||||
if count_protocol[i] > 0:
|
||||
print("{}: {} packets".format(
|
||||
cast(ndpi.ndpi_get_proto_name(ndpi_info_mod, i), c_char_p).value.decode('utf-8'),
|
||||
str(count_protocol[i])))
|
||||
|
||||
|
||||
def free(ndpi_struct):
|
||||
ndpi.ndpi_tdestroy(flows_root, free_walk)
|
||||
ndpi.ndpi_exit_detection_module(ndpi_struct)
|
||||
|
||||
|
||||
def initialize(ndpi_struct):
|
||||
all = NDPIProtocolBitMask()
|
||||
ndpi.ndpi_wrap_NDPI_BITMASK_SET_ALL(pointer(all))
|
||||
ndpi.ndpi_set_protocol_detection_bitmask2(ndpi_struct, pointer(all))
|
||||
|
||||
|
||||
print('Using nDPI ' + cast(ndpi.ndpi_revision(), c_char_p).value.decode("utf-8"))
|
||||
|
||||
initialize(ndpi_info_mod)
|
||||
|
||||
if len(sys.argv) != 2:
|
||||
print("\nUsage: ndpi_example.py <device>")
|
||||
sys.exit(0)
|
||||
|
||||
if "." in sys.argv[1]:
|
||||
print('Reading pcap from file ' + sys.argv[1] + '...')
|
||||
scapy_cap = None
|
||||
try:
|
||||
scapy_cap = rdpcap(sys.argv[1])
|
||||
except FileNotFoundError:
|
||||
print("\nFile not found")
|
||||
except Scapy_Exception:
|
||||
print("\nBad pcap")
|
||||
else:
|
||||
for packet in scapy_cap:
|
||||
packetcaptured(packet)
|
||||
else:
|
||||
print('Capturing live traffic from device ' + sys.argv[1] + '...')
|
||||
try:
|
||||
sniff(iface=sys.argv[1], prn=packetcaptured)
|
||||
except KeyboardInterrupt:
|
||||
print('\nInterrupted\n')
|
||||
except PermissionError:
|
||||
sys.exit('\nRoot privilege required for live capture on interface: {}\n'.format(sys.argv[1]))
|
||||
|
||||
|
||||
result()
|
||||
free(ndpi_info_mod)
|
||||
@@ -0,0 +1,864 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
file: ndpi_typestruct.py
|
||||
This file is part of nDPI.
|
||||
|
||||
Copyright (C) 2011-19 - ntop.org
|
||||
Copyright (C) 2019 - Zied Aouini <aouinizied@gmail.com> (Incremental improvements)
|
||||
|
||||
nDPI is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
|
||||
nDPI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
||||
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with nDPI.
|
||||
If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from ctypes import CDLL, Structure, c_uint16, c_int, c_ulong, c_uint32, CFUNCTYPE, c_void_p, POINTER, c_char_p, c_uint8
|
||||
from ctypes import c_char, c_uint, c_int16, c_longlong, c_size_t, Union, c_ubyte, c_uint64, c_int32, c_ushort, cast
|
||||
from os.path import abspath, dirname
|
||||
ndpi = CDLL(dirname(abspath(__file__)) + '/ndpi_wrap.so')
|
||||
|
||||
# ----------------------------------------------- Structures -----------------------------------------------------------
|
||||
|
||||
|
||||
class NDPIDetectionModuleStruct(Structure):
|
||||
pass
|
||||
|
||||
|
||||
class NDPIFlowStruct(Structure):
|
||||
pass
|
||||
|
||||
|
||||
class NDPIProtocol(Structure):
|
||||
_fields_ = [
|
||||
("master_protocol", c_uint16),
|
||||
("app_protocol", c_uint16),
|
||||
("category", c_int)
|
||||
]
|
||||
|
||||
|
||||
class TimeVal(Structure):
|
||||
_fields_ = [("tv_sec", c_ulong), ("tv_usec", c_ulong)]
|
||||
|
||||
|
||||
class PcapPktHdr(Structure):
|
||||
_fields_ = [("ts", TimeVal), ("caplen", c_uint32), ("len", c_uint32)]
|
||||
|
||||
|
||||
class NDPIMask(Structure):
|
||||
_fields_ = [("fds_bits", c_uint32)]
|
||||
|
||||
|
||||
class NDPIProtocolBitMask(Structure):
|
||||
_fields_ = [("fds_bits", NDPIMask * ndpi.ndpi_wrap_ndpi_num_fds_bits())]
|
||||
|
||||
|
||||
class NDPISubprotocolConfStruct(Structure):
|
||||
_fields_ = [("func", CFUNCTYPE(c_void_p, POINTER(NDPIDetectionModuleStruct), c_char_p, c_char_p, c_int))]
|
||||
|
||||
|
||||
class NDPIAutoma(Structure):
|
||||
_fields_ = [
|
||||
("ac_automa", c_void_p),
|
||||
("ac_automa_finalized", c_uint8)
|
||||
]
|
||||
|
||||
|
||||
class NDPINode(Structure):
|
||||
pass
|
||||
|
||||
|
||||
NDPINode._fields_ = [
|
||||
('key', POINTER(c_char)),
|
||||
('left', POINTER(NDPINode)),
|
||||
('right', POINTER(NDPINode)),
|
||||
]
|
||||
|
||||
|
||||
class NDPICallFunctionStruct(Structure):
|
||||
_fields_ = [
|
||||
("detection_bitmask", NDPIProtocolBitMask),
|
||||
("excluded_protocol_bitmask", NDPIProtocolBitMask),
|
||||
("ndpi_selection_bitmask", c_uint32),
|
||||
("func", CFUNCTYPE(None, POINTER(NDPIDetectionModuleStruct), POINTER(NDPIFlowStruct))),
|
||||
("detection_feature", c_uint8)
|
||||
]
|
||||
|
||||
|
||||
class NDPIProtoDefaultsT(Structure):
|
||||
_fields_ = [
|
||||
("protoName", c_char_p),
|
||||
("protoCategory", c_uint),
|
||||
("can_have_a_subprotocol", c_uint8),
|
||||
("protoId", c_uint16),
|
||||
("protoIdx", c_uint16),
|
||||
("master_tcp_protoId", c_uint16 * 2),
|
||||
("master_udp_protoId", c_uint16 * 2),
|
||||
("protoBreed", c_uint),
|
||||
("func", CFUNCTYPE(None, POINTER(NDPIDetectionModuleStruct), POINTER(NDPIFlowStruct))),
|
||||
]
|
||||
|
||||
|
||||
class NDPIDefaultsPortsTreeNodeT(Structure):
|
||||
_fields_ = [
|
||||
("proto", NDPIProtoDefaultsT),
|
||||
("customUserProto", c_uint8),
|
||||
("default_port", c_int16)
|
||||
]
|
||||
|
||||
|
||||
class SpinlockT(Structure):
|
||||
_fields_ = [("val", c_int)]
|
||||
|
||||
|
||||
class AtomicT(Structure):
|
||||
_fields_ = [("counter", c_int)]
|
||||
|
||||
|
||||
class TimeT(Structure):
|
||||
_fields_ = [("counter", c_longlong)]
|
||||
|
||||
|
||||
class HashIp4pNode(Structure):
|
||||
pass
|
||||
|
||||
|
||||
HashIp4pNode._fields_ = [
|
||||
("next", POINTER(HashIp4pNode)),
|
||||
("prev", POINTER(HashIp4pNode)),
|
||||
("lchg", TimeT),
|
||||
("port", c_uint16),
|
||||
("count", c_uint16, 12),
|
||||
("flag", c_uint16, 4),
|
||||
("ip", c_uint32)
|
||||
]
|
||||
|
||||
|
||||
class HashIp4p(Structure):
|
||||
_fields_ = [
|
||||
("top", POINTER(HashIp4pNode)),
|
||||
("lock",SpinlockT),
|
||||
("len", c_size_t)
|
||||
]
|
||||
|
||||
|
||||
class HashIp4pTable(Structure):
|
||||
_fields_ = [
|
||||
("size", c_size_t),
|
||||
("ipv6", c_int),
|
||||
("lock", SpinlockT),
|
||||
("count", AtomicT),
|
||||
("tbl", HashIp4p)
|
||||
]
|
||||
|
||||
|
||||
class BtAnnounce(Structure):
|
||||
_fields_ = [
|
||||
("hash", c_uint32 * 5),
|
||||
("ip", c_uint32 * 4),
|
||||
("time", c_uint32),
|
||||
("port", c_uint16),
|
||||
("name_len", c_uint8),
|
||||
("name", c_uint8 * 149)
|
||||
]
|
||||
|
||||
|
||||
class NDPILruCacheEntry(Structure):
|
||||
_fields_ = [
|
||||
("key", c_uint32),
|
||||
("is_full", c_uint32, 1),
|
||||
("value", c_uint32, 16),
|
||||
("pad", c_uint32, 15)
|
||||
]
|
||||
|
||||
|
||||
class NDPILruCache(Structure):
|
||||
_fields_ = [
|
||||
("num_entries", c_uint32),
|
||||
("entries", POINTER(NDPILruCacheEntry)),
|
||||
]
|
||||
|
||||
|
||||
class CacheEntry(Structure):
|
||||
pass
|
||||
|
||||
|
||||
CacheEntry._fields_ = [
|
||||
("item", c_void_p),
|
||||
("item_size", c_uint32),
|
||||
("prev", POINTER(CacheEntry)),
|
||||
("next", POINTER(CacheEntry))
|
||||
]
|
||||
|
||||
|
||||
class CacheEntryMap(Structure):
|
||||
pass
|
||||
|
||||
|
||||
CacheEntryMap._fields_ = [
|
||||
("entry", POINTER(CacheEntry)),
|
||||
("next", POINTER(CacheEntryMap)),
|
||||
]
|
||||
|
||||
|
||||
class Cache(Structure):
|
||||
_fields_ = [
|
||||
("size", c_uint32),
|
||||
("max_size", c_uint32),
|
||||
("head", POINTER(CacheEntry)),
|
||||
("tail", POINTER(CacheEntry)),
|
||||
("map", POINTER(POINTER(CacheEntryMap)))
|
||||
]
|
||||
|
||||
|
||||
class CustomCategories(Structure):
|
||||
_fields_ = [
|
||||
("hostnames", NDPIAutoma),
|
||||
("hostnames_shadow", NDPIAutoma),
|
||||
("ipAddresses", c_void_p),
|
||||
("ipAddresses_shadow", c_void_p),
|
||||
("categories_loaded", c_uint8),
|
||||
]
|
||||
|
||||
|
||||
NDPIDetectionModuleStruct._fields_ = [
|
||||
("detection_bitmask", NDPIProtocolBitMask),
|
||||
("generic_http_packet_bitmask", NDPIProtocolBitMask),
|
||||
("current_ts", c_uint32),
|
||||
("ticks_per_second", c_uint32),
|
||||
("custom_category_labels",
|
||||
(c_char * ndpi.ndpi_wrap_num_custom_categories()) * ndpi.ndpi_wrap_custom_category_label_len()),
|
||||
("callback_buffer", NDPICallFunctionStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)),
|
||||
("callback_buffer_size", c_uint32),
|
||||
("callback_buffer_tcp_no_payload", NDPICallFunctionStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)),
|
||||
("callback_buffer_size_tcp_no_payload", c_uint32),
|
||||
("callback_buffer_tcp_payload", NDPICallFunctionStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)),
|
||||
("callback_buffer_size_tcp_payload", c_uint32),
|
||||
("callback_buffer_udp", NDPICallFunctionStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)),
|
||||
("callback_buffer_size_udp", c_uint32),
|
||||
("callback_buffer_non_tcp_udp", NDPICallFunctionStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)),
|
||||
("callback_buffer_size_non_tcp_udp", c_uint32),
|
||||
("tcpRoot", POINTER(NDPIDefaultsPortsTreeNodeT)),
|
||||
("udpRoot", POINTER(NDPIDefaultsPortsTreeNodeT)),
|
||||
("ndpi_log_level", c_uint),
|
||||
("tcp_max_retransmission_window_size", c_uint32),
|
||||
("directconnect_connection_ip_tick_timeout", c_uint32),
|
||||
("subprotocol_conf", NDPISubprotocolConfStruct * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() + 1)),
|
||||
("ndpi_num_supported_protocols", c_uint),
|
||||
("ndpi_num_custom_protocols", c_uint),
|
||||
("host_automa", NDPIAutoma),
|
||||
("content_automa", NDPIAutoma),
|
||||
("subprotocol_automa", NDPIAutoma),
|
||||
("bigrams_automa", NDPIAutoma),
|
||||
("impossible_bigrams_automa", NDPIAutoma),
|
||||
("custom_categories", CustomCategories),
|
||||
("protocols_ptree", c_void_p),
|
||||
("irc_timeout", c_uint32),
|
||||
("gnutella_timeout", c_uint32),
|
||||
("battlefield_timeout", c_uint32),
|
||||
("thunder_timeout", c_uint32),
|
||||
("soulseek_connection_ip_tick_timeout", c_uint32),
|
||||
("rtsp_connection_timeout", c_uint32),
|
||||
("tvants_connection_timeout", c_uint32),
|
||||
("orb_rstp_ts_timeout", c_uint32),
|
||||
("yahoo_detect_http_connections", c_uint8),
|
||||
("yahoo_lan_video_timeout", c_uint32),
|
||||
("zattoo_connection_timeout", c_uint32),
|
||||
("jabber_stun_timeout", c_uint32),
|
||||
("jabber_file_transfer_timeout", c_uint32),
|
||||
("ip_version_limit", c_uint8),
|
||||
("bt_ht", POINTER(HashIp4pTable)),
|
||||
("bt6_ht", POINTER(HashIp4pTable)),
|
||||
("bt_ann", POINTER(BtAnnounce)),
|
||||
("bt_ann_len", c_int),
|
||||
("ookla_cache", POINTER(NDPILruCache)),
|
||||
("tinc_cache", POINTER(Cache)),
|
||||
("proto_defaults", NDPIProtoDefaultsT * (ndpi.ndpi_wrap_ndpi_max_supported_protocols() +
|
||||
ndpi.ndpi_wrap_ndpi_max_num_custom_protocols())),
|
||||
("http_dont_dissect_response", c_uint8, 1),
|
||||
("dns_dont_dissect_response", c_uint8, 1),
|
||||
("direction_detect_disable", c_uint8, 1),
|
||||
("disable_metadata_export", c_uint8, 1),
|
||||
("hyperscan", c_void_p)
|
||||
]
|
||||
|
||||
|
||||
class U6Addr(Union):
|
||||
_fields_ = [
|
||||
("u6_addr8", c_uint8 * 16),
|
||||
("u6_addr16", c_uint16 * 8),
|
||||
("u6_addr32", c_uint32 * 4),
|
||||
("u6_addr64", c_uint64 * 2)
|
||||
]
|
||||
|
||||
|
||||
class NDPIIn6Addr(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [("u6_addr", U6Addr)]
|
||||
|
||||
|
||||
class NDPIIpAddrT(Union):
|
||||
_fields_ = [
|
||||
('ipv4', c_uint32),
|
||||
('ipv4_u_int8_t', c_uint8 * 4),
|
||||
('ipv6', NDPIIn6Addr),
|
||||
]
|
||||
|
||||
|
||||
class NDPIIdStruct(Structure):
|
||||
_fields_ = [
|
||||
('detected_protocol_bitmask', NDPIProtocolBitMask),
|
||||
('rtsp_ip_address', NDPIIpAddrT),
|
||||
('yahoo_video_lan_timer', c_uint32),
|
||||
('irc_port', c_uint16 * 8),
|
||||
('last_time_port_used', c_uint32 * 8),
|
||||
('irc_ts', c_uint32),
|
||||
('gnutella_ts', c_uint32),
|
||||
('battlefield_ts', c_uint32),
|
||||
('thunder_ts', c_uint32),
|
||||
('rtsp_timer', c_uint32),
|
||||
('oscar_last_safe_access_time', c_uint32),
|
||||
('zattoo_ts', c_uint32),
|
||||
('jabber_stun_or_ft_ts', c_uint32),
|
||||
('directconnect_last_safe_access_time', c_uint32),
|
||||
('soulseek_last_safe_access_time', c_uint32),
|
||||
('detected_directconnect_port', c_uint16),
|
||||
('detected_directconnect_udp_port', c_uint16),
|
||||
('detected_directconnect_ssl_port', c_uint16),
|
||||
('bt_port_t', c_uint16 * 8),
|
||||
('bt_port_u', c_uint16 * 8),
|
||||
('jabber_voice_stun_port', c_uint16 * 6),
|
||||
('jabber_file_transfer_port', c_uint16 * 2),
|
||||
('detected_gnutella_port', c_uint16),
|
||||
('detected_gnutella_udp_port1', c_uint16),
|
||||
('detected_gnutella_udp_port2', c_uint16),
|
||||
('soulseek_listen_port', c_uint16),
|
||||
('irc_number_of_port', c_uint8),
|
||||
('oscar_ssl_session_id', c_uint8 * 33),
|
||||
('jabber_voice_stun_used_ports', c_uint8),
|
||||
('yahoo_video_lan_dir', c_uint32, 1),
|
||||
('yahoo_conf_logged_in', c_uint32, 1),
|
||||
('yahoo_voice_conf_logged_in', c_uint32, 1),
|
||||
('rtsp_ts_set', c_uint32, 1),
|
||||
]
|
||||
|
||||
|
||||
class NDPIFlowTcpStruct(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('smtp_command_bitmask', c_uint16),
|
||||
('pop_command_bitmask', c_uint16),
|
||||
('qq_nxt_len', c_uint16),
|
||||
('wa_matched_so_far', c_uint8),
|
||||
('tds_login_version', c_uint8),
|
||||
('irc_stage', c_uint8),
|
||||
('irc_port', c_uint8),
|
||||
('h323_valid_packets', c_uint8),
|
||||
('gnutella_msg_id', c_uint8 * 3),
|
||||
('irc_3a_counter', c_uint32, 3),
|
||||
('irc_stage2', c_uint32, 5),
|
||||
('irc_direction', c_uint32, 2),
|
||||
('irc_0x1000_full', c_uint32, 1),
|
||||
('soulseek_stage', c_uint32, 2),
|
||||
('tds_stage', c_uint32, 3),
|
||||
('usenet_stage', c_uint32, 2),
|
||||
('imesh_stage', c_uint32, 4),
|
||||
('http_setup_dir', c_uint32, 2),
|
||||
('http_stage', c_uint32, 2),
|
||||
('http_empty_line_seen', c_uint32, 1),
|
||||
('http_wait_for_retransmission', c_uint32, 1),
|
||||
('gnutella_stage', c_uint32, 2),
|
||||
('mms_stage', c_uint32, 2),
|
||||
('yahoo_sip_comm', c_uint32, 1),
|
||||
('yahoo_http_proxy_stage', c_uint32, 2),
|
||||
('msn_stage', c_uint32, 3),
|
||||
('msn_ssl_ft', c_uint32, 2),
|
||||
('ssh_stage', c_uint32, 3),
|
||||
('vnc_stage', c_uint32, 2),
|
||||
('telnet_stage', c_uint32, 2),
|
||||
('tls_srv_cert_fingerprint_ctx', c_void_p),
|
||||
('tls_seen_client_cert', c_uint8, 1),
|
||||
('tls_seen_server_cert', c_uint8, 1),
|
||||
('tls_seen_certificate', c_uint8, 1),
|
||||
('tls_srv_cert_fingerprint_found', c_uint8, 1),
|
||||
('tls_srv_cert_fingerprint_processed', c_uint8, 1),
|
||||
('tls_stage', c_uint8, 2),
|
||||
('tls_record_offset', c_int16),
|
||||
('tls_fingerprint_len', c_int16),
|
||||
('tls_sha1_certificate_fingerprint', c_uint8 * 20),
|
||||
('postgres_stage', c_uint32, 3),
|
||||
('ddlink_server_direction', c_uint32, 1),
|
||||
('seen_syn', c_uint32, 1),
|
||||
('seen_syn_ack', c_uint32, 1),
|
||||
('seen_ack', c_uint32, 1),
|
||||
('icecast_stage', c_uint32, 1),
|
||||
('dofus_stage', c_uint32, 1),
|
||||
('fiesta_stage', c_uint32, 2),
|
||||
('wow_stage', c_uint32, 2),
|
||||
('veoh_tv_stage', c_uint32, 2),
|
||||
('shoutcast_stage', c_uint32, 2),
|
||||
('rtp_special_packets_seen', c_uint32, 1),
|
||||
('mail_pop_stage', c_uint32, 2),
|
||||
('mail_imap_stage', c_uint32, 3),
|
||||
('mail_imap_starttls', c_uint32, 2),
|
||||
('skype_packet_id', c_uint8),
|
||||
('citrix_packet_id', c_uint8),
|
||||
('lotus_notes_packet_id', c_uint8),
|
||||
('teamviewer_stage', c_uint8),
|
||||
('prev_zmq_pkt_len', c_uint8),
|
||||
('prev_zmq_pkt', c_char * 10),
|
||||
('ppstream_stage', c_uint32, 3),
|
||||
('memcached_matches', c_uint8),
|
||||
('nest_log_sink_matches', c_uint8),
|
||||
]
|
||||
|
||||
|
||||
class NDPIFlowUdpStruct(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('battlefield_msg_id', c_uint32),
|
||||
('snmp_msg_id', c_uint32),
|
||||
('battlefield_stage', c_uint32, 3),
|
||||
('snmp_stage', c_uint32, 2),
|
||||
('ppstream_stage', c_uint32, 3),
|
||||
('halflife2_stage', c_uint32, 2),
|
||||
('tftp_stage', c_uint32, 1),
|
||||
('aimini_stage', c_uint32, 5),
|
||||
('xbox_stage', c_uint32, 1),
|
||||
('wsus_stage', c_uint32, 1),
|
||||
('skype_packet_id', c_uint8),
|
||||
('teamviewer_stage', c_uint8),
|
||||
('eaq_pkt_id', c_uint8),
|
||||
('eaq_sequence', c_uint32),
|
||||
('rx_conn_epoch', c_uint32),
|
||||
('rx_conn_id', c_uint32),
|
||||
('memcached_matches', c_uint8),
|
||||
('wireguard_stage', c_uint8),
|
||||
('wireguard_peer_index', c_uint32 * 2),
|
||||
]
|
||||
|
||||
|
||||
class L4(Union):
|
||||
_fields_ = [("tcp", NDPIFlowTcpStruct), ("udp", NDPIFlowUdpStruct)]
|
||||
|
||||
|
||||
class Http(Structure):
|
||||
_fields_ = [
|
||||
("method", c_int),
|
||||
("url", c_char_p),
|
||||
("content_type", c_char_p),
|
||||
("num_request_headers", c_uint8),
|
||||
("num_response_headers", c_uint8),
|
||||
("request_version", c_uint8),
|
||||
("response_status_code", c_uint16),
|
||||
]
|
||||
|
||||
|
||||
class Dns(Structure):
|
||||
_fields_ = [
|
||||
("num_queries", c_uint8),
|
||||
("num_answers", c_uint8),
|
||||
("reply_code", c_uint8),
|
||||
("is_query", c_uint8),
|
||||
("query_type", c_uint16),
|
||||
("query_class", c_uint16),
|
||||
("rsp_type", c_uint16),
|
||||
("rsp_addr", NDPIIpAddrT)
|
||||
]
|
||||
|
||||
|
||||
class Ntp(Structure):
|
||||
_fields_ = [("request_code", c_uint8),
|
||||
("version", c_uint8)]
|
||||
|
||||
|
||||
class Kerberos(Structure):
|
||||
_fields_ = [("cname", c_char * 24),
|
||||
("realm", c_char * 24)]
|
||||
|
||||
|
||||
class Ssl(Structure):
|
||||
_fields_ = [
|
||||
("ssl_version", c_uint16),
|
||||
("client_certificate", c_char * 64),
|
||||
("server_certificate", c_char * 64),
|
||||
("server_organization", c_char * 64),
|
||||
('notBefore', c_uint32),
|
||||
('notAfter', c_uint32),
|
||||
("ja3_client", c_char * 33),
|
||||
("ja3_server", c_char * 33),
|
||||
("server_cipher", c_uint16),
|
||||
("server_unsafe_cipher", c_int)
|
||||
]
|
||||
|
||||
|
||||
class Stun(Structure):
|
||||
_fields_ = [
|
||||
("num_udp_pkts", c_uint8),
|
||||
("num_processed_pkts", c_uint8),
|
||||
("num_binding_requests", c_uint8),
|
||||
]
|
||||
|
||||
|
||||
class StunSsl(Structure):
|
||||
_fields_ = [("ssl", Ssl), ("stun", Stun)]
|
||||
|
||||
|
||||
class Ssh(Structure):
|
||||
_fields_ = [
|
||||
("client_signature", c_char * 48),
|
||||
("server_signature", c_char * 48),
|
||||
("hassh_client", c_char * 33),
|
||||
("hassh_server", c_char * 33)
|
||||
]
|
||||
|
||||
|
||||
class Imo(Structure):
|
||||
_fields_ = [
|
||||
("last_one_byte_pkt", c_uint8),
|
||||
("last_byte", c_uint8)
|
||||
]
|
||||
|
||||
|
||||
class Mdns(Structure):
|
||||
_fields_ = [("answer", c_char * 96)]
|
||||
|
||||
|
||||
class Ubntac2(Structure):
|
||||
_fields_ = [("version", c_char * 32)]
|
||||
|
||||
|
||||
class Http2(Structure):
|
||||
_fields_ = [
|
||||
("detected_os", c_char * 32),
|
||||
("nat_ip", c_char * 24)
|
||||
]
|
||||
|
||||
|
||||
class Bittorrent(Structure):
|
||||
_fields_ = [("hash", c_char * 20)]
|
||||
|
||||
|
||||
class Dhcp(Structure):
|
||||
_fields_ = [
|
||||
("fingerprint", c_char * 48),
|
||||
("class_ident", c_char * 48)
|
||||
]
|
||||
|
||||
|
||||
class Protos(Union):
|
||||
_fields_ = [
|
||||
("dns", Dns),
|
||||
("kerberos", Kerberos),
|
||||
("stun_ssl", StunSsl),
|
||||
("ssh", Ssh),
|
||||
("imo", Imo),
|
||||
("mdns", Mdns),
|
||||
("ubntac2", Ubntac2),
|
||||
("http", Http2),
|
||||
("bittorrent", Bittorrent),
|
||||
("dhcp", Dhcp)
|
||||
]
|
||||
|
||||
|
||||
class TincCacheEntry(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('src_address', c_uint32),
|
||||
('dst_address', c_uint32),
|
||||
('dst_port', c_uint16),
|
||||
]
|
||||
|
||||
|
||||
class NDPIIntOneLineStruct(Structure):
|
||||
_fields_ = [
|
||||
('ptr', POINTER(c_uint8)),
|
||||
('len', c_uint16),
|
||||
]
|
||||
|
||||
|
||||
class NDPIIphdr(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('ihl', c_uint8, 4),
|
||||
('version', c_uint8, 4),
|
||||
('tos', c_uint8),
|
||||
('tot_len', c_uint16),
|
||||
('id', c_uint16),
|
||||
('frag_off', c_uint16),
|
||||
('ttl', c_uint8),
|
||||
('protocol', c_uint8),
|
||||
('check', c_uint16),
|
||||
('saddr', c_uint32),
|
||||
('daddr', c_uint32)]
|
||||
|
||||
|
||||
class NDPIIp6Hdrctl(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('ip6_un1_flow', c_uint32),
|
||||
('ip6_un1_plen', c_uint16),
|
||||
('ip6_un1_nxt', c_uint8),
|
||||
('ip6_un1_hlim', c_uint8),
|
||||
]
|
||||
|
||||
|
||||
class NDPIIpv6hdr(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('ip6_hdr', NDPIIp6Hdrctl),
|
||||
('ip6_src', NDPIIn6Addr),
|
||||
('ip6_dst', NDPIIn6Addr),
|
||||
]
|
||||
|
||||
|
||||
class NDPITcpHdr(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('source', c_uint16),
|
||||
('dest', c_uint16),
|
||||
('seq', c_uint32),
|
||||
('ack_seq', c_uint32),
|
||||
('res1', c_uint16, 4),
|
||||
('doff', c_uint16, 4),
|
||||
('fin', c_uint16, 1),
|
||||
('syn', c_uint16, 1),
|
||||
('rst', c_uint16, 1),
|
||||
('psh', c_uint16, 1),
|
||||
('ack', c_uint16, 1),
|
||||
('urg', c_uint16, 1),
|
||||
('ece', c_uint16, 1),
|
||||
('cwr', c_uint16, 1),
|
||||
('window', c_uint16),
|
||||
('check', c_uint16),
|
||||
('urg_ptr', c_uint16),
|
||||
]
|
||||
|
||||
|
||||
class NDPIUdpHdr(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('source', c_uint16),
|
||||
('dest', c_uint16),
|
||||
('len', c_uint16),
|
||||
('check', c_uint16),
|
||||
]
|
||||
|
||||
|
||||
class NDPIPacketStructStack(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
('detected_subprotocol_stack', c_uint8 * ndpi.ndpi_wrap_ndpi_procol_size()),
|
||||
('protocol_stack_info', c_uint16)
|
||||
]
|
||||
|
||||
|
||||
class NDPIPacketStruct(Structure):
|
||||
_fields_ = [
|
||||
('iph', POINTER(NDPIIphdr)),
|
||||
('iphv6', POINTER(NDPIIpv6hdr)),
|
||||
('tcp', POINTER(NDPITcpHdr)),
|
||||
('udp', POINTER(NDPIUdpHdr)),
|
||||
('generic_l4_ptr', POINTER(c_uint8)),
|
||||
('payload', POINTER(c_uint8)),
|
||||
('tick_timestamp', c_uint32),
|
||||
('tick_timestamp_l', c_uint64),
|
||||
('detected_protocol_stack', c_uint16 * ndpi.ndpi_wrap_ndpi_procol_size()),
|
||||
('ndpi_packet_stack', NDPIPacketStructStack),
|
||||
('line', NDPIIntOneLineStruct * 64),
|
||||
('host_line', NDPIIntOneLineStruct),
|
||||
('forwarded_line', NDPIIntOneLineStruct),
|
||||
('referer_line', NDPIIntOneLineStruct),
|
||||
('content_line', NDPIIntOneLineStruct),
|
||||
('accept_line', NDPIIntOneLineStruct),
|
||||
('user_agent_line', NDPIIntOneLineStruct),
|
||||
('http_url_name', NDPIIntOneLineStruct),
|
||||
('http_encoding', NDPIIntOneLineStruct),
|
||||
('http_transfer_encoding', NDPIIntOneLineStruct),
|
||||
('http_contentlen', NDPIIntOneLineStruct),
|
||||
('http_cookie', NDPIIntOneLineStruct),
|
||||
('http_origin', NDPIIntOneLineStruct),
|
||||
('http_x_session_type', NDPIIntOneLineStruct),
|
||||
('server_line', NDPIIntOneLineStruct),
|
||||
('http_method', NDPIIntOneLineStruct),
|
||||
('http_response', NDPIIntOneLineStruct),
|
||||
('http_num_headers', c_uint8),
|
||||
('l3_packet_len', c_uint16),
|
||||
('l4_packet_len', c_uint16),
|
||||
('payload_packet_len', c_uint16),
|
||||
('actual_payload_len', c_uint16),
|
||||
('num_retried_bytes', c_uint16),
|
||||
('parsed_lines', c_uint16),
|
||||
('parsed_unix_lines', c_uint16),
|
||||
('empty_line_position', c_uint16),
|
||||
('tcp_retransmission', c_uint8),
|
||||
('l4_protocol', c_uint8),
|
||||
('ssl_certificate_detected', c_uint8, 4),
|
||||
('ssl_certificate_num_checks', c_uint8, 4),
|
||||
('packet_lines_parsed_complete', c_uint8, 1),
|
||||
('packet_direction', c_uint8, 1),
|
||||
('empty_line_position_set', c_uint8, 1),
|
||||
('pad', c_uint8, 5),
|
||||
]
|
||||
|
||||
|
||||
class NDPIFlowStructStack(Structure):
|
||||
_pack_ = 1
|
||||
_fields_ = [
|
||||
("detected_protocol_stack", c_uint16 * ndpi.ndpi_wrap_ndpi_procol_size()),
|
||||
("protocol_stack_info", c_uint16)
|
||||
]
|
||||
|
||||
|
||||
NDPIFlowStruct._fields_ = [
|
||||
("ndpi_flow_stack", NDPIFlowStructStack),
|
||||
("guessed_protocol_id", c_uint16),
|
||||
("guessed_host_protocol_id", c_uint16),
|
||||
("guessed_category", c_uint16),
|
||||
("guessed_header_category", c_uint16),
|
||||
("l4_proto", c_uint8),
|
||||
("protocol_id_already_guessed", c_uint8, 1),
|
||||
("host_already_guessed", c_uint8, 1),
|
||||
("init_finished", c_uint8, 1),
|
||||
("setup_packet_direction", c_uint8, 1),
|
||||
("packet_direction", c_uint8, 1),
|
||||
("check_extra_packets", c_uint8, 1),
|
||||
("next_tcp_seq_nr", c_uint32 * 2),
|
||||
("max_extra_packets_to_check", c_uint8),
|
||||
("num_extra_packets_checked", c_uint8),
|
||||
("num_processed_pkts", c_uint8),
|
||||
("extra_packets_func", CFUNCTYPE(c_int, POINTER(NDPIDetectionModuleStruct), POINTER(NDPIFlowStruct))),
|
||||
("l4", L4),
|
||||
("server_id", POINTER(NDPIIdStruct)),
|
||||
("host_server_name", c_ubyte * 256),
|
||||
("http", Http),
|
||||
("protos", Protos),
|
||||
("excluded_protocol_bitmask", NDPIProtocolBitMask),
|
||||
("category", c_int),
|
||||
('redis_s2d_first_char', c_uint8),
|
||||
('redis_d2s_first_char', c_uint8),
|
||||
('packet_counter', c_uint16),
|
||||
('packet_direction_counter', c_uint16 * 2),
|
||||
('byte_counter', c_uint16 * 2),
|
||||
('bittorrent_stage', c_uint8),
|
||||
('directconnect_stage', c_uint8, 2),
|
||||
('sip_yahoo_voice', c_uint8, 1),
|
||||
('http_detected', c_uint8, 1),
|
||||
('http_upper_protocol', c_uint16),
|
||||
('http_lower_protocol', c_uint16),
|
||||
('rtsprdt_stage', c_uint8, 2),
|
||||
('rtsp_control_flow', c_uint8, 1),
|
||||
('yahoo_detection_finished', c_uint8, 2),
|
||||
('zattoo_stage', c_uint8, 3),
|
||||
('qq_stage', c_uint8, 3),
|
||||
('thunder_stage', c_uint8, 2),
|
||||
('oscar_ssl_voice_stage', c_uint8, 3),
|
||||
('oscar_video_voice', c_uint8, 1),
|
||||
('florensia_stage', c_uint8, 1),
|
||||
('socks5_stage', c_uint8, 2),
|
||||
('socks4_stage', c_uint8, 2),
|
||||
('edonkey_stage', c_uint8, 2),
|
||||
('ftp_control_stage', c_uint8, 2),
|
||||
('rtmp_stage', c_uint8, 2),
|
||||
('pando_stage', c_uint8, 3),
|
||||
('steam_stage1', c_uint16, 3),
|
||||
('steam_stage2', c_uint16, 2),
|
||||
('steam_stage3', c_uint16, 2),
|
||||
('pplive_stage1', c_uint8, 3),
|
||||
('pplive_stage2', c_uint8, 2),
|
||||
('pplive_stage3', c_uint8, 2),
|
||||
('starcraft_udp_stage', c_uint8, 3),
|
||||
('ovpn_session_id', c_uint8 * 8),
|
||||
('ovpn_counter', c_uint8),
|
||||
('tinc_state', c_uint8),
|
||||
('TincCacheEntry', TincCacheEntry),
|
||||
('csgo_strid', c_uint8 * 18),
|
||||
('csgo_state', c_uint8),
|
||||
('csgo_s2', c_uint8),
|
||||
('csgo_id2', c_uint32),
|
||||
('kxun_counter', c_uint16),
|
||||
('iqiyi_counter', c_uint16),
|
||||
('packet', NDPIPacketStruct),
|
||||
('flow', POINTER(NDPIFlowStruct)),
|
||||
('src', POINTER(NDPIIdStruct)),
|
||||
('dst', POINTER(NDPIIdStruct))
|
||||
]
|
||||
|
||||
# ----------------------------------------------- nDPI APIs ------------------------------------------------------------
|
||||
|
||||
""" ndpi_detection_giveup: Function to be called before we give up with detection for a given flow.
|
||||
This function reduces the NDPI_UNKNOWN_PROTOCOL detection. """
|
||||
ndpi.ndpi_detection_giveup.restype = NDPIProtocol
|
||||
ndpi.ndpi_detection_giveup.argtypes = [POINTER(NDPIDetectionModuleStruct),
|
||||
POINTER(NDPIFlowStruct), c_uint8,
|
||||
POINTER(c_uint8)]
|
||||
|
||||
""" ndpi_detection_process_packet: Processes one packet and returns the ID of the detected protocol.
|
||||
This is the MAIN PACKET PROCESSING FUNCTION. """
|
||||
ndpi.ndpi_detection_process_packet.restype = NDPIProtocol
|
||||
ndpi.ndpi_detection_process_packet.argtypes = [POINTER(NDPIDetectionModuleStruct),
|
||||
POINTER(NDPIFlowStruct),
|
||||
POINTER(c_ubyte),
|
||||
c_ushort,
|
||||
c_uint64,
|
||||
POINTER(NDPIIdStruct),
|
||||
POINTER(NDPIIdStruct)]
|
||||
|
||||
""" ndpi_ssl_version2str : Converts ssl version to readable string """
|
||||
ndpi.ndpi_ssl_version2str.restype = c_char_p
|
||||
ndpi.ndpi_ssl_version2str.argtypes = [c_int16, POINTER(c_uint8)]
|
||||
|
||||
""" ndpi_init_detection_module: Returns a new initialized detection module.
|
||||
Note that before you can use it you can still load hosts and do other things. As soon as you are ready to use
|
||||
it do not forget to call first ndpi_finalize_initalization() """
|
||||
ndpi.ndpi_init_detection_module.restype = POINTER(NDPIDetectionModuleStruct)
|
||||
|
||||
|
||||
def ndpi_ndpi_finalize_initalization(detection_module):
|
||||
""" ndpi_finalize_initalization: Completes the initialization (ndpi_revision >= 3.1)"""
|
||||
if cast(ndpi.ndpi_revision(), c_char_p).value.decode("utf-8")[:3] >= '3.1':
|
||||
ndpi.ndpi_finalize_initalization.restype = c_void_p
|
||||
ndpi.ndpi_finalize_initalization.argtypes = [POINTER(NDPIDetectionModuleStruct)]
|
||||
return ndpi.ndpi_finalize_initalization(detection_module)
|
||||
else:
|
||||
# ignore it
|
||||
return None
|
||||
|
||||
|
||||
""" ndpi_tfind: find a node, or return 0. """
|
||||
ndpi.ndpi_tfind.restype = c_void_p
|
||||
|
||||
""" ndpi_tsearch: ftp://ftp.cc.uoc.gr/mirrors/OpenBSD/src/lib/libc/stdlib/tsearch.c
|
||||
find or insert datum into search tree. """
|
||||
ndpi.ndpi_tsearch.restype = c_void_p
|
||||
ndpi.ndpi_tsearch.argtypes = [c_void_p, POINTER(c_void_p), CFUNCTYPE(c_int, c_void_p, c_void_p)]
|
||||
|
||||
""" ndpi_revision: Get the nDPI version release. """
|
||||
ndpi.ndpi_revision.restype = c_void_p
|
||||
|
||||
""" ndpi_get_proto_name: Get the protocol name associated to the ID."""
|
||||
ndpi.ndpi_get_proto_name.restype = c_void_p
|
||||
|
||||
""" ndpi_category_get_name: Get protocol category as string."""
|
||||
ndpi.ndpi_category_get_name.restype = c_void_p
|
||||
|
||||
""" ndpi_get_num_supported_protocols: Get the total number of the supported protocols."""
|
||||
ndpi.ndpi_get_num_supported_protocols.restype = c_uint
|
||||
|
||||
""" ndpi_wrap_NDPI_BITMASK_SET_ALL: memset((char *)(p), 0xFF, sizeof(*(p)))"""
|
||||
ndpi.ndpi_wrap_NDPI_BITMASK_SET_ALL.argtypes = [POINTER(NDPIProtocolBitMask)]
|
||||
|
||||
""" ndpi_set_protocol_detection_bitmask2: Sets the protocol bitmask2."""
|
||||
ndpi.ndpi_set_protocol_detection_bitmask2.argtypes = [POINTER(NDPIDetectionModuleStruct),
|
||||
POINTER(NDPIProtocolBitMask)]
|
||||
|
||||
""" ndpi_twalk: Walk the nodes of a tree. """
|
||||
ndpi.ndpi_twalk.argtypes = [c_void_p, CFUNCTYPE(None, c_void_p, c_int32, c_int, c_void_p), c_void_p]
|
||||
|
||||
""" ndpi_tdestroy: node destroy. """
|
||||
ndpi.ndpi_tdestroy.argtypes = [c_void_p, CFUNCTYPE(None, c_void_p)]
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* ndpi_wrap.c
|
||||
*
|
||||
* Copyright (C) 2011-19 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "sys/types.h"
|
||||
#include "ndpi_config.h"
|
||||
#include "ndpi_main.h"
|
||||
|
||||
int ndpi_wrap_get_api_version(){
|
||||
return NDPI_API_VERSION;
|
||||
}
|
||||
|
||||
int ndpi_wrap_ndpi_num_fds_bits(){
|
||||
return NDPI_NUM_FDS_BITS;
|
||||
}
|
||||
|
||||
int ndpi_wrap_num_custom_categories(){
|
||||
return NUM_CUSTOM_CATEGORIES;
|
||||
}
|
||||
|
||||
int ndpi_wrap_custom_category_label_len(){
|
||||
return CUSTOM_CATEGORY_LABEL_LEN;
|
||||
}
|
||||
|
||||
int ndpi_wrap_ndpi_max_supported_protocols(){
|
||||
return NDPI_MAX_SUPPORTED_PROTOCOLS;
|
||||
}
|
||||
|
||||
int ndpi_wrap_ndpi_max_num_custom_protocols(){
|
||||
return NDPI_MAX_NUM_CUSTOM_PROTOCOLS;
|
||||
}
|
||||
|
||||
int ndpi_wrap_ndpi_procol_size(){
|
||||
return NDPI_PROTOCOL_SIZE;
|
||||
}
|
||||
|
||||
void ndpi_wrap_NDPI_BITMASK_SET_ALL(NDPI_PROTOCOL_BITMASK* bitmask){
|
||||
NDPI_ONE(bitmask);
|
||||
}
|
||||
|
||||
void dummy() {
|
||||
/* Dummy call just to cause linker to include the ndpi library */
|
||||
ndpi_tfind(NULL, NULL, NULL);
|
||||
}
|
||||
Binary file not shown.
@@ -1,10 +0,0 @@
|
||||
library_includedir=$(includedir)/libndpi-@VERSION@/libndpi
|
||||
|
||||
library_include_HEADERS = ndpi_api.h \
|
||||
ndpi_define.h \
|
||||
ndpi_typedefs.h \
|
||||
ndpi_main.h \
|
||||
ndpi_protocol_ids.h \
|
||||
ndpi_protocols.h \
|
||||
ndpi_win32.h \
|
||||
ndpi_includes.h
|
||||
@@ -1,767 +0,0 @@
|
||||
/*
|
||||
* ndpi_api.h
|
||||
*
|
||||
* Copyright (C) 2011-17 - 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
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __NDPI_API_H__
|
||||
#define __NDPI_API_H__
|
||||
|
||||
#include "ndpi_main.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* The #define below is used for apps that dynamically link with nDPI to make
|
||||
sure that datastructures and in sync across versions
|
||||
*/
|
||||
#define NDPI_API_VERSION 1
|
||||
|
||||
#define SIZEOF_ID_STRUCT (sizeof(struct ndpi_id_struct))
|
||||
#define SIZEOF_FLOW_STRUCT (sizeof(struct ndpi_flow_struct))
|
||||
|
||||
#define NDPI_DETECTION_ONLY_IPV4 ( 1 << 0 )
|
||||
#define NDPI_DETECTION_ONLY_IPV6 ( 1 << 1 )
|
||||
|
||||
#define ADD_TO_DETECTION_BITMASK 1
|
||||
#define NO_ADD_TO_DETECTION_BITMASK 0
|
||||
#define SAVE_DETECTION_BITMASK_AS_UNKNOWN 1
|
||||
#define NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN 0
|
||||
|
||||
|
||||
/**
|
||||
* Check if a string is encoded with punycode
|
||||
* ( https://tools.ietf.org/html/rfc3492 )
|
||||
*
|
||||
* @par buff = pointer to the string to ckeck
|
||||
* @par len = len of the string
|
||||
* @return 1 if the string is punycoded;
|
||||
* else 0
|
||||
*
|
||||
*/
|
||||
int check_punycode_string(char * buff , int len);
|
||||
|
||||
|
||||
/**
|
||||
* Get the size of the flow struct
|
||||
*
|
||||
* @return the size of the flow struct
|
||||
*
|
||||
*/
|
||||
u_int32_t ndpi_detection_get_sizeof_ndpi_flow_struct(void);
|
||||
|
||||
|
||||
/**
|
||||
* Get the size of the id struct
|
||||
*
|
||||
* @return the size of the id struct
|
||||
*
|
||||
*/
|
||||
u_int32_t ndpi_detection_get_sizeof_ndpi_id_struct(void);
|
||||
|
||||
|
||||
/**
|
||||
* nDPI personal allocation and free functions
|
||||
**/
|
||||
void * ndpi_malloc(size_t size);
|
||||
void * ndpi_calloc(unsigned long count, size_t size);
|
||||
void * ndpi_realloc(void *ptr, size_t old_size, size_t new_size);
|
||||
char * ndpi_strdup(const char *s);
|
||||
void ndpi_free(void *ptr);
|
||||
void * ndpi_flow_malloc(size_t size);
|
||||
void ndpi_flow_free(void *ptr);
|
||||
|
||||
/**
|
||||
* Search the first occurrence of substring -find- in -s-
|
||||
* The search is limited to the first -slen- characters of the string
|
||||
*
|
||||
* @par s = string to parse
|
||||
* @par find = string to match with -s-
|
||||
* @par slen = max length to match between -s- and -find-
|
||||
* @return a pointer to the beginning of the located substring;
|
||||
* NULL if the substring is not found
|
||||
*
|
||||
*/
|
||||
char* ndpi_strnstr(const char *s, const char *find, size_t slen);
|
||||
|
||||
/**
|
||||
* Same as ndpi_strnstr but case insensitive
|
||||
*
|
||||
* @par s = string to parse
|
||||
* @par find = string to match with -s-
|
||||
* @par slen = max length to match between -s- and -find-
|
||||
* @return a pointer to the beginning of the located substring;
|
||||
* NULL if the substring is not found
|
||||
*
|
||||
*/
|
||||
char* ndpi_strncasestr(const char *s, const char *find, size_t slen);
|
||||
|
||||
|
||||
/**
|
||||
* Returns the nDPI protocol id for IP-based protocol detection
|
||||
*
|
||||
* @par ndpi_struct = the struct created for the protocol detection
|
||||
* @par pin = IP host address (MUST BE in network byte order):
|
||||
* See man(7) ip for details
|
||||
* @return the nDPI protocol ID
|
||||
*
|
||||
*/
|
||||
u_int16_t ndpi_network_ptree_match(struct ndpi_detection_module_struct *ndpi_struct, struct in_addr *pin);
|
||||
|
||||
|
||||
/**
|
||||
* Init single protocol match
|
||||
*
|
||||
* @par ndpi_mod = the struct created for the protocol detection
|
||||
* @par match = the struct passed to match the protocol
|
||||
*
|
||||
*/
|
||||
void ndpi_init_protocol_match(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol_match *match);
|
||||
|
||||
/**
|
||||
* Returns a new initialized detection module
|
||||
*
|
||||
* @return the initialized detection module
|
||||
*
|
||||
*/
|
||||
struct ndpi_detection_module_struct *ndpi_init_detection_module(void);
|
||||
|
||||
/**
|
||||
* Frees the memory allocated in the specified flow
|
||||
*
|
||||
* @par flow = the flow to deallocate
|
||||
*
|
||||
*/
|
||||
void ndpi_free_flow(struct ndpi_flow_struct *flow);
|
||||
|
||||
|
||||
/**
|
||||
* Enables cache support.
|
||||
* In nDPI is used for some protocol (i.e. Skype)
|
||||
*
|
||||
* @par ndpi_mod = the struct created for the protocol detection
|
||||
* @par host = string for the host name
|
||||
* @par port = unsigned int for the port number
|
||||
*
|
||||
*/
|
||||
void ndpi_enable_cache(struct ndpi_detection_module_struct *ndpi_mod, char* host, u_int port);
|
||||
|
||||
|
||||
/**
|
||||
* Destroys the detection module
|
||||
*
|
||||
* @par ndpi_struct = the struct to clearing for the detection module
|
||||
*
|
||||
*/
|
||||
void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_struct);
|
||||
|
||||
|
||||
/**
|
||||
* Sets a single protocol bitmask
|
||||
* This function does not increment the index of the callback_buffer
|
||||
*
|
||||
* @par label = string for the protocol name
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par detection_bitmask = the protocol bitmask
|
||||
* @par idx = the index of the callback_buffer
|
||||
* @par func = function pointer of the protocol search
|
||||
* @par ndpi_selection_bitmask = the protocol selected bitmask
|
||||
* @par b_save_bitmask_unknow = if set as "true" save the detection bitmask as unknow
|
||||
* @par b_add_detection_bitmask = if set as "true" add the protocol bitmask to the detection bitmask
|
||||
*
|
||||
*/
|
||||
void ndpi_set_bitmask_protocol_detection(char *label, struct ndpi_detection_module_struct *ndpi_struct,
|
||||
const NDPI_PROTOCOL_BITMASK *detection_bitmask,
|
||||
const u_int32_t idx,
|
||||
u_int16_t ndpi_protocol_id,
|
||||
void (*func) (struct ndpi_detection_module_struct *, struct ndpi_flow_struct *flow),
|
||||
const NDPI_SELECTION_BITMASK_PROTOCOL_SIZE ndpi_selection_bitmask,
|
||||
u_int8_t b_save_bitmask_unknow,
|
||||
u_int8_t b_add_detection_bitmask);
|
||||
|
||||
|
||||
/**
|
||||
* Sets the protocol bitmask2
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par detection_bitmask = the protocol bitmask to set
|
||||
*
|
||||
*/
|
||||
void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
const NDPI_PROTOCOL_BITMASK * detection_bitmask);
|
||||
|
||||
|
||||
/**
|
||||
* Function to be called before we give up with detection for a given flow.
|
||||
* This function reduces the NDPI_UNKNOWN_PROTOCOL detection
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the flow given for the detection module
|
||||
* @return the detected protocol even if the flow is not completed;
|
||||
*
|
||||
*/
|
||||
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow);
|
||||
|
||||
/**
|
||||
* Processes an extra packet in order to get more information for a given protocol
|
||||
* (like SSL getting both client and server certificate even if we already know after
|
||||
* seeing the client certificate what the protocol is)
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = pointer to the connection state machine
|
||||
* @par packet = unsigned char pointer to the Layer 3 (IP header)
|
||||
* @par packetlen = the length of the packet
|
||||
* @par current_tick = the current timestamp for the packet
|
||||
* @par src = pointer to the source subscriber state machine
|
||||
* @par dst = pointer to the destination subscriber state machine
|
||||
* @return void
|
||||
*
|
||||
*/
|
||||
void ndpi_process_extra_packet(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
const unsigned char *packet,
|
||||
const unsigned short packetlen,
|
||||
const u_int64_t current_tick,
|
||||
struct ndpi_id_struct *src,
|
||||
struct ndpi_id_struct *dst);
|
||||
|
||||
/**
|
||||
* Processes one packet and returns the ID of the detected protocol.
|
||||
* This is the MAIN PACKET PROCESSING FUNCTION.
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = pointer to the connection state machine
|
||||
* @par packet = unsigned char pointer to the Layer 3 (IP header)
|
||||
* @par packetlen = the length of the packet
|
||||
* @par current_tick = the current timestamp for the packet
|
||||
* @par src = pointer to the source subscriber state machine
|
||||
* @par dst = pointer to the destination subscriber state machine
|
||||
* @return the detected ID of the protocol
|
||||
*
|
||||
*/
|
||||
ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
const unsigned char *packet,
|
||||
const unsigned short packetlen,
|
||||
const u_int64_t current_tick,
|
||||
struct ndpi_id_struct *src,
|
||||
struct ndpi_id_struct *dst);
|
||||
|
||||
|
||||
/**
|
||||
* Get the main protocol of the passed flows for the detected module
|
||||
*
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the flow given for the detection module
|
||||
* @return the ID of the master protocol detected
|
||||
*
|
||||
*/
|
||||
u_int16_t ndpi_get_flow_masterprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow);
|
||||
|
||||
|
||||
/**
|
||||
* API call that is called internally by ndpi_detection_process_packet or by apps
|
||||
* that want to avoid calling ndpi_detection_process_packet as they have already
|
||||
* parsed the packet and thus want to avoid this.
|
||||
*
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the flow given for the detection module
|
||||
* @par ndpi_selection_bitmask = the protocol selected bitmask
|
||||
*
|
||||
*/
|
||||
void ndpi_check_flow_func(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_SIZE *ndpi_selection_packet);
|
||||
|
||||
/**
|
||||
* Query the pointer to the layer 4 packet
|
||||
*
|
||||
* @par l3 = pointer to the layer 3 data
|
||||
* @par l3_len = length of the layer 3 data
|
||||
* @par l4_return = address to the pointer of the layer 4 data if return value == 0, else undefined
|
||||
* @par l4_len_return = length of the layer 4 data if return value == 0, else undefined
|
||||
* @par l4_protocol_return = protocol of the layer 4 data if return value == 0, undefined otherwise
|
||||
* @par flags = limit operation on ipv4 or ipv6 packets. Possible values: NDPI_DETECTION_ONLY_IPV4 - NDPI_DETECTION_ONLY_IPV6 - 0 (any)
|
||||
* @return 0 if layer 4 data could be found correctly;
|
||||
else != 0
|
||||
*
|
||||
*/
|
||||
u_int8_t ndpi_detection_get_l4(const u_int8_t *l3, u_int16_t l3_len, const u_int8_t **l4_return, u_int16_t *l4_len_return,
|
||||
u_int8_t *l4_protocol_return, u_int32_t flags);
|
||||
|
||||
|
||||
/**
|
||||
* Search and return the protocol based on matched ports
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par shost = source address in host byte order
|
||||
* @par sport = source port number
|
||||
* @par dhost = destination address in host byte order
|
||||
* @par dport = destination port number
|
||||
* @return the struct ndpi_protocol that match the port base protocol
|
||||
*
|
||||
*/
|
||||
ndpi_protocol ndpi_find_port_based_protocol(struct ndpi_detection_module_struct *ndpi_struct/* , u_int8_t proto */,
|
||||
u_int32_t shost,
|
||||
u_int16_t sport,
|
||||
u_int32_t dhost,
|
||||
u_int16_t dport);
|
||||
|
||||
|
||||
/**
|
||||
* Search and return the protocol guessed that is undetected
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par proto = the l4 protocol number
|
||||
* @par shost = source address in host byte order
|
||||
* @par sport = source port number
|
||||
* @par dhost = destination address in host byte order
|
||||
* @par dport = destination port number
|
||||
* @return the struct ndpi_protocol that match the port base protocol
|
||||
*
|
||||
*/
|
||||
ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int8_t proto,
|
||||
u_int32_t shost,
|
||||
u_int16_t sport,
|
||||
u_int32_t dhost,
|
||||
u_int16_t dport);
|
||||
|
||||
|
||||
/**
|
||||
* Check if the string passed match with a protocol
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par string_to_match = the string to match
|
||||
* @par string_to_match_len = the length of the string
|
||||
* @par is_host_match = value of the second field of struct ndpi_automa
|
||||
* @return the ID of the matched subprotocol
|
||||
*
|
||||
*/
|
||||
int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
char *string_to_match,
|
||||
u_int string_to_match_len,
|
||||
u_int8_t is_host_match);
|
||||
|
||||
|
||||
/**
|
||||
* Check if the host passed match with a protocol
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the flow where match the host
|
||||
* @par string_to_match = the string to match
|
||||
* @par string_to_match_len = the length of the string
|
||||
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
||||
* @return the ID of the matched subprotocol
|
||||
*
|
||||
*/
|
||||
int ndpi_match_host_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
char *string_to_match,
|
||||
u_int string_to_match_len,
|
||||
u_int16_t master_protocol_id);
|
||||
|
||||
|
||||
/**
|
||||
* Check if the string content passed match with a protocol
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the flow where match the host
|
||||
* @par string_to_match = the string to match
|
||||
* @par string_to_match_len = the length of the string
|
||||
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
||||
* @return the ID of the matched subprotocol
|
||||
*
|
||||
*/
|
||||
int ndpi_match_content_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
char *string_to_match,
|
||||
u_int string_to_match_len,
|
||||
u_int16_t master_protocol_id);
|
||||
|
||||
|
||||
/**
|
||||
* Exclude protocol from search
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the flow where match the host
|
||||
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
||||
*
|
||||
*/
|
||||
void ndpi_exclude_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int16_t master_protocol_id,
|
||||
const char *_file, const char *_func,int _line);
|
||||
|
||||
|
||||
/**
|
||||
* Check if the string -bigram_to_match- match with a bigram of -automa-
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par automa = the struct ndpi_automa for the bigram
|
||||
* @par bigram_to_match = the bigram string to match
|
||||
* @return 0
|
||||
*
|
||||
*/
|
||||
int ndpi_match_bigram(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
ndpi_automa *automa,
|
||||
char *bigram_to_match);
|
||||
|
||||
/**
|
||||
* Write the protocol name in the buffer -buf- as master_protocol.protocol
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par proto = the struct ndpi_protocol contain the protocols name
|
||||
* @par buf = the buffer to write the name of the protocols
|
||||
* @par buf_len = the length of the buffer
|
||||
* @return the buffer contains the master_protocol and protocol name
|
||||
*
|
||||
*/
|
||||
char* ndpi_protocol2name(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol proto, char *buf, u_int buf_len);
|
||||
|
||||
/**
|
||||
* Find out if a given category is custom/user-defined
|
||||
*
|
||||
* @par category = the category associated to the protocol
|
||||
* @return 1 if this is a custom user category, 0 otherwise
|
||||
*
|
||||
*/
|
||||
int ndpi_is_custom_category(ndpi_protocol_category_t category);
|
||||
|
||||
/**
|
||||
* Overwrite a protocol category defined by nDPI with the custom category
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par protoId = the protocol identifier to overwrite
|
||||
* @par breed = the breed to be associated to the protocol
|
||||
*
|
||||
*/
|
||||
void ndpi_set_proto_breed(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
u_int16_t protoId, ndpi_protocol_breed_t breed);
|
||||
|
||||
/**
|
||||
* Overwrite a protocol category defined by nDPI with the custom category
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par protoId = the protocol identifier to overwrite
|
||||
* @par category = the category associated to the protocol
|
||||
*
|
||||
*/
|
||||
void ndpi_set_proto_category(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
u_int16_t protoId, ndpi_protocol_category_t protoCategory);
|
||||
|
||||
/**
|
||||
* Check if subprotocols of the specified master protocol are just
|
||||
* informative (and not real)
|
||||
*
|
||||
* @par mod = the detection module
|
||||
* @par protoId = the (master) protocol identifier to query
|
||||
* @return 1 = the subprotocol is informative, 0 otherwise.
|
||||
*
|
||||
*/
|
||||
u_int8_t ndpi_is_subprotocol_informative(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
u_int16_t protoId);
|
||||
|
||||
/**
|
||||
* Get protocol category as string
|
||||
*
|
||||
* @par mod = the detection module
|
||||
* @par category = the category associated to the protocol
|
||||
* @return the string name of the category
|
||||
*
|
||||
*/
|
||||
const char* ndpi_category_get_name(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
ndpi_protocol_category_t category);
|
||||
|
||||
/**
|
||||
* Set protocol category string
|
||||
*
|
||||
* @par mod = the detection module
|
||||
* @par category = the category associated to the protocol
|
||||
* @paw name = the string name of the category
|
||||
*
|
||||
*/
|
||||
void ndpi_category_set_name(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
ndpi_protocol_category_t category, char *name);
|
||||
|
||||
/**
|
||||
* Get protocol category
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par proto = the struct ndpi_protocol contain the protocols name
|
||||
* @return the protocol category
|
||||
*/
|
||||
ndpi_protocol_category_t ndpi_get_proto_category(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol proto);
|
||||
|
||||
/**
|
||||
* Get the protocol name associated to the ID
|
||||
*
|
||||
* @par mod = the detection module
|
||||
* @par proto_id = the ID of the protocol
|
||||
* @return the buffer contains the master_protocol and protocol name
|
||||
*
|
||||
*/
|
||||
char* ndpi_get_proto_name(struct ndpi_detection_module_struct *mod, u_int16_t proto_id);
|
||||
|
||||
|
||||
/**
|
||||
* Return the protocol breed ID associated to the protocol
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par proto = the ID of the protocol
|
||||
* @return the breed ID associated to the protocol
|
||||
*
|
||||
*/
|
||||
ndpi_protocol_breed_t ndpi_get_proto_breed(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t proto);
|
||||
|
||||
|
||||
/**
|
||||
* Return the string name of the protocol breed
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par breed_id = the breed ID associated to the protocol
|
||||
* @return the string name of the breed ID
|
||||
*
|
||||
*/
|
||||
char* ndpi_get_proto_breed_name(struct ndpi_detection_module_struct *ndpi_struct, ndpi_protocol_breed_t breed_id);
|
||||
|
||||
|
||||
/**
|
||||
* Return the ID of the protocol
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par proto = the protocol name
|
||||
* @return the ID of the protocol
|
||||
*
|
||||
*/
|
||||
int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_mod, char *proto);
|
||||
|
||||
|
||||
/**
|
||||
* Return the ID of the category
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par proto = the category name
|
||||
* @return the ID of the category
|
||||
*
|
||||
*/
|
||||
int ndpi_get_category_id(struct ndpi_detection_module_struct *ndpi_mod, char *cat);
|
||||
|
||||
|
||||
/**
|
||||
* Write the list of the supported protocols
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
*/
|
||||
void ndpi_dump_protocols(struct ndpi_detection_module_struct *mod);
|
||||
|
||||
|
||||
/**
|
||||
* Read a file and load the protocols
|
||||
*
|
||||
* Format: <tcp|udp>:<port>,<tcp|udp>:<port>,.....@<proto>
|
||||
*
|
||||
* Example:
|
||||
* tcp:80,tcp:3128@HTTP
|
||||
* udp:139@NETBIOS
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par path = the path of the file
|
||||
* @return 0 if the file is loaded correctly;
|
||||
* -1 else
|
||||
*
|
||||
*/
|
||||
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod, char* path);
|
||||
|
||||
|
||||
/**
|
||||
* Get the total number of the supported protocols
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @return the number of protocols
|
||||
*
|
||||
*/
|
||||
u_int ndpi_get_num_supported_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
||||
|
||||
|
||||
/**
|
||||
* Get the nDPI version release
|
||||
*
|
||||
* @return the NDPI_GIT_RELEASE
|
||||
*
|
||||
*/
|
||||
char* ndpi_revision(void);
|
||||
|
||||
|
||||
/**
|
||||
* Set the automa for the protocol search
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par automa = the automa to match
|
||||
*
|
||||
*/
|
||||
void ndpi_set_automa(struct ndpi_detection_module_struct *ndpi_struct, void* automa);
|
||||
|
||||
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
/**
|
||||
* Retrieve information for HTTP flows
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par flow = the detected flow
|
||||
* @return the HTTP method information about the flow
|
||||
*
|
||||
*/
|
||||
ndpi_http_method ndpi_get_http_method(struct ndpi_detection_module_struct *ndpi_mod, struct ndpi_flow_struct *flow);
|
||||
|
||||
|
||||
/**
|
||||
* Get the HTTP url
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par flow = the detected flow
|
||||
* @return the HTTP method information about the flow
|
||||
*
|
||||
*/
|
||||
char* ndpi_get_http_url(struct ndpi_detection_module_struct *ndpi_mod, struct ndpi_flow_struct *flow);
|
||||
|
||||
|
||||
/**
|
||||
* Get the HTTP content-type
|
||||
*
|
||||
* @par ndpi_mod = the detection module
|
||||
* @par flow = the detected flow
|
||||
* @return the HTTP method information about the flow
|
||||
*
|
||||
*/
|
||||
char* ndpi_get_http_content_type(struct ndpi_detection_module_struct *ndpi_mod, struct ndpi_flow_struct *flow);
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef NDPI_PROTOCOL_TOR
|
||||
/**
|
||||
* Check if the flow could be detected as TOR protocol
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = the detected flow
|
||||
* @par certificate = the ssl certificate
|
||||
* @return 1 if the flow is TOR;
|
||||
* 0 else
|
||||
*
|
||||
*/
|
||||
int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow, char *certificate);
|
||||
#endif
|
||||
|
||||
/* Wrappers functions */
|
||||
/**
|
||||
* Init Aho-Corasick automata
|
||||
*
|
||||
* @return The requested automata, or NULL if an error occurred
|
||||
*
|
||||
*/
|
||||
void* ndpi_init_automa(void);
|
||||
|
||||
|
||||
/**
|
||||
* Free Aho-Corasick automata allocated with ndpi_init_automa();
|
||||
*
|
||||
* @par The automata initialized with ndpi_init_automa();
|
||||
*
|
||||
*/
|
||||
void ndpi_free_automa(void *_automa);
|
||||
|
||||
|
||||
/**
|
||||
* Add a string to match to an automata
|
||||
*
|
||||
* @par The automata initialized with ndpi_init_automa();
|
||||
* @par The (sub)string to search
|
||||
* @par The number associated with this string
|
||||
* @return 0 in case of no error, or -1 if an error occurred.
|
||||
*
|
||||
*/
|
||||
int ndpi_add_string_value_to_automa(void *_automa, char *str, unsigned long num);
|
||||
|
||||
|
||||
/**
|
||||
* Add a string to match to an automata. Same as ndpi_add_string_value_to_automa() with num set to 1
|
||||
*
|
||||
* @par The automata initialized with ndpi_init_automa();
|
||||
* @par The (sub)string to search
|
||||
* @return 0 in case of no error, or -1 if an error occurred.
|
||||
*
|
||||
*/
|
||||
int ndpi_add_string_to_automa(void *_automa, char *str);
|
||||
|
||||
|
||||
/**
|
||||
* Finalize the automa (necessary before start searching)
|
||||
*
|
||||
* @par The automata initialized with ndpi_init_automa();
|
||||
*
|
||||
*/
|
||||
void ndpi_finalize_automa(void *_automa);
|
||||
|
||||
|
||||
/**
|
||||
* Add a string to match to an automata
|
||||
*
|
||||
* @par The automata initialized with ndpi_init_automa();
|
||||
* @par The (sub)string to search
|
||||
* @return 0 in case of match, or -1 if no match, or -2 if an error occurred.
|
||||
*
|
||||
*/
|
||||
int ndpi_match_string(void *_automa, char *string_to_match);
|
||||
|
||||
|
||||
/**
|
||||
* Add a string to match to an automata
|
||||
*
|
||||
* @par The automata initialized with ndpi_init_automa();
|
||||
* @par The (sub)string to search
|
||||
* @par The id associated with the matched string or 0 id not found.
|
||||
* @return 0 in case of match, or -1 if no match, or -2 if an error occurred.
|
||||
*
|
||||
*/
|
||||
int ndpi_match_string_id(void *_automa, char *string_to_match, unsigned long *id);
|
||||
|
||||
|
||||
/* Utility functions to set ndpi malloc/free/print wrappers */
|
||||
void set_ndpi_malloc(void* (*__ndpi_malloc)(size_t size));
|
||||
void set_ndpi_free(void (*__ndpi_free)(void *ptr));
|
||||
void set_ndpi_flow_malloc(void* (*__ndpi_flow_malloc)(size_t size));
|
||||
void set_ndpi_flow_free(void (*__ndpi_flow_free)(void *ptr));
|
||||
void set_ndpi_debug_function(struct ndpi_detection_module_struct *ndpi_str, ndpi_debug_function_ptr ndpi_debug_printf);
|
||||
void * ndpi_malloc(size_t size);
|
||||
void * ndpi_calloc(unsigned long count, size_t size);
|
||||
void ndpi_free(void *ptr);
|
||||
u_int8_t ndpi_get_api_version();
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __NDPI_API_H__ */
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,92 @@
|
||||
/*
|
||||
*
|
||||
* Copyright (c) 2016 Cisco Systems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following
|
||||
* disclaimer in the documentation and/or other materials provided
|
||||
* with the distribution.
|
||||
*
|
||||
* Neither the name of the Cisco Systems, Inc. nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file ndpi_classify.h
|
||||
*
|
||||
* \brief header file for inline Classification functionality
|
||||
*/
|
||||
|
||||
#ifndef NDPI_CLASSIFY_H
|
||||
#define NDPI_CLASSIFY_H
|
||||
|
||||
#include "ndpi_includes.h"
|
||||
|
||||
/* constants */
|
||||
#define NUM_PARAMETERS_SPLT_LOGREG 208
|
||||
#define NUM_PARAMETERS_BD_LOGREG 464
|
||||
#define MC_BINS_LEN 10
|
||||
#define MC_BINS_TIME 10
|
||||
#define MC_BIN_SIZE_TIME 50
|
||||
#define MC_BIN_SIZE_LEN 150
|
||||
#define MAX_BIN_LEN 1500
|
||||
#define NUM_BD_VALUES 256
|
||||
#define NDPI_TIMESTAMP_LEN 64
|
||||
|
||||
/** Classifier parameter type codes */
|
||||
typedef enum {
|
||||
SPLT_PARAM_TYPE = 0,
|
||||
BD_PARAM_TYPE = 1
|
||||
} classifier_type_codes_t;
|
||||
|
||||
extern float parameters_bd[NUM_PARAMETERS_BD_LOGREG];
|
||||
extern float parameters_splt[NUM_PARAMETERS_SPLT_LOGREG];
|
||||
|
||||
/* Classifier functions */
|
||||
float ndpi_classify(const unsigned short *pkt_len, const pkt_timeval *pkt_time,
|
||||
const unsigned short *pkt_len_twin, const pkt_timeval *pkt_time_twin,
|
||||
pkt_timeval start_time, pkt_timeval start_time_twin, uint32_t max_num_pkt_len,
|
||||
uint16_t sp, uint16_t dp, uint32_t op, uint32_t ip, uint32_t np_o, uint32_t np_i,
|
||||
uint32_t ob, uint32_t ib, uint16_t use_bd, const uint32_t *bd, const uint32_t *bd_t);
|
||||
|
||||
void ndpi_merge_splt_arrays(const uint16_t *pkt_len, const pkt_timeval *pkt_time,
|
||||
const uint16_t *pkt_len_twin, const pkt_timeval *pkt_time_twin,
|
||||
pkt_timeval start_time, pkt_timeval start_time_twin,
|
||||
uint16_t s_idx, uint16_t r_idx,
|
||||
uint16_t *merged_lens, uint16_t *merged_times);
|
||||
|
||||
void ndpi_update_params(classifier_type_codes_t param_type, const char *param_file);
|
||||
|
||||
void ndpi_flow_info_freer(void *node);
|
||||
unsigned int ndpi_timer_eq(const pkt_timeval *a, const pkt_timeval *b);
|
||||
unsigned int ndpi_timer_lt(const pkt_timeval *a, const pkt_timeval *b);
|
||||
void ndpi_timer_sub(const pkt_timeval *a, const pkt_timeval *b, pkt_timeval *result);
|
||||
void ndpi_timer_clear(pkt_timeval *a);
|
||||
unsigned int ndpi_timeval_to_milliseconds(pkt_timeval ts);
|
||||
unsigned int ndpi_timeval_to_microseconds(pkt_timeval ts);
|
||||
void ndpi_log_timestamp(char *log_ts, uint32_t log_ts_len);
|
||||
|
||||
#endif /* NDPI_CLASSIFY_H */
|
||||
@@ -35,7 +35,9 @@
|
||||
#include <endian.h>
|
||||
#define __BYTE_ORDER BYTE_ORDER
|
||||
#if BYTE_ORDER == LITTLE_ENDIAN
|
||||
#ifndef __LITTLE_ENDIAN__
|
||||
#define __LITTLE_ENDIAN__
|
||||
#endif /* __LITTLE_ENDIAN__ */
|
||||
#else
|
||||
#define __BIG_ENDIAN__
|
||||
#endif/* BYTE_ORDER */
|
||||
@@ -179,6 +181,8 @@
|
||||
#define NDPI_JABBER_FT_TIMEOUT 5
|
||||
#define NDPI_SOULSEEK_CONNECTION_IP_TICK_TIMEOUT 600
|
||||
|
||||
#include "ndpi_config.h" /* To have access to NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
#define NDPI_LOG(proto, m, log_level, args...) \
|
||||
{ \
|
||||
@@ -187,7 +191,7 @@
|
||||
(*(mod->ndpi_debug_printf))(proto, mod, log_level, __FILE__, __FUNCTION__, __LINE__, args); \
|
||||
}
|
||||
|
||||
/* We must define NDPI_CURRENT_PROTO before include ndpi_main.h !!!
|
||||
/* We must define NDPI_CURRENT_PROTO before include ndpi_main.h !!!
|
||||
*
|
||||
* #include "ndpi_protocol_ids.h"
|
||||
* #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_XXXX
|
||||
@@ -196,7 +200,7 @@
|
||||
*/
|
||||
|
||||
#ifndef NDPI_CURRENT_PROTO
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTO_UNKNOWN
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_UNKNOWN
|
||||
#endif
|
||||
|
||||
#define NDPI_LOG_ERR(mod, args...) \
|
||||
@@ -231,11 +235,11 @@
|
||||
# define NDPI_LOG_DBG(...) {}
|
||||
# define NDPI_LOG_DBG2(...) {}
|
||||
# else
|
||||
# define NDPI_LOG(proto, mod, log_level, args...) {}
|
||||
# define NDPI_LOG_ERR(mod, args...) {}
|
||||
# define NDPI_LOG_INFO(mod, args...) {}
|
||||
# define NDPI_LOG_DBG(mod, args...) {}
|
||||
# define NDPI_LOG_DBG2(mod, args...) {}
|
||||
# define NDPI_LOG(proto, mod, log_level, args...) { /* printf(args); */ }
|
||||
# define NDPI_LOG_ERR(mod, args...) { printf(args); }
|
||||
# define NDPI_LOG_INFO(mod, args...) { /* printf(args); */ }
|
||||
# define NDPI_LOG_DBG(mod, args...) { /* printf(args); */ }
|
||||
# define NDPI_LOG_DBG2(mod, args...) { /* printf(args); */ }
|
||||
# endif
|
||||
#endif /* NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
|
||||
@@ -250,7 +254,7 @@
|
||||
|
||||
/** macro to compare 2 IPv6 addresses with each other to identify the "smaller" IPv6 address */
|
||||
#define NDPI_COMPARE_IPV6_ADDRESS_STRUCTS(x,y) \
|
||||
((((u_int64_t *)(x))[0]) < (((u_int64_t *)(y))[0]) || ( (((u_int64_t *)(x))[0]) == (((u_int64_t *)(y))[0]) && (((u_int64_t *)(x))[1]) < (((u_int64_t *)(y))[1])) )
|
||||
((x.u6_addr.u6_addr64[0] < y.u6_addr.u6_addr64[0]) || ((x.u6_addr.u6_addr64[0] == y.u6_addr.u6_addr64[0]) && (x.u6_addr.u6_addr64[1] < y.u6_addr.u6_addr64[1])))
|
||||
|
||||
#define NDPI_NUM_BITS 512
|
||||
|
||||
@@ -274,6 +278,12 @@
|
||||
#define NDPI_BITMASK_SET_ALL(a) NDPI_ONE(&a)
|
||||
#define NDPI_BITMASK_SET(a, b) { memcpy(&a, &b, sizeof(NDPI_PROTOCOL_BITMASK)); }
|
||||
|
||||
#define NDPI_SET_BIT(num, n) num |= 1UL << ( n )
|
||||
#define NDPI_CLR_BIT(num, n) num &= ~(1UL << ( n ))
|
||||
#define NDPI_CLR_BIT(num, n) num &= ~(1UL << ( n ))
|
||||
#define NDPI_ISSET_BIT(num, n) (num & (1UL << ( n )))
|
||||
#define NDPI_ZERO_BIT(num) num = 0
|
||||
|
||||
/* this is a very very tricky macro *g*,
|
||||
* the compiler will remove all shifts here if the protocol is static...
|
||||
*/
|
||||
@@ -304,10 +314,10 @@
|
||||
#define NDPI_ICMPV6_PROTOCOL_TYPE 0x3a
|
||||
|
||||
/* the get_uXX will return raw network packet bytes !! */
|
||||
#define get_u_int8_t(X,O) (*(u_int8_t *)(((u_int8_t *)X) + O))
|
||||
#define get_u_int16_t(X,O) (*(u_int16_t *)(((u_int8_t *)X) + O))
|
||||
#define get_u_int32_t(X,O) (*(u_int32_t *)(((u_int8_t *)X) + O))
|
||||
#define get_u_int64_t(X,O) (*(u_int64_t *)(((u_int8_t *)X) + O))
|
||||
#define get_u_int8_t(X,O) (*(u_int8_t *)((&(((u_int8_t *)X)[O]))))
|
||||
#define get_u_int16_t(X,O) (*(u_int16_t *)((&(((u_int8_t *)X)[O]))))
|
||||
#define get_u_int32_t(X,O) (*(u_int32_t *)((&(((u_int8_t *)X)[O]))))
|
||||
#define get_u_int64_t(X,O) (*(u_int64_t *)((&(((u_int8_t *)X)[O]))))
|
||||
|
||||
/* new definitions to get little endian from network bytes */
|
||||
#define get_ul8(X,O) get_u_int8_t(X,O)
|
||||
@@ -328,13 +338,44 @@
|
||||
#define match_first_bytes(payload,st) (memcmp((payload),(st),(sizeof(st)-1))==0)
|
||||
|
||||
#if defined(WIN32) && !defined(snprintf)
|
||||
#define snprintf _snprintf
|
||||
#define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
#define NDPI_MAX_DNS_REQUESTS 16
|
||||
#define NDPI_MIN_NUM_STUN_DETECTION 8
|
||||
|
||||
#define NDPI_MAJOR @NDPI_MAJOR@
|
||||
#define NDPI_MINOR @NDPI_MINOR@
|
||||
#define NDPI_PATCH @NDPI_PATCH@
|
||||
|
||||
/* IMPORTANT: order according to its severity */
|
||||
#define NDPI_CIPHER_SAFE 0
|
||||
#define NDPI_CIPHER_WEAK 1
|
||||
#define NDPI_CIPHER_INSECURE 2
|
||||
|
||||
#define NDPI_OPTIMAL_HLL_NUM_BUCKETS 16
|
||||
|
||||
#define NDPI_MAX_NUM_TLS_APPL_BLOCKS 8
|
||||
|
||||
#ifdef __APPLE__
|
||||
|
||||
#include <libkern/OSByteOrder.h>
|
||||
|
||||
#define htobe16(x) OSSwapHostToBigInt16(x)
|
||||
#define htole16(x) OSSwapHostToLittleInt16(x)
|
||||
#define be16toh(x) OSSwapBigToHostInt16(x)
|
||||
#define le16toh(x) OSSwapLittleToHostInt16(x)
|
||||
|
||||
#define htobe32(x) OSSwapHostToBigInt32(x)
|
||||
#define htole32(x) OSSwapHostToLittleInt32(x)
|
||||
#define be32toh(x) OSSwapBigToHostInt32(x)
|
||||
#define le32toh(x) OSSwapLittleToHostInt32(x)
|
||||
|
||||
#define htobe64(x) OSSwapHostToBigInt64(x)
|
||||
#define htole64(x) OSSwapHostToLittleInt64(x)
|
||||
#define be64toh(x) OSSwapBigToHostInt64(x)
|
||||
#define le64toh(x) OSSwapLittleToHostInt64(x)
|
||||
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
#endif /* __NDPI_DEFINE_INCLUDE_FILE__ */
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <time.h>
|
||||
@@ -56,7 +57,7 @@
|
||||
#if defined __NetBSD__ || defined __OpenBSD__
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#ifdef __OpenBSD__
|
||||
#if defined __OpenBSD__
|
||||
#include <pthread.h>
|
||||
|
||||
#endif
|
||||
@@ -66,4 +67,10 @@
|
||||
|
||||
#endif /* Win32 */
|
||||
|
||||
#if defined __OpenBSD__
|
||||
#include "ndpi_includes_OpenBSD.h"
|
||||
#else
|
||||
typedef struct timeval pkt_timeval;
|
||||
#endif /* __OpenBSD__ */
|
||||
|
||||
#endif /* __NDPI_INCLUDES_H__ */
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
/*
|
||||
* ndpi_includes_OpenBSD.h
|
||||
*
|
||||
* Copyright (C) 2011-16 - 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
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __NDPI_INCLUDES_OPENBSD_H__
|
||||
#define __NDPI_INCLUDES_OPENBSD_H__
|
||||
|
||||
#ifndef IPPROTO_SCTP
|
||||
#define IPPROTO_SCTP 132
|
||||
#endif /* IPPROTO_SCTP */
|
||||
|
||||
#include <net/bpf.h>
|
||||
|
||||
typedef struct bpf_timeval pkt_timeval;
|
||||
|
||||
#endif /* __NDPI_INCLUDES_OPENBSD_H__ */
|
||||
+51
-24
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ndpi_main.h
|
||||
*
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
* Copyright (C) 2011-20 - 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
|
||||
@@ -24,7 +24,6 @@
|
||||
#ifndef __NDPI_MAIN_H__
|
||||
#define __NDPI_MAIN_H__
|
||||
|
||||
#include "ndpi_config.h"
|
||||
#include "ndpi_includes.h"
|
||||
#include "ndpi_define.h"
|
||||
#include "ndpi_protocol_ids.h"
|
||||
@@ -54,35 +53,56 @@ extern "C" {
|
||||
extern u_int8_t ndpi_ips_match(u_int32_t src, u_int32_t dst,
|
||||
u_int32_t net, u_int32_t num_bits);
|
||||
|
||||
u_int16_t ntohs_ndpi_bytestream_to_number(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
|
||||
|
||||
u_int32_t ndpi_bytestream_to_number(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
|
||||
u_int64_t ndpi_bytestream_to_number64(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
|
||||
u_int32_t ndpi_bytestream_dec_or_hex_to_number(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
|
||||
u_int64_t ndpi_bytestream_dec_or_hex_to_number64(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
|
||||
u_int32_t ndpi_bytestream_to_ipv4(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
|
||||
u_int16_t ntohs_ndpi_bytestream_to_number(const u_int8_t * str,
|
||||
u_int16_t max_chars_to_read,
|
||||
u_int16_t * bytes_read);
|
||||
|
||||
u_int32_t ndpi_bytestream_to_number(const u_int8_t * str, u_int16_t max_chars_to_read,
|
||||
u_int16_t * bytes_read);
|
||||
u_int64_t ndpi_bytestream_to_number64(const u_int8_t * str, u_int16_t max_chars_to_read,
|
||||
u_int16_t * bytes_read);
|
||||
u_int32_t ndpi_bytestream_dec_or_hex_to_number(const u_int8_t * str,
|
||||
u_int16_t max_chars_to_read,
|
||||
u_int16_t * bytes_read);
|
||||
u_int64_t ndpi_bytestream_dec_or_hex_to_number64(const u_int8_t * str,
|
||||
u_int16_t max_chars_to_read,
|
||||
u_int16_t * bytes_read);
|
||||
u_int32_t ndpi_bytestream_to_ipv4(const u_int8_t * str, u_int16_t max_chars_to_read,
|
||||
u_int16_t * bytes_read);
|
||||
|
||||
void ndpi_set_detected_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int16_t upper_detected_protocol,
|
||||
u_int16_t lower_detected_protocol);
|
||||
|
||||
extern void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
extern void ndpi_parse_packet_line_info_any(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
extern void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow);
|
||||
extern void ndpi_parse_packet_line_info_any(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow);
|
||||
|
||||
extern u_int16_t ndpi_check_for_email_address(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, u_int16_t counter);
|
||||
extern u_int16_t ndpi_check_for_email_address(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow, u_int16_t counter);
|
||||
|
||||
extern void ndpi_int_change_packet_protocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow,
|
||||
extern void ndpi_int_change_packet_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int16_t upper_detected_protocol,
|
||||
u_int16_t lower_detected_protocol);
|
||||
extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow,
|
||||
extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int16_t upper_detected_protocol,
|
||||
u_int16_t lower_detected_protocol);
|
||||
extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol_breed_t protoBreed, u_int16_t protoId,
|
||||
u_int16_t tcp_alias_protoId[2], u_int16_t udp_alias_protoId[2], char *protoName,
|
||||
extern void ndpi_int_change_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
ndpi_protocol_category_t protocol_category);
|
||||
|
||||
extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
ndpi_protocol_breed_t protoBreed, u_int16_t protoId,
|
||||
u_int8_t can_have_a_subprotocol,
|
||||
u_int16_t tcp_alias_protoId[2],
|
||||
u_int16_t udp_alias_protoId[2], char *protoName,
|
||||
ndpi_protocol_category_t protoCategory,
|
||||
ndpi_port_range *tcpDefPorts, ndpi_port_range *udpDefPorts);
|
||||
ndpi_port_range *tcpDefPorts,
|
||||
ndpi_port_range *udpDefPorts);
|
||||
|
||||
extern void ndpi_int_reset_packet_protocol(struct ndpi_packet_struct *packet);
|
||||
extern void ndpi_int_reset_protocol(struct ndpi_flow_struct *flow);
|
||||
@@ -92,24 +112,27 @@ extern "C" {
|
||||
extern void ndpi_packet_src_ip_get(const struct ndpi_packet_struct *packet, ndpi_ip_addr_t * ip);
|
||||
extern void ndpi_packet_dst_ip_get(const struct ndpi_packet_struct *packet, ndpi_ip_addr_t * ip);
|
||||
|
||||
extern char *ndpi_get_ip_string(struct ndpi_detection_module_struct *ndpi_struct, const ndpi_ip_addr_t * ip);
|
||||
extern char *ndpi_get_packet_src_ip_string(struct ndpi_detection_module_struct *ndpi_struct, const struct ndpi_packet_struct *packet);
|
||||
extern int ndpi_parse_ip_string(const char *ip_str, ndpi_ip_addr_t *parsed_ip);
|
||||
extern char *ndpi_get_ip_string(const ndpi_ip_addr_t * ip, char *buf, u_int buf_len);
|
||||
extern u_int8_t ndpi_is_ipv6(const ndpi_ip_addr_t *ip);
|
||||
|
||||
extern char* ndpi_get_proto_by_id(struct ndpi_detection_module_struct *ndpi_mod, u_int id);
|
||||
u_int16_t ndpi_get_proto_by_name(struct ndpi_detection_module_struct *ndpi_mod, const char *name);
|
||||
|
||||
extern u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int8_t proto, u_int16_t sport, u_int16_t dport,
|
||||
u_int8_t *user_defined_proto);
|
||||
|
||||
extern u_int8_t ndpi_is_proto(ndpi_protocol p, u_int16_t proto);
|
||||
extern u_int8_t ndpi_is_proto(ndpi_protocol proto, u_int16_t p);
|
||||
|
||||
extern u_int16_t ndpi_get_lower_proto(ndpi_protocol p);
|
||||
extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t protocol_id,
|
||||
extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int16_t protocol_id,
|
||||
u_int16_t** tcp_master_proto,
|
||||
u_int16_t** udp_master_proto);
|
||||
#ifdef NDPI_PROTOCOL_NETBIOS
|
||||
int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
|
||||
#endif
|
||||
#/* NDPI_PROTOCOL_NETBIOS */
|
||||
int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len);
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
@@ -127,6 +150,10 @@ extern "C" {
|
||||
#define ndpi_match_strprefix(payload, payload_len, str) \
|
||||
ndpi_match_prefix((payload), (payload_len), (str), (sizeof(str)-1))
|
||||
|
||||
#ifdef NDPI_DETECTION_SUPPORT_IPV6
|
||||
int ndpi_handle_ipv6_extension_headers(struct ndpi_detection_module_struct *ndpi_str, const u_int8_t ** l4ptr, u_int16_t * l4len, u_int8_t * nxt_hdr);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
+274
-263
@@ -1,8 +1,7 @@
|
||||
|
||||
/*
|
||||
* ndpi_protocol_ids.h
|
||||
*
|
||||
* Copyright (C) 2011-18 - ntop.org
|
||||
* Copyright (C) 2011-20 - 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
|
||||
@@ -23,273 +22,285 @@
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __NDPI_API_H__
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef __NDPI_PROTOCOLS_DEFAULT_H__
|
||||
#define __NDPI_PROTOCOLS_DEFAULT_H__
|
||||
#ifndef __NDPI_PROTOCOLS_IDS_H__
|
||||
#define __NDPI_PROTOCOLS_IDS_H__
|
||||
|
||||
#define NDPI_DETECTION_SUPPORT_IPV6
|
||||
#define NDPI_PROTOCOL_SIZE 2
|
||||
|
||||
#define NDPI_PROTOCOL_UNKNOWN 0
|
||||
typedef enum {
|
||||
NDPI_PROTOCOL_UNKNOWN = 0,
|
||||
NDPI_PROTOCOL_FTP_CONTROL = 1, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_MAIL_POP = 2,
|
||||
NDPI_PROTOCOL_MAIL_SMTP = 3,
|
||||
NDPI_PROTOCOL_MAIL_IMAP = 4,
|
||||
NDPI_PROTOCOL_DNS = 5,
|
||||
NDPI_PROTOCOL_IPP = 6,
|
||||
NDPI_PROTOCOL_HTTP = 7,
|
||||
NDPI_PROTOCOL_MDNS = 8,
|
||||
NDPI_PROTOCOL_NTP = 9,
|
||||
NDPI_PROTOCOL_NETBIOS = 10,
|
||||
NDPI_PROTOCOL_NFS = 11,
|
||||
NDPI_PROTOCOL_SSDP = 12,
|
||||
NDPI_PROTOCOL_BGP = 13,
|
||||
NDPI_PROTOCOL_SNMP = 14,
|
||||
NDPI_PROTOCOL_XDMCP = 15,
|
||||
NDPI_PROTOCOL_SMBV1 = 16, /* SMB version 1 */
|
||||
NDPI_PROTOCOL_SYSLOG = 17,
|
||||
NDPI_PROTOCOL_DHCP = 18,
|
||||
NDPI_PROTOCOL_POSTGRES = 19,
|
||||
NDPI_PROTOCOL_MYSQL = 20,
|
||||
NDPI_PROTOCOL_HOTMAIL = 21,
|
||||
NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK = 22,
|
||||
NDPI_PROTOCOL_MAIL_POPS = 23,
|
||||
NDPI_PROTOCOL_APPLEJUICE = 24,
|
||||
NDPI_PROTOCOL_DIRECTCONNECT = 25,
|
||||
NDPI_PROTOCOL_NTOP = 26,
|
||||
NDPI_PROTOCOL_COAP = 27,
|
||||
NDPI_PROTOCOL_VMWARE = 28,
|
||||
NDPI_PROTOCOL_MAIL_SMTPS = 29,
|
||||
NDPI_PROTOCOL_FBZERO = 30,
|
||||
NDPI_PROTOCOL_UBNTAC2 = 31, /* Ubiquity UBNT AirControl = 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
|
||||
NDPI_PROTOCOL_KONTIKI = 32,
|
||||
NDPI_PROTOCOL_OPENFT = 33,
|
||||
NDPI_PROTOCOL_FASTTRACK = 34,
|
||||
NDPI_PROTOCOL_GNUTELLA = 35,
|
||||
NDPI_PROTOCOL_EDONKEY = 36, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_BITTORRENT = 37,
|
||||
NDPI_PROTOCOL_SKYPE_CALL = 38, /* Skype call and videocalls */
|
||||
NDPI_PROTOCOL_SIGNAL = 39,
|
||||
NDPI_PROTOCOL_MEMCACHED = 40, /* Memcached - Darryl Sokoloski <darryl@egloo.ca> */
|
||||
NDPI_PROTOCOL_SMBV23 = 41, /* SMB version 2/3 */
|
||||
NDPI_PROTOCOL_MINING = 42, /* Bitcoin, Ethereum, ZCash, Monero */
|
||||
NDPI_PROTOCOL_NEST_LOG_SINK = 43, /* Nest Log Sink (Nest Protect) - Darryl Sokoloski <darryl@egloo.ca> */
|
||||
NDPI_PROTOCOL_MODBUS = 44, /* Modbus */
|
||||
NDPI_PROTOCOL_WHATSAPP_CALL = 45, /* WhatsApp video ad audio calls go here */
|
||||
NDPI_PROTOCOL_DATASAVER = 46, /* Protocols used to save data on Internet communications */
|
||||
NDPI_PROTOCOL_XBOX = 47,
|
||||
NDPI_PROTOCOL_QQ = 48,
|
||||
NDPI_PROTOCOL_TIKTOK = 49,
|
||||
NDPI_PROTOCOL_RTSP = 50,
|
||||
NDPI_PROTOCOL_MAIL_IMAPS = 51,
|
||||
NDPI_PROTOCOL_ICECAST = 52,
|
||||
NDPI_PROTOCOL_FREE_53 = 53,
|
||||
NDPI_PROTOCOL_PPSTREAM = 54,
|
||||
NDPI_PROTOCOL_ZATTOO = 55,
|
||||
NDPI_PROTOCOL_SHOUTCAST = 56,
|
||||
NDPI_PROTOCOL_SOPCAST = 57,
|
||||
NDPI_PROTOCOL_DISCORD = 58,
|
||||
NDPI_PROTOCOL_TVUPLAYER = 59,
|
||||
NDPI_PROTOCOL_HTTP_DOWNLOAD = 60,
|
||||
NDPI_PROTOCOL_QQLIVE = 61,
|
||||
NDPI_PROTOCOL_THUNDER = 62,
|
||||
NDPI_PROTOCOL_SOULSEEK = 63,
|
||||
NDPI_PROTOCOL_PS_VUE = 64,
|
||||
NDPI_PROTOCOL_IRC = 65,
|
||||
NDPI_PROTOCOL_AYIYA = 66,
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER = 67,
|
||||
NDPI_PROTOCOL_NATS = 68,
|
||||
NDPI_PROTOCOL_FREE_69 = 69, /* Free */
|
||||
NDPI_PROTOCOL_YAHOO = 70,
|
||||
NDPI_PROTOCOL_FREE_71 = 71, /* Free */
|
||||
NDPI_PROTOCOL_GOOGLE_PLUS = 72,
|
||||
NDPI_PROTOCOL_IP_VRRP = 73,
|
||||
NDPI_PROTOCOL_STEAM = 74, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_HALFLIFE2 = 75,
|
||||
NDPI_PROTOCOL_WORLDOFWARCRAFT = 76,
|
||||
NDPI_PROTOCOL_TELNET = 77,
|
||||
NDPI_PROTOCOL_STUN = 78,
|
||||
NDPI_PROTOCOL_IP_IPSEC = 79,
|
||||
NDPI_PROTOCOL_IP_GRE = 80,
|
||||
NDPI_PROTOCOL_IP_ICMP = 81,
|
||||
NDPI_PROTOCOL_IP_IGMP = 82,
|
||||
NDPI_PROTOCOL_IP_EGP = 83,
|
||||
NDPI_PROTOCOL_IP_SCTP = 84,
|
||||
NDPI_PROTOCOL_IP_OSPF = 85,
|
||||
NDPI_PROTOCOL_IP_IP_IN_IP = 86,
|
||||
NDPI_PROTOCOL_RTP = 87,
|
||||
NDPI_PROTOCOL_RDP = 88,
|
||||
NDPI_PROTOCOL_VNC = 89,
|
||||
NDPI_PROTOCOL_FREE90 = 90, /* Free */
|
||||
NDPI_PROTOCOL_TLS = 91,
|
||||
NDPI_PROTOCOL_SSH = 92,
|
||||
NDPI_PROTOCOL_USENET = 93,
|
||||
NDPI_PROTOCOL_MGCP = 94,
|
||||
NDPI_PROTOCOL_IAX = 95,
|
||||
NDPI_PROTOCOL_TFTP = 96,
|
||||
NDPI_PROTOCOL_AFP = 97,
|
||||
NDPI_PROTOCOL_STEALTHNET = 98,
|
||||
NDPI_PROTOCOL_AIMINI = 99,
|
||||
NDPI_PROTOCOL_SIP = 100,
|
||||
NDPI_PROTOCOL_TRUPHONE = 101,
|
||||
NDPI_PROTOCOL_IP_ICMPV6 = 102,
|
||||
NDPI_PROTOCOL_DHCPV6 = 103,
|
||||
NDPI_PROTOCOL_ARMAGETRON = 104,
|
||||
NDPI_PROTOCOL_CROSSFIRE = 105,
|
||||
NDPI_PROTOCOL_DOFUS = 106,
|
||||
NDPI_PROTOCOL_FIESTA = 107,
|
||||
NDPI_PROTOCOL_FLORENSIA = 108,
|
||||
NDPI_PROTOCOL_GUILDWARS = 109,
|
||||
NDPI_PROTOCOL_HTTP_ACTIVESYNC = 110,
|
||||
NDPI_PROTOCOL_KERBEROS = 111,
|
||||
NDPI_PROTOCOL_LDAP = 112,
|
||||
NDPI_PROTOCOL_MAPLESTORY = 113,
|
||||
NDPI_PROTOCOL_MSSQL_TDS = 114,
|
||||
NDPI_PROTOCOL_PPTP = 115,
|
||||
NDPI_PROTOCOL_WARCRAFT3 = 116,
|
||||
NDPI_PROTOCOL_WORLD_OF_KUNG_FU = 117,
|
||||
NDPI_PROTOCOL_SLACK = 118,
|
||||
NDPI_PROTOCOL_FACEBOOK = 119,
|
||||
NDPI_PROTOCOL_TWITTER = 120,
|
||||
NDPI_PROTOCOL_DROPBOX = 121,
|
||||
NDPI_PROTOCOL_GMAIL = 122,
|
||||
NDPI_PROTOCOL_GOOGLE_MAPS = 123,
|
||||
NDPI_PROTOCOL_YOUTUBE = 124,
|
||||
NDPI_PROTOCOL_SKYPE = 125,
|
||||
NDPI_PROTOCOL_GOOGLE = 126,
|
||||
NDPI_PROTOCOL_DCERPC = 127,
|
||||
NDPI_PROTOCOL_NETFLOW = 128,
|
||||
NDPI_PROTOCOL_SFLOW = 129,
|
||||
NDPI_PROTOCOL_HTTP_CONNECT = 130,
|
||||
NDPI_PROTOCOL_HTTP_PROXY = 131,
|
||||
NDPI_PROTOCOL_CITRIX = 132, /* It also includes the old NDPI_PROTOCOL_CITRIX_ONLINE */
|
||||
NDPI_PROTOCOL_NETFLIX = 133,
|
||||
NDPI_PROTOCOL_LASTFM = 134,
|
||||
NDPI_PROTOCOL_WAZE = 135,
|
||||
NDPI_PROTOCOL_YOUTUBE_UPLOAD = 136, /* Upload files to youtube */
|
||||
NDPI_PROTOCOL_HULU = 137,
|
||||
NDPI_PROTOCOL_CHECKMK = 138,
|
||||
NDPI_PROTOCOL_AJP = 139, /* Leonn Paiva <leonn.paiva@gmail.com> */
|
||||
NDPI_PROTOCOL_APPLE = 140,
|
||||
NDPI_PROTOCOL_WEBEX = 141,
|
||||
NDPI_PROTOCOL_WHATSAPP = 142,
|
||||
NDPI_PROTOCOL_APPLE_ICLOUD = 143,
|
||||
NDPI_PROTOCOL_VIBER = 144,
|
||||
NDPI_PROTOCOL_APPLE_ITUNES = 145,
|
||||
NDPI_PROTOCOL_RADIUS = 146,
|
||||
NDPI_PROTOCOL_WINDOWS_UPDATE = 147,
|
||||
NDPI_PROTOCOL_TEAMVIEWER = 148, /* xplico.org */
|
||||
NDPI_PROTOCOL_TUENTI = 149,
|
||||
NDPI_PROTOCOL_LOTUS_NOTES = 150,
|
||||
NDPI_PROTOCOL_SAP = 151,
|
||||
NDPI_PROTOCOL_GTP = 152,
|
||||
NDPI_PROTOCOL_UPNP = 153,
|
||||
NDPI_PROTOCOL_LLMNR = 154,
|
||||
NDPI_PROTOCOL_REMOTE_SCAN = 155,
|
||||
NDPI_PROTOCOL_SPOTIFY = 156,
|
||||
NDPI_PROTOCOL_MESSENGER = 157,
|
||||
NDPI_PROTOCOL_H323 = 158, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_OPENVPN = 159, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_NOE = 160, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_CISCOVPN = 161, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_TEAMSPEAK = 162, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_TOR = 163, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_SKINNY = 164, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_RTCP = 165, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_RSYNC = 166, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_ORACLE = 167, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_CORBA = 168, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_UBUNTUONE = 169, /* Remy Mudingay <mudingay@ill.fr> */
|
||||
NDPI_PROTOCOL_WHOIS_DAS = 170,
|
||||
NDPI_PROTOCOL_COLLECTD = 171,
|
||||
NDPI_PROTOCOL_SOCKS = 172, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_NINTENDO = 173,
|
||||
NDPI_PROTOCOL_RTMP = 174, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_FTP_DATA = 175, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_WIKIPEDIA = 176, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_ZMQ = 177,
|
||||
NDPI_PROTOCOL_AMAZON = 178, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_EBAY = 179, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_CNN = 180, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
NDPI_PROTOCOL_MEGACO = 181, /* Gianluca Costa <g.costa@xplico.org> */
|
||||
NDPI_PROTOCOL_REDIS = 182,
|
||||
NDPI_PROTOCOL_FREE_183 = 183,
|
||||
NDPI_PROTOCOL_VHUA = 184,
|
||||
NDPI_PROTOCOL_TELEGRAM = 185, /* Gianluca Costa <g.costa@xplico.org> */
|
||||
NDPI_PROTOCOL_VEVO = 186,
|
||||
NDPI_PROTOCOL_PANDORA = 187,
|
||||
NDPI_PROTOCOL_QUIC = 188, /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
|
||||
NDPI_PROTOCOL_ZOOM = 189, /* Zoom video conference. */
|
||||
NDPI_PROTOCOL_EAQ = 190,
|
||||
NDPI_PROTOCOL_OOKLA = 191,
|
||||
NDPI_PROTOCOL_AMQP = 192,
|
||||
NDPI_PROTOCOL_KAKAOTALK = 193, /* KakaoTalk Chat (no voice call) */
|
||||
NDPI_PROTOCOL_KAKAOTALK_VOICE = 194, /* KakaoTalk Voice */
|
||||
NDPI_PROTOCOL_TWITCH = 195, /* Edoardo Dominici <edoaramis@gmail.com> */
|
||||
NDPI_PROTOCOL_DOH_DOT = 196, /* DoH (DNS over HTTPS), DoT (DNS over TLS) */
|
||||
NDPI_PROTOCOL_WECHAT = 197,
|
||||
NDPI_PROTOCOL_MPEGTS = 198,
|
||||
NDPI_PROTOCOL_SNAPCHAT = 199,
|
||||
NDPI_PROTOCOL_SINA = 200,
|
||||
NDPI_PROTOCOL_HANGOUT_DUO = 201, /* Google Hangout ad Duo (merged as they are very similar) */
|
||||
NDPI_PROTOCOL_IFLIX = 202, /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
|
||||
NDPI_PROTOCOL_GITHUB = 203,
|
||||
NDPI_PROTOCOL_BJNP = 204,
|
||||
NDPI_PROTOCOL_FREE_205 = 205,
|
||||
NDPI_PROTOCOL_WIREGUARD = 206,
|
||||
NDPI_PROTOCOL_SMPP = 207, /* Damir Franusic <df@release14.org> */
|
||||
NDPI_PROTOCOL_DNSCRYPT = 208, /* Toni Uhlig <matzeton@googlemail.com> */
|
||||
NDPI_PROTOCOL_TINC = 209, /* William Guglielmo <william@deselmo.com> */
|
||||
NDPI_PROTOCOL_DEEZER = 210,
|
||||
NDPI_PROTOCOL_INSTAGRAM = 211, /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
|
||||
NDPI_PROTOCOL_MICROSOFT = 212,
|
||||
NDPI_PROTOCOL_STARCRAFT = 213, /* Matteo Bracci <matteobracci1@gmail.com> */
|
||||
NDPI_PROTOCOL_TEREDO = 214,
|
||||
NDPI_PROTOCOL_HOTSPOT_SHIELD = 215,
|
||||
NDPI_PROTOCOL_IMO = 216,
|
||||
NDPI_PROTOCOL_GOOGLE_DRIVE = 217,
|
||||
NDPI_PROTOCOL_OCS = 218,
|
||||
NDPI_PROTOCOL_MICROSOFT_365 = 219,
|
||||
NDPI_PROTOCOL_CLOUDFLARE = 220,
|
||||
NDPI_PROTOCOL_MS_ONE_DRIVE = 221,
|
||||
NDPI_PROTOCOL_MQTT = 222,
|
||||
NDPI_PROTOCOL_RX = 223,
|
||||
NDPI_PROTOCOL_APPLESTORE = 224,
|
||||
NDPI_PROTOCOL_OPENDNS = 225,
|
||||
NDPI_PROTOCOL_GIT = 226,
|
||||
NDPI_PROTOCOL_DRDA = 227,
|
||||
NDPI_PROTOCOL_PLAYSTORE = 228,
|
||||
NDPI_PROTOCOL_SOMEIP = 229,
|
||||
NDPI_PROTOCOL_FIX = 230,
|
||||
NDPI_PROTOCOL_PLAYSTATION = 231,
|
||||
NDPI_PROTOCOL_PASTEBIN = 232, /* Paulo Angelo <pa@pauloangelo.com> */
|
||||
NDPI_PROTOCOL_LINKEDIN = 233, /* Paulo Angelo <pa@pauloangelo.com> */
|
||||
NDPI_PROTOCOL_SOUNDCLOUD = 234,
|
||||
NDPI_PROTOCOL_CSGO = 235, /* Counter-Strike Global Offensive, Dota = 2 */
|
||||
NDPI_PROTOCOL_LISP = 236,
|
||||
NDPI_PROTOCOL_DIAMETER = 237,
|
||||
NDPI_PROTOCOL_APPLE_PUSH = 238,
|
||||
NDPI_PROTOCOL_GOOGLE_SERVICES = 239,
|
||||
NDPI_PROTOCOL_AMAZON_VIDEO = 240,
|
||||
NDPI_PROTOCOL_GOOGLE_DOCS = 241,
|
||||
NDPI_PROTOCOL_WHATSAPP_FILES = 242, /* Videos, pictures, voice messages... */
|
||||
NDPI_PROTOCOL_TARGUS_GETDATA = 243,
|
||||
NDPI_PROTOCOL_DNP3 = 244,
|
||||
NDPI_PROTOCOL_IEC60870 = 245, /* https://en.wikipedia.org/wiki/IEC_60870-5 */
|
||||
NDPI_PROTOCOL_BLOOMBERG = 246,
|
||||
NDPI_PROTOCOL_CAPWAP = 247,
|
||||
NDPI_PROTOCOL_ZABBIX = 248,
|
||||
NDPI_PROTOCOL_S7COMM = 249,
|
||||
NDPI_PROTOCOL_MSTEAMS = 250,
|
||||
NDPI_PROTOCOL_WEBSOCKET = 251, /* Leonn Paiva <leonn.paiva@gmail.com> */
|
||||
NDPI_PROTOCOL_ANYDESK = 252, /* Toni Uhlig <matzeton@googlemail.com> */
|
||||
NDPI_PROTOCOL_SOAP = 253, /* Toni Uhlig <matzeton@googlemail.com> */
|
||||
|
||||
#define NDPI_PROTOCOL_NO_MASTER_PROTO NDPI_PROTOCOL_UNKNOWN
|
||||
#ifdef CUSTOM_NDPI_PROTOCOLS
|
||||
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
|
||||
#endif
|
||||
|
||||
#define NDPI_PROTOCOL_UNKNOWN 0
|
||||
#define NDPI_PROTOCOL_FTP_CONTROL 1 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_MAIL_POP 2
|
||||
#define NDPI_PROTOCOL_MAIL_SMTP 3
|
||||
#define NDPI_PROTOCOL_MAIL_IMAP 4
|
||||
#define NDPI_PROTOCOL_DNS 5
|
||||
#define NDPI_PROTOCOL_IPP 6
|
||||
#define NDPI_PROTOCOL_HTTP 7
|
||||
#define NDPI_PROTOCOL_MDNS 8
|
||||
#define NDPI_PROTOCOL_NTP 9
|
||||
#define NDPI_PROTOCOL_NETBIOS 10
|
||||
#define NDPI_PROTOCOL_NFS 11
|
||||
#define NDPI_PROTOCOL_SSDP 12
|
||||
#define NDPI_PROTOCOL_BGP 13
|
||||
#define NDPI_PROTOCOL_SNMP 14
|
||||
#define NDPI_PROTOCOL_XDMCP 15
|
||||
#define NDPI_PROTOCOL_SMB 16
|
||||
#define NDPI_PROTOCOL_SYSLOG 17
|
||||
#define NDPI_PROTOCOL_DHCP 18
|
||||
#define NDPI_PROTOCOL_POSTGRES 19
|
||||
#define NDPI_PROTOCOL_MYSQL 20
|
||||
#define NDPI_PROTOCOL_HOTMAIL 21
|
||||
#define NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK 22
|
||||
#define NDPI_PROTOCOL_MAIL_POPS 23
|
||||
#define NDPI_PROTOCOL_APPLEJUICE 24
|
||||
#define NDPI_PROTOCOL_DIRECTCONNECT 25
|
||||
#define NDPI_PROTOCOL_SOCRATES 26
|
||||
#define NDPI_PROTOCOL_COAP 27
|
||||
#define NDPI_PROTOCOL_VMWARE 28
|
||||
#define NDPI_PROTOCOL_MAIL_SMTPS 29
|
||||
#define NDPI_PROTOCOL_FILETOPIA 30
|
||||
#define NDPI_PROTOCOL_UBNTAC2 31 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
|
||||
#define NDPI_PROTOCOL_KONTIKI 32
|
||||
#define NDPI_PROTOCOL_OPENFT 33
|
||||
#define NDPI_PROTOCOL_FASTTRACK 34
|
||||
#define NDPI_PROTOCOL_GNUTELLA 35
|
||||
#define NDPI_PROTOCOL_EDONKEY 36 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_BITTORRENT 37
|
||||
#define NDPI_PROTOCOL_EPP 38
|
||||
#define NDPI_CONTENT_AVI 39
|
||||
#define NDPI_CONTENT_FLASH 40
|
||||
#define NDPI_CONTENT_OGG 41
|
||||
#define NDPI_CONTENT_MPEG 42
|
||||
#define NDPI_CONTENT_QUICKTIME 43
|
||||
#define NDPI_CONTENT_REALMEDIA 44
|
||||
#define NDPI_CONTENT_WINDOWSMEDIA 45
|
||||
#define NDPI_CONTENT_MMS 46
|
||||
#define NDPI_PROTOCOL_XBOX 47
|
||||
#define NDPI_PROTOCOL_QQ 48
|
||||
/*
|
||||
IMPORTANT
|
||||
before allocating a new identifier please fill up
|
||||
one of those named NDPI_PROTOCOL_FREE_XXX and not used
|
||||
(placeholders to avoid protocol renumbering)
|
||||
*/
|
||||
|
||||
/* Free to use */
|
||||
#define NDPI_PROTOCOL_FREE_A 49
|
||||
/* IMPORTANT:NDPI_LAST_IMPLEMENTED_PROTOCOL MUST BE THE LAST ELEMENT */
|
||||
NDPI_LAST_IMPLEMENTED_PROTOCOL
|
||||
} ndpi_protocol_id_t;
|
||||
|
||||
#define NDPI_PROTOCOL_RTSP 50
|
||||
#define NDPI_PROTOCOL_MAIL_IMAPS 51
|
||||
#define NDPI_PROTOCOL_ICECAST 52
|
||||
#define NDPI_PROTOCOL_PPLIVE 53 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_PPSTREAM 54
|
||||
#define NDPI_PROTOCOL_ZATTOO 55
|
||||
#define NDPI_PROTOCOL_SHOUTCAST 56
|
||||
#define NDPI_PROTOCOL_SOPCAST 57
|
||||
#define NDPI_PROTOCOL_TVANTS 58
|
||||
#define NDPI_PROTOCOL_TVUPLAYER 59
|
||||
#define NDPI_PROTOCOL_HTTP_DOWNLOAD 60
|
||||
#define NDPI_PROTOCOL_QQLIVE 61
|
||||
#define NDPI_PROTOCOL_THUNDER 62
|
||||
#define NDPI_PROTOCOL_SOULSEEK 63
|
||||
#define NDPI_PROTOCOL_SSL_NO_CERT 64
|
||||
#define NDPI_PROTOCOL_IRC 65
|
||||
#define NDPI_PROTOCOL_AYIYA 66
|
||||
#define NDPI_PROTOCOL_UNENCRYPTED_JABBER 67
|
||||
#define NDPI_PROTOCOL_MSN 68
|
||||
#define NDPI_PROTOCOL_OSCAR 69
|
||||
#define NDPI_PROTOCOL_YAHOO 70
|
||||
#define NDPI_PROTOCOL_BATTLEFIELD 71
|
||||
#define NDPI_PROTOCOL_GOOGLE_PLUS 72
|
||||
#define NDPI_PROTOCOL_IP_VRRP 73
|
||||
#define NDPI_PROTOCOL_STEAM 74 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_HALFLIFE2 75
|
||||
#define NDPI_PROTOCOL_WORLDOFWARCRAFT 76
|
||||
#define NDPI_PROTOCOL_TELNET 77
|
||||
#define NDPI_PROTOCOL_STUN 78
|
||||
#define NDPI_PROTOCOL_IP_IPSEC 79
|
||||
#define NDPI_PROTOCOL_IP_GRE 80
|
||||
#define NDPI_PROTOCOL_IP_ICMP 81
|
||||
#define NDPI_PROTOCOL_IP_IGMP 82
|
||||
#define NDPI_PROTOCOL_IP_EGP 83
|
||||
#define NDPI_PROTOCOL_IP_SCTP 84
|
||||
#define NDPI_PROTOCOL_IP_OSPF 85
|
||||
#define NDPI_PROTOCOL_IP_IP_IN_IP 86
|
||||
#define NDPI_PROTOCOL_RTP 87
|
||||
#define NDPI_PROTOCOL_RDP 88
|
||||
#define NDPI_PROTOCOL_VNC 89
|
||||
#define NDPI_PROTOCOL_PCANYWHERE 90
|
||||
#define NDPI_PROTOCOL_SSL 91
|
||||
#define NDPI_PROTOCOL_SSH 92
|
||||
#define NDPI_PROTOCOL_USENET 93
|
||||
#define NDPI_PROTOCOL_MGCP 94
|
||||
#define NDPI_PROTOCOL_IAX 95
|
||||
#define NDPI_PROTOCOL_TFTP 96
|
||||
#define NDPI_PROTOCOL_AFP 97
|
||||
#define NDPI_PROTOCOL_STEALTHNET 98
|
||||
#define NDPI_PROTOCOL_AIMINI 99
|
||||
#define NDPI_PROTOCOL_SIP 100
|
||||
#define NDPI_PROTOCOL_TRUPHONE 101
|
||||
#define NDPI_PROTOCOL_IP_ICMPV6 102
|
||||
#define NDPI_PROTOCOL_DHCPV6 103
|
||||
#define NDPI_PROTOCOL_ARMAGETRON 104
|
||||
#define NDPI_PROTOCOL_CROSSFIRE 105
|
||||
#define NDPI_PROTOCOL_DOFUS 106
|
||||
#define NDPI_PROTOCOL_FIESTA 107
|
||||
#define NDPI_PROTOCOL_FLORENSIA 108
|
||||
#define NDPI_PROTOCOL_GUILDWARS 109
|
||||
#define NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC 110 /*avoid large declarations in the future*/
|
||||
#define NDPI_PROTOCOL_KERBEROS 111
|
||||
#define NDPI_PROTOCOL_LDAP 112
|
||||
#define NDPI_PROTOCOL_MAPLESTORY 113
|
||||
#define NDPI_PROTOCOL_MSSQL_TDS 114
|
||||
#define NDPI_PROTOCOL_PPTP 115
|
||||
#define NDPI_PROTOCOL_WARCRAFT3 116
|
||||
#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU 117
|
||||
#define NDPI_PROTOCOL_SLACK 118
|
||||
#define NDPI_PROTOCOL_FACEBOOK 119
|
||||
#define NDPI_PROTOCOL_TWITTER 120
|
||||
#define NDPI_PROTOCOL_DROPBOX 121
|
||||
#define NDPI_PROTOCOL_GMAIL 122
|
||||
#define NDPI_PROTOCOL_GOOGLE_MAPS 123
|
||||
#define NDPI_PROTOCOL_YOUTUBE 124
|
||||
#define NDPI_PROTOCOL_SKYPE 125
|
||||
#define NDPI_PROTOCOL_GOOGLE 126
|
||||
#define NDPI_PROTOCOL_DCERPC 127
|
||||
#define NDPI_PROTOCOL_NETFLOW 128
|
||||
#define NDPI_PROTOCOL_SFLOW 129
|
||||
#define NDPI_PROTOCOL_HTTP_CONNECT 130
|
||||
#define NDPI_PROTOCOL_HTTP_PROXY 131
|
||||
#define NDPI_PROTOCOL_CITRIX 132 /* It includes also the old NDPI_PROTOCOL_CITRIX_ONLINE */
|
||||
#define NDPI_PROTOCOL_NETFLIX 133
|
||||
#define NDPI_PROTOCOL_LASTFM 134
|
||||
#define NDPI_PROTOCOL_WAZE 135
|
||||
#define NDPI_PROTOCOL_YOUTUBE_UPLOAD 136 /* Upload files to youtube */
|
||||
#define NDPI_PROTOCOL_ICQ 137
|
||||
#define NDPI_PROTOCOL_CHECKMK 138
|
||||
#define NDPI_PROTOCOL_NO_MASTER_PROTO NDPI_PROTOCOL_UNKNOWN
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS NDPI_LAST_IMPLEMENTED_PROTOCOL
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
/* Free to use */
|
||||
#define NDPI_PROTOCOL_FREE_B 139
|
||||
|
||||
#define NDPI_PROTOCOL_APPLE 140
|
||||
#define NDPI_PROTOCOL_WEBEX 141
|
||||
#define NDPI_PROTOCOL_WHATSAPP 142
|
||||
#define NDPI_PROTOCOL_APPLE_ICLOUD 143
|
||||
#define NDPI_PROTOCOL_VIBER 144
|
||||
#define NDPI_PROTOCOL_APPLE_ITUNES 145
|
||||
#define NDPI_PROTOCOL_RADIUS 146
|
||||
#define NDPI_PROTOCOL_WINDOWS_UPDATE 147
|
||||
#define NDPI_PROTOCOL_TEAMVIEWER 148 /* xplico.org */
|
||||
#define NDPI_PROTOCOL_TUENTI 149
|
||||
#define NDPI_PROTOCOL_LOTUS_NOTES 150
|
||||
#define NDPI_PROTOCOL_SAP 151
|
||||
#define NDPI_PROTOCOL_GTP 152
|
||||
#define NDPI_PROTOCOL_UPNP 153
|
||||
#define NDPI_PROTOCOL_LLMNR 154
|
||||
#define NDPI_PROTOCOL_REMOTE_SCAN 155
|
||||
#define NDPI_PROTOCOL_SPOTIFY 156
|
||||
#define NDPI_CONTENT_WEBM 157
|
||||
#define NDPI_PROTOCOL_H323 158 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_OPENVPN 159 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_NOE 160 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_CISCOVPN 161 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_TEAMSPEAK 162 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_TOR 163 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_SKINNY 164 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_RTCP 165 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_RSYNC 166 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_ORACLE 167 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_CORBA 168 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_UBUNTUONE 169 /* Remy Mudingay <mudingay@ill.fr> */
|
||||
#define NDPI_PROTOCOL_WHOIS_DAS 170
|
||||
#define NDPI_PROTOCOL_COLLECTD 171
|
||||
#define NDPI_PROTOCOL_SOCKS 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_NINTENDO 173
|
||||
#define NDPI_PROTOCOL_RTMP 174 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_FTP_DATA 175 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_WIKIPEDIA 176 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_ZMQ 177
|
||||
#define NDPI_PROTOCOL_AMAZON 178 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_EBAY 179 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_CNN 180 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_MEGACO 181 /* Gianluca Costa <g.costa@xplico.org> */
|
||||
#define NDPI_PROTOCOL_REDIS 182
|
||||
#define NDPI_PROTOCOL_PANDO 183 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_VHUA 184
|
||||
#define NDPI_PROTOCOL_TELEGRAM 185 /* Gianluca Costa <g.costa@xplico.org> */
|
||||
#define NDPI_PROTOCOL_VEVO 186
|
||||
#define NDPI_PROTOCOL_PANDORA 187
|
||||
#define NDPI_PROTOCOL_QUIC 188 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
|
||||
#define NDPI_PROTOCOL_WHATSAPP_VOICE 189
|
||||
#define NDPI_PROTOCOL_EAQ 190
|
||||
#define NDPI_PROTOCOL_OOKLA 191
|
||||
#define NDPI_PROTOCOL_AMQP 192
|
||||
#define NDPI_PROTOCOL_KAKAOTALK 193 /* KakaoTalk Chat (no voice call) */
|
||||
#define NDPI_PROTOCOL_KAKAOTALK_VOICE 194 /* KakaoTalk Voice */
|
||||
#define NDPI_PROTOCOL_TWITCH 195 /* Edoardo Dominici <edoaramis@gmail.com> */
|
||||
#define NDPI_PROTOCOL_QUICKPLAY 196 /* Streaming service used by various services such as hooq.tv */
|
||||
#define NDPI_PROTOCOL_WECHAT 197
|
||||
#define NDPI_PROTOCOL_MPEGTS 198
|
||||
#define NDPI_PROTOCOL_SNAPCHAT 199
|
||||
#define NDPI_PROTOCOL_SINA 200
|
||||
#define NDPI_PROTOCOL_HANGOUT 201
|
||||
#define NDPI_PROTOCOL_IFLIX 202 /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
|
||||
#define NDPI_PROTOCOL_GITHUB 203
|
||||
#define NDPI_PROTOCOL_BJNP 204
|
||||
#define NDPI_PROTOCOL_1KXUN 205
|
||||
#define NDPI_PROTOCOL_IQIYI 206
|
||||
#define NDPI_PROTOCOL_SMPP 207 /* Damir Franusic <df@release14.org> */
|
||||
#define NDPI_PROTOCOL_DNSCRYPT 208
|
||||
#define NDPI_PROTOCOL_TINC 209 /* William Guglielmo <william@deselmo.com> */
|
||||
#define NDPI_PROTOCOL_DEEZER 210
|
||||
#define NDPI_PROTOCOL_INSTAGRAM 211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
|
||||
#define NDPI_PROTOCOL_MICROSOFT 212
|
||||
#define NDPI_PROTOCOL_STARCRAFT 213 /* Matteo Bracci <matteobracci1@gmail.com> */
|
||||
#define NDPI_PROTOCOL_TEREDO 214
|
||||
#define NDPI_PROTOCOL_HOTSPOT_SHIELD 215
|
||||
#define NDPI_PROTOCOL_HEP 216 /* sipcapture.org QXIP BV */
|
||||
#define NDPI_PROTOCOL_GOOGLE_DRIVE 217
|
||||
#define NDPI_PROTOCOL_OCS 218
|
||||
#define NDPI_PROTOCOL_OFFICE_365 219
|
||||
#define NDPI_PROTOCOL_CLOUDFLARE 220
|
||||
#define NDPI_PROTOCOL_MS_ONE_DRIVE 221
|
||||
#define NDPI_PROTOCOL_MQTT 222
|
||||
#define NDPI_PROTOCOL_RX 223
|
||||
#define NDPI_PROTOCOL_APPLESTORE 224
|
||||
#define NDPI_PROTOCOL_OPENDNS 225
|
||||
#define NDPI_PROTOCOL_GIT 226
|
||||
#define NDPI_PROTOCOL_DRDA 227
|
||||
#define NDPI_PROTOCOL_PLAYSTORE 228
|
||||
#define NDPI_PROTOCOL_SOMEIP 229
|
||||
#define NDPI_PROTOCOL_FIX 230
|
||||
#define NDPI_PROTOCOL_PLAYSTATION 231
|
||||
#define NDPI_PROTOCOL_PASTEBIN 232 /* Paulo Angelo <pa@pauloangelo.com> */
|
||||
#define NDPI_PROTOCOL_LINKEDIN 233 /* Paulo Angelo <pa@pauloangelo.com> */
|
||||
#define NDPI_PROTOCOL_SOUNDCLOUD 234
|
||||
#define NDPI_PROTOCOL_CSGO 235 /* Counter-Strike Global Offensive, Dota 2 */
|
||||
#define NDPI_PROTOCOL_LISP 236
|
||||
#define NDPI_PROTOCOL_DIAMETER 237
|
||||
#define NDPI_PROTOCOL_APPLE_PUSH 238
|
||||
#define NDPI_PROTOCOL_GOOGLE_SERVICES 239
|
||||
#define NDPI_PROTOCOL_AMAZON_VIDEO 240
|
||||
#define NDPI_PROTOCOL_GOOGLE_DOCS 241
|
||||
#define NDPI_PROTOCOL_WHATSAPP_FILES 242 /* Videos, pictures, voice messages... */
|
||||
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_WHATSAPP_FILES
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
#endif
|
||||
#endif /* __NDPI_PROTOCOL_IDS_H__ */
|
||||
|
||||
+24
-165
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ndpi_protocols.h
|
||||
*
|
||||
* Copyright (C) 2011-18 - ntop.org
|
||||
* Copyright (C) 2011-20 - 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
|
||||
@@ -51,158 +51,6 @@ u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struc
|
||||
|
||||
void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
|
||||
/* Applications and other protocols. */
|
||||
void ndpi_search_diameter(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_lisp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_edonkey(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_directconnect(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_applejuice_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_i23v5(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_socrates(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_soulseek_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_msn(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_yahoo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_oscar(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_sip(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_hep(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_http_subprotocol_conf(struct ndpi_detection_module_struct *ndpi_struct, char *attr, char *value, int protocol_id);
|
||||
void ndpi_search_ftp_control(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ftp_data(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_usenet_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_filetopia_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_vmware(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mms_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_icecast_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_shoutcast_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_veohtv_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_openft_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_tvants_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_sopcast(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ppstream(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_pplive(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_iax(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mgcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_zattoo(struct ndpi_detection_module_struct*ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_qq(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_feidian(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_thunder(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_activesync(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_in_non_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_vnc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_steam(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_halflife2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_xbox(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_smb_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_telnet_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ntp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_nfs(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rtp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ssdp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_worldofwarcraft(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_postgres_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mysql_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_quake(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_battlefield(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_secondlife(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_pcanywhere(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rdp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_snmp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_kontiki(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_syslog(struct ndpi_detection_module_struct*ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_warcraft3(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_xdmcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_tftp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mssql_tds(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_pptp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_stealthnet(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dhcpv6_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_checkmk(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_world_of_kung_fu(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_guildwars_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dropbox(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_citrix(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dcerpc(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_netflow(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_sflow(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_radius(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_wsus(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_teamview(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_lotus_notes(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_gtp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_spotify(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_openvpn(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_noe(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ciscovpn(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_viber(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_teamspeak(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_corba(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_collectd(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_oracle(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rsync(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rtcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_skinny(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_tor(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_whois_das(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_socks5(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_socks4(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rtmp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_pando(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_megaco(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_redis(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_zmq(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_vhua(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_telegram(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_eaq(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mpegts(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_starcraft(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_coap(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_mqtt (struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_someip (struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_rx(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_git(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_drda(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_bjnp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_smpp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_tinc(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_fix(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_csgo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
/* --- INIT FUNCTIONS --- */
|
||||
void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -210,7 +58,6 @@ void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_battlefield_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_lisp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -231,7 +78,6 @@ void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
||||
void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_filetopia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -256,11 +102,11 @@ void init_mail_imap_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
void init_mail_pop_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mail_smtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_maplestory_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mdns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mgpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mining_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_msn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_nats_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mssql_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mysql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -273,11 +119,7 @@ void init_ntp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
||||
void init_openft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_openvpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_oracle_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_oscar_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_pando_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_pcanywhere_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_postgres_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_pplive_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ppstream_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_pptp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_qq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -294,7 +136,7 @@ void init_rtsp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
void init_sflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_sip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_hep_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_imo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_skinny_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -305,7 +147,7 @@ void init_soulseek_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
|
||||
void init_socks_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ssl_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_tls_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_starcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -319,9 +161,9 @@ void init_telnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
||||
void init_tftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_tor_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_tvants_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_upnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -333,7 +175,6 @@ void init_world_of_warcraft_dissector(struct ndpi_detection_module_struct *ndpi_
|
||||
void init_world_of_kung_fu_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_xbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_xdmcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_yahoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_zattoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_zmq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_stracraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -353,5 +194,23 @@ void init_nintendo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
|
||||
void init_csgo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_checkmk_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_amazon_video_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_whatsapp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_fbzero_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_memcached_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_nest_log_sink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ookla_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_modbus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_capwap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_zabbix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_wireguard_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_targus_getdata_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_dnp3_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_104_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_s7comm_dissector(struct ndpi_detection_module_struct *ndpi_struct,u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_websocket_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_soap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_dnscrypt_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
|
||||
#endif /* __NDPI_PROTOCOLS_H__ */
|
||||
|
||||
+776
-381
File diff suppressed because it is too large
Load Diff
@@ -31,6 +31,8 @@
|
||||
#define __mingw_forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
|
||||
#endif
|
||||
|
||||
#undef _WIN32_WINNT
|
||||
#define _WIN32_WINNT _WIN32_WINNT_WIN8
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#include <ws2tcpip.h>
|
||||
@@ -39,6 +41,7 @@
|
||||
#include <getopt.h> /* getopt from: http://www.pwilson.net/sample.html. */
|
||||
#include <process.h> /* for getpid() and the exec..() family */
|
||||
#include <stdint.h>
|
||||
#include <time.h>
|
||||
|
||||
#ifndef _CRT_SECURE_NO_WARNINGS
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
@@ -48,6 +51,17 @@
|
||||
|
||||
#define IPVERSION 4 /* on *nix it is defined in netinet/ip.h */
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
|
||||
#endif
|
||||
|
||||
#ifndef IPPROTO_SCTP
|
||||
#define IPPROTO_SCTP 132
|
||||
#endif
|
||||
|
||||
#undef gettimeofday
|
||||
#define gettimeofday mingw_gettimeofday
|
||||
|
||||
extern char* strsep(char **sp, char *sep);
|
||||
|
||||
typedef unsigned char u_char;
|
||||
@@ -75,6 +89,15 @@ typedef unsigned __int64 u_int64_t;
|
||||
|
||||
extern unsigned long waitForNextEvent(unsigned long ulDelay /* ms */);
|
||||
|
||||
#define sleep(a /* sec */) waitForNextEvent(1000*a /* ms */)
|
||||
#define sleep(a /* sec */) waitForNextEvent(1000*a /* ms */)
|
||||
#define strtok_r strtok_s
|
||||
#define timegm _mkgmtime
|
||||
|
||||
static inline struct tm * localtime_r(const time_t *timep, struct tm * result)
|
||||
{
|
||||
struct tm *timeinfo;
|
||||
timeinfo = localtime(timep);
|
||||
return timeinfo;
|
||||
}
|
||||
|
||||
#endif /* __NDPI_WIN32_H__ */
|
||||
|
||||
@@ -1,182 +0,0 @@
|
||||
lib_LTLIBRARIES = libndpi.la
|
||||
|
||||
CFLAGS += -fPIC -DPIC # --coverage
|
||||
libndpi_la_CPPFLAGS = -I$(top_srcdir)/src/include/ -I$(top_srcdir)/src/lib/third_party/include/ @HS_INC@
|
||||
libndpi_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/libndpi.sym
|
||||
|
||||
libndpi_la_includedir = $(includedir)/libndpi-@VERSION@/libndpi
|
||||
|
||||
libndpi_la_include_HEADERS = ../include/ndpi_api.h \
|
||||
../include/ndpi_define.h \
|
||||
../include/ndpi_main.h \
|
||||
../include/ndpi_includes.h \
|
||||
../include/ndpi_config.h \
|
||||
../include/ndpi_protocol_ids.h \
|
||||
../include/ndpi_protocols.h \
|
||||
../include/ndpi_typedefs.h \
|
||||
third_party/include/libcache.h
|
||||
|
||||
libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
ndpi_main.c \
|
||||
protocols/afp.c \
|
||||
protocols/aimini.c \
|
||||
protocols/applejuice.c \
|
||||
protocols/apple_push.c \
|
||||
protocols/armagetron.c \
|
||||
protocols/ayiya.c \
|
||||
protocols/amqp.c \
|
||||
protocols/battlefield.c \
|
||||
protocols/bgp.c \
|
||||
protocols/bittorrent.c \
|
||||
protocols/bjnp.c \
|
||||
protocols/checkmk.c \
|
||||
protocols/ciscovpn.c \
|
||||
protocols/citrix.c \
|
||||
protocols/coap.c \
|
||||
protocols/collectd.c \
|
||||
protocols/corba.c \
|
||||
protocols/crossfire.c \
|
||||
protocols/csgo.c \
|
||||
protocols/dcerpc.c \
|
||||
protocols/dhcp.c \
|
||||
protocols/dhcpv6.c \
|
||||
protocols/diameter.c \
|
||||
protocols/directconnect.c \
|
||||
protocols/directdownloadlink.c \
|
||||
protocols/dns.c \
|
||||
protocols/dofus.c \
|
||||
protocols/drda.c \
|
||||
protocols/dropbox.c \
|
||||
protocols/eaq.c \
|
||||
protocols/edonkey.c \
|
||||
protocols/fasttrack.c \
|
||||
protocols/fiesta.c \
|
||||
protocols/fix.c \
|
||||
protocols/filetopia.c \
|
||||
protocols/florensia.c \
|
||||
protocols/ftp_control.c \
|
||||
protocols/ftp_data.c \
|
||||
protocols/git.c \
|
||||
protocols/gnutella.c \
|
||||
protocols/gtp.c \
|
||||
protocols/guildwars.c \
|
||||
protocols/hangout.c \
|
||||
protocols/h323.c \
|
||||
protocols/halflife2_and_mods.c \
|
||||
protocols/hep.c \
|
||||
protocols/http_activesync.c \
|
||||
protocols/http.c \
|
||||
protocols/iax.c \
|
||||
protocols/icecast.c \
|
||||
protocols/ipp.c \
|
||||
protocols/irc.c \
|
||||
protocols/jabber.c \
|
||||
protocols/kakaotalk_voice.c \
|
||||
protocols/kerberos.c \
|
||||
protocols/kontiki.c \
|
||||
protocols/ldap.c \
|
||||
protocols/lotus_notes.c \
|
||||
protocols/lisp.c \
|
||||
protocols/mail_imap.c \
|
||||
protocols/mail_pop.c \
|
||||
protocols/mail_smtp.c \
|
||||
protocols/maplestory.c \
|
||||
protocols/mdns.c \
|
||||
protocols/megaco.c \
|
||||
protocols/mgcp.c \
|
||||
protocols/mms.c \
|
||||
protocols/mpegts.c \
|
||||
protocols/mqtt.c \
|
||||
protocols/msn.c \
|
||||
protocols/mssql_tds.c \
|
||||
protocols/mysql.c \
|
||||
protocols/netbios.c \
|
||||
protocols/netflow.c \
|
||||
protocols/nintendo.c \
|
||||
protocols/nfs.c \
|
||||
protocols/noe.c \
|
||||
protocols/non_tcp_udp.c \
|
||||
protocols/ntp.c \
|
||||
protocols/openft.c \
|
||||
protocols/openvpn.c \
|
||||
protocols/oracle.c \
|
||||
protocols/oscar.c \
|
||||
protocols/pando.c \
|
||||
protocols/pcanywhere.c \
|
||||
protocols/postgres.c \
|
||||
protocols/pplive.c \
|
||||
protocols/ppstream.c \
|
||||
protocols/pptp.c \
|
||||
protocols/qq.c \
|
||||
protocols/quic.c \
|
||||
protocols/radius.c \
|
||||
protocols/rdp.c \
|
||||
protocols/redis_net.c \
|
||||
protocols/rsync.c \
|
||||
protocols/rtcp.c \
|
||||
protocols/rtmp.c \
|
||||
protocols/rtp.c \
|
||||
protocols/rtsp.c \
|
||||
protocols/rx.c \
|
||||
protocols/sflow.c \
|
||||
protocols/shoutcast.c \
|
||||
protocols/sip.c \
|
||||
protocols/skinny.c \
|
||||
protocols/skype.c \
|
||||
protocols/smb.c \
|
||||
protocols/snmp.c \
|
||||
protocols/socks45.c \
|
||||
protocols/socrates.c \
|
||||
protocols/sopcast.c \
|
||||
protocols/soulseek.c \
|
||||
protocols/spotify.c \
|
||||
protocols/ssdp.c \
|
||||
protocols/ssh.c \
|
||||
protocols/ssl.c \
|
||||
protocols/starcraft.c \
|
||||
protocols/stealthnet.c \
|
||||
protocols/steam.c \
|
||||
protocols/stun.c \
|
||||
protocols/syslog.c \
|
||||
protocols/tcp_udp.c \
|
||||
protocols/teamspeak.c \
|
||||
protocols/teamviewer.c \
|
||||
protocols/telegram.c \
|
||||
protocols/telnet.c \
|
||||
protocols/tftp.c \
|
||||
protocols/thunder.c \
|
||||
protocols/tor.c \
|
||||
protocols/teredo.c \
|
||||
protocols/tvants.c \
|
||||
protocols/tvuplayer.c \
|
||||
protocols/ubntac2.c \
|
||||
protocols/usenet.c \
|
||||
protocols/viber.c \
|
||||
protocols/vhua.c \
|
||||
protocols/vmware.c \
|
||||
protocols/vnc.c \
|
||||
protocols/warcraft3.c \
|
||||
protocols/whoisdas.c \
|
||||
protocols/world_of_kung_fu.c \
|
||||
protocols/world_of_warcraft.c \
|
||||
protocols/xbox.c \
|
||||
protocols/xdmcp.c \
|
||||
protocols/yahoo.c \
|
||||
protocols/zattoo.c \
|
||||
protocols/zeromq.c \
|
||||
protocols/smpp.c \
|
||||
protocols/tinc.c \
|
||||
protocols/someip.c \
|
||||
protocols/whatsapp.c \
|
||||
third_party/include/actypes.h \
|
||||
third_party/include/ahocorasick.h \
|
||||
third_party/include/ndpi_patricia.h \
|
||||
third_party/include/node.h \
|
||||
third_party/include/sort.h \
|
||||
third_party/include/libcache.h \
|
||||
third_party/src/ahocorasick.c \
|
||||
third_party/src/node.c \
|
||||
third_party/src/sort.c \
|
||||
third_party/src/libcache.c
|
||||
|
||||
EXTRA_DIST = third_party/src/ndpi_patricia.c
|
||||
@@ -0,0 +1,83 @@
|
||||
#
|
||||
# Simple non-autotools dependent makefile
|
||||
#
|
||||
# ./autogen.sh
|
||||
# cd src/lib
|
||||
# make Makefile
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# Installation directories
|
||||
#
|
||||
prefix = @prefix@
|
||||
libdir = ${prefix}/lib
|
||||
includedir = ${prefix}/include/ndpi
|
||||
CC = @CC@
|
||||
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -Wall @CFLAGS@ @CUSTOM_NDPI@
|
||||
LDFLAGS = @LDFLAGS@ @ADDITIONAL_LIBS@ @LIBS@
|
||||
RANLIB = ranlib
|
||||
|
||||
OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
|
||||
HEADERS = $(wildcard ../include/*.h)
|
||||
NDPI_VERSION_MAJOR = @NDPI_MAJOR@
|
||||
NDPI_LIB_STATIC = libndpi.a
|
||||
NDPI_LIB_SHARED_BASE = libndpi.so
|
||||
NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@
|
||||
NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
|
||||
|
||||
ifneq ($(OS),Windows_NT)
|
||||
OS := $(shell uname)
|
||||
endif
|
||||
BUILD_MINGW = @BUILD_MINGW@
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
CC=clang
|
||||
SONAME_FLAG=
|
||||
else
|
||||
ifneq ($(BUILD_MINGW),)
|
||||
NDPI_LIB_SHARED_BASE = libndpi
|
||||
NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE)-@NDPI_VERSION_SHORT@.dll
|
||||
else
|
||||
SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
|
||||
endif
|
||||
endif
|
||||
|
||||
all: $(NDPI_LIBS)
|
||||
|
||||
ndpi_main.c: ndpi_content_match.c.inc
|
||||
|
||||
$(NDPI_LIB_STATIC): $(OBJECTS)
|
||||
ar rc $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(NDPI_LIB_SHARED): $(OBJECTS)
|
||||
$(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS)
|
||||
ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
|
||||
ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
|
||||
|
||||
%.o: %.c $(HEADERS) Makefile
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
clean:
|
||||
/bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo libndpi.so*
|
||||
|
||||
distdir:
|
||||
cp ndpi_content_match.c.inc '$(distdir)/'
|
||||
find . -type d | xargs -I'{}' mkdir -p '$(distdir)/{}'
|
||||
find ../include -type f -name '*.h' | xargs -I'{}' cp '{}' '$(distdir)/{}'
|
||||
find . -type f -name '*.c' -o -name '*.h' | xargs -I'{}' cp '{}' '$(distdir)/{}'
|
||||
|
||||
distclean: clean
|
||||
/bin/rm -f Makefile
|
||||
|
||||
cppcheck:
|
||||
cppcheck --template='{file}:{line}:{severity}:{message}' --quiet --enable=all --force -I ../include *.c protocols/*.c
|
||||
|
||||
install: $(NDPI_LIBS)
|
||||
mkdir -p $(DESTDIR)$(libdir)
|
||||
cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
|
||||
cp -P $(NDPI_LIB_SHARED_BASE) $(DESTDIR)$(libdir)/
|
||||
cp -P $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) $(DESTDIR)$(libdir)/
|
||||
mkdir -p $(DESTDIR)$(includedir)
|
||||
cp ../include/*.h $(DESTDIR)$(includedir)
|
||||
@@ -1,22 +0,0 @@
|
||||
#
|
||||
# Simple non-autotools dependent makefile
|
||||
#
|
||||
# ./autogen.sh
|
||||
# cd src/lib
|
||||
# make -f Makefile.simple
|
||||
#
|
||||
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include
|
||||
RANLIB=ranlib
|
||||
|
||||
OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o
|
||||
HEADERS = $(wildcard ../include/*.h)
|
||||
|
||||
libndpi.a: $(OBJECTS)
|
||||
ar rc $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
%.o: %.c $(HEADERS) Makefile
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
clean:
|
||||
/bin/rm -f libndpi.a $(OBJECTS)
|
||||
@@ -0,0 +1,817 @@
|
||||
/*
|
||||
* ndpi_analyze.c
|
||||
*
|
||||
* Copyright (C) 2019 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library.
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "ndpi_config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include <float.h> /* FLT_EPSILON */
|
||||
#include "ndpi_api.h"
|
||||
#include "ndpi_config.h"
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_init_data_analysis(struct ndpi_analyze_struct *ret, u_int16_t _max_series_len) {
|
||||
u_int32_t len;
|
||||
|
||||
memset(ret, 0, sizeof(struct ndpi_analyze_struct));
|
||||
|
||||
if(_max_series_len > MAX_SERIES_LEN) _max_series_len = MAX_SERIES_LEN;
|
||||
ret->num_values_array_len = _max_series_len;
|
||||
|
||||
if(ret->num_values_array_len > 0) {
|
||||
len = sizeof(u_int32_t)*ret->num_values_array_len;
|
||||
if((ret->values = ndpi_malloc(len)) == NULL) {
|
||||
ndpi_free(ret);
|
||||
ret = NULL;
|
||||
} else
|
||||
memset(ret->values, 0, len);
|
||||
} else
|
||||
ret->values = NULL;
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
struct ndpi_analyze_struct* ndpi_alloc_data_analysis(u_int16_t _max_series_len) {
|
||||
struct ndpi_analyze_struct *ret = ndpi_malloc(sizeof(struct ndpi_analyze_struct));
|
||||
|
||||
if(ret != NULL)
|
||||
ndpi_init_data_analysis(ret, _max_series_len);
|
||||
|
||||
return(ret);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_free_data_analysis(struct ndpi_analyze_struct *d) {
|
||||
if(d->values) ndpi_free(d->values);
|
||||
ndpi_free(d);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_reset_data_analysis(struct ndpi_analyze_struct *d) {
|
||||
memset(d, 0, sizeof(struct ndpi_analyze_struct));
|
||||
memset(d->values, 0, sizeof(u_int32_t)*d->num_values_array_len);
|
||||
d->num_data_entries = 0;
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/*
|
||||
Add a new point to analyze
|
||||
*/
|
||||
void ndpi_data_add_value(struct ndpi_analyze_struct *s, const u_int32_t value) {
|
||||
if(s->sum_total == 0)
|
||||
s->min_val = s->max_val = value;
|
||||
else {
|
||||
if(value < s->min_val) s->min_val = value;
|
||||
if(value > s->max_val) s->max_val = value;
|
||||
}
|
||||
|
||||
s->sum_total += value, s->num_data_entries++;
|
||||
|
||||
if(s->num_values_array_len) {
|
||||
s->values[s->next_value_insert_index] = value;
|
||||
|
||||
if(++s->next_value_insert_index == s->num_values_array_len)
|
||||
s->next_value_insert_index = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Optimized stddev calculation
|
||||
|
||||
https://www.khanacademy.org/math/probability/data-distributions-a1/summarizing-spread-distributions/a/calculating-standard-deviation-step-by-step
|
||||
https://math.stackexchange.com/questions/683297/how-to-calculate-standard-deviation-without-detailed-historical-data
|
||||
http://mathcentral.uregina.ca/QQ/database/QQ.09.02/carlos1.html
|
||||
*/
|
||||
s->stddev.sum_square_total += value * value;
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/* Compute the average on all values */
|
||||
float ndpi_data_average(struct ndpi_analyze_struct *s) {
|
||||
return((s->num_data_entries == 0) ? 0 : ((float)s->sum_total / (float)s->num_data_entries));
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
u_int32_t ndpi_data_last(struct ndpi_analyze_struct *s) {
|
||||
if((s->num_data_entries == 0) || (s->sum_total == 0))
|
||||
return(0);
|
||||
|
||||
if(s->next_value_insert_index == 0)
|
||||
return(s->values[s->num_values_array_len-1]);
|
||||
else
|
||||
return(s->values[s->next_value_insert_index-1]);
|
||||
}
|
||||
|
||||
/* Return min/max on all values */
|
||||
u_int32_t ndpi_data_min(struct ndpi_analyze_struct *s) { return(s->min_val); }
|
||||
u_int32_t ndpi_data_max(struct ndpi_analyze_struct *s) { return(s->max_val); }
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/* Compute the variance on all values */
|
||||
float ndpi_data_variance(struct ndpi_analyze_struct *s) {
|
||||
return(s->num_data_entries ? (float)(s->stddev.sum_square_total - ((s->sum_total * s->sum_total) / (s->num_data_entries))) / (float)s->num_data_entries : 0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/*
|
||||
See the link below for "Population and sample standard deviation review"
|
||||
https://www.khanacademy.org/math/statistics-probability/summarizing-quantitative-data/variance-standard-deviation-sample/a/population-and-sample-standard-deviation-review
|
||||
|
||||
In nDPI we use an approximate stddev calculation to avoid storing all data in memory
|
||||
*/
|
||||
/* Compute the standard deviation on all values */
|
||||
float ndpi_data_stddev(struct ndpi_analyze_struct *s) {
|
||||
return(sqrt(ndpi_data_variance(s)));
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/* Compute the average only on the sliding window */
|
||||
float ndpi_data_window_average(struct ndpi_analyze_struct *s) {
|
||||
if(s->num_values_array_len) {
|
||||
float sum = 0.0;
|
||||
u_int16_t i, n = ndpi_min(s->num_data_entries, s->num_values_array_len);
|
||||
|
||||
if(n == 0)
|
||||
return(0);
|
||||
|
||||
for(i=0; i<n; i++)
|
||||
sum += s->values[i];
|
||||
|
||||
return((float)sum / (float)n);
|
||||
} else
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/* Compute the variance only on the sliding window */
|
||||
float ndpi_data_window_variance(struct ndpi_analyze_struct *s) {
|
||||
if(s->num_values_array_len) {
|
||||
float sum = 0.0, avg = ndpi_data_window_average(s);
|
||||
u_int16_t i, n = ndpi_min(s->num_data_entries, s->num_values_array_len);
|
||||
|
||||
if(n == 0)
|
||||
return(0);
|
||||
|
||||
for(i=0; i<n; i++)
|
||||
sum += pow(s->values[i]-avg, 2);
|
||||
|
||||
return((float)sum / (float)n);
|
||||
} else
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/* Compute the variance only on the sliding window */
|
||||
float ndpi_data_window_stddev(struct ndpi_analyze_struct *s) {
|
||||
return(sqrt(ndpi_data_window_variance(s)));
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/*
|
||||
Compute entropy on the last sliding window values
|
||||
*/
|
||||
float ndpi_data_entropy(struct ndpi_analyze_struct *s) {
|
||||
if(s->num_values_array_len) {
|
||||
int i;
|
||||
float sum = 0.0, total = 0.0;
|
||||
|
||||
for(i=0; i<s->num_values_array_len; i++)
|
||||
total += s->values[i];
|
||||
|
||||
for (i=0; i<s->num_values_array_len; i++) {
|
||||
float tmp = (float)s->values[i] / (float)total;
|
||||
|
||||
if(tmp > FLT_EPSILON)
|
||||
sum -= tmp * logf(tmp);
|
||||
}
|
||||
|
||||
return(sum / logf(2.0));
|
||||
} else
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_data_print_window_values(struct ndpi_analyze_struct *s) {
|
||||
if(s->num_values_array_len) {
|
||||
u_int16_t i, n = ndpi_min(s->num_data_entries, s->num_values_array_len);
|
||||
|
||||
for(i=0; i<n; i++)
|
||||
printf("[%u: %u]", i, s->values[i]);
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/*
|
||||
Upload / download ration
|
||||
|
||||
-1 Download
|
||||
0 Mixed
|
||||
1 Upload
|
||||
*/
|
||||
float ndpi_data_ratio(u_int32_t sent, u_int32_t rcvd) {
|
||||
float s = (float)((int64_t)sent + (int64_t)rcvd);
|
||||
float d = (float)((int64_t)sent - (int64_t)rcvd);
|
||||
|
||||
return((s == 0) ? 0 : (d/s));
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
const char* ndpi_data_ratio2str(float ratio) {
|
||||
if(ratio < -0.2) return("Download");
|
||||
else if(ratio > 0.2) return("Upload");
|
||||
else return("Mixed");
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
/* ********************************************************************************* */
|
||||
|
||||
#include "third_party/src/hll/hll.c"
|
||||
#include "third_party/src/hll/MurmurHash3.c"
|
||||
|
||||
int ndpi_hll_init(struct ndpi_hll *hll, u_int8_t bits) {
|
||||
return(hll_init(hll, bits));
|
||||
}
|
||||
|
||||
void ndpi_hll_destroy(struct ndpi_hll *hll) {
|
||||
hll_destroy(hll);
|
||||
}
|
||||
|
||||
void ndpi_hll_reset(struct ndpi_hll *hll) {
|
||||
hll_reset(hll);
|
||||
}
|
||||
|
||||
void ndpi_hll_add(struct ndpi_hll *hll, const char *data, size_t data_len) {
|
||||
hll_add(hll, (const void *)data, data_len);
|
||||
}
|
||||
|
||||
void ndpi_hll_add_number(struct ndpi_hll *hll, u_int32_t value) {
|
||||
hll_add(hll, (const void *)&value, sizeof(value));
|
||||
}
|
||||
|
||||
double ndpi_hll_count(struct ndpi_hll *hll) {
|
||||
return(hll_count(hll));
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
/* ********************************************************************************* */
|
||||
|
||||
int ndpi_init_bin(struct ndpi_bin *b, enum ndpi_bin_family f, u_int8_t num_bins) {
|
||||
b->num_bins = num_bins, b->family = f, b->is_empty = 1;
|
||||
|
||||
switch(f) {
|
||||
case ndpi_bin_family8:
|
||||
if((b->u.bins8 = (u_int8_t*)ndpi_calloc(num_bins, sizeof(u_int8_t))) == NULL)
|
||||
return(-1);
|
||||
break;
|
||||
|
||||
case ndpi_bin_family16:
|
||||
if((b->u.bins16 = (u_int16_t*)ndpi_calloc(num_bins, sizeof(u_int16_t))) == NULL)
|
||||
return(-1);
|
||||
break;
|
||||
|
||||
case ndpi_bin_family32:
|
||||
if((b->u.bins32 = (u_int32_t*)ndpi_calloc(num_bins, sizeof(u_int32_t))) == NULL)
|
||||
return(-1);
|
||||
break;
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_free_bin(struct ndpi_bin *b) {
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
free(b->u.bins8);
|
||||
break;
|
||||
case ndpi_bin_family16:
|
||||
free(b->u.bins16);
|
||||
break;
|
||||
case ndpi_bin_family32:
|
||||
free(b->u.bins32);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
struct ndpi_bin* ndpi_clone_bin(struct ndpi_bin *b) {
|
||||
struct ndpi_bin *out = (struct ndpi_bin*)ndpi_malloc(sizeof(struct ndpi_bin));
|
||||
|
||||
if(!out) return(NULL);
|
||||
|
||||
out->num_bins = b->num_bins, out->family = b->family, out->is_empty = b->is_empty;
|
||||
|
||||
switch(out->family) {
|
||||
case ndpi_bin_family8:
|
||||
if((out->u.bins8 = (u_int8_t*)ndpi_calloc(out->num_bins, sizeof(u_int8_t))) == NULL) {
|
||||
free(out);
|
||||
return(NULL);
|
||||
} else
|
||||
memcpy(out->u.bins8, b->u.bins8, out->num_bins*sizeof(u_int8_t));
|
||||
break;
|
||||
|
||||
case ndpi_bin_family16:
|
||||
if((out->u.bins16 = (u_int16_t*)ndpi_calloc(out->num_bins, sizeof(u_int16_t))) == NULL) {
|
||||
free(out);
|
||||
return(NULL);
|
||||
} else
|
||||
memcpy(out->u.bins16, b->u.bins16, out->num_bins*sizeof(u_int16_t));
|
||||
break;
|
||||
|
||||
case ndpi_bin_family32:
|
||||
if((out->u.bins32 = (u_int32_t*)ndpi_calloc(out->num_bins, sizeof(u_int32_t))) == NULL) {
|
||||
free(out);
|
||||
return(NULL);
|
||||
} else
|
||||
memcpy(out->u.bins32, b->u.bins32, out->num_bins*sizeof(u_int32_t));
|
||||
break;
|
||||
}
|
||||
|
||||
return(out);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_set_bin(struct ndpi_bin *b, u_int8_t slot_id, u_int32_t val) {
|
||||
if(slot_id >= b->num_bins) slot_id = 0;
|
||||
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
b->u.bins8[slot_id] = (u_int8_t)val;
|
||||
break;
|
||||
case ndpi_bin_family16:
|
||||
b->u.bins16[slot_id] = (u_int16_t)val;
|
||||
break;
|
||||
case ndpi_bin_family32:
|
||||
b->u.bins32[slot_id] = (u_int32_t)val;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_inc_bin(struct ndpi_bin *b, u_int8_t slot_id, u_int32_t val) {
|
||||
b->is_empty = 0;
|
||||
|
||||
if(slot_id >= b->num_bins) slot_id = 0;
|
||||
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
b->u.bins8[slot_id] += (u_int8_t)val;
|
||||
break;
|
||||
case ndpi_bin_family16:
|
||||
b->u.bins16[slot_id] += (u_int16_t)val;
|
||||
break;
|
||||
case ndpi_bin_family32:
|
||||
b->u.bins32[slot_id] += (u_int32_t)val;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
u_int32_t ndpi_get_bin_value(struct ndpi_bin *b, u_int8_t slot_id) {
|
||||
if(slot_id >= b->num_bins) slot_id = 0;
|
||||
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
return(b->u.bins8[slot_id]);
|
||||
break;
|
||||
case ndpi_bin_family16:
|
||||
return(b->u.bins16[slot_id]);
|
||||
break;
|
||||
case ndpi_bin_family32:
|
||||
return(b->u.bins32[slot_id]);
|
||||
break;
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
void ndpi_reset_bin(struct ndpi_bin *b) {
|
||||
b->is_empty = 1;
|
||||
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
memset(b->u.bins8, 0, sizeof(u_int8_t)*b->num_bins);
|
||||
break;
|
||||
case ndpi_bin_family16:
|
||||
memset(b->u.bins16, 0, sizeof(u_int16_t)*b->num_bins);
|
||||
break;
|
||||
case ndpi_bin_family32:
|
||||
memset(b->u.bins32, 0, sizeof(u_int32_t)*b->num_bins);
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* ********************************************************************************* */
|
||||
|
||||
/*
|
||||
Each bin slot is transformed in a % with respect to the value total
|
||||
*/
|
||||
void ndpi_normalize_bin(struct ndpi_bin *b) {
|
||||
u_int8_t i;
|
||||
u_int32_t tot = 0;
|
||||
|
||||
if(b->is_empty) return;
|
||||
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
for(i=0; i<b->num_bins; i++) tot += b->u.bins8[i];
|
||||
|
||||
if(tot > 0) {
|
||||
for(i=0; i<b->num_bins; i++)
|
||||
b->u.bins8[i] = (b->u.bins8[i]*100) / tot;
|
||||
}
|
||||
break;
|
||||
case ndpi_bin_family16:
|
||||
for(i=0; i<b->num_bins; i++) tot += b->u.bins16[i];
|
||||
|
||||
if(tot > 0) {
|
||||
for(i=0; i<b->num_bins; i++)
|
||||
b->u.bins16[i] = (b->u.bins16[i]*100) / tot;
|
||||
}
|
||||
break;
|
||||
case ndpi_bin_family32:
|
||||
for(i=0; i<b->num_bins; i++) tot += b->u.bins32[i];
|
||||
|
||||
if(tot > 0) {
|
||||
for(i=0; i<b->num_bins; i++)
|
||||
b->u.bins32[i] = (b->u.bins32[i]*100) / tot;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
char* ndpi_print_bin(struct ndpi_bin *b, u_int8_t normalize_first, char *out_buf, u_int out_buf_len) {
|
||||
u_int8_t i;
|
||||
u_int len = 0;
|
||||
|
||||
if(!out_buf) return(out_buf); else out_buf[0] = '\0';
|
||||
|
||||
if(normalize_first)
|
||||
ndpi_normalize_bin(b);
|
||||
|
||||
switch(b->family) {
|
||||
case ndpi_bin_family8:
|
||||
for(i=0; i<b->num_bins; i++) {
|
||||
int rc = snprintf(&out_buf[len], out_buf_len-len, "%s%u", (i > 0) ? "," : "", b->u.bins8[i]);
|
||||
|
||||
if(rc < 0) break;
|
||||
len += rc;
|
||||
}
|
||||
break;
|
||||
|
||||
case ndpi_bin_family16:
|
||||
for(i=0; i<b->num_bins; i++) {
|
||||
int rc = snprintf(&out_buf[len], out_buf_len-len, "%s%u", (i > 0) ? "," : "", b->u.bins16[i]);
|
||||
|
||||
if(rc < 0) break;
|
||||
len += rc;
|
||||
}
|
||||
break;
|
||||
|
||||
case ndpi_bin_family32:
|
||||
for(i=0; i<b->num_bins; i++) {
|
||||
int rc = snprintf(&out_buf[len], out_buf_len-len, "%s%u", (i > 0) ? "," : "", b->u.bins32[i]);
|
||||
|
||||
if(rc < 0) break;
|
||||
len += rc;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return(out_buf);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
// #define COSINE_SIMILARITY
|
||||
|
||||
/*
|
||||
Determines how similar are two bins
|
||||
|
||||
Cosine Similiarity
|
||||
0 = Very differet
|
||||
... (gray zone)
|
||||
1 = Alike
|
||||
|
||||
See https://en.wikipedia.org/wiki/Cosine_similarity for more details
|
||||
|
||||
---
|
||||
Euclidean similarity
|
||||
|
||||
0 = alike
|
||||
...
|
||||
the higher the more different
|
||||
*/
|
||||
float ndpi_bin_similarity(struct ndpi_bin *b1, struct ndpi_bin *b2, u_int8_t normalize_first) {
|
||||
u_int8_t i;
|
||||
|
||||
if(
|
||||
// (b1->family != b2->family) ||
|
||||
(b1->num_bins != b2->num_bins))
|
||||
return(-1);
|
||||
|
||||
if(normalize_first)
|
||||
ndpi_normalize_bin(b1), ndpi_normalize_bin(b2);
|
||||
|
||||
#ifdef COSINE_SIMILARITY
|
||||
{
|
||||
u_int32_t sumxx = 0, sumxy = 0, sumyy = 0;
|
||||
|
||||
for(i=0; i<b1->num_bins; i++) {
|
||||
u_int32_t a = ndpi_get_bin_value(b1, i);
|
||||
u_int32_t b = ndpi_get_bin_value(b2, i);
|
||||
|
||||
sumxx += a*a, sumyy += b*b, sumxy += a*b;
|
||||
}
|
||||
|
||||
if((sumxx == 0) || (sumyy == 0))
|
||||
return(0);
|
||||
else
|
||||
return((float)sumxy / sqrt((float)(sumxx * sumyy)));
|
||||
}
|
||||
#else
|
||||
{
|
||||
u_int32_t sum = 0;
|
||||
|
||||
for(i=0; i<b1->num_bins; i++) {
|
||||
u_int32_t a = ndpi_get_bin_value(b1, i);
|
||||
u_int32_t b = ndpi_get_bin_value(b2, i);
|
||||
u_int32_t diff = (a > b) ? (a - b) : (b - a);
|
||||
|
||||
if(a != b) sum += pow(diff, 2);
|
||||
|
||||
// printf("[a: %u][b: %u][sum: %u]\n", a, b, sum);
|
||||
}
|
||||
|
||||
/* The lower the more similar */
|
||||
return(sqrt(sum));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
|
||||
#define MAX_NUM_CLUSTERS 128
|
||||
|
||||
/*
|
||||
Clusters bins into 'num_clusters'
|
||||
- (in) bins: a vection 'num_bins' long of bins to cluster
|
||||
- (in) 'num_clusters': number of desired clusters 0...(num_clusters-1)
|
||||
- (out) 'cluster_ids': a vector 'num_bins' long containing the id's of each clustered bin
|
||||
- (out) 'centroids': an optional 'num_clusters' long vector of (centroid) bins
|
||||
See
|
||||
- https://en.wikipedia.org/wiki/K-means_clustering
|
||||
*/
|
||||
int ndpi_cluster_bins(struct ndpi_bin *bins, u_int16_t num_bins,
|
||||
u_int8_t num_clusters, u_int16_t *cluster_ids,
|
||||
struct ndpi_bin *centroids) {
|
||||
u_int16_t i, j, max_iterations = 25, num_iterations, num_moves;
|
||||
u_int8_t verbose = 0, alloc_centroids = 0;
|
||||
char out_buf[256];
|
||||
float *bin_score;
|
||||
u_int16_t num_cluster_elems[MAX_NUM_CLUSTERS] = { 0 };
|
||||
|
||||
srand(time(NULL));
|
||||
|
||||
if(num_clusters > num_bins) num_clusters = num_bins;
|
||||
if(num_clusters > MAX_NUM_CLUSTERS) num_clusters = MAX_NUM_CLUSTERS;
|
||||
|
||||
if(verbose)
|
||||
printf("Distributing %u bins over %u clusters\n", num_bins, num_clusters);
|
||||
|
||||
if((bin_score = (float*)ndpi_calloc(num_bins, sizeof(float))) == NULL)
|
||||
return(-2);
|
||||
|
||||
if(centroids == NULL) {
|
||||
alloc_centroids = 1;
|
||||
|
||||
if((centroids = (struct ndpi_bin*)ndpi_malloc(sizeof(struct ndpi_bin)*num_clusters)) == NULL) {
|
||||
ndpi_free(bin_score);
|
||||
return(-2);
|
||||
} else {
|
||||
for(i=0; i<num_clusters; i++)
|
||||
ndpi_init_bin(¢roids[i], ndpi_bin_family32 /* Use 32 bit to avoid overlaps */, bins[0].num_bins);
|
||||
}
|
||||
}
|
||||
|
||||
/* Reset the id's */
|
||||
memset(cluster_ids, 0, sizeof(u_int16_t) * num_bins);
|
||||
|
||||
/* Randomly pick a cluster id */
|
||||
for(i=0; i<num_bins; i++) {
|
||||
u_int cluster_id = rand() % num_clusters;
|
||||
|
||||
cluster_ids[i] = cluster_id;
|
||||
|
||||
if(verbose)
|
||||
printf("Initializing cluster %u for bin %u: %s\n",
|
||||
cluster_id, i,
|
||||
ndpi_print_bin(&bins[i], 0, out_buf, sizeof(out_buf)));
|
||||
|
||||
num_cluster_elems[cluster_id]++;
|
||||
}
|
||||
|
||||
num_iterations = 0;
|
||||
|
||||
/* Now let's try to find a better arrangement */
|
||||
while(num_iterations++ < max_iterations) {
|
||||
|
||||
/* Compute the centroids for each cluster */
|
||||
memset(bin_score, 0, num_bins*sizeof(float));
|
||||
|
||||
if(verbose) {
|
||||
printf("\nIteration %u\n", num_iterations);
|
||||
|
||||
for(j=0; j<num_clusters; j++)
|
||||
printf("Cluster %u: %u bins\n", j, num_cluster_elems[j]);
|
||||
}
|
||||
|
||||
for(i=0; i<num_clusters; i++)
|
||||
ndpi_reset_bin(¢roids[i]);
|
||||
|
||||
for(i=0; i<num_bins; i++) {
|
||||
for(j=0; j<bins[i].num_bins; j++) {
|
||||
ndpi_inc_bin(¢roids[cluster_ids[i]], j, ndpi_get_bin_value(&bins[i], j));
|
||||
}
|
||||
}
|
||||
|
||||
for(i=0; i<num_clusters; i++) {
|
||||
ndpi_normalize_bin(¢roids[i]);
|
||||
|
||||
if(verbose)
|
||||
printf("Centroid [%u] %s\n", i,
|
||||
ndpi_print_bin(¢roids[i], 0, out_buf, sizeof(out_buf)));
|
||||
}
|
||||
|
||||
/* Now let's check if there are bins to move across clusters */
|
||||
num_moves = 0;
|
||||
|
||||
for(i=0; i<num_bins; i++) {
|
||||
u_int16_t j;
|
||||
float best_similarity, current_similarity = 0;
|
||||
u_int8_t cluster_id = 0;
|
||||
|
||||
if(verbose)
|
||||
printf("Analysing bin %u [cluster: %u]\n",
|
||||
i, cluster_ids[i]);
|
||||
|
||||
#ifdef COSINE_SIMILARITY
|
||||
best_similarity = -1;
|
||||
#else
|
||||
best_similarity = 99999999999;
|
||||
#endif
|
||||
|
||||
for(j=0; j<num_clusters; j++) {
|
||||
float similarity;
|
||||
|
||||
if(centroids[j].is_empty) continue;
|
||||
|
||||
similarity = ndpi_bin_similarity(&bins[i], ¢roids[j], 0);
|
||||
|
||||
if(j == cluster_ids[i])
|
||||
current_similarity = similarity;
|
||||
|
||||
if(verbose)
|
||||
printf("Bin %u / centroid %u [similarity: %f]\n", i, j, similarity);
|
||||
|
||||
#ifdef COSINE_SIMILARITY
|
||||
if(similarity > best_similarity) {
|
||||
cluster_id = j, best_similarity = similarity;
|
||||
}
|
||||
#else
|
||||
if(similarity < best_similarity) {
|
||||
cluster_id = j, best_similarity = similarity;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if((best_similarity == current_similarity) && (num_cluster_elems[cluster_ids[i]] > 1)) {
|
||||
/*
|
||||
In case of identical similarity let's leave things as they are
|
||||
this unless this is a cluster with only one element
|
||||
*/
|
||||
cluster_id = cluster_ids[i];
|
||||
}
|
||||
|
||||
bin_score[i] = best_similarity;
|
||||
|
||||
if(cluster_ids[i] != cluster_id) {
|
||||
if(verbose)
|
||||
printf("Moved bin %u from cluster %u -> %u [similarity: %f]\n",
|
||||
i, cluster_ids[i], cluster_id, best_similarity);
|
||||
|
||||
num_cluster_elems[cluster_ids[i]]--;
|
||||
num_cluster_elems[cluster_id]++;
|
||||
|
||||
cluster_ids[i] = cluster_id;
|
||||
num_moves++;
|
||||
}
|
||||
}
|
||||
|
||||
if(num_moves == 0)
|
||||
break;
|
||||
|
||||
if(verbose) {
|
||||
for(j=0; j<num_clusters; j++)
|
||||
printf("Cluster %u: %u bins\n", j, num_cluster_elems[j]);
|
||||
}
|
||||
|
||||
#if 0
|
||||
for(j=0; j<num_clusters; j++) {
|
||||
if(num_cluster_elems[j] == 0) {
|
||||
u_int16_t candidate;
|
||||
float score;
|
||||
|
||||
if(verbose)
|
||||
printf("\nCluster %u is empty: need to rebalance\n", j);
|
||||
|
||||
#ifdef COSINE_SIMILARITY
|
||||
score = 99999999999;
|
||||
|
||||
for(i=0; i<num_bins; i++) {
|
||||
if((cluster_ids[i] != j) && (bin_score[i] < score) && (num_cluster_elems[cluster_ids[i]] > 1))
|
||||
score = bin_score[i], candidate = i;
|
||||
}
|
||||
#else
|
||||
score = 0;
|
||||
|
||||
for(i=0; i<num_bins; i++) {
|
||||
if((cluster_ids[i] != j) && (bin_score[i] > score) && (num_cluster_elems[cluster_ids[i]] > 1))
|
||||
score = bin_score[i], candidate = i;
|
||||
}
|
||||
#endif
|
||||
|
||||
if(verbose)
|
||||
printf("Rebalance: moving bin %u from cluster %u -> %u [similarity: %f]\n",
|
||||
candidate, cluster_ids[candidate], j, score);
|
||||
|
||||
num_cluster_elems[cluster_ids[candidate]]--;
|
||||
num_cluster_elems[j]++;
|
||||
cluster_ids[candidate] = j;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
} /* while(...) */
|
||||
|
||||
if(alloc_centroids) {
|
||||
for(i=0; i<num_clusters; i++)
|
||||
ndpi_free_bin(¢roids[i]);
|
||||
|
||||
ndpi_free(centroids);
|
||||
}
|
||||
|
||||
ndpi_free(bin_score);
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************************************************************* */
|
||||
@@ -0,0 +1,694 @@
|
||||
/*
|
||||
*
|
||||
* Copyright (c) 2016 Cisco Systems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following
|
||||
* disclaimer in the documentation and/or other materials provided
|
||||
* with the distribution.
|
||||
*
|
||||
* Neither the name of the Cisco Systems, Inc. nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file ndpi_classify.c
|
||||
*
|
||||
* \brief contains the functionality for inline classification
|
||||
*
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
// #include <sys/time.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include "ndpi_main.h"
|
||||
#include "ndpi_classify.h"
|
||||
#include "ndpi_includes.h"
|
||||
|
||||
/** finds the minimum value between to inputs */
|
||||
#ifndef min
|
||||
#define min(a,b) \
|
||||
({ __typeof__ (a) _a = (a); \
|
||||
__typeof__ (b) _b = (b); \
|
||||
_a < _b ? _a : _b; })
|
||||
#endif
|
||||
|
||||
|
||||
//bias (1) + w (207)
|
||||
//const float ndpi_parameters_splt[NUM_PARAMETERS_SPLT_LOGREG] = {
|
||||
float ndpi_parameters_splt[NUM_PARAMETERS_SPLT_LOGREG] = {
|
||||
-2.088057846500587456e+00, 7.763936238952200239e-05, 4.404309737393306595e-05, -9.467385027293546973e-02,
|
||||
4.348947142638090457e-01, -2.091409170053043390e-04, -5.788902107267982974e-04, 4.481443450852441001e-10,
|
||||
-3.136135459023654537e+00, -1.507730262127600751e+00, -1.204663669965535977e+00, -1.171839254318371104e+00,
|
||||
4.329302247232582057e-01, 8.310653628092458334e+00, 3.299246725156660176e+00, 0.000000000000000000e+00,
|
||||
1.847454931582027254e-02, -1.498024139966201096e+00, -7.660670007653060942e-01, -2.908130300830076731e+00,
|
||||
-1.252564844610269734e+00, -1.910955328742287573e+00, 9.471710980110392697e-01, 2.352302758516665371e+00,
|
||||
2.982269972214651954e+00, 4.280736383314343918e+00, 4.633629909719495288e+00, -2.198052637823726840e+00,
|
||||
-1.150759637168392580e+00, 3.420433363184381292e+00, 1.857878113059351077e-02, -1.559806674919653746e+00,
|
||||
4.197498183183401288e+00, 6.262186949633183453e+00, 1.100694844370524095e+01, 2.778688785515088000e+01,
|
||||
3.679948298336883195e+00, -2.432801394376875592e+00, 5.133442052706843617e-01, 2.181172654073517680e+00,
|
||||
-8.577551729671881731e-01, 7.013844214023315926e-01, 3.138233436228588857e+00, 7.319940508466630247e-01,
|
||||
0.000000000000000000e+00, 3.529209394581482861e+00, 1.464585117707144413e+01, 8.506550226820598359e-01,
|
||||
-9.060397326548508268e-01, 6.787474954688997641e+00, 8.125411068867387954e+00, 4.515740684104064151e+00,
|
||||
5.372135582950940069e+00, 9.210951196799497254e-01, 4.802177410869620466e+00, 2.945445016176073594e+01,
|
||||
1.575032253128311632e+00, -1.355276854364796946e-01, -3.322474764169629502e-01, 3.018397817188666732e+00,
|
||||
1.186503569922195744e+00, 0.000000000000000000e+00, 8.883242370198487503e-01, 7.248276146728496627e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, -4.831246718433664711e+00, 6.124136970173365002e-01,
|
||||
4.145693892559814686e-01, 2.683998941637626867e+00, 2.063906603639539039e+00, 2.989801217386735210e+00,
|
||||
2.262965767379551962e-01, 2.240332214649647380e+00, 5.984550782416063086e+00, 4.587011255338186544e+00,
|
||||
1.233118485315272039e+01, 1.115223490909697857e+00, -3.682686422016995476e+00, 6.096498453291562258e-01,
|
||||
1.119275528656461516e+00, 1.377886278915177731e-01, 3.828176805973048324e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 1.442927634029647344e+01, 0.000000000000000000e+00, 5.719118583309401593e-01,
|
||||
1.993632609731877392e-01, 3.047472271520709430e+00, 5.736784864911910198e+00, 6.677826247219391220e+00,
|
||||
6.307175478564531090e+00, 3.150295169417364249e+01, 3.738597740702392258e+00, 1.129754590514236234e+01,
|
||||
6.108506268573830056e+00, 1.605489516792866667e+00, 2.929631990348545489e+00, -2.832543082245212937e-02,
|
||||
1.358286530670594461e+00, 1.655932469853677924e+00, 6.701964773769768513e-01, 2.131182050917533211e+00,
|
||||
2.998351165769753468e+00, 7.772095996358327596e+00, 1.285014785269981141e+00, 4.407334784589962418e+00,
|
||||
1.719858214230612026e+00, -1.012765674651314063e+00, -5.749271123172469133e-01, -3.559614093795681278e+00,
|
||||
-3.073088477387719397e+00, -4.492469521371540431e+00, -3.753286990415885427e+00, -3.219255423324282273e+00,
|
||||
-2.806436518181075090e+00, -2.697305948568419875e+00, -7.879608430851776646e-01, 4.625507221739111330e+00,
|
||||
4.809280703883450414e+00, -3.435194026629848629e+00, -3.218943068168937049e+00, 3.335535704890596698e+00,
|
||||
2.071359212435486263e+00, 4.538992059175040339e+00, -2.770772323566738038e+01, 2.903047708571506735e+00,
|
||||
-4.436143805989154032e+00, -2.647991280011542381e-01, 1.737252348126810064e+00, -4.121989655995259128e+00,
|
||||
3.209709099445720581e-01, 1.012758514896711759e+01, 3.313255624721038295e+00, 4.631467619785444967e+00,
|
||||
7.668642402146534032e+00, 6.780938812710099128e+00, -3.256164342602652972e+00, 6.749565128319576779e-01,
|
||||
0.000000000000000000e+00, -4.407265954524525853e+00, 0.000000000000000000e+00, -3.666522115024547901e+01,
|
||||
-7.886029397826226273e+01, 0.000000000000000000e+00, 0.000000000000000000e+00, -2.261283814517791058e+01,
|
||||
-4.024317426178160240e+00, 3.213063737030031342e-01, 5.079805145796887800e+00, 1.326813226475260343e+00,
|
||||
1.233684078112145643e+00, 8.671852503871454232e+00, -2.041800256066371944e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -1.607347800380474823e+01, -4.430790279223246309e+00, 1.177552465851384511e+00,
|
||||
6.342921220500139512e+00, -2.466913734548706327e-02, 3.451642566010713065e-01, -6.012767168531006234e+00,
|
||||
7.328146570137336724e+00, 7.500088131707050465e+00, 0.000000000000000000e+00, -3.547913249211809017e+01,
|
||||
-3.130964814607208879e+00, 8.247326544297072237e-01, 3.757262485775580418e-01, -2.136528302027558723e+00,
|
||||
-2.631627236037529793e-01, -2.016718799388414141e+01, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -7.708602132869285528e-01, -2.602868328868111814e+00, 1.435184800833797958e+00,
|
||||
0.000000000000000000e+00, -2.080420864280113413e+00, 1.169498351211070819e+00, -1.798334115637199560e+01,
|
||||
-1.193885252696202670e+01, 0.000000000000000000e+00, 0.000000000000000000e+00, 4.304089297965300709e+00,
|
||||
-3.020893216686394656e+00, -1.234427481614708721e+00, 0.000000000000000000e+00, 1.853340741926325697e+00,
|
||||
-2.686000064995862147e+01, -1.672275139058893600e+01, -2.826268691607605987e+01, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -1.547397429377200817e+00, -4.018181657009961327e+00, -7.289186736637049968e+00,
|
||||
-7.458655219230571731e+00, -9.625538282761622710e+00, -1.103039457077456298e+01, -6.262675161142102809e+01,
|
||||
-9.265912629799268885e+00, -8.961543476816615339e+00, -9.622764435629340696e+00, -1.097978292092879826e+01,
|
||||
};
|
||||
|
||||
//bias (1) + w (207)
|
||||
//const float ndpi_parameters_bd[NUM_PARAMETERS_BD_LOGREG] = {
|
||||
float ndpi_parameters_bd[NUM_PARAMETERS_BD_LOGREG] = {
|
||||
-1.678134053325450292e+00, 1.048946534609769413e-04, 9.608725756967682636e-05, -7.515489355100658797e-02,
|
||||
2.089554874872663892e-01, -1.012058874142656513e-04, -2.917652723373885169e-04, 1.087540461196068741e-10,
|
||||
-2.594688448425090055e+00, -2.071803573048482061e+00, -1.399303273236228939e+00, -2.089300736641718004e+00,
|
||||
-8.842347826063630123e-01, 6.476433717022786141e+00, 3.114501282249810377e+00, -2.239127990932460399e+00,
|
||||
-4.667574389646080291e-01, -2.200651610813817438e+00, -1.674926704401964894e+00, -3.894420410398949706e+00,
|
||||
-1.232376502509682004e+00, -2.231027070413975189e+00, 7.691948448668822769e-01, 3.222335181407633531e+00,
|
||||
1.430983188964249919e+00, 2.144317250116257956e+00, 6.596745231472220361e+00, -2.464580889153460852e+00,
|
||||
-1.923337901965658681e+00, 2.910328594745831943e+00, -3.123244869063500073e-01, -1.683345539896562659e+00,
|
||||
3.785795988845424898e+00, 5.235473328290667361e+00, 8.512526402199654285e+00, 1.393475907195251473e+01,
|
||||
1.673386027437856916e+00, -2.910729265724139925e+00, 2.969886703676111184e-01, 1.700051266957717466e+00,
|
||||
-5.472121114836264733e-01, 1.716354591332415469e-01, 3.177884264837486317e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 1.924354871334499062e-01, 6.568439271753665487e+00, 2.102316342451608644e-01,
|
||||
-1.132124603237853355e+00, 7.329625148148498859e+00, 6.606460464951361189e+00, 2.844223241371105271e+00,
|
||||
3.078771172794853683e+00, 0.000000000000000000e+00, 2.656884613648917703e+00, 1.779697712165259205e+01,
|
||||
0.000000000000000000e+00, -3.457017935109325535e-01, 2.157595478838472414e-01, 3.829196175023549031e+00,
|
||||
0.000000000000000000e+00, 1.650776974765602867e-01, 1.357223085191380796e-02, 3.946357663253555081e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, -2.155616432815957495e+00, 8.213633570666911687e-01,
|
||||
1.125480801049912050e-01, 2.684005418659722420e+00, 5.769541257304295900e-01, 1.060883870466023948e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 3.413708974045502664e+00, 2.275281553961784553e+00,
|
||||
5.176725998383044924e+00, 1.019445219242678835e+00, -1.848344450190015698e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 1.491820649409327126e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 9.379741891282449728e+00, 0.000000000000000000e+00, 5.444605374840002510e-01,
|
||||
-9.654403640632221173e-02, 2.642171746731144744e+00, 4.626416118226488905e+00, 3.654642208477139498e+00,
|
||||
3.427412899258296619e+00, 1.490784083593987397e+01, 2.322393214516801141e+00, 6.511453713852694669e+00,
|
||||
6.949721651828602020e+00, 1.186838154505042375e+00, 2.072129970488261197e+00, 0.000000000000000000e+00,
|
||||
1.598928631178261561e+00, 5.926083912988970859e-01, -1.612886287403501873e-01, 9.452951868724716045e-01,
|
||||
2.145707914290207352e+00, 5.391610489831286657e+00, 8.454389313314318866e-01, 2.372736567215404602e+00,
|
||||
-3.130110237826235764e-01, -2.994989290166069740e+00, -2.571950567149417832e+00, -5.018016256298333921e+00,
|
||||
-4.851489154898488643e+00, -7.101788768628541249e+00, -5.227281714666618839e+00, -6.351346048086286444e+00,
|
||||
-4.558191218464671124e+00, -5.293990544168526213e+00, -2.920034449434862345e-01, 5.166915658100844411e+00,
|
||||
4.642130303354632836e+00, -5.246106907306949951e-01, -3.120281208300208498e+00, 1.544764033379846691e+00,
|
||||
0.000000000000000000e+00, 3.721469736246234561e+00, -1.083434721745241625e+01, 2.901590918368040395e+00,
|
||||
-3.602037909234679258e+00, 0.000000000000000000e+00, 2.736307835089097917e+00, -5.037400262764839987e+00,
|
||||
-1.163050013241316849e+00, 6.565863507998260573e+00, 1.872406036485896097e+00, 2.249439295570562880e+00,
|
||||
3.276076277814265136e+00, 5.747730113795930684e+00, -2.084335807954610154e+00, 1.812930768433161921e+00,
|
||||
0.000000000000000000e+00, -4.068875727535363751e+00, -4.509432609364653205e-02, -1.424182063303933710e+01,
|
||||
-1.743400430675688639e+01, 0.000000000000000000e+00, 0.000000000000000000e+00, -8.986019040369217947e+00,
|
||||
-2.005955598483518898e+00, 1.514163405869717538e+00, 4.060752357984299010e+00, 1.405971170124569403e+00,
|
||||
1.383171915541985708e+00, 4.654452090729912506e+00, -3.395023560174311950e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -8.562968788250293173e+00, -1.939561462845156514e+00, 2.627499899415196793e+00,
|
||||
4.949794698120698833e+00, 4.355655772643094448e-01, 0.000000000000000000e+00, -1.055190553626396577e+00,
|
||||
4.757318838337171840e+00, 3.966536148163406938e+00, 0.000000000000000000e+00, -1.190662117721104352e+01,
|
||||
-1.673945042186458121e+00, 0.000000000000000000e+00, -1.203943763219820356e-02, -1.411827841131889194e+00,
|
||||
-7.623501643009024109e-01, -6.774873775798392117e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, -1.755294779557688090e+00, 1.542887322103192238e+00,
|
||||
0.000000000000000000e+00, -8.228978371972577310e-01, 0.000000000000000000e+00, -5.379142925264499553e+00,
|
||||
-1.144060263986041326e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 4.731108583634047626e+00,
|
||||
-1.569393147397664556e+00, -3.449886418134247568e-01, 0.000000000000000000e+00, 1.658412661295906920e+00,
|
||||
-5.077151059809188460e+00, -7.326467579034271260e+00, -1.190177296658179840e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, -1.914781807241187739e+00, -5.438446604150855457e+00,
|
||||
-5.988893208768400811e+00, -7.886849112491050029e+00, -9.355574940159534947e+00, -1.682361325340106006e+01,
|
||||
-7.609538696398503888e+00, -7.363350786768400269e+00, -7.366039984795356155e+00, -7.051111570136543882e+00,
|
||||
2.337391373249395610e+00, -4.374845402801011574e+01, -3.610863365629191080e+00, 7.684297617701028571e+01,
|
||||
2.162851395732025139e+01, 1.066280518306870562e+01, 8.109257308306457901e+01, 5.149561395669890906e+00,
|
||||
0.000000000000000000e+00, 3.219993054481156136e+00, 0.000000000000000000e+00, 2.093519725422254396e+01,
|
||||
-5.225298528278367272e+00, 0.000000000000000000e+00, 2.159597932230871820e+00, -5.205637201784965384e+01,
|
||||
1.601979388461561982e+01, 6.945290207097973401e+00, 8.036724740759808583e-01, 4.712266457087280536e+00,
|
||||
2.146353485778652370e+01, 3.470089369007970248e+01, 9.468591086256607170e+00, 9.760488656497257054e-01,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 9.008837970422939323e-01,
|
||||
0.000000000000000000e+00, 1.462843531299845168e+01, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
-1.179406942091425847e+01, 0.000000000000000000e+00, 1.642473653464513816e+01, 1.387228776263151175e+01,
|
||||
0.000000000000000000e+00, 1.613129141280310108e+01, 0.000000000000000000e+00, -1.077318890268341045e+00,
|
||||
4.189407459072477802e-01, 0.000000000000000000e+00, -1.570052145651456899e+00, 0.000000000000000000e+00,
|
||||
1.120834605828141939e+01, 4.286417457736029490e+01, 0.000000000000000000e+00, 2.938378293327098945e+01,
|
||||
1.194087082487160956e+01, 0.000000000000000000e+00, -9.951431855637998813e-02, 3.844291513997798448e-01,
|
||||
2.362333099868798669e+01, -1.002532136112976957e+01, 2.427817537309562823e+01, 0.000000000000000000e+00,
|
||||
1.076329692188489773e+01, 1.760895870067486157e+00, 2.080295785135324849e+01, -4.335217053626006134e+01,
|
||||
-6.272369476984676062e-01, 5.165768790797590881e+00, -4.507215926635629311e-01, 0.000000000000000000e+00,
|
||||
-4.242472062530233679e+00, -4.931831554080153168e+00, -2.806203935735193777e+00, -2.670377941558885126e+01,
|
||||
0.000000000000000000e+00, -2.124688439238133242e+01, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
2.452415244698852970e+00, -1.173727222080745092e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
-1.458125295680756039e+01, -1.757703406512062827e+01, 0.000000000000000000e+00, 3.943626521423988951e+00,
|
||||
0.000000000000000000e+00, -4.006095410470026152e+00, 1.727171067402430538e+01, -3.412620901789366457e+01,
|
||||
0.000000000000000000e+00, 1.760073934312834254e+01, 3.266082201875645552e+01, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 1.514535424913179362e+01, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -3.100487758075622935e-01, 0.000000000000000000e+00, 2.387863228159451978e+01,
|
||||
1.237098847411416891e+01, 1.154430573879687560e-02, 7.976366278729441817e+00, 0.000000000000000000e+00,
|
||||
-6.296727640787388447e-01, 1.406230674131906255e+01, 1.430275589872723430e+01, -2.231764570537816184e+00,
|
||||
0.000000000000000000e+00, 5.003869692542436631e+00, 0.000000000000000000e+00, -5.482127427587509594e+00,
|
||||
-8.830547931126154992e+00, -5.376776036224484301e+01, -2.918517871695104304e+01, -1.009022417771788049e+01,
|
||||
-4.811775051355994037e+00, -1.188016976215758547e+01, -2.055483647266791536e+01, -2.482333959706277327e+01,
|
||||
-1.048392515070836950e+01, -3.837352144714887459e+01, 0.000000000000000000e+00, -9.298440675063780247e+00,
|
||||
0.000000000000000000e+00, 3.584086297861655890e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 1.184271790014085113e+00,
|
||||
1.594266439891793219e+01, 0.000000000000000000e+00, 8.473235161049382569e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 6.748879951595517568e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -1.057534737660506430e+01, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -3.179879192807419841e+01, 0.000000000000000000e+00, 5.000324879565139824e+00,
|
||||
0.000000000000000000e+00, 1.229183419446936654e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
4.127983063177185663e+00, 6.616705680943091750e+00, 5.848245769217652601e+00, -1.818944631334333550e+01,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
2.694838778746875274e+00, 0.000000000000000000e+00, 1.463145767737777625e+01, -4.924734438569850603e+00,
|
||||
0.000000000000000000e+00, 1.877377621310543088e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
1.971941442729244764e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 1.732809836566829187e+00, 2.700285877421266534e+01,
|
||||
2.915978562591383216e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, -6.999629705176019456e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 1.089611710258455268e+01,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
2.121018958070171934e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
-7.416250358067024706e+00, -1.263327458973565065e+01, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 2.241612733384156897e+01,
|
||||
0.000000000000000000e+00, 8.607688079645482659e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 1.750217629228628269e+01, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, -1.957769005108392690e+01, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -3.242393079195928784e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, 1.348338590741638932e+01, 0.000000000000000000e+00,
|
||||
-2.000312276678208392e-02, -7.776608146776987640e-01, 0.000000000000000000e+00, 0.000000000000000000e+00,
|
||||
0.000000000000000000e+00, -5.387825733845168941e+00, 0.000000000000000000e+00, 2.153516224136292934e+01,
|
||||
0.000000000000000000e+00, 0.000000000000000000e+00, -9.635140703414636576e+00, 2.603288107669730511e+00,
|
||||
};
|
||||
|
||||
/**
|
||||
* \fn void ndpi_merge_splt_arrays (const uint16_t *pkt_len, const pkt_timeval *pkt_time,
|
||||
const uint16_t *pkt_len_twin, const pkt_timeval *pkt_time_twin,
|
||||
pkt_timeval start_time, pkt_timeval start_time_twin,
|
||||
uint16_t s_idx, uint16_t r_idx,
|
||||
uint16_t *merged_lens, uint16_t *merged_times,
|
||||
uint32_t max_num_pkt_len, uint32_t max_merged_num_pkts)
|
||||
* \param pkt_len length of the packet
|
||||
* \param pkt_time time of the packet
|
||||
* \param pkt_len_twin length of the twin packet
|
||||
* \param pkt_time_twin time of the twin packet
|
||||
* \param start_time start time
|
||||
* \param start_time_twin start time of twin
|
||||
* \param s_idx s index in the merge
|
||||
* \param r_idx r index in the merge
|
||||
* \param merged_lens length of the merge
|
||||
* \param merged_times time of the merge
|
||||
* \param max_merged_num_pkts number of packets merged
|
||||
* \return none
|
||||
*/
|
||||
void
|
||||
ndpi_merge_splt_arrays (const uint16_t *pkt_len, const pkt_timeval *pkt_time,
|
||||
const uint16_t *pkt_len_twin, const pkt_timeval *pkt_time_twin,
|
||||
pkt_timeval start_time, pkt_timeval start_time_twin,
|
||||
uint16_t s_idx, uint16_t r_idx,
|
||||
uint16_t *merged_lens, uint16_t *merged_times)
|
||||
{
|
||||
int s,r;
|
||||
pkt_timeval ts_start = { 0, 0 }; /* initialize to avoid spurious warnings */
|
||||
pkt_timeval tmp, tmp_r;
|
||||
pkt_timeval start_m;
|
||||
|
||||
if(r_idx + s_idx == 0) {
|
||||
return ;
|
||||
} else if(r_idx == 0) {
|
||||
ts_start = pkt_time[0];
|
||||
tmp = pkt_time[0];
|
||||
ndpi_timer_sub(&tmp, &start_time, &start_m);
|
||||
} else if(s_idx == 0) {
|
||||
ts_start = pkt_time_twin[0];
|
||||
tmp = pkt_time_twin[0];
|
||||
ndpi_timer_sub(&tmp, &start_time_twin, &start_m);
|
||||
} else {
|
||||
if(ndpi_timer_lt(&start_time, &start_time_twin)) {
|
||||
ts_start = pkt_time[0];
|
||||
tmp = pkt_time[0];
|
||||
ndpi_timer_sub(&tmp, &start_time, &start_m);
|
||||
} else {
|
||||
// ts_start = pkt_time_twin[0];
|
||||
tmp = pkt_time_twin[0];
|
||||
ndpi_timer_sub(&tmp, &start_time_twin, &start_m);
|
||||
}
|
||||
}
|
||||
s = r = 0;
|
||||
while ((s < s_idx) || (r < r_idx)) {
|
||||
if(s >= s_idx) {
|
||||
merged_lens[s+r] = pkt_len_twin[r];
|
||||
tmp = pkt_time_twin[r];
|
||||
ndpi_timer_sub(&tmp, &ts_start, &tmp_r);
|
||||
merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r);
|
||||
if(merged_times[s+r] == 0)
|
||||
merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r);
|
||||
ts_start = tmp;
|
||||
r++;
|
||||
} else if(r >= r_idx) {
|
||||
merged_lens[s+r] = pkt_len[s];
|
||||
tmp = pkt_time[s];
|
||||
ndpi_timer_sub(&tmp, &ts_start, &tmp_r);
|
||||
merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r);
|
||||
if(merged_times[s+r] == 0)
|
||||
merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r);
|
||||
ts_start = tmp;
|
||||
s++;
|
||||
} else {
|
||||
if(ndpi_timer_lt(&pkt_time[s], &pkt_time_twin[r])) {
|
||||
merged_lens[s+r] = pkt_len[s];
|
||||
tmp = pkt_time[s];
|
||||
ndpi_timer_sub(&tmp, &ts_start, &tmp_r);
|
||||
merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r);
|
||||
if(merged_times[s+r] == 0)
|
||||
merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r);
|
||||
ts_start = tmp;
|
||||
s++;
|
||||
} else {
|
||||
merged_lens[s+r] = pkt_len_twin[r];
|
||||
tmp = pkt_time_twin[r];
|
||||
ndpi_timer_sub(&tmp, &ts_start, &tmp_r);
|
||||
merged_times[s+r] = ndpi_timeval_to_milliseconds(tmp_r);
|
||||
if(merged_times[s+r] == 0)
|
||||
merged_times[s+r] = ndpi_timeval_to_microseconds(tmp_r);
|
||||
ts_start = tmp;
|
||||
r++;
|
||||
}
|
||||
}
|
||||
}
|
||||
merged_times[0] = ndpi_timeval_to_milliseconds(start_m);
|
||||
if(merged_times[0] == 0)
|
||||
merged_times[0] = ndpi_timeval_to_microseconds(start_m);
|
||||
}
|
||||
|
||||
/* transform lens array to Markov chain */
|
||||
static void
|
||||
ndpi_get_mc_rep_lens (uint16_t *lens, float *length_mc, uint16_t num_packets)
|
||||
{
|
||||
float row_sum;
|
||||
int prev_packet_size = 0;
|
||||
int cur_packet_size = 0;
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < MC_BINS_LEN*MC_BINS_LEN; i++) { // init to 0
|
||||
length_mc[i] = 0.0;
|
||||
}
|
||||
|
||||
if(num_packets == 0) {
|
||||
// nothing to do
|
||||
} else if(num_packets == 1) {
|
||||
cur_packet_size = (int)min(lens[0]/(float)MC_BIN_SIZE_LEN,(uint16_t)MC_BINS_LEN-1);
|
||||
length_mc[cur_packet_size + cur_packet_size*MC_BINS_LEN] = 1.0;
|
||||
} else {
|
||||
for (i = 1; i < num_packets; i++) {
|
||||
prev_packet_size = (int)min((uint16_t)(lens[i-1]/(float)MC_BIN_SIZE_LEN),(uint16_t)MC_BINS_LEN-1);
|
||||
cur_packet_size = (int)min((uint16_t)(lens[i]/(float)MC_BIN_SIZE_LEN),(uint16_t)MC_BINS_LEN-1);
|
||||
length_mc[prev_packet_size*MC_BINS_LEN + cur_packet_size] += 1.0;
|
||||
}
|
||||
// normalize rows of Markov chain
|
||||
for (i = 0; i < MC_BINS_LEN; i++) {
|
||||
// find sum
|
||||
row_sum = 0.0;
|
||||
for (j = 0; j < MC_BINS_LEN; j++) {
|
||||
row_sum += length_mc[i*MC_BINS_LEN+j];
|
||||
}
|
||||
if(row_sum != 0.0) {
|
||||
for (j = 0; j < MC_BINS_LEN; j++) {
|
||||
length_mc[i*MC_BINS_LEN+j] /= row_sum;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* transform times array to Markov chain */
|
||||
void
|
||||
ndpi_get_mc_rep_times (uint16_t *times, float *time_mc, uint16_t num_packets)
|
||||
{
|
||||
float row_sum;
|
||||
int prev_packet_time = 0;
|
||||
int cur_packet_time = 0;
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < MC_BINS_TIME*MC_BINS_TIME; i++) { // init to 0
|
||||
time_mc[i] = 0.0;
|
||||
}
|
||||
if(num_packets == 0) {
|
||||
// nothing to do
|
||||
} else if(num_packets == 1) {
|
||||
cur_packet_time = (int)min(times[0]/(float)MC_BIN_SIZE_TIME,(uint16_t)MC_BINS_TIME-1);
|
||||
time_mc[cur_packet_time + cur_packet_time*MC_BINS_TIME] = 1.0;
|
||||
} else {
|
||||
for (i = 1; i < num_packets; i++) {
|
||||
prev_packet_time = (int)min((uint16_t)(times[i-1]/(float)MC_BIN_SIZE_TIME),(uint16_t)MC_BINS_TIME-1);
|
||||
cur_packet_time = (int)min((uint16_t)(times[i]/(float)MC_BIN_SIZE_TIME),(uint16_t)MC_BINS_TIME-1);
|
||||
time_mc[prev_packet_time*MC_BINS_TIME + cur_packet_time] += 1.0;
|
||||
}
|
||||
// normalize rows of Markov chain
|
||||
for (i = 0; i < MC_BINS_TIME; i++) {
|
||||
// find sum
|
||||
row_sum = 0.0;
|
||||
for (j = 0; j < MC_BINS_TIME; j++) {
|
||||
row_sum += time_mc[i*MC_BINS_TIME+j];
|
||||
}
|
||||
if(row_sum != 0.0) {
|
||||
for (j = 0; j < MC_BINS_TIME; j++) {
|
||||
time_mc[i*MC_BINS_TIME+j] /= row_sum;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \fn float classify (const unsigned short *pkt_len, const pkt_timeval *pkt_time,
|
||||
const unsigned short *pkt_len_twin, const pkt_timeval *pkt_time_twin,
|
||||
pkt_timeval start_time, pkt_timeval start_time_twin, uint32_t max_num_pkt_len,
|
||||
uint16_t sp, uint16_t dp, uint32_t op, uint32_t ip, uint32_t np_o, uint32_t np_i,
|
||||
uint32_t ob, uint32_t ib, uint16_t use_bd, const uint32_t *bd, const uint32_t *bd_t)
|
||||
* \param pkt_len length of the packet
|
||||
* \param pkt_time time of the packet
|
||||
* \param pkt_len_twin length of the packet twin
|
||||
* \param pkt_time_twin time of the packet twin
|
||||
* \param start_time start time
|
||||
* \param start_time_twin start time of the twin
|
||||
* \param max_num_pkt_len maximum len of number of packets
|
||||
* \param sp
|
||||
* \param dp
|
||||
* \param op
|
||||
* \param ip
|
||||
* \param np_o
|
||||
* \param np_i
|
||||
* \param ob
|
||||
* \param ib
|
||||
* \param use_bd
|
||||
* \param *bd pointer to bd
|
||||
* \param *bd_t pointer to bd type
|
||||
* \return float score
|
||||
*/
|
||||
float
|
||||
ndpi_classify (const unsigned short *pkt_len, const pkt_timeval *pkt_time,
|
||||
const unsigned short *pkt_len_twin, const pkt_timeval *pkt_time_twin,
|
||||
pkt_timeval start_time, pkt_timeval start_time_twin, uint32_t max_num_pkt_len,
|
||||
uint16_t sp, uint16_t dp, uint32_t op, uint32_t ip, uint32_t np_o, uint32_t np_i,
|
||||
uint32_t ob, uint32_t ib, uint16_t use_bd, const uint32_t *bd, const uint32_t *bd_t)
|
||||
{
|
||||
|
||||
float features[NUM_PARAMETERS_BD_LOGREG] = {1.0};
|
||||
float mc_lens[MC_BINS_LEN*MC_BINS_LEN];
|
||||
float mc_times[MC_BINS_TIME*MC_BINS_TIME];
|
||||
uint32_t i;
|
||||
float score = 0.0;
|
||||
|
||||
uint32_t op_n = min(np_o, max_num_pkt_len);
|
||||
uint32_t ip_n = min(np_i, max_num_pkt_len);
|
||||
uint16_t *merged_lens = NULL;
|
||||
uint16_t *merged_times = NULL;
|
||||
|
||||
for (i = 1; i < NUM_PARAMETERS_BD_LOGREG; i++) {
|
||||
features[i] = 0.0;
|
||||
}
|
||||
|
||||
merged_lens = ndpi_calloc(1, sizeof(uint16_t)*(op_n + ip_n));
|
||||
merged_times = ndpi_calloc(1, sizeof(uint16_t)*(op_n + ip_n));
|
||||
|
||||
if(!merged_lens || !merged_times) {
|
||||
ndpi_free(merged_lens);
|
||||
ndpi_free(merged_times);
|
||||
return(score);
|
||||
}
|
||||
|
||||
// fill out meta data
|
||||
features[1] = (float)dp; // destination port
|
||||
features[2] = (float)sp; // source port
|
||||
features[3] = (float)ip; // inbound packets
|
||||
features[4] = (float)op; // outbound packets
|
||||
features[5] = (float)ib; // inbound bytes
|
||||
features[6] = (float)ob; // outbound bytes
|
||||
features[7] = 0.0;// skipping 7 until we process the pkt_time arrays
|
||||
|
||||
// find the raw features
|
||||
ndpi_merge_splt_arrays(pkt_len, pkt_time, pkt_len_twin, pkt_time_twin, start_time, start_time_twin, op_n, ip_n,
|
||||
merged_lens, merged_times);
|
||||
|
||||
// find new duration
|
||||
for (i = 0; i < op_n+ip_n; i++) {
|
||||
features[7] += (float)merged_times[i];
|
||||
}
|
||||
|
||||
// get the Markov chain representation for the lengths
|
||||
ndpi_get_mc_rep_lens(merged_lens, mc_lens, op_n+ip_n);
|
||||
|
||||
// get the Markov chain representation for the times
|
||||
ndpi_get_mc_rep_times(merged_times, mc_times, op_n+ip_n);
|
||||
|
||||
// fill out lens/times in feature vector
|
||||
for (i = 0; i < MC_BINS_LEN*MC_BINS_LEN; i++) {
|
||||
features[i+8] = mc_lens[i]; // lengths
|
||||
}
|
||||
for (i = 0; i < MC_BINS_TIME*MC_BINS_TIME; i++) {
|
||||
features[i+8+MC_BINS_LEN*MC_BINS_LEN] = mc_times[i]; // times
|
||||
}
|
||||
|
||||
// fill out byte distribution features
|
||||
if(ob+ib > 100 && use_bd) {
|
||||
for (i = 0; i < NUM_BD_VALUES; i++) {
|
||||
if(pkt_len_twin != NULL) {
|
||||
features[i+8+MC_BINS_LEN*MC_BINS_LEN+MC_BINS_TIME*MC_BINS_TIME] = (bd[i]+bd_t[i])/((float)(ob+ib));
|
||||
} else {
|
||||
features[i+8+MC_BINS_LEN*MC_BINS_LEN+MC_BINS_TIME*MC_BINS_TIME] = bd[i]/((float)(ob));
|
||||
}
|
||||
}
|
||||
|
||||
score = ndpi_parameters_bd[0];
|
||||
for (i = 1; i < NUM_PARAMETERS_BD_LOGREG; i++) {
|
||||
score += features[i]*ndpi_parameters_bd[i];
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < NUM_PARAMETERS_SPLT_LOGREG; i++) {
|
||||
score += features[i]*ndpi_parameters_splt[i];
|
||||
}
|
||||
}
|
||||
|
||||
score = min(-score,500.0); // check b/c overflow
|
||||
|
||||
ndpi_free(merged_lens);
|
||||
ndpi_free(merged_times);
|
||||
|
||||
return 1.0/(1.0+exp(score));
|
||||
}
|
||||
|
||||
/**
|
||||
* \fn void update_params (char *splt_params, char *bd_params)
|
||||
* \brief if a user supplies new parameter files, update parameters splt/bd
|
||||
* \param param_type type of new parameters to update
|
||||
* \param params file name with new parameters
|
||||
* \reutrn none
|
||||
*/
|
||||
void
|
||||
ndpi_update_params (classifier_type_codes_t param_type, const char *param_file)
|
||||
{
|
||||
float param;
|
||||
FILE *fp;
|
||||
int count = 0;
|
||||
|
||||
switch (param_type) {
|
||||
case (SPLT_PARAM_TYPE):
|
||||
count = 0;
|
||||
fp = fopen(param_file,"r");
|
||||
if(fp != NULL) {
|
||||
while (fscanf(fp, "%f", ¶m) != EOF) {
|
||||
ndpi_parameters_splt[count] = param;
|
||||
count++;
|
||||
if(count >= NUM_PARAMETERS_SPLT_LOGREG) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
}
|
||||
break;
|
||||
|
||||
case (BD_PARAM_TYPE):
|
||||
count = 0;
|
||||
fp = fopen(param_file,"r");
|
||||
if(fp != NULL) {
|
||||
while (fscanf(fp, "%f", ¶m) != EOF) {
|
||||
ndpi_parameters_bd[count] = param;
|
||||
count++;
|
||||
if(count >= NUM_PARAMETERS_BD_LOGREG) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
printf("error: unknown paramerter type (%d)", param_type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* *********************************************************************
|
||||
* ---------------------------------------------------------------------
|
||||
* Time functions
|
||||
* For portability and static analysis, we define our own timer
|
||||
* comparison functions (rather than use non-standard
|
||||
* timercmp/timersub macros)
|
||||
* ---------------------------------------------------------------------
|
||||
* *********************************************************************
|
||||
*/
|
||||
|
||||
/**
|
||||
* \brief Compare two times to see if they are equal
|
||||
* \param a First time value
|
||||
* \param b Second time value
|
||||
* \return 1 if equal, 0 otherwise
|
||||
*/
|
||||
unsigned int
|
||||
ndpi_timer_eq(const pkt_timeval *a,
|
||||
const pkt_timeval *b)
|
||||
{
|
||||
if(a->tv_sec == b->tv_sec && a->tv_usec == b->tv_usec) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned int
|
||||
ndpi_timer_lt(const pkt_timeval *a,
|
||||
const pkt_timeval *b)
|
||||
{
|
||||
return (a->tv_sec == b->tv_sec) ?
|
||||
(a->tv_usec < b->tv_usec):(a->tv_sec < b->tv_sec);
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Calculate the difference betwen two times (result = a - b)
|
||||
* \param a First time value
|
||||
* \param b Second time value
|
||||
* \param result The difference between the two time values
|
||||
* \return none
|
||||
*/
|
||||
void
|
||||
ndpi_timer_sub(const pkt_timeval *a,
|
||||
const pkt_timeval *b,
|
||||
pkt_timeval *result)
|
||||
{
|
||||
result->tv_sec = a->tv_sec - b->tv_sec;
|
||||
result->tv_usec = a->tv_usec - b->tv_usec;
|
||||
if(result->tv_usec < 0) {
|
||||
--result->tv_sec;
|
||||
result->tv_usec += 1000000;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Zeroize a timeval.
|
||||
* \param a Timeval to zero out
|
||||
* \return none
|
||||
*/
|
||||
void
|
||||
ndpi_timer_clear(pkt_timeval *a)
|
||||
{
|
||||
a->tv_sec = a->tv_usec = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Calculate the milliseconds representation of a timeval.
|
||||
* \param ts Timeval
|
||||
* \return unsigned int - Milliseconds
|
||||
*/
|
||||
unsigned int
|
||||
ndpi_timeval_to_milliseconds(pkt_timeval ts)
|
||||
{
|
||||
unsigned int result = ts.tv_usec / 1000 + ts.tv_sec * 1000;
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Calculate the microseconds representation of a timeval.
|
||||
* \param ts Timeval
|
||||
* \return unsigned int - Milliseconds
|
||||
*/
|
||||
unsigned int
|
||||
ndpi_timeval_to_microseconds(pkt_timeval ts)
|
||||
{
|
||||
unsigned int result = ts.tv_usec + ts.tv_sec * 1000 * 1000;
|
||||
return result;
|
||||
}
|
||||
|
||||
void
|
||||
ndpi_log_timestamp(char *log_ts, uint32_t log_ts_len)
|
||||
{
|
||||
pkt_timeval tv;
|
||||
time_t nowtime;
|
||||
struct tm nowtm_r;
|
||||
char tmbuf[NDPI_TIMESTAMP_LEN];
|
||||
|
||||
gettimeofday(&tv, NULL);
|
||||
nowtime = tv.tv_sec;
|
||||
localtime_r(&nowtime, &nowtm_r);
|
||||
strftime(tmbuf, NDPI_TIMESTAMP_LEN, "%H:%M:%S", &nowtm_r);
|
||||
snprintf(log_ts, log_ts_len, "%s.%06ld", tmbuf, (long)tv.tv_usec);
|
||||
}
|
||||
@@ -0,0 +1,380 @@
|
||||
/*
|
||||
* ndpi_community_id.c
|
||||
*
|
||||
* Copyright (C) 2011-20 - 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
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "ndpi_config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "ndpi_api.h"
|
||||
#include "ndpi_config.h"
|
||||
#include "ndpi_includes.h"
|
||||
|
||||
#include <time.h>
|
||||
#ifndef WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
|
||||
#include <sys/endian.h>
|
||||
#endif
|
||||
|
||||
#include "ndpi_sha1.h"
|
||||
|
||||
#define NDPI_ICMP6_ECHO_REQUEST 128
|
||||
#define NDPI_ICMP6_ECHO_REPLY 129
|
||||
#define NDPI_MLD_LISTENER_QUERY 130
|
||||
#define NDPI_MLD_LISTENER_REPORT 131
|
||||
|
||||
#define NDPI_ROUTER_SOLICIT 133
|
||||
#define NDPI_ROUTER_ADVERT 134
|
||||
#define NDPI_NEIGHBOR_SOLICIT 135
|
||||
#define NDPI_NEIGHBOR_ADVERT 136
|
||||
|
||||
#define NDPI_ICMP_ECHOREPLY 0
|
||||
#define NDPI_ICMP_ECHO 8
|
||||
#define NDPI_ICMP_ROUTERADVERT 9
|
||||
#define NDPI_ICMP_ROUTERSOLICIT 10
|
||||
#define NDPI_ICMP_TIMESTAMP 13
|
||||
#define NDPI_ICMP_TIMESTAMPREPLY 14
|
||||
#define NDPI_ICMP_INFO_REQUEST 15
|
||||
#define NDPI_ICMP_INFO_REPLY 16
|
||||
#define NDPI_ICMP_MASKREQ 17
|
||||
#define NDPI_ICMP_MASKREPLY 18
|
||||
|
||||
#define NDPI_ICMP6_WRUREQUEST 139
|
||||
#define NDPI_ICMP6_WRUREPLY 140
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
static ssize_t ndpi_community_id_buf_copy(u_int8_t * const dst, const void * const src, ssize_t len) {
|
||||
if(src)
|
||||
memcpy(dst, src, len);
|
||||
else
|
||||
memset(dst, 0, len);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
/*
|
||||
https://github.com/corelight/community-id-spec/blob/bda913f617389df07cdaa23606e11bbd318e265c/community-id.py#L56
|
||||
*/
|
||||
static u_int8_t ndpi_community_id_icmp_type_to_code_v4(u_int8_t icmp_type, u_int8_t icmp_code, int *is_one_way) {
|
||||
*is_one_way = 0;
|
||||
|
||||
switch(icmp_type) {
|
||||
case NDPI_ICMP_ECHO:
|
||||
return NDPI_ICMP_ECHOREPLY;
|
||||
case NDPI_ICMP_ECHOREPLY:
|
||||
return NDPI_ICMP_ECHO;
|
||||
case NDPI_ICMP_TIMESTAMP:
|
||||
return NDPI_ICMP_TIMESTAMPREPLY;
|
||||
case NDPI_ICMP_TIMESTAMPREPLY:
|
||||
return NDPI_ICMP_TIMESTAMP;
|
||||
case NDPI_ICMP_INFO_REQUEST:
|
||||
return NDPI_ICMP_INFO_REPLY;
|
||||
case NDPI_ICMP_INFO_REPLY:
|
||||
return NDPI_ICMP_INFO_REQUEST;
|
||||
case NDPI_ICMP_ROUTERSOLICIT:
|
||||
return NDPI_ICMP_ROUTERADVERT;
|
||||
case NDPI_ICMP_ROUTERADVERT:
|
||||
return NDPI_ICMP_ROUTERSOLICIT;
|
||||
case NDPI_ICMP_MASKREQ:
|
||||
return NDPI_ICMP_MASKREPLY;
|
||||
case NDPI_ICMP_MASKREPLY:
|
||||
return NDPI_ICMP_MASKREQ;
|
||||
default:
|
||||
*is_one_way = 1;
|
||||
return icmp_code;
|
||||
}
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
/*
|
||||
https://github.com/corelight/community-id-spec/blob/bda913f617389df07cdaa23606e11bbd318e265c/community-id.py#L83
|
||||
*/
|
||||
static u_int8_t ndpi_community_id_icmp_type_to_code_v6(u_int8_t icmp_type, u_int8_t icmp_code, int *is_one_way) {
|
||||
*is_one_way = 0;
|
||||
|
||||
switch(icmp_type) {
|
||||
case NDPI_ICMP6_ECHO_REQUEST:
|
||||
return NDPI_ICMP6_ECHO_REPLY;
|
||||
case NDPI_ICMP6_ECHO_REPLY:
|
||||
return NDPI_ICMP6_ECHO_REQUEST;
|
||||
case NDPI_ROUTER_SOLICIT:
|
||||
return NDPI_ROUTER_ADVERT;
|
||||
case NDPI_ROUTER_ADVERT:
|
||||
return NDPI_ROUTER_SOLICIT;
|
||||
case NDPI_NEIGHBOR_SOLICIT:
|
||||
return NDPI_NEIGHBOR_ADVERT;
|
||||
case NDPI_NEIGHBOR_ADVERT:
|
||||
return NDPI_NEIGHBOR_SOLICIT;
|
||||
case NDPI_MLD_LISTENER_QUERY:
|
||||
return NDPI_MLD_LISTENER_REPORT;
|
||||
case NDPI_MLD_LISTENER_REPORT:
|
||||
return NDPI_MLD_LISTENER_QUERY;
|
||||
case NDPI_ICMP6_WRUREQUEST:
|
||||
return NDPI_ICMP6_WRUREPLY;
|
||||
case NDPI_ICMP6_WRUREPLY:
|
||||
return NDPI_ICMP6_WRUREQUEST;
|
||||
// Home Agent Address Discovery Request Message and reply
|
||||
case 144:
|
||||
return 145;
|
||||
case 145:
|
||||
return 144;
|
||||
default:
|
||||
*is_one_way = 1;
|
||||
return icmp_code;
|
||||
}
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
/*
|
||||
https://github.com/corelight/community-id-spec/blob/bda913f617389df07cdaa23606e11bbd318e265c/community-id.py#L164
|
||||
*/
|
||||
static int ndpi_community_id_peer_v4_is_less_than(u_int32_t ip1, u_int32_t ip2, u_int16_t p1, u_int16_t p2) {
|
||||
int comp = memcmp(&ip1, &ip2, sizeof(u_int32_t));
|
||||
return comp < 0 || (comp == 0 && p1 < p2);
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
static int ndpi_community_id_peer_v6_is_less_than(struct ndpi_in6_addr *ip1, struct ndpi_in6_addr *ip2, u_int16_t p1, u_int16_t p2) {
|
||||
int comp = memcmp(ip1, ip2, sizeof(struct ndpi_in6_addr));
|
||||
|
||||
return comp < 0 || (comp == 0 && p1 < p2);
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
void ndpi_string_sha1_hash(const uint8_t *message, size_t len, u_char *hash /* 20-bytes */) {
|
||||
SHA1_CTX ctx;
|
||||
|
||||
SHA1Init(&ctx);
|
||||
SHA1Update(&ctx, message, len);
|
||||
SHA1Final(hash, &ctx);
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
/*
|
||||
https://github.com/corelight/community-id-spec/blob/bda913f617389df07cdaa23606e11bbd318e265c/community-id.py#L285
|
||||
*/
|
||||
static int ndpi_community_id_finalize_and_compute_hash(u_int8_t *comm_buf, u_int16_t off, u_int8_t l4_proto,
|
||||
u_int16_t src_port, u_int16_t dst_port,
|
||||
char *hash_buf, u_int8_t hash_buf_len) {
|
||||
u_int8_t pad = 0;
|
||||
uint32_t hash[5];
|
||||
char *community_id;
|
||||
|
||||
/* L4 proto */
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], &l4_proto, sizeof(l4_proto));
|
||||
|
||||
/* Pad */
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], &pad, sizeof(pad));
|
||||
|
||||
/* Source and destination ports */
|
||||
switch(l4_proto) {
|
||||
case IPPROTO_ICMP:
|
||||
case IPPROTO_ICMPV6:
|
||||
case IPPROTO_SCTP:
|
||||
case IPPROTO_UDP:
|
||||
case IPPROTO_TCP:
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], &src_port, sizeof(src_port));
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], &dst_port, sizeof(dst_port));
|
||||
break;
|
||||
}
|
||||
|
||||
/* Compute SHA1 */
|
||||
ndpi_string_sha1_hash(comm_buf, off, (u_char*)hash);
|
||||
|
||||
/* Base64 encoding */
|
||||
community_id = ndpi_base64_encode((u_int8_t*)hash, sizeof(hash));
|
||||
|
||||
if(community_id == NULL)
|
||||
return -1;
|
||||
|
||||
#if 0 /* Debug Info */
|
||||
printf("Hex output: ");
|
||||
for(int i = 0; i < off; i++)
|
||||
printf("%.2x ", comm_buf[i]);
|
||||
printf("\n");
|
||||
|
||||
printf("Sha1 sum: ");
|
||||
for(int i = 0; i < 5; i++)
|
||||
printf("%.2x ", ntohl(hash[i]));
|
||||
printf("\n");
|
||||
|
||||
printf("Base64: %s\n", community_id);
|
||||
#endif
|
||||
|
||||
if(hash_buf_len < 2 || hash_buf_len-2 < strlen(community_id)+1) {
|
||||
ndpi_free(community_id);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Writing hash */
|
||||
hash_buf[0] = '1';
|
||||
hash_buf[1] = ':';
|
||||
strcpy(&hash_buf[2], community_id);
|
||||
ndpi_free(community_id);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
/*
|
||||
NOTE:
|
||||
- Leave fields empty/zero when information is missing (e.g. with ICMP ports are zero)
|
||||
- The hash_buf most be 30+1 bits or longer
|
||||
- Return code: 0 = OK, -1 otherwise
|
||||
*/
|
||||
|
||||
int ndpi_flowv4_flow_hash(u_int8_t l4_proto, u_int32_t src_ip, u_int32_t dst_ip,
|
||||
u_int16_t src_port, u_int16_t dst_port,
|
||||
u_int8_t icmp_type, u_int8_t icmp_code,
|
||||
u_char *hash_buf, u_int8_t hash_buf_len) {
|
||||
/*
|
||||
Input buffer (40 bytes)
|
||||
2 - Seed
|
||||
16 - IPv6 src
|
||||
16 - IPv6 dst
|
||||
1 - L4 proto
|
||||
1 - Pad
|
||||
2 - Port src
|
||||
2 - Port dst
|
||||
*/
|
||||
u_int8_t comm_buf[40] = { 0 };
|
||||
u_int16_t off = 0;
|
||||
u_int16_t seed = 0;
|
||||
u_int32_t *ip_a_ptr, *ip_b_ptr;
|
||||
u_int16_t port_a, port_b;
|
||||
int icmp_one_way = 0;
|
||||
|
||||
/* Adjust the ports according to the specs */
|
||||
switch(l4_proto) {
|
||||
case IPPROTO_ICMP:
|
||||
src_port = icmp_type;
|
||||
dst_port = ndpi_community_id_icmp_type_to_code_v4(icmp_type, icmp_code, &icmp_one_way);
|
||||
break;
|
||||
case IPPROTO_SCTP:
|
||||
case IPPROTO_UDP:
|
||||
case IPPROTO_TCP:
|
||||
/* src/dst port ok */
|
||||
break;
|
||||
default:
|
||||
src_port = dst_port = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Convert tuple to NBO */
|
||||
src_ip = htonl(src_ip);
|
||||
dst_ip = htonl(dst_ip);
|
||||
src_port = htons(src_port);
|
||||
dst_port = htons(dst_port);
|
||||
|
||||
/*
|
||||
The community id hash doesn't have the definition of client and server, it just sorts IP addresses
|
||||
and ports to make sure the smaller ip address is the first. This performs this check and
|
||||
possibly swap client ip and port.
|
||||
*/
|
||||
if(icmp_one_way || ndpi_community_id_peer_v4_is_less_than(src_ip, dst_ip, src_port, dst_port)) {
|
||||
ip_a_ptr = &src_ip, ip_b_ptr = &dst_ip;
|
||||
port_a = src_port, port_b = dst_port;
|
||||
} else {
|
||||
/* swap flow peers */
|
||||
ip_a_ptr = &dst_ip, ip_b_ptr = &src_ip;
|
||||
port_a = dst_port, port_b = src_port;
|
||||
}
|
||||
|
||||
/* Seed */
|
||||
off = ndpi_community_id_buf_copy(&comm_buf[off], &seed, sizeof(seed));
|
||||
|
||||
/* Source and destination IPs */
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], ip_a_ptr, sizeof(src_ip));
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], ip_b_ptr, sizeof(dst_ip));
|
||||
|
||||
return ndpi_community_id_finalize_and_compute_hash(comm_buf, off,
|
||||
l4_proto, port_a, port_b, (char*)hash_buf, hash_buf_len);
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
|
||||
int ndpi_flowv6_flow_hash(u_int8_t l4_proto, struct ndpi_in6_addr *src_ip, struct ndpi_in6_addr *dst_ip,
|
||||
u_int16_t src_port, u_int16_t dst_port,
|
||||
u_int8_t icmp_type, u_int8_t icmp_code,
|
||||
u_char *hash_buf, u_int8_t hash_buf_len) {
|
||||
u_int8_t comm_buf[40] = { 0 };
|
||||
u_int16_t off = 0;
|
||||
u_int16_t seed = 0;
|
||||
struct ndpi_in6_addr *ip_a_ptr, *ip_b_ptr;
|
||||
u_int16_t port_a, port_b;
|
||||
int icmp_one_way = 0;
|
||||
|
||||
switch(l4_proto) {
|
||||
case IPPROTO_ICMPV6:
|
||||
src_port = icmp_type;
|
||||
dst_port = ndpi_community_id_icmp_type_to_code_v6(icmp_type, icmp_code, &icmp_one_way);
|
||||
break;
|
||||
case IPPROTO_SCTP:
|
||||
case IPPROTO_UDP:
|
||||
case IPPROTO_TCP:
|
||||
/* src/dst port ok */
|
||||
break;
|
||||
default:
|
||||
src_port = dst_port = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Convert tuple to NBO */
|
||||
src_port = htons(src_port);
|
||||
dst_port = htons(dst_port);
|
||||
|
||||
if(icmp_one_way || ndpi_community_id_peer_v6_is_less_than(src_ip, dst_ip, src_port, dst_port)) {
|
||||
ip_a_ptr = src_ip, ip_b_ptr = dst_ip;
|
||||
port_a = src_port, port_b = dst_port;
|
||||
} else {
|
||||
ip_a_ptr = dst_ip, ip_b_ptr = src_ip;
|
||||
port_a = dst_port, port_b = src_port;
|
||||
}
|
||||
|
||||
/* Seed */
|
||||
off = ndpi_community_id_buf_copy(&comm_buf[off], &seed, sizeof(seed));
|
||||
|
||||
/* Source and destination IPs */
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], ip_a_ptr, sizeof(struct ndpi_in6_addr));
|
||||
off += ndpi_community_id_buf_copy(&comm_buf[off], ip_b_ptr, sizeof(struct ndpi_in6_addr));
|
||||
|
||||
return ndpi_community_id_finalize_and_compute_hash(comm_buf, off,
|
||||
l4_proto, port_a, port_b, (char*)hash_buf, hash_buf_len);
|
||||
}
|
||||
|
||||
/* **************************************************** */
|
||||
+1375
-458
File diff suppressed because it is too large
Load Diff
+4707
-3027
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,8 @@
|
||||
/*
|
||||
* afp.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
* Copyright (C) 2009-11 by ipoque GmbH
|
||||
* Copyright (C) 2011-20 - 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
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_AFP
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AFP
|
||||
|
||||
#include "ndpi_api.h"
|
||||
@@ -100,5 +98,3 @@ void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* aimini.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2011-20 - 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
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_AIMINI
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AIMINI
|
||||
|
||||
#include "ndpi_api.h"
|
||||
@@ -293,5 +291,3 @@ void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
/*
|
||||
* ajp.c
|
||||
*
|
||||
* Copyright (C) 2018 by Leonn Paiva <leonn.paiva@gmail.com>
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AJP
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
enum ajp_direction {
|
||||
AJP_SERVER_TO_CONTAINER = 0x1234,
|
||||
AJP_CONTAINER_TO_SERVER = 0x4142
|
||||
};
|
||||
|
||||
enum ajp_packet_type {
|
||||
AJP_UNKNOWN = 0,
|
||||
|
||||
/* packet types */
|
||||
AJP_FORWARD_REQUEST = 2,
|
||||
AJP_SEND_BODY_CHUNK = 3,
|
||||
AJP_SEND_HEADERS = 4,
|
||||
AJP_END_RESPONSE = 5,
|
||||
AJP_GET_BODY_CHUNK = 6,
|
||||
AJP_SHUTDOWN = 7,
|
||||
AJP_PING = 8,
|
||||
AJP_CPONG = 9,
|
||||
AJP_CPING = 10,
|
||||
AJP_BODY = 11
|
||||
};
|
||||
|
||||
PACK_ON
|
||||
struct ajp_header {
|
||||
uint16_t magic;
|
||||
uint16_t len;
|
||||
uint8_t code;
|
||||
} PACK_OFF;
|
||||
|
||||
static void set_ajp_detected(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
|
||||
if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
|
||||
ndpi_search_tcp_or_udp(ndpi_struct, flow);
|
||||
|
||||
/* If no custom protocol has been detected */
|
||||
/* if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) */
|
||||
ndpi_int_reset_protocol(flow);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AJP, flow->guessed_host_protocol_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************************************************/
|
||||
|
||||
static void ndpi_check_ajp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ajp_header ajp_hdr;
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if (packet->payload_packet_len < sizeof(ajp_hdr)) {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
memcpy(&ajp_hdr, packet->payload, sizeof(struct ajp_header));
|
||||
|
||||
ajp_hdr.magic = ntohs(ajp_hdr.magic);
|
||||
ajp_hdr.len = ntohs(ajp_hdr.len);
|
||||
|
||||
if (ajp_hdr.len > 0 && ajp_hdr.magic == AJP_SERVER_TO_CONTAINER) {
|
||||
if (ajp_hdr.code == AJP_FORWARD_REQUEST || ajp_hdr.code == AJP_SHUTDOWN
|
||||
|| ajp_hdr.code == AJP_PING || ajp_hdr.code == AJP_CPING) {
|
||||
|
||||
set_ajp_detected(ndpi_struct, flow);
|
||||
|
||||
} else {
|
||||
NDPI_LOG_DBG(ndpi_struct, "Invalid AJP request type");
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
} else if (ajp_hdr.len > 0 && ajp_hdr.magic == AJP_CONTAINER_TO_SERVER) {
|
||||
if (ajp_hdr.code == AJP_SEND_BODY_CHUNK || ajp_hdr.code == AJP_SEND_HEADERS
|
||||
|| ajp_hdr.code == AJP_END_RESPONSE || ajp_hdr.code == AJP_GET_BODY_CHUNK
|
||||
|| ajp_hdr.code == AJP_CPONG) {
|
||||
|
||||
set_ajp_detected(ndpi_struct, flow);
|
||||
|
||||
} else {
|
||||
NDPI_LOG_DBG(ndpi_struct, "Invalid AJP response type");
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
} else {
|
||||
NDPI_LOG_DBG(ndpi_struct,"Invalid AJP packet\n");
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
|
||||
void ndpi_search_ajp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// Break after 20 packets.
|
||||
if(flow->packet_counter > 20) {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search AJP\n");
|
||||
ndpi_check_ajp(ndpi_struct, flow);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/* ********************************* */
|
||||
|
||||
|
||||
void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("AJP", ndpi_struct, detection_bitmask,
|
||||
*id, NDPI_PROTOCOL_AJP, ndpi_search_ajp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
/*
|
||||
* amazon_video.c
|
||||
*
|
||||
* Copyright (C) 2018-20 by 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
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AMAZON_VIDEO
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
static void ndpi_check_amazon_video(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search Amazon Prime\n");
|
||||
|
||||
if(packet->payload_packet_len > 4) {
|
||||
if((packet->tcp != NULL) &&
|
||||
(packet->payload[0] == 0xFE &&
|
||||
packet->payload[1] == 0xED &&
|
||||
packet->payload[2] == 0xFA &&
|
||||
packet->payload[3] == 0xCE)) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found Amazon Video on TCP\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AMAZON_VIDEO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else if((packet->udp != NULL) &&
|
||||
(packet->payload[0] == 0xDE &&
|
||||
packet->payload[1] == 0xAD &&
|
||||
packet->payload[2] == 0xBE &&
|
||||
packet->payload[3] == 0xEF)) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found Amazon Video on UDP\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AMAZON_VIDEO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
void ndpi_search_amazon_video(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search amazon_video\n");
|
||||
|
||||
/* skip marked packets */
|
||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_AMAZON_VIDEO)
|
||||
ndpi_check_amazon_video(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
|
||||
void init_amazon_video_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) {
|
||||
ndpi_set_bitmask_protocol_detection("AMAZON_VIDEO", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_AMAZON_VIDEO,
|
||||
ndpi_search_amazon_video,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
*id += 1;
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* amqp.c
|
||||
*
|
||||
* Copyright (C) 2011-17 - ntop.org
|
||||
* Copyright (C) 2011-20 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
@@ -20,8 +20,6 @@
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_AMQP
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AMQP
|
||||
|
||||
#include "ndpi_api.h"
|
||||
@@ -87,4 +85,3 @@ void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_APPLE_PUSH
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_APPLE_PUSH
|
||||
|
||||
#include "ndpi_api.h"
|
||||
@@ -33,20 +31,22 @@ static void ndpi_check_apple_push(struct ndpi_detection_module_struct *ndpi_stru
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
/* https://support.apple.com/en-us/HT203609 */
|
||||
if(((ntohl(packet->iph->saddr) & 0xFF000000 /* 255.0.0.0 */) == 0x11000000 /* 17.0.0.0/8 */)
|
||||
|| ((ntohl(packet->iph->daddr) & 0xFF000000 /* 255.0.0.0 */) == 0x11000000 /* 17.0.0.0/8 */)) {
|
||||
u_int16_t apple_push_port = ntohs(5223);
|
||||
u_int16_t notification_apn_port = ntohs(2195);
|
||||
u_int16_t apn_feedback_port = ntohs(2196);
|
||||
|
||||
if(((packet->tcp->source == apple_push_port) || (packet->tcp->dest == apple_push_port))
|
||||
|| ((packet->tcp->source == notification_apn_port) || (packet->tcp->dest == notification_apn_port))
|
||||
|| ((packet->tcp->source == apn_feedback_port) || (packet->tcp->dest == apn_feedback_port))
|
||||
) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found apple_push\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_APPLE_PUSH, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
if(packet->iph) {
|
||||
/* https://support.apple.com/en-us/HT203609 */
|
||||
if(((ntohl(packet->iph->saddr) & 0xFF000000 /* 255.0.0.0 */) == 0x11000000 /* 17.0.0.0/8 */)
|
||||
|| ((ntohl(packet->iph->daddr) & 0xFF000000 /* 255.0.0.0 */) == 0x11000000 /* 17.0.0.0/8 */)) {
|
||||
u_int16_t apple_push_port = ntohs(5223);
|
||||
u_int16_t notification_apn_port = ntohs(2195);
|
||||
u_int16_t apn_feedback_port = ntohs(2196);
|
||||
|
||||
if(((packet->tcp->source == apple_push_port) || (packet->tcp->dest == apple_push_port))
|
||||
|| ((packet->tcp->source == notification_apn_port) || (packet->tcp->dest == notification_apn_port))
|
||||
|| ((packet->tcp->source == apn_feedback_port) || (packet->tcp->dest == apn_feedback_port))
|
||||
) {
|
||||
NDPI_LOG_INFO(ndpi_struct, "found apple_push\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_APPLE_PUSH, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,6 +76,3 @@ void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* applejuice.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2011-20 - 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
|
||||
@@ -24,8 +24,6 @@
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_APPLEJUICE
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_APPLEJUICE
|
||||
|
||||
#include "ndpi_api.h"
|
||||
@@ -67,5 +65,3 @@ void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user