Compare commits
398
Commits
1.8
...
2.0-stable
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6607c33cb8 | ||
|
|
de8e469c09 | ||
|
|
3cfcc05912 | ||
|
|
cf1402d64e | ||
|
|
09c1765766 | ||
|
|
cb6aabbf19 | ||
|
|
b89a2dce6f | ||
|
|
97a57ac68d | ||
|
|
a487a58884 | ||
|
|
ccfe37870c | ||
|
|
867acf717a | ||
|
|
6f27a48721 | ||
|
|
185cd4fb30 | ||
|
|
73b3ee51d1 | ||
|
|
b579408711 | ||
|
|
ec0e6f98d4 | ||
|
|
b4b682a4bf | ||
|
|
167732cae4 | ||
|
|
2b128a2f1b | ||
|
|
f4bba23ba7 | ||
|
|
724d182939 | ||
|
|
ebb6d4499a | ||
|
|
b2282a49b5 | ||
|
|
a044178b47 | ||
|
|
a874e7869c | ||
|
|
cef42b4050 | ||
|
|
0a2cbe4926 | ||
|
|
99c9f1d36b | ||
|
|
0091f35e02 | ||
|
|
f2730f06a0 | ||
|
|
5271233774 | ||
|
|
5da83360aa | ||
|
|
cd26942edf | ||
|
|
8a7dc10f51 | ||
|
|
c2bbe79a3e | ||
|
|
e6dc092b73 | ||
|
|
5c1954012b | ||
|
|
21567e8686 | ||
|
|
1af3d571d9 | ||
|
|
442adce51d | ||
|
|
3f5e4cb7ee | ||
|
|
4c6f9d5c25 | ||
|
|
a43244e493 | ||
|
|
5c2fa2d2e7 | ||
|
|
aa6167bb42 | ||
|
|
205b82f6ba | ||
|
|
a03a343723 | ||
|
|
92d19ae2ed | ||
|
|
32d02836f0 | ||
|
|
4030b52ecb | ||
|
|
064b50df81 | ||
|
|
af5021d571 | ||
|
|
e1b905124f | ||
|
|
6cae3a7dce | ||
|
|
d4a16d9e55 | ||
|
|
6c2c885176 | ||
|
|
43f18ddb0f | ||
|
|
b9a2511ea8 | ||
|
|
c96507b7a4 | ||
|
|
e2f2111637 | ||
|
|
9a94c34b91 | ||
|
|
6581579d37 | ||
|
|
4cc54cceb5 | ||
|
|
a9c01ded17 | ||
|
|
cbc08f7e50 | ||
|
|
45582194cf | ||
|
|
56b6c7ed93 | ||
|
|
c1db9a830d | ||
|
|
4c5de9ef8e | ||
|
|
3a21152f4c | ||
|
|
b97e3ee51a | ||
|
|
2b0809f3dc | ||
|
|
29cd6ef994 | ||
|
|
d8b2189cc3 | ||
|
|
3a8c2d0b6f | ||
|
|
eed3ba5d1e | ||
|
|
bc68949c76 | ||
|
|
e4ef2d8140 | ||
|
|
0659f9b592 | ||
|
|
0390c8ccfb | ||
|
|
281ba768ec | ||
|
|
806fae6596 | ||
|
|
65359e53d8 | ||
|
|
92b1b46fa6 | ||
|
|
760d468aca | ||
|
|
6a5b380bc7 | ||
|
|
689d3e7602 | ||
|
|
4300208642 | ||
|
|
149818671d | ||
|
|
dc1f005823 | ||
|
|
eeb6f9334a | ||
|
|
3add72c686 | ||
|
|
5de6a96af5 | ||
|
|
1e014aa95b | ||
|
|
9962eb1f08 | ||
|
|
6bc35b92d3 | ||
|
|
40aaa05456 | ||
|
|
e17f62d261 | ||
|
|
65cde78f6d | ||
|
|
9a5402518c | ||
|
|
11fc826e52 | ||
|
|
249b5d6783 | ||
|
|
7a2dcf0f9f | ||
|
|
710d528215 | ||
|
|
ce0a3e858a | ||
|
|
d178bec60e | ||
|
|
fba88e225f | ||
|
|
7bac815938 | ||
|
|
18916e682f | ||
|
|
fbe1fb285d | ||
|
|
04014d73d9 | ||
|
|
1aa10f5211 | ||
|
|
35fe91116a | ||
|
|
fa34be1a00 | ||
|
|
7bb615a262 | ||
|
|
c51f88e62a | ||
|
|
120e3473f8 | ||
|
|
4a5407feb7 | ||
|
|
d332370298 | ||
|
|
d5b15c498b | ||
|
|
66e93da6f5 | ||
|
|
f8fed9be7e | ||
|
|
3dbb97413c | ||
|
|
47f9f54b89 | ||
|
|
e89ce717ba | ||
|
|
0645625585 | ||
|
|
e115e0b89e | ||
|
|
6a7ad10ae0 | ||
|
|
5a2f556ff7 | ||
|
|
b0e0b29201 | ||
|
|
616b6ce4d5 | ||
|
|
6a27b6262d | ||
|
|
940c185c5d | ||
|
|
f831f30556 | ||
|
|
fd93036b79 | ||
|
|
889cdbff3c | ||
|
|
a787287bfa | ||
|
|
c2c92b2e9b | ||
|
|
e68aeb69eb | ||
|
|
846f457db4 | ||
|
|
35ab1b5d1c | ||
|
|
76e1bed466 | ||
|
|
100acbbe7b | ||
|
|
66044578c2 | ||
|
|
eb92c6b676 | ||
|
|
af04f78bd7 | ||
|
|
b35c1ab696 | ||
|
|
5c1c8b80e2 | ||
|
|
787ca096e6 | ||
|
|
363b38ceb0 | ||
|
|
e2cfc96577 | ||
|
|
b16769ddbe | ||
|
|
ffbe5d1e22 | ||
|
|
1d2e67d38c | ||
|
|
b6eecd7d0c | ||
|
|
b229b89c78 | ||
|
|
b161a6d7f7 | ||
|
|
799e39227c | ||
|
|
38820ec916 | ||
|
|
be1ee30fa8 | ||
|
|
beb069df64 | ||
|
|
9941045468 | ||
|
|
8fa2d8f0d6 | ||
|
|
a3d32d9d80 | ||
|
|
bf35300817 | ||
|
|
ff9af3166f | ||
|
|
8805d8523b | ||
|
|
0610ae2d21 | ||
|
|
5972fca190 | ||
|
|
9f8fedb3b1 | ||
|
|
048ab4b5d3 | ||
|
|
8aa1d770f0 | ||
|
|
4e6dda6361 | ||
|
|
e44834e0c5 | ||
|
|
1a3ee31865 | ||
|
|
721af38aed | ||
|
|
2ac04dba4d | ||
|
|
e7fbcc690b | ||
|
|
f4ce6a8023 | ||
|
|
773dbf4ef2 | ||
|
|
5486dcd1f9 | ||
|
|
61f0eb062e | ||
|
|
b68f197fea | ||
|
|
39e475b4ea | ||
|
|
f5b8855fed | ||
|
|
03e8111e1b | ||
|
|
e26b64a0fc | ||
|
|
8b1aa4a7bd | ||
|
|
b2b36be6cf | ||
|
|
7d82948bd1 | ||
|
|
f7515514bd | ||
|
|
12a3d80f71 | ||
|
|
ef69a1610a | ||
|
|
483eb63408 | ||
|
|
b019dcd11a | ||
|
|
163945f4b4 | ||
|
|
22ee439215 | ||
|
|
582f5e0f72 | ||
|
|
5f672dfb42 | ||
|
|
6f31ae722e | ||
|
|
cc5167c09a | ||
|
|
c6eb41b7bf | ||
|
|
eeef26ae59 | ||
|
|
d53b655c32 | ||
|
|
be81d33495 | ||
|
|
035a290ab5 | ||
|
|
c041a723c1 | ||
|
|
45ca2ace0b | ||
|
|
424fbb710c | ||
|
|
169a8fb97f | ||
|
|
098812d3cc | ||
|
|
4eb5297a79 | ||
|
|
c52c738408 | ||
|
|
797eb2c3ca | ||
|
|
d9a2d9a6bd | ||
|
|
4da4db1e73 | ||
|
|
4c23c3fec9 | ||
|
|
2ab1faf05a | ||
|
|
f670eefd84 | ||
|
|
4e1c301b2a | ||
|
|
b25e3e0917 | ||
|
|
f571d7ed3a | ||
|
|
9abbef7e05 | ||
|
|
1fbe25f91e | ||
|
|
19ad081bb1 | ||
|
|
911be714e5 | ||
|
|
f51fef6027 | ||
|
|
8761e3a869 | ||
|
|
b9a1eba152 | ||
|
|
1e19b689c4 | ||
|
|
0f94a46f86 | ||
|
|
d9659617e9 | ||
|
|
edf0b2fbfe | ||
|
|
61c8dca469 | ||
|
|
d86e504779 | ||
|
|
3d6b4d4dff | ||
|
|
45bcb9927d | ||
|
|
612a07f420 | ||
|
|
d129abcde0 | ||
|
|
6fad364daa | ||
|
|
dc7a85ee76 | ||
|
|
26aec8714e | ||
|
|
65f61fd5b1 | ||
|
|
57ad066e66 | ||
|
|
2a2a0d4aeb | ||
|
|
1082a234fe | ||
|
|
141bb48d76 | ||
|
|
85bb227b45 | ||
|
|
2005979f46 | ||
|
|
48a206a434 | ||
|
|
3a6d2c7c5f | ||
|
|
800ad1737c | ||
|
|
c7eb8d1082 | ||
|
|
4564b973df | ||
|
|
2586618c1b | ||
|
|
7758bc821e | ||
|
|
78f7f19359 | ||
|
|
04e45f503b | ||
|
|
58e97c966c | ||
|
|
e3d15ef4e7 | ||
|
|
61f1ace43f | ||
|
|
087ca9d0d5 | ||
|
|
002b8b04e9 | ||
|
|
6f0232763c | ||
|
|
8169b35fa6 | ||
|
|
097ba22a59 | ||
|
|
78ebb3445a | ||
|
|
b8fb5fb403 | ||
|
|
93f01e614f | ||
|
|
e9f00a4e8a | ||
|
|
7d0397a8fb | ||
|
|
2682ab6791 | ||
|
|
b60e82c702 | ||
|
|
bac82eeb8e | ||
|
|
94c134318b | ||
|
|
6fd334dcd7 | ||
|
|
df6b71c5ea | ||
|
|
4c467d7cad | ||
|
|
db794beb84 | ||
|
|
3b95cd9a11 | ||
|
|
bbe4717075 | ||
|
|
2c47dca086 | ||
|
|
a17553cbf1 | ||
|
|
7e8e243e68 | ||
|
|
cf470ec038 | ||
|
|
016623decb | ||
|
|
a0a8c0294d | ||
|
|
9fe92f6145 | ||
|
|
9f3804444e | ||
|
|
67ac0b431c | ||
|
|
1f807a1348 | ||
|
|
bf778d6df1 | ||
|
|
f8a9faf2fa | ||
|
|
054f8376e4 | ||
|
|
d601b0ce20 | ||
|
|
730c8d6879 | ||
|
|
dbb3d8280e | ||
|
|
36956ebf68 | ||
|
|
3c8d5bb788 | ||
|
|
9e9b64a7e7 | ||
|
|
0a73a9bd9c | ||
|
|
d9addc9245 | ||
|
|
6b4b7a9083 | ||
|
|
afcf567538 | ||
|
|
2b67b3bc81 | ||
|
|
3cd6456349 | ||
|
|
c10052764b | ||
|
|
2ae4db34b0 | ||
|
|
9ddaccbae0 | ||
|
|
f7ca670ce0 | ||
|
|
ce3493952b | ||
|
|
ac8aaf0e08 | ||
|
|
3ceb19a9c6 | ||
|
|
95974b0d24 | ||
|
|
ba3bf6c3d9 | ||
|
|
7300e88cdb | ||
|
|
7364fcc7df | ||
|
|
562b90d93c | ||
|
|
210602476f | ||
|
|
58e37f8130 | ||
|
|
b6802767aa | ||
|
|
76f7454049 | ||
|
|
fb687b7217 | ||
|
|
b34d418b57 | ||
|
|
45f8f72bae | ||
|
|
11ca0a01d3 | ||
|
|
5f4bbe311e | ||
|
|
305e310f0a | ||
|
|
ed35c466ae | ||
|
|
48341094a3 | ||
|
|
fb73ab95ea | ||
|
|
9c4f80449b | ||
|
|
dc88cc4e64 | ||
|
|
bee9090a92 | ||
|
|
d1bf5d2bb6 | ||
|
|
9c2eba2009 | ||
|
|
44271e7bb8 | ||
|
|
5e399498c3 | ||
|
|
3bfa021760 | ||
|
|
7853c4a90b | ||
|
|
e7613a3851 | ||
|
|
b34e9bf42a | ||
|
|
6e1341c148 | ||
|
|
92cac451c8 | ||
|
|
0e04068952 | ||
|
|
0a06b3b208 | ||
|
|
8bccfa5b10 | ||
|
|
5e1e6a48a4 | ||
|
|
4981005572 | ||
|
|
9e207f7f24 | ||
|
|
5ec1b685d8 | ||
|
|
c41571879b | ||
|
|
62a5f2350b | ||
|
|
82f10ddc6a | ||
|
|
4fa76bee78 | ||
|
|
384dee1f95 | ||
|
|
3e5033ff13 | ||
|
|
01ac65eee4 | ||
|
|
da80bd8bb4 | ||
|
|
470901dc58 | ||
|
|
32e6a79e9c | ||
|
|
d1f0b56adc | ||
|
|
77fc4be458 | ||
|
|
3dec8d1880 | ||
|
|
b102caf482 | ||
|
|
7ec9e78e4d | ||
|
|
b6237bc39d | ||
|
|
54935e4aa3 | ||
|
|
18b9addc85 | ||
|
|
abdccaa8eb | ||
|
|
a93c83fe6b | ||
|
|
4fe8d350a2 | ||
|
|
72e3930e08 | ||
|
|
31140c8da7 | ||
|
|
47bb46176b | ||
|
|
0e49eb1d17 | ||
|
|
87717dd77f | ||
|
|
6fb81f146e | ||
|
|
ff6b193821 | ||
|
|
96623c0e4f | ||
|
|
0f089bd49a | ||
|
|
b318d191a5 | ||
|
|
d0665bb301 | ||
|
|
adbba69988 | ||
|
|
539ab241cd | ||
|
|
f18b7c5e14 | ||
|
|
19324f2904 | ||
|
|
6c83cd627f | ||
|
|
ed09d78ed9 | ||
|
|
0b7a392b30 | ||
|
|
2379443ef5 | ||
|
|
8c50b9692e | ||
|
|
787be6ec08 | ||
|
|
72efa329db | ||
|
|
a79b338208 | ||
|
|
08b2899676 | ||
|
|
074e489fe3 | ||
|
|
f8badefa90 |
@@ -35,3 +35,11 @@ stamp-h1
|
||||
/m4/ltsugar.m4
|
||||
/m4/ltversion.m4
|
||||
/m4/lt~obsolete.m4
|
||||
/autom4te.cache/
|
||||
/compile
|
||||
/example/.deps/
|
||||
/src/lib/.deps/
|
||||
/src/lib/protocols/.deps/
|
||||
/src/lib/third_party/src/.deps/
|
||||
/test-driver
|
||||
/tests/Makefile
|
||||
|
||||
+31
-4
@@ -1,16 +1,30 @@
|
||||
language: c
|
||||
|
||||
os:
|
||||
- osx
|
||||
- linux
|
||||
|
||||
compiler:
|
||||
- clang
|
||||
- gcc
|
||||
|
||||
matrix:
|
||||
exclude:
|
||||
# osx use always clang for build...
|
||||
- os: osx
|
||||
compiler: gcc
|
||||
|
||||
install:
|
||||
- sudo apt-get update || true
|
||||
- sudo apt-get install build-essential
|
||||
- sudo apt-get install libpcap-dev libtool autoconf automake autogen
|
||||
#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
|
||||
|
||||
before_script:
|
||||
- ./autogen.sh
|
||||
# - lcov --directory . --zerocounters
|
||||
|
||||
script:
|
||||
- ./configure
|
||||
@@ -19,4 +33,17 @@ script:
|
||||
after_script:
|
||||
- cd tests
|
||||
- ./do.sh
|
||||
|
||||
|
||||
#after_success:
|
||||
#- cd ${TRAVIS_BUILD_DIR}
|
||||
#- lcov --directory . --capture --output-file coverage.info # capture coverage info
|
||||
#- lcov --remove coverage.info 'tests/*' 'packages/*' 'm4/*' 'doc/*' --output-file coverage.info
|
||||
#- lcov --list coverage.info # debug before upload
|
||||
#- coveralls-lcov --repo-token ${COVERALLS_TOKEN} coverage.info # uploads to coveralls
|
||||
|
||||
notifications:
|
||||
email:
|
||||
recipients:
|
||||
- packager@ntop.org
|
||||
on_success: never
|
||||
on_failure: always
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
# CHANGELOG
|
||||
|
||||
#### nDPI 2.0 (May 2017)
|
||||
|
||||
## Main New Features
|
||||
|
||||
* nDPI Wireshark plugin for Layer-7 protocol dissection. The plugin, available via an extcap interface, passes Wireshark the nDPI-detected protocols by adding an ethernet packet trailer that is then interpreted and displayed inside the Wireshark GUI. Readme: https://github.com/ntop/nDPI/blob/dev/wireshark/README.md
|
||||
|
||||
|
||||
## New Supported Protocols and Services
|
||||
|
||||
* STARTTLS
|
||||
* IMAPS
|
||||
* DNScrypt
|
||||
* QUIC (Quick UDP Internet Connections)
|
||||
* AMQP (Advanced Message Queueing Protocol)
|
||||
* Ookla (SpeedTest)
|
||||
* BJNP
|
||||
* AFP (Apple Filing Protocol)
|
||||
* SMPP (Short Message Peer-to-Peer)
|
||||
* VNC
|
||||
* OpenVPN
|
||||
* OpenDNS
|
||||
* RX protocol (used by AFS)
|
||||
* CoAP and MQTT (IoT specific protocols)
|
||||
* Cloudflare
|
||||
* Office 365
|
||||
* OCS
|
||||
* MS Lync
|
||||
* Ubiquity AirControl 2
|
||||
* HEP (Extensible Encapsulation Protocol)
|
||||
* WhatsApp Voice vs WhatsApp (chat, no voice)
|
||||
* Viber
|
||||
* Wechat
|
||||
* Github
|
||||
* Hotmail
|
||||
* Slack
|
||||
* Instagram
|
||||
* Snapchat
|
||||
* MPEG TS protocol
|
||||
* Twitch
|
||||
* KakaoTalk Voice and Chat
|
||||
* Meu
|
||||
* EAQ
|
||||
* iQIYI media service
|
||||
* Weibo
|
||||
* PPStream
|
||||
|
||||
|
||||
## Improvements
|
||||
|
||||
* SSH client/server version dissection
|
||||
* Improved SSL dissection
|
||||
* SSL server certificate detection
|
||||
* Added double tagging 802.1Q in dissection of vlan-tagged packets
|
||||
* Improved netBIOS dissection
|
||||
* Improved Skype detection
|
||||
* Improved Netflix traffic detection
|
||||
* Improved HTTP subprotocol matching
|
||||
* Implemented DHCP host name extraction
|
||||
* Updated Facebook detection by ip server ranges
|
||||
* Updated Twitter networks
|
||||
* Improved Microsoft detection
|
||||
* Enhanced Google detection
|
||||
* Improved BT-uTP protocol dissection
|
||||
* Added detection of Cisco datalink layer (Cisco hDLC and Cisco SLARP)
|
||||
|
||||
|
||||
#### Older releases
|
||||
|
||||
#### 2014-03-21
|
||||
* improved support for eDonkey/eMule/Kademlia
|
||||
* improved support for PPLive
|
||||
|
||||
#### 2014-03-20
|
||||
* code optimizations
|
||||
* consistency improvements
|
||||
* added support for new applications: Pando Media Booster
|
||||
* improved support for Steam
|
||||
* added support for new web services: Wikipedia, MSN, Amazon, eBay, CNN
|
||||
|
||||
#### 2014-03-19
|
||||
* added new protocols: FTP, code improvements
|
||||
|
||||
#### 2014-03-17
|
||||
* added new protocols: SOCKSv4, SOCKSv5, RTMP
|
||||
@@ -1,16 +0,0 @@
|
||||
2014-03-21:
|
||||
- improved support for eDonkey/eMule/Kademlia
|
||||
- improved support for PPLive
|
||||
|
||||
2014-03-20:
|
||||
- code optimizations
|
||||
- consistency improvements
|
||||
- added support for new applications: Pando Media Booster
|
||||
- improved support for Steam
|
||||
- added support for new web services: Wikipedia, MSN, Amazon, eBay, CNN
|
||||
|
||||
2014-03-19:
|
||||
- added new protocols: FTP, code improvements
|
||||
|
||||
2014-03-17:
|
||||
- added new protocols: SOCKSv4, SOCKSv5, RTMP
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = src/lib example
|
||||
SUBDIRS = src/lib example tests
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libndpi.pc
|
||||
|
||||
@@ -15,6 +15,10 @@ In order to compile this library do
|
||||
- ./configure
|
||||
- make
|
||||
|
||||
To run tests do additionally:
|
||||
|
||||
- cd tests; ./do.sh
|
||||
|
||||
Please note that the pre-requisites for compilation include:
|
||||
- GNU tools (autogen, automake, autoconf, libtool)
|
||||
- GNU C compiler (gcc)
|
||||
@@ -23,7 +27,7 @@ Please note that the pre-requisites for compilation include:
|
||||
|
||||
The entire procedure of adding new protocols in detail:
|
||||
|
||||
1. Add new protocol together with its unique ID to: src/include/ndpi_protocols_osdpi.h
|
||||
1. Add new protocol together with its unique ID to: src/include/ndpi_protocol_ids.h
|
||||
2. Create a new protocol in: src/lib/protocols/
|
||||
3. Variables to be kept for the duration of the entire flow (as state variables) needs to be placed in: /include/ndpi_structs.h in ndpi_flow_tcp_struct (for TCP only), ndpi_flow_udp_struct (for UDP only), or ndpi_flow_struct (for both).
|
||||
4. Add a new entry for the search function for the new protocol in: src/include/ndpi_protocols.h
|
||||
@@ -34,6 +38,14 @@ The entire procedure of adding new protocols in detail:
|
||||
9. ./autogen.sh
|
||||
10. ./configure
|
||||
11. make
|
||||
12. 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 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.
|
||||
|
||||
### 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
|
||||
|
||||
@@ -41,6 +53,10 @@ 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
|
||||
|
||||
[ntopng_logo]: https://camo.githubusercontent.com/0f789abcef232035c05e0d2e82afa3cc3be46485/687474703a2f2f7777772e6e746f702e6f72672f77702d636f6e74656e742f75706c6f6164732f323031312f30382f6e746f706e672d69636f6e2d313530783135302e706e67
|
||||
|
||||
[ntop_logo]: https://camo.githubusercontent.com/58e2a1ecfff62d8ecc9d74633bd1013f26e06cba/687474703a2f2f7777772e6e746f702e6f72672f77702d636f6e74656e742f75706c6f6164732f323031352f30352f6e746f702e706e67
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
rerequisites for Compilation
|
||||
Prerequisites for Compilation
|
||||
-----------------------------
|
||||
|
||||
Prerequisites
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ TCP 172.16.253.130:2021 <-> 75.147.140.249:443 [VLAN: 0][proto: 91/SSL][28 pkts/
|
||||
TCP 172.16.253.130:2077 <-> 77.247.181.163:443 [VLAN: 0][proto: 91/SSL][136 pkts/94329 bytes][SSL client: www.fk4pprq42hsvl2wey.com]
|
||||
|
||||
It can be detected by analyzing the SSL client certificate and checking the name that does not match to a real host in
|
||||
addition of begin a bit weird. As doing DNS resolution is not a task for nDPI we let applications do and then recognize
|
||||
addition of being a bit weird. As doing DNS resolution is not a task for nDPI we let applications do and then recognize
|
||||
SSL-tunnelled connections.
|
||||
|
||||
See http://www.netresec.com/?page=Blog&month=2013-04&post=Detecting-TOR-Communication-in-Network-Traffic
|
||||
|
||||
+11
-13
@@ -1,4 +1,4 @@
|
||||
AC_INIT([libndpi], [1.8.0])
|
||||
AC_INIT([libndpi], [2.0.0])
|
||||
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
@@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects])
|
||||
LT_INIT
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AX_PTHREAD
|
||||
|
||||
if test -d ".git"; then :
|
||||
@@ -17,8 +18,7 @@ if test -d ".git"; then :
|
||||
#
|
||||
#
|
||||
GIT_NUM=`git log --pretty=oneline | wc -l | tr -d '[[:space:]]'`
|
||||
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
|
||||
GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
|
||||
GIT_RELEASE="${PACKAGE_VERSION}-${GIT_NUM}-${GIT_TAG}"
|
||||
else
|
||||
GIT_RELEASE="${PACKAGE_VERSION}"
|
||||
GIT_DATE=`date`
|
||||
@@ -50,6 +50,11 @@ if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
||||
|
||||
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"])
|
||||
|
||||
@@ -61,6 +66,7 @@ else
|
||||
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]))
|
||||
|
||||
@@ -76,24 +82,16 @@ AS_IF([test "x$enable_json_c" != "xno"], [
|
||||
[])
|
||||
])
|
||||
|
||||
OLD_LIBS=$LIBS
|
||||
LIBS="-L/opt/napatech3/lib $LIBS"
|
||||
AC_CHECK_LIB([ntapi],
|
||||
[NT_Init],
|
||||
[PCAP_LIB="$PCAP_LIB -L/opt/napatech3/lib -lntapi"],
|
||||
[], [] )
|
||||
LIBS=$OLD_LIBS
|
||||
|
||||
|
||||
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 libndpi.pc])
|
||||
AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile tests/Makefile libndpi.pc])
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AC_SUBST(GIT_RELEASE)
|
||||
AC_SUBST(SVN_DATE)
|
||||
AC_SUBST(JSON_C_LIB)
|
||||
AC_SUBST(PCAP_INC)
|
||||
AC_SUBST(PCAP_LIB)
|
||||
AC_SUBST(DL_LIB)
|
||||
AC_SUBST(HAVE_PTHREAD_SETAFFINITY_NP)
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
+4
-4
@@ -1,12 +1,12 @@
|
||||
bin_PROGRAMS = ndpiReader
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src/include @PCAP_INC@
|
||||
AM_CFLAGS = @PTHREAD_CFLAGS@
|
||||
AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage
|
||||
|
||||
LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@
|
||||
AM_LDFLAGS = -static
|
||||
LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ @DL_LIB@
|
||||
AM_LDFLAGS = -static @DL_LIB@
|
||||
|
||||
ndpiReader_SOURCES = ndpiReader.c ndpi_util.c
|
||||
ndpiReader_SOURCES = ndpiReader.c ndpi_util.c ndpi_util.h
|
||||
|
||||
ndpiReader.o: ndpiReader.c
|
||||
|
||||
|
||||
+872
-123
File diff suppressed because it is too large
Load Diff
+294
-211
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ndpi_util.c
|
||||
*
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
* 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
|
||||
@@ -48,6 +48,7 @@
|
||||
#define MPLS_MULTI 0x8848
|
||||
#define PPPoE 0x8864
|
||||
#define SNAP 0xaa
|
||||
#define BSTP 0x42 /* Bridge Spanning Tree Protocol */
|
||||
|
||||
/* mask for FCF */
|
||||
#define WIFI_DATA 0x2 /* 0000 0010 */
|
||||
@@ -62,8 +63,9 @@
|
||||
#define GTP_U_V1_PORT 2152
|
||||
#define TZSP_PORT 37008
|
||||
|
||||
#define SIZEOF_ID_STRUCT (sizeof(struct ndpi_id_struct))
|
||||
#define SIZEOF_FLOW_STRUCT (sizeof(struct ndpi_flow_struct))
|
||||
#ifndef DLT_LINUX_SLL
|
||||
#define DLT_LINUX_SLL 113
|
||||
#endif
|
||||
|
||||
#include "ndpi_main.h"
|
||||
#include "ndpi_util.h"
|
||||
@@ -71,18 +73,13 @@
|
||||
/* ***************************************************** */
|
||||
|
||||
void ndpi_free_flow_info_half(struct ndpi_flow_info *flow) {
|
||||
if(flow->ndpi_flow) { ndpi_free_flow(flow->ndpi_flow); flow->ndpi_flow = NULL; }
|
||||
if(flow->ndpi_flow) { ndpi_flow_free(flow->ndpi_flow); flow->ndpi_flow = NULL; }
|
||||
if(flow->src_id) { ndpi_free(flow->src_id); flow->src_id = NULL; }
|
||||
if(flow->dst_id) { ndpi_free(flow->dst_id); flow->dst_id = NULL; }
|
||||
|
||||
}
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
static const u_int8_t nDPI_traceLevel = 0;
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
extern u_int32_t current_ndpi_memory, max_ndpi_memory;
|
||||
|
||||
/**
|
||||
@@ -109,11 +106,12 @@ static void free_wrapper(void *freeable) {
|
||||
/* ***************************************************** */
|
||||
|
||||
struct ndpi_workflow * ndpi_workflow_init(const struct ndpi_workflow_prefs * prefs, pcap_t * pcap_handle) {
|
||||
|
||||
|
||||
set_ndpi_malloc(malloc_wrapper), set_ndpi_free(free_wrapper);
|
||||
set_ndpi_flow_malloc(NULL), set_ndpi_flow_free(NULL);
|
||||
/* TODO: just needed here to init ndpi malloc wrapper */
|
||||
struct ndpi_detection_module_struct * module = ndpi_init_detection_module();
|
||||
|
||||
|
||||
struct ndpi_workflow * workflow = ndpi_calloc(1, sizeof(struct ndpi_workflow));
|
||||
|
||||
workflow->pcap_handle = pcap_handle;
|
||||
@@ -131,7 +129,7 @@ struct ndpi_workflow * ndpi_workflow_init(const struct ndpi_workflow_prefs * pre
|
||||
|
||||
/* ***************************************************** */
|
||||
|
||||
static void ndpi_flow_info_freer(void *node) {
|
||||
void ndpi_flow_info_freer(void *node) {
|
||||
struct ndpi_flow_info *flow = (struct ndpi_flow_info*)node;
|
||||
|
||||
ndpi_free_flow_info_half(flow);
|
||||
@@ -157,14 +155,54 @@ int ndpi_workflow_node_cmp(const void *a, const void *b) {
|
||||
struct ndpi_flow_info *fa = (struct ndpi_flow_info*)a;
|
||||
struct ndpi_flow_info *fb = (struct ndpi_flow_info*)b;
|
||||
|
||||
if(fa->vlan_id < fb->vlan_id ) return(-1); else { if(fa->vlan_id > fb->vlan_id ) return(1); }
|
||||
if(fa->hashval < fb->hashval) return(-1); else if(fa->hashval > fb->hashval) return(1);
|
||||
|
||||
/* Flows have the same hash */
|
||||
|
||||
if(fa->vlan_id < fb->vlan_id ) return(-1); else { if(fa->vlan_id > fb->vlan_id ) return(1); }
|
||||
if(fa->protocol < fb->protocol ) return(-1); else { if(fa->protocol > fb->protocol ) return(1); }
|
||||
|
||||
if(
|
||||
(
|
||||
(fa->lower_ip == fb->lower_ip )
|
||||
&& (fa->lower_port == fb->lower_port)
|
||||
&& (fa->upper_ip == fb->upper_ip )
|
||||
&& (fa->upper_port == fb->upper_port)
|
||||
)
|
||||
||
|
||||
(
|
||||
(fa->lower_ip == fb->upper_ip )
|
||||
&& (fa->lower_port == fb->upper_port)
|
||||
&& (fa->upper_ip == fb->lower_ip )
|
||||
&& (fa->upper_port == fb->lower_port)
|
||||
)
|
||||
)
|
||||
return(0);
|
||||
|
||||
if(fa->lower_ip < fb->lower_ip ) return(-1); else { if(fa->lower_ip > fb->lower_ip ) return(1); }
|
||||
if(fa->lower_port < fb->lower_port) return(-1); else { if(fa->lower_port > fb->lower_port) return(1); }
|
||||
if(fa->upper_ip < fb->upper_ip ) return(-1); else { if(fa->upper_ip > fb->upper_ip ) return(1); }
|
||||
if(fa->upper_port < fb->upper_port) return(-1); else { if(fa->upper_port > fb->upper_port) return(1); }
|
||||
if(fa->protocol < fb->protocol ) return(-1); else { if(fa->protocol > fb->protocol ) return(1); }
|
||||
|
||||
return(0); /* notreached */
|
||||
}
|
||||
|
||||
return(0);
|
||||
/* ***************************************************** */
|
||||
|
||||
static void patchIPv6Address(char *str) {
|
||||
int i = 0, j = 0;
|
||||
|
||||
while(str[i] != '\0') {
|
||||
if((str[i] == ':')
|
||||
&& (str[i+1] == '0')
|
||||
&& (str[i+2] == ':')) {
|
||||
str[j++] = ':';
|
||||
str[j++] = ':';
|
||||
i += 3;
|
||||
} else
|
||||
str[j++] = str[i++];
|
||||
}
|
||||
if(str[j] != '\0') str[j] = '\0';
|
||||
}
|
||||
|
||||
/* ***************************************************** */
|
||||
@@ -186,11 +224,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
u_int8_t **payload,
|
||||
u_int16_t *payload_len,
|
||||
u_int8_t *src_to_dst_direction) {
|
||||
u_int32_t idx, l4_offset;
|
||||
u_int32_t lower_ip;
|
||||
u_int32_t upper_ip;
|
||||
u_int16_t lower_port;
|
||||
u_int16_t upper_port;
|
||||
u_int32_t idx, l4_offset, hashval;
|
||||
struct ndpi_flow_info flow;
|
||||
void *ret;
|
||||
u_int8_t *l3, *l4;
|
||||
@@ -199,12 +233,12 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
Note: to keep things simple (ndpiReader is just a demo app)
|
||||
we handle IPv6 a-la-IPv4.
|
||||
*/
|
||||
if(version == 4) {
|
||||
if(version == IPVERSION) {
|
||||
if(ipsize < 20)
|
||||
return NULL;
|
||||
|
||||
if((iph->ihl * 4) > ipsize || ipsize < ntohs(iph->tot_len)
|
||||
|| (iph->frag_off & htons(0x1FFF)) != 0)
|
||||
/* || (iph->frag_off & htons(0x1FFF)) != 0 */)
|
||||
return NULL;
|
||||
|
||||
l4_offset = iph->ihl * 4;
|
||||
@@ -230,134 +264,86 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
if(l4_packet_len > workflow->stats.max_packet_len)
|
||||
workflow->stats.max_packet_len = l4_packet_len;
|
||||
|
||||
if(iph->saddr < iph->daddr) {
|
||||
lower_ip = iph->saddr;
|
||||
upper_ip = iph->daddr;
|
||||
} else {
|
||||
lower_ip = iph->daddr;
|
||||
upper_ip = iph->saddr;
|
||||
}
|
||||
|
||||
*proto = iph->protocol;
|
||||
l4 = ((u_int8_t *) l3 + l4_offset);
|
||||
|
||||
if(iph->protocol == 6 && l4_packet_len >= 20) {
|
||||
if(iph->protocol == IPPROTO_TCP && l4_packet_len >= 20) {
|
||||
u_int tcp_len;
|
||||
|
||||
workflow->stats.tcp_count++;
|
||||
|
||||
// tcp
|
||||
workflow->stats.tcp_count++;
|
||||
*tcph = (struct ndpi_tcphdr *)l4;
|
||||
*sport = ntohs((*tcph)->source), *dport = ntohs((*tcph)->dest);
|
||||
|
||||
if(iph->saddr < iph->daddr) {
|
||||
lower_port = (*tcph)->source, upper_port = (*tcph)->dest;
|
||||
*src_to_dst_direction = 1;
|
||||
} else {
|
||||
lower_port = (*tcph)->dest;
|
||||
upper_port = (*tcph)->source;
|
||||
|
||||
*src_to_dst_direction = 0;
|
||||
if(iph->saddr == iph->daddr) {
|
||||
if(lower_port > upper_port) {
|
||||
u_int16_t p = lower_port;
|
||||
|
||||
lower_port = upper_port;
|
||||
upper_port = p;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tcp_len = ndpi_min(4*(*tcph)->doff, l4_packet_len);
|
||||
*payload = &l4[tcp_len];
|
||||
*payload_len = ndpi_max(0, l4_packet_len-4*(*tcph)->doff);
|
||||
} else if(iph->protocol == 17 && l4_packet_len >= 8) {
|
||||
} else if(iph->protocol == IPPROTO_UDP && l4_packet_len >= 8) {
|
||||
// udp
|
||||
workflow->stats.udp_count++;
|
||||
|
||||
workflow->stats.udp_count++;
|
||||
*udph = (struct ndpi_udphdr *)l4;
|
||||
*sport = ntohs((*udph)->source), *dport = ntohs((*udph)->dest);
|
||||
*payload = &l4[sizeof(struct ndpi_udphdr)];
|
||||
*payload_len = ndpi_max(0, l4_packet_len-sizeof(struct ndpi_udphdr));
|
||||
|
||||
if(iph->saddr < iph->daddr) {
|
||||
lower_port = (*udph)->source, upper_port = (*udph)->dest;
|
||||
*src_to_dst_direction = 1;
|
||||
} else {
|
||||
lower_port = (*udph)->dest, upper_port = (*udph)->source;
|
||||
|
||||
*src_to_dst_direction = 0;
|
||||
|
||||
if(iph->saddr == iph->daddr) {
|
||||
if(lower_port > upper_port) {
|
||||
u_int16_t p = lower_port;
|
||||
|
||||
lower_port = upper_port;
|
||||
upper_port = p;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*sport = ntohs(lower_port), *dport = ntohs(upper_port);
|
||||
} else {
|
||||
// non tcp/udp protocols
|
||||
lower_port = 0;
|
||||
upper_port = 0;
|
||||
*sport = *dport = 0;
|
||||
}
|
||||
|
||||
flow.protocol = iph->protocol, flow.vlan_id = vlan_id;
|
||||
flow.lower_ip = lower_ip, flow.upper_ip = upper_ip;
|
||||
flow.lower_port = lower_port, flow.upper_port = upper_port;
|
||||
|
||||
if(0)
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_DEBUG, "[NDPI] [%u][%u:%u <-> %u:%u]\n",
|
||||
iph->protocol, lower_ip, ntohs(lower_port), upper_ip, ntohs(upper_port));
|
||||
|
||||
idx = (vlan_id + lower_ip + upper_ip + iph->protocol + lower_port + upper_port) % workflow->prefs.num_roots;
|
||||
flow.lower_ip = iph->saddr, flow.upper_ip = iph->daddr;
|
||||
flow.lower_port = htons(*sport), flow.upper_port = htons(*dport);
|
||||
flow.hashval = hashval = flow.protocol + flow.vlan_id + flow.lower_ip + flow.upper_ip + flow.lower_port + flow.upper_port;
|
||||
idx = hashval % workflow->prefs.num_roots;
|
||||
ret = ndpi_tfind(&flow, &workflow->ndpi_flows_root[idx], ndpi_workflow_node_cmp);
|
||||
|
||||
if(ret == NULL) {
|
||||
if(workflow->stats.ndpi_flow_count == workflow->prefs.max_ndpi_flows) {
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_ERROR, "maximum flow count (%u) has been exceeded\n", workflow->prefs.max_ndpi_flows);
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR,
|
||||
"maximum flow count (%u) has been exceeded\n",
|
||||
workflow->prefs.max_ndpi_flows);
|
||||
exit(-1);
|
||||
} else {
|
||||
struct ndpi_flow_info *newflow = (struct ndpi_flow_info*)malloc(sizeof(struct ndpi_flow_info));
|
||||
|
||||
if(newflow == NULL) {
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(1): not enough memory\n", __FUNCTION__);
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(1): not enough memory\n", __FUNCTION__);
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
memset(newflow, 0, sizeof(struct ndpi_flow_info));
|
||||
newflow->hashval = hashval;
|
||||
newflow->protocol = iph->protocol, newflow->vlan_id = vlan_id;
|
||||
newflow->lower_ip = lower_ip, newflow->upper_ip = upper_ip;
|
||||
newflow->lower_port = lower_port, newflow->upper_port = upper_port;
|
||||
newflow->lower_ip = iph->saddr, newflow->upper_ip = iph->daddr;
|
||||
newflow->lower_port = htons(*sport), newflow->upper_port = htons(*dport);
|
||||
newflow->ip_version = version;
|
||||
|
||||
if(version == 4) {
|
||||
inet_ntop(AF_INET, &lower_ip, newflow->lower_name, sizeof(newflow->lower_name));
|
||||
inet_ntop(AF_INET, &upper_ip, newflow->upper_name, sizeof(newflow->upper_name));
|
||||
if(version == IPVERSION) {
|
||||
inet_ntop(AF_INET, &newflow->lower_ip, newflow->lower_name, sizeof(newflow->lower_name));
|
||||
inet_ntop(AF_INET, &newflow->upper_ip, newflow->upper_name, sizeof(newflow->upper_name));
|
||||
} else {
|
||||
inet_ntop(AF_INET6, &iph6->ip6_src, newflow->lower_name, sizeof(newflow->lower_name));
|
||||
inet_ntop(AF_INET6, &iph6->ip6_dst, newflow->upper_name, sizeof(newflow->upper_name));
|
||||
/* For consistency across platforms replace :0: with :: */
|
||||
patchIPv6Address(newflow->lower_name), patchIPv6Address(newflow->upper_name);
|
||||
}
|
||||
|
||||
if((newflow->ndpi_flow = ndpi_malloc(SIZEOF_FLOW_STRUCT)) == NULL) {
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(2): not enough memory\n", __FUNCTION__);
|
||||
if((newflow->ndpi_flow = ndpi_flow_malloc(SIZEOF_FLOW_STRUCT)) == NULL) {
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(2): not enough memory\n", __FUNCTION__);
|
||||
free(newflow);
|
||||
return(NULL);
|
||||
} else
|
||||
memset(newflow->ndpi_flow, 0, SIZEOF_FLOW_STRUCT);
|
||||
|
||||
if((newflow->src_id = ndpi_malloc(SIZEOF_ID_STRUCT)) == NULL) {
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(3): not enough memory\n", __FUNCTION__);
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(3): not enough memory\n", __FUNCTION__);
|
||||
free(newflow);
|
||||
return(NULL);
|
||||
} else
|
||||
memset(newflow->src_id, 0, SIZEOF_ID_STRUCT);
|
||||
|
||||
if((newflow->dst_id = ndpi_malloc(SIZEOF_ID_STRUCT)) == NULL) {
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(4): not enough memory\n", __FUNCTION__);
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR, "[NDPI] %s(4): not enough memory\n", __FUNCTION__);
|
||||
free(newflow);
|
||||
return(NULL);
|
||||
} else
|
||||
@@ -373,11 +359,14 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
||||
} else {
|
||||
struct ndpi_flow_info *flow = *(struct ndpi_flow_info**)ret;
|
||||
|
||||
if(flow->lower_ip == lower_ip && flow->upper_ip == upper_ip
|
||||
&& flow->lower_port == lower_port && flow->upper_port == upper_port)
|
||||
*src = flow->src_id, *dst = flow->dst_id;
|
||||
if(flow->lower_ip == iph->saddr
|
||||
&& flow->upper_ip == iph->daddr
|
||||
&& flow->lower_port == htons(*sport)
|
||||
&& flow->upper_port == htons(*dport)
|
||||
)
|
||||
*src = flow->src_id, *dst = flow->dst_id, *src_to_dst_direction = 1;
|
||||
else
|
||||
*src = flow->dst_id, *dst = flow->src_id;
|
||||
*src = flow->dst_id, *dst = flow->src_id, *src_to_dst_direction = 0, flow->bidirectional = 1;
|
||||
|
||||
return flow;
|
||||
}
|
||||
@@ -401,12 +390,12 @@ static struct ndpi_flow_info *get_ndpi_flow_info6(struct ndpi_workflow * workflo
|
||||
struct ndpi_iphdr iph;
|
||||
|
||||
memset(&iph, 0, sizeof(iph));
|
||||
iph.version = 4;
|
||||
iph.version = IPVERSION;
|
||||
iph.saddr = iph6->ip6_src.u6_addr.u6_addr32[2] + iph6->ip6_src.u6_addr.u6_addr32[3];
|
||||
iph.daddr = iph6->ip6_dst.u6_addr.u6_addr32[2] + iph6->ip6_dst.u6_addr.u6_addr32[3];
|
||||
iph.protocol = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt;
|
||||
|
||||
if(iph.protocol == 0x3C /* IPv6 destination option */) {
|
||||
if(iph.protocol == IPPROTO_DSTOPTS /* IPv6 destination option */) {
|
||||
u_int8_t *options = (u_int8_t*)iph6 + sizeof(const struct ndpi_ipv6hdr);
|
||||
|
||||
iph.protocol = options[0];
|
||||
@@ -421,26 +410,91 @@ static struct ndpi_flow_info *get_ndpi_flow_info6(struct ndpi_workflow * workflo
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
// ipsize = header->len - ip_offset ; rawsize = header->len
|
||||
static unsigned int packet_processing(struct ndpi_workflow * workflow,
|
||||
const u_int64_t time,
|
||||
u_int16_t vlan_id,
|
||||
const struct ndpi_iphdr *iph,
|
||||
struct ndpi_ipv6hdr *iph6,
|
||||
u_int16_t ip_offset,
|
||||
u_int16_t ipsize, u_int16_t rawsize) {
|
||||
void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_flow_info *flow) {
|
||||
if(!flow->ndpi_flow) return;
|
||||
|
||||
snprintf(flow->host_server_name, sizeof(flow->host_server_name), "%s",
|
||||
flow->ndpi_flow->host_server_name);
|
||||
|
||||
/* BITTORRENT */
|
||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_BITTORRENT) {
|
||||
int i, j, n = 0;
|
||||
|
||||
for(i=0, j = 0; j < sizeof(flow->bittorent_hash)-1; i++) {
|
||||
sprintf(&flow->bittorent_hash[j], "%02x", flow->ndpi_flow->bittorent_hash[i]);
|
||||
j += 2, n += flow->ndpi_flow->bittorent_hash[i];
|
||||
}
|
||||
|
||||
if(n == 0) flow->bittorent_hash[0] = '\0';
|
||||
}
|
||||
/* MDNS */
|
||||
else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_MDNS) {
|
||||
snprintf(flow->info, sizeof(flow->info), "%s", flow->ndpi_flow->protos.mdns.answer);
|
||||
}
|
||||
/* UBNTAC2 */
|
||||
else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UBNTAC2) {
|
||||
snprintf(flow->info, sizeof(flow->info), "%s", flow->ndpi_flow->protos.ubntac2.version);
|
||||
}
|
||||
if(flow->detected_protocol.app_protocol != NDPI_PROTOCOL_DNS) {
|
||||
/* SSH */
|
||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_SSH) {
|
||||
snprintf(flow->ssh_ssl.client_info, sizeof(flow->ssh_ssl.client_info), "%s",
|
||||
flow->ndpi_flow->protos.ssh.client_signature);
|
||||
snprintf(flow->ssh_ssl.server_info, sizeof(flow->ssh_ssl.server_info), "%s",
|
||||
flow->ndpi_flow->protos.ssh.server_signature);
|
||||
}
|
||||
/* SSL */
|
||||
else if((flow->detected_protocol.app_protocol == NDPI_PROTOCOL_SSL)
|
||||
|| (flow->detected_protocol.master_protocol == NDPI_PROTOCOL_SSL)) {
|
||||
snprintf(flow->ssh_ssl.client_info, sizeof(flow->ssh_ssl.client_info), "%s",
|
||||
flow->ndpi_flow->protos.ssl.client_certificate);
|
||||
snprintf(flow->ssh_ssl.server_info, sizeof(flow->ssh_ssl.server_info), "%s",
|
||||
flow->ndpi_flow->protos.ssl.server_certificate);
|
||||
}
|
||||
}
|
||||
|
||||
if(flow->detection_completed) {
|
||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
|
||||
if (workflow->__flow_giveup_callback != NULL)
|
||||
workflow->__flow_giveup_callback(workflow, flow, workflow->__flow_giveup_udata);
|
||||
} else {
|
||||
if (workflow->__flow_detected_callback != NULL)
|
||||
workflow->__flow_detected_callback(workflow, flow, workflow->__flow_detected_udata);
|
||||
}
|
||||
|
||||
ndpi_free_flow_info_half(flow);
|
||||
}
|
||||
}
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
/**
|
||||
Function to process the packet:
|
||||
determine the flow of a packet and try to decode it
|
||||
@return: 0 if success; else != 0
|
||||
|
||||
@Note: ipsize = header->len - ip_offset ; rawsize = header->len
|
||||
*/
|
||||
static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
||||
const u_int64_t time,
|
||||
u_int16_t vlan_id,
|
||||
const struct ndpi_iphdr *iph,
|
||||
struct ndpi_ipv6hdr *iph6,
|
||||
u_int16_t ip_offset,
|
||||
u_int16_t ipsize, u_int16_t rawsize) {
|
||||
struct ndpi_id_struct *src, *dst;
|
||||
struct ndpi_flow_info *flow;
|
||||
struct ndpi_flow_info *flow = NULL;
|
||||
struct ndpi_flow_struct *ndpi_flow = NULL;
|
||||
u_int8_t proto;
|
||||
struct ndpi_tcphdr *tcph = NULL;
|
||||
struct ndpi_udphdr *udph = NULL;
|
||||
u_int16_t sport, dport, payload_len;
|
||||
u_int8_t *payload;
|
||||
u_int8_t src_to_dst_direction= 1;
|
||||
u_int8_t src_to_dst_direction = 1;
|
||||
struct ndpi_proto nproto = { NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_UNKNOWN };
|
||||
|
||||
if(iph)
|
||||
flow = get_ndpi_flow_info(workflow, 4, vlan_id, iph, NULL,
|
||||
flow = get_ndpi_flow_info(workflow, IPVERSION, vlan_id, iph, NULL,
|
||||
ip_offset, ipsize,
|
||||
ntohs(iph->tot_len) - (iph->ihl * 4),
|
||||
&tcph, &udph, &sport, &dport,
|
||||
@@ -454,85 +508,53 @@ static unsigned int packet_processing(struct ndpi_workflow * workflow,
|
||||
|
||||
if(flow != NULL) {
|
||||
workflow->stats.ip_packet_count++;
|
||||
workflow->stats.total_wire_bytes += rawsize + 24 /* CRC etc */, workflow->stats.total_ip_bytes += rawsize;
|
||||
workflow->stats.total_wire_bytes += rawsize + 24 /* CRC etc */,
|
||||
workflow->stats.total_ip_bytes += rawsize;
|
||||
ndpi_flow = flow->ndpi_flow;
|
||||
flow->packets++, flow->bytes += rawsize;
|
||||
flow->last_seen = time;
|
||||
} else {
|
||||
return(0);
|
||||
} else { // flow is NULL
|
||||
workflow->stats.total_discarded_bytes++;
|
||||
return(nproto);
|
||||
}
|
||||
|
||||
/* Protocol already detected */
|
||||
if(flow->detection_completed) return(0);
|
||||
if(flow->detection_completed) return(flow->detected_protocol);
|
||||
|
||||
flow->detected_protocol = ndpi_detection_process_packet(workflow->ndpi_struct, ndpi_flow,
|
||||
iph ? (uint8_t *)iph : (uint8_t *)iph6,
|
||||
ipsize, time, src, dst);
|
||||
|
||||
if((flow->detected_protocol.protocol != NDPI_PROTOCOL_UNKNOWN)
|
||||
if((flow->detected_protocol.app_protocol != NDPI_PROTOCOL_UNKNOWN)
|
||||
|| ((proto == IPPROTO_UDP) && (flow->packets > 8))
|
||||
|| ((proto == IPPROTO_TCP) && (flow->packets > 10))) {
|
||||
/* New protocol detected or give up */
|
||||
flow->detection_completed = 1;
|
||||
|
||||
if((flow->detected_protocol.protocol == NDPI_PROTOCOL_UNKNOWN) && (ndpi_flow->num_stun_udp_pkts > 0))
|
||||
ndpi_set_detected_protocol(workflow->ndpi_struct, ndpi_flow, NDPI_PROTOCOL_STUN, NDPI_PROTOCOL_UNKNOWN);
|
||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
|
||||
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
|
||||
flow->ndpi_flow);
|
||||
process_ndpi_collected_info(workflow, flow);
|
||||
}
|
||||
|
||||
snprintf(flow->host_server_name, sizeof(flow->host_server_name), "%s", flow->ndpi_flow->host_server_name);
|
||||
|
||||
if(flow->detected_protocol.protocol == NDPI_PROTOCOL_BITTORRENT) {
|
||||
int i, j, n = 0;
|
||||
|
||||
for(i=0, j = 0; i<20; i++) {
|
||||
sprintf(&flow->bittorent_hash[j], "%02x", flow->ndpi_flow->bittorent_hash[i]);
|
||||
j += 2, n += flow->ndpi_flow->bittorent_hash[i];
|
||||
}
|
||||
|
||||
if(n == 0) flow->bittorent_hash[0] = '\0';
|
||||
}
|
||||
|
||||
if((proto == IPPROTO_TCP) && (flow->detected_protocol.protocol != NDPI_PROTOCOL_DNS)) {
|
||||
snprintf(flow->ssl.client_certificate, sizeof(flow->ssl.client_certificate), "%s", flow->ndpi_flow->protos.ssl.client_certificate);
|
||||
snprintf(flow->ssl.server_certificate, sizeof(flow->ssl.server_certificate), "%s", flow->ndpi_flow->protos.ssl.server_certificate);
|
||||
}
|
||||
|
||||
if(flow->detected_protocol.protocol == NDPI_PROTOCOL_UNKNOWN) {
|
||||
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
|
||||
|
||||
if (workflow->__flow_giveup_callback != NULL)
|
||||
workflow->__flow_giveup_callback(workflow, flow, workflow->__flow_giveup_udata);
|
||||
} else {
|
||||
if (workflow->__flow_detected_callback != NULL)
|
||||
workflow->__flow_detected_callback(workflow, flow, workflow->__flow_detected_udata);
|
||||
}
|
||||
|
||||
ndpi_free_flow_info_half(flow);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return(flow->detected_protocol);
|
||||
}
|
||||
|
||||
/* ****************************************************** */
|
||||
void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet) {
|
||||
|
||||
struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet) {
|
||||
/*
|
||||
* Declare pointers to packet headers
|
||||
*/
|
||||
|
||||
/* --- Ethernet header --- */
|
||||
const struct ndpi_ethhdr *ethernet;
|
||||
/* --- Ethernet II header --- */
|
||||
const struct ndpi_ethhdr *ethernet_2;
|
||||
/* --- LLC header --- */
|
||||
const struct ndpi_llc_header *llc;
|
||||
const struct ndpi_llc_header_snap *llc;
|
||||
|
||||
/* --- Cisco HDLC header --- */
|
||||
const struct ndpi_chdlc *chdlc;
|
||||
/* --- SLARP frame --- */
|
||||
struct ndpi_slarp *slarp;
|
||||
/* --- CDP --- */
|
||||
struct ndpi_cdp *cdp;
|
||||
|
||||
/* --- Radio Tap header --- */
|
||||
const struct ndpi_radiotap_header *radiotap;
|
||||
@@ -547,17 +569,18 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
/** --- IPv6 header --- **/
|
||||
struct ndpi_ipv6hdr *iph6;
|
||||
|
||||
struct ndpi_proto nproto = { NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_UNKNOWN };
|
||||
|
||||
/* lengths and offsets */
|
||||
u_int16_t eth_offset = 0;
|
||||
u_int16_t radio_len;
|
||||
u_int16_t fc;
|
||||
u_int16_t type;
|
||||
u_int16_t type = 0;
|
||||
int wifi_len = 0;
|
||||
int llc_off;
|
||||
int pyld_eth_len = 0;
|
||||
int check;
|
||||
u_int64_t time;
|
||||
u_int16_t ip_offset, ip_len, ip6_offset;
|
||||
u_int16_t ip_offset = 0, ip_len;
|
||||
u_int16_t frag_off = 0, vlan_id = 0;
|
||||
u_int8_t proto = 0;
|
||||
u_int32_t label;
|
||||
@@ -584,7 +607,7 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
|
||||
datalink_check:
|
||||
switch(datalink_type) {
|
||||
case DLT_NULL :
|
||||
case DLT_NULL:
|
||||
if(ntohl(*((u_int32_t*)&packet[eth_offset])) == 2)
|
||||
type = ETH_P_IP;
|
||||
else
|
||||
@@ -608,7 +631,7 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
break;
|
||||
|
||||
/* IEEE 802.3 Ethernet - 1 */
|
||||
case DLT_EN10MB :
|
||||
case DLT_EN10MB:
|
||||
ethernet = (struct ndpi_ethhdr *) &packet[eth_offset];
|
||||
ip_offset = sizeof(struct ndpi_ethhdr) + eth_offset;
|
||||
check = ntohs(ethernet->h_proto);
|
||||
@@ -619,30 +642,34 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
type = check;
|
||||
|
||||
if(pyld_eth_len != 0) {
|
||||
llc = (struct ndpi_llc_header_snap *)(&packet[ip_offset]);
|
||||
/* check for LLC layer with SNAP extension */
|
||||
if(packet[ip_offset] == SNAP) {
|
||||
llc = (struct ndpi_llc_header *)(&packet[ip_offset]);
|
||||
if(llc->dsap == SNAP || llc->ssap == SNAP) {
|
||||
type = llc->snap.proto_ID;
|
||||
ip_offset += + 8;
|
||||
}
|
||||
/* No SNAP extension - Spanning Tree pkt must be discarted */
|
||||
else if(llc->dsap == BSTP || llc->ssap == BSTP) {
|
||||
goto v4_warning;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
/* Linux Cooked Capture - 113 */
|
||||
case DLT_LINUX_SLL :
|
||||
case DLT_LINUX_SLL:
|
||||
type = (packet[eth_offset+14] << 8) + packet[eth_offset+15];
|
||||
ip_offset = 16 + eth_offset;
|
||||
break;
|
||||
|
||||
/* Radiotap link-layer - 127 */
|
||||
case DLT_IEEE802_11_RADIO :
|
||||
case DLT_IEEE802_11_RADIO:
|
||||
radiotap = (struct ndpi_radiotap_header *) &packet[eth_offset];
|
||||
radio_len = radiotap->len;
|
||||
|
||||
/* Check Bad FCS presence */
|
||||
if((radiotap->flags & BAD_FCS) == BAD_FCS) {
|
||||
workflow->stats.total_discarded_bytes += header->len;
|
||||
return;
|
||||
return(nproto);
|
||||
}
|
||||
|
||||
/* Calculate 802.11 header length (variable) */
|
||||
@@ -658,12 +685,12 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
break;
|
||||
|
||||
/* Check ether_type from LLC */
|
||||
llc = (struct ndpi_llc_header*)(packet + eth_offset + wifi_len + radio_len);
|
||||
llc = (struct ndpi_llc_header_snap*)(packet + eth_offset + wifi_len + radio_len);
|
||||
if(llc->dsap == SNAP)
|
||||
type = ntohs(llc->snap.proto_ID);
|
||||
|
||||
/* Set IP header offset */
|
||||
ip_offset = wifi_len + radio_len + sizeof(struct ndpi_llc_header) + eth_offset;
|
||||
ip_offset = wifi_len + radio_len + sizeof(struct ndpi_llc_header_snap) + eth_offset;
|
||||
break;
|
||||
|
||||
case DLT_RAW:
|
||||
@@ -672,37 +699,43 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
|
||||
default:
|
||||
/* printf("Unknown datalink %d\n", datalink_type); */
|
||||
return;
|
||||
return(nproto);
|
||||
}
|
||||
|
||||
/* check ether type */
|
||||
switch(type) {
|
||||
case VLAN:
|
||||
case VLAN:
|
||||
vlan_id = ((packet[ip_offset] << 8) + packet[ip_offset+1]) & 0xFFF;
|
||||
type = (packet[ip_offset+2] << 8) + packet[ip_offset+3];
|
||||
ip_offset += 4;
|
||||
vlan_packet = 1;
|
||||
// double tagging for 802.1Q
|
||||
if(type == 0x8100) {
|
||||
vlan_id = ((packet[ip_offset] << 8) + packet[ip_offset+1]) & 0xFFF;
|
||||
type = (packet[ip_offset+2] << 8) + packet[ip_offset+3];
|
||||
ip_offset += 4;
|
||||
vlan_packet = 1;
|
||||
break;
|
||||
case MPLS_UNI:
|
||||
case MPLS_MULTI:
|
||||
mpls = (struct ndpi_mpls_header *) &packet[ip_offset];
|
||||
label = ntohl(mpls->label);
|
||||
/* label = ntohl(*((u_int32_t*)&packet[ip_offset])); */
|
||||
workflow->stats.mpls_count++;
|
||||
type = ETH_P_IP, ip_offset += 4;
|
||||
}
|
||||
break;
|
||||
case MPLS_UNI:
|
||||
case MPLS_MULTI:
|
||||
mpls = (struct ndpi_mpls_header *) &packet[ip_offset];
|
||||
label = ntohl(mpls->label);
|
||||
/* label = ntohl(*((u_int32_t*)&packet[ip_offset])); */
|
||||
workflow->stats.mpls_count++;
|
||||
type = ETH_P_IP, ip_offset += 4;
|
||||
|
||||
while((label & 0x100) != 0x100) {
|
||||
ip_offset += 4;
|
||||
label = ntohl(mpls->label);
|
||||
}
|
||||
break;
|
||||
case PPPoE:
|
||||
workflow->stats.pppoe_count++;
|
||||
type = ETH_P_IP;
|
||||
ip_offset += 8;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
while((label & 0x100) != 0x100) {
|
||||
ip_offset += 4;
|
||||
label = ntohl(mpls->label);
|
||||
}
|
||||
break;
|
||||
case PPPoE:
|
||||
workflow->stats.pppoe_count++;
|
||||
type = ETH_P_IP;
|
||||
ip_offset += 8;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
workflow->stats.vlan_count += vlan_packet;
|
||||
@@ -721,40 +754,40 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
|
||||
if(cap_warning_used == 0) {
|
||||
if(!workflow->prefs.quiet_mode)
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_DEBUG, "\n\nWARNING: packet capture size is smaller than packet size, DETECTION MIGHT NOT WORK CORRECTLY\n\n");
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_DEBUG, "\n\nWARNING: packet capture size is smaller than packet size, DETECTION MIGHT NOT WORK CORRECTLY\n\n");
|
||||
cap_warning_used = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(iph->version == 4) {
|
||||
ip_len = ((u_short)iph->ihl * 4);
|
||||
if(iph->version == IPVERSION) {
|
||||
ip_len = ((u_int16_t)iph->ihl * 4);
|
||||
iph6 = NULL;
|
||||
|
||||
if(iph->protocol == 41) {
|
||||
if(iph->protocol == IPPROTO_IPV6) {
|
||||
ip_offset += ip_len;
|
||||
goto iph_check;
|
||||
}
|
||||
|
||||
if((frag_off & 0x3FFF) != 0) {
|
||||
if((frag_off & 0x1FFF) != 0) {
|
||||
static u_int8_t ipv4_frags_warning_used = 0;
|
||||
workflow->stats.fragmented_count++;
|
||||
|
||||
if(ipv4_frags_warning_used == 0) {
|
||||
if(!workflow->prefs.quiet_mode)
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_DEBUG, "\n\nWARNING: IPv4 fragments are not handled by this demo (nDPI supports them)\n");
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_DEBUG, "\n\nWARNING: IPv4 fragments are not handled by this demo (nDPI supports them)\n");
|
||||
ipv4_frags_warning_used = 1;
|
||||
}
|
||||
|
||||
workflow->stats.total_discarded_bytes += header->len;
|
||||
return;
|
||||
return(nproto);
|
||||
}
|
||||
} else if(iph->version == 6) {
|
||||
iph6 = (struct ndpi_ipv6hdr *)&packet[ip_offset];
|
||||
proto = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt;
|
||||
ip_len = sizeof(struct ndpi_ipv6hdr);
|
||||
|
||||
if(proto == 0x3C /* IPv6 destination option */) {
|
||||
if(proto == IPPROTO_DSTOPTS /* IPv6 destination option */) {
|
||||
|
||||
u_int8_t *options = (u_int8_t*)&packet[ip_offset+ip_len];
|
||||
proto = options[0];
|
||||
@@ -768,11 +801,11 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
v4_warning:
|
||||
if(ipv4_warning_used == 0) {
|
||||
if(!workflow->prefs.quiet_mode)
|
||||
NDPI_LOG(0, workflow.ndpi_struct, NDPI_LOG_DEBUG, "\n\nWARNING: only IPv4/IPv6 packets are supported in this demo (nDPI supports both IPv4 and IPv6), all other packets will be discarded\n\n");
|
||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_DEBUG, "\n\nWARNING: only IPv4/IPv6 packets are supported in this demo (nDPI supports both IPv4 and IPv6), all other packets will be discarded\n\n");
|
||||
ipv4_warning_used = 1;
|
||||
}
|
||||
workflow->stats.total_discarded_bytes += header->len;
|
||||
return;
|
||||
return(nproto);
|
||||
}
|
||||
|
||||
if(workflow->prefs.decode_tunnels && (proto == IPPROTO_UDP)) {
|
||||
@@ -795,7 +828,7 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
|
||||
iph = (struct ndpi_iphdr *) &packet[ip_offset];
|
||||
|
||||
if(iph->version != 4) {
|
||||
if(iph->version != IPVERSION) {
|
||||
// printf("WARNING: not good (packet_id=%u)!\n", (unsigned int)workflow->stats.raw_packet_count);
|
||||
goto v4_warning;
|
||||
}
|
||||
@@ -831,7 +864,7 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
offset += tag_len;
|
||||
|
||||
if(offset >= header->caplen)
|
||||
return; /* Invalid packet */
|
||||
return(nproto); /* Invalid packet */
|
||||
else {
|
||||
eth_offset = offset;
|
||||
goto datalink_check;
|
||||
@@ -842,6 +875,56 @@ void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
}
|
||||
|
||||
/* process the packet */
|
||||
packet_processing(workflow, time, vlan_id, iph, iph6,
|
||||
ip_offset, header->len - ip_offset, header->len);
|
||||
return(packet_processing(workflow, time, vlan_id, iph, iph6,
|
||||
ip_offset, header->caplen - ip_offset, header->caplen));
|
||||
}
|
||||
|
||||
/* ********************************************************** */
|
||||
/* http://home.thep.lu.se/~bjorn/crc/crc32_fast.c */
|
||||
/* ********************************************************** */
|
||||
|
||||
static uint32_t crc32_for_byte(uint32_t r) {
|
||||
int j;
|
||||
for(j = 0; j < 8; ++j)
|
||||
r = (r & 1? 0: (uint32_t)0xEDB88320L) ^ r >> 1;
|
||||
return r ^ (uint32_t)0xFF000000L;
|
||||
}
|
||||
|
||||
/* Any unsigned integer type with at least 32 bits may be used as
|
||||
* accumulator type for fast crc32-calulation, but unsigned long is
|
||||
* probably the optimal choice for most systems. */
|
||||
typedef unsigned long accum_t;
|
||||
|
||||
static void init_tables(uint32_t* table, uint32_t* wtable) {
|
||||
size_t i, j, k, w;
|
||||
for(i = 0; i < 0x100; ++i)
|
||||
table[i] = crc32_for_byte(i);
|
||||
for(k = 0; k < sizeof(accum_t); ++k)
|
||||
for(i = 0; i < 0x100; ++i) {
|
||||
for(j = w = 0; j < sizeof(accum_t); ++j)
|
||||
w = table[(uint8_t)(j == k? w ^ i: w)] ^ w >> 8;
|
||||
wtable[(k << 8) + i] = w ^ (k? wtable[0]: 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void __crc32(const void* data, size_t n_bytes, uint32_t* crc) {
|
||||
static uint32_t table[0x100], wtable[0x100*sizeof(accum_t)];
|
||||
size_t n_accum = n_bytes/sizeof(accum_t);
|
||||
size_t i, j;
|
||||
if(!*table)
|
||||
init_tables(table, wtable);
|
||||
for(i = 0; i < n_accum; ++i) {
|
||||
accum_t a = *crc ^ ((accum_t*)data)[i];
|
||||
for(j = *crc = 0; j < sizeof(accum_t); ++j)
|
||||
*crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)];
|
||||
}
|
||||
for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
|
||||
*crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8;
|
||||
}
|
||||
|
||||
u_int32_t ethernet_crc32(const void* data, size_t n_bytes) {
|
||||
u_int32_t crc = 0;
|
||||
__crc32(data, n_bytes, &crc);
|
||||
return crc;
|
||||
}
|
||||
|
||||
|
||||
+38
-19
@@ -26,7 +26,6 @@
|
||||
*
|
||||
* WARNING: this API is unstable! Use it at your own risk!
|
||||
*/
|
||||
|
||||
#ifndef __NDPI_UTIL_H__
|
||||
#define __NDPI_UTIL_H__
|
||||
|
||||
@@ -39,15 +38,20 @@
|
||||
#define NUM_ROOTS 512
|
||||
#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
|
||||
|
||||
// flow tracking
|
||||
typedef struct ndpi_flow_info {
|
||||
u_int32_t hashval;
|
||||
u_int32_t lower_ip;
|
||||
u_int32_t upper_ip;
|
||||
u_int16_t lower_port;
|
||||
u_int16_t upper_port;
|
||||
u_int8_t detection_completed, protocol;
|
||||
u_int8_t detection_completed, protocol, bidirectional;
|
||||
u_int16_t vlan_id;
|
||||
struct ndpi_flow_struct *ndpi_flow;
|
||||
char lower_name[48], upper_name[48];
|
||||
@@ -55,20 +59,23 @@ typedef struct ndpi_flow_info {
|
||||
u_int64_t last_seen;
|
||||
u_int64_t bytes;
|
||||
u_int32_t 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_certificate[48], server_certificate[48];
|
||||
} ssl;
|
||||
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;
|
||||
@@ -84,6 +91,8 @@ typedef struct ndpi_stats {
|
||||
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;
|
||||
@@ -92,9 +101,12 @@ typedef struct ndpi_workflow_prefs {
|
||||
} 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;
|
||||
|
||||
@@ -114,38 +126,45 @@ typedef struct ndpi_workflow {
|
||||
struct ndpi_detection_module_struct *ndpi_struct;
|
||||
} 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. */
|
||||
void ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
||||
const struct pcap_pkthdr *header,
|
||||
const u_char *packet);
|
||||
|
||||
/* flow callbacks: 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) {
|
||||
/* 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;
|
||||
}
|
||||
|
||||
static inline void ndpi_workflow_set_flow_giveup_callback(struct ndpi_workflow * workflow,
|
||||
ndpi_workflow_callback_ptr callback,
|
||||
void * 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);
|
||||
#endif
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ tcp:3000@ntop
|
||||
# Format:
|
||||
# host:"<value>",host:"<value>",.....@<subproto>
|
||||
|
||||
host:"googlesyndacation.com"@Google
|
||||
host:"googlesyndication.com"@Google
|
||||
host:"venere.com"@Venere
|
||||
host:"kataweb.it",host:"repubblica.it"@Repubblica
|
||||
host:"ntop"@ntop
|
||||
|
||||
+1096
File diff suppressed because it is too large
Load Diff
+7
-1
@@ -29,6 +29,7 @@ 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
|
||||
@@ -40,9 +41,14 @@ 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_free
|
||||
set_ndpi_debug_function
|
||||
set_ndpi_debug_function
|
||||
ndpi_category_str
|
||||
ndpi_get_proto_category
|
||||
ndpi_netbios_name_interpret
|
||||
+270
-117
@@ -19,10 +19,10 @@
|
||||
# is necessary on AIX to use the special cc_r compiler alias.)
|
||||
#
|
||||
# NOTE: You are assumed to not only compile your program with these flags,
|
||||
# but also link it with them as well. e.g. you should link with
|
||||
# but also to link with them as well. For example, you might link with
|
||||
# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
|
||||
#
|
||||
# If you are only building threads programs, you may wish to use these
|
||||
# If you are only building threaded programs, you may wish to use these
|
||||
# variables in your default LIBS, CFLAGS, and CC:
|
||||
#
|
||||
# LIBS="$PTHREAD_LIBS $LIBS"
|
||||
@@ -30,8 +30,8 @@
|
||||
# CC="$PTHREAD_CC"
|
||||
#
|
||||
# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
|
||||
# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
|
||||
# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
|
||||
# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
|
||||
# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
|
||||
#
|
||||
# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
|
||||
# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
|
||||
@@ -82,35 +82,40 @@
|
||||
# modified version of the Autoconf Macro, you may extend this special
|
||||
# exception to the GPL to apply to your modified version as well.
|
||||
|
||||
#serial 21
|
||||
#serial 23
|
||||
|
||||
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
|
||||
AC_DEFUN([AX_PTHREAD], [
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
AC_LANG_PUSH([C])
|
||||
ax_pthread_ok=no
|
||||
|
||||
# We used to check for pthread.h first, but this fails if pthread.h
|
||||
# requires special compiler flags (e.g. on True64 or Sequent).
|
||||
# requires special compiler flags (e.g. on Tru64 or Sequent).
|
||||
# It gets checked for in the link test anyway.
|
||||
|
||||
# First of all, check if the user has set any of the PTHREAD_LIBS,
|
||||
# etcetera environment variables, and if threads linking works using
|
||||
# them:
|
||||
if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
|
||||
save_CFLAGS="$CFLAGS"
|
||||
if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
|
||||
ax_pthread_save_CC="$CC"
|
||||
ax_pthread_save_CFLAGS="$CFLAGS"
|
||||
ax_pthread_save_LIBS="$LIBS"
|
||||
AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
|
||||
AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
|
||||
AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
|
||||
AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
|
||||
AC_MSG_RESULT([$ax_pthread_ok])
|
||||
if test x"$ax_pthread_ok" = xno; then
|
||||
if test "x$ax_pthread_ok" = "xno"; then
|
||||
PTHREAD_LIBS=""
|
||||
PTHREAD_CFLAGS=""
|
||||
fi
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CC="$ax_pthread_save_CC"
|
||||
CFLAGS="$ax_pthread_save_CFLAGS"
|
||||
LIBS="$ax_pthread_save_LIBS"
|
||||
fi
|
||||
|
||||
# We must check for the threads library under a number of different
|
||||
@@ -123,7 +128,7 @@ fi
|
||||
# which indicates that we try without any flags at all, and "pthread-config"
|
||||
# which is a program returning the flags for the Pth emulation library.
|
||||
|
||||
ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
|
||||
ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
|
||||
|
||||
# The ordering *is* (sometimes) important. Some notes on the
|
||||
# individual items follow:
|
||||
@@ -132,82 +137,225 @@ ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mt
|
||||
# none: in case threads are in libc; should be tried before -Kthread and
|
||||
# other compiler flags to prevent continual compiler warnings
|
||||
# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
|
||||
# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
|
||||
# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
|
||||
# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
|
||||
# -pthreads: Solaris/gcc
|
||||
# -mthreads: Mingw32/gcc, Lynx/gcc
|
||||
# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
|
||||
# (Note: HP C rejects this with "bad form for `-t' option")
|
||||
# -pthreads: Solaris/gcc (Note: HP C also rejects)
|
||||
# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
|
||||
# doesn't hurt to check since this sometimes defines pthreads too;
|
||||
# also defines -D_REENTRANT)
|
||||
# ... -mt is also the pthreads flag for HP/aCC
|
||||
# doesn't hurt to check since this sometimes defines pthreads and
|
||||
# -D_REENTRANT too), HP C (must be checked before -lpthread, which
|
||||
# is present but should not be used directly; and before -mthreads,
|
||||
# because the compiler interprets this as "-mt" + "-hreads")
|
||||
# -mthreads: Mingw32/gcc, Lynx/gcc
|
||||
# pthread: Linux, etcetera
|
||||
# --thread-safe: KAI C++
|
||||
# pthread-config: use pthread-config program (for GNU Pth library)
|
||||
|
||||
case ${host_os} in
|
||||
case $host_os in
|
||||
|
||||
freebsd*)
|
||||
|
||||
# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
|
||||
# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
|
||||
|
||||
ax_pthread_flags="-kthread lthread $ax_pthread_flags"
|
||||
;;
|
||||
|
||||
hpux*)
|
||||
|
||||
# From the cc(1) man page: "[-mt] Sets various -D flags to enable
|
||||
# multi-threading and also sets -lpthread."
|
||||
|
||||
ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
|
||||
;;
|
||||
|
||||
openedition*)
|
||||
|
||||
# IBM z/OS requires a feature-test macro to be defined in order to
|
||||
# enable POSIX threads at all, so give the user a hint if this is
|
||||
# not set. (We don't define these ourselves, as they can affect
|
||||
# other portions of the system API in unpredictable ways.)
|
||||
|
||||
AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
|
||||
[
|
||||
# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
|
||||
AX_PTHREAD_ZOS_MISSING
|
||||
# endif
|
||||
],
|
||||
[AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
|
||||
# On Solaris (at least, for some versions), libc contains stubbed
|
||||
# (non-functional) versions of the pthreads routines, so link-based
|
||||
# tests will erroneously succeed. (We need to link with -pthreads/-mt/
|
||||
# -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
|
||||
# a function called by this macro, so we could check for that, but
|
||||
# who knows whether they'll stub that too in a future libc.) So,
|
||||
# we'll just look for -pthreads and -lpthread first:
|
||||
# tests will erroneously succeed. (N.B.: The stubs are missing
|
||||
# pthread_cleanup_push, or rather a function called by this macro,
|
||||
# so we could check for that, but who knows whether they'll stub
|
||||
# that too in a future libc.) So we'll check first for the
|
||||
# standard Solaris way of linking pthreads (-mt -lpthread).
|
||||
|
||||
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
|
||||
;;
|
||||
|
||||
darwin*)
|
||||
ax_pthread_flags="-pthread $ax_pthread_flags"
|
||||
ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Clang doesn't consider unrecognized options an error unless we specify
|
||||
# -Werror. We throw in some extra Clang-specific options to ensure that
|
||||
# this doesn't happen for GCC, which also accepts -Werror.
|
||||
# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
|
||||
|
||||
AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
|
||||
save_CFLAGS="$CFLAGS"
|
||||
ax_pthread_extra_flags="-Werror"
|
||||
CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[ax_pthread_extra_flags=
|
||||
AC_MSG_RESULT([no])])
|
||||
CFLAGS="$save_CFLAGS"
|
||||
AS_IF([test "x$GCC" = "xyes"],
|
||||
[ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
|
||||
|
||||
if test x"$ax_pthread_ok" = xno; then
|
||||
for flag in $ax_pthread_flags; do
|
||||
# The presence of a feature test macro requesting re-entrant function
|
||||
# definitions is, on some systems, a strong hint that pthreads support is
|
||||
# correctly enabled
|
||||
|
||||
case $flag in
|
||||
case $host_os in
|
||||
darwin* | hpux* | linux* | osf* | solaris*)
|
||||
ax_pthread_check_macro="_REENTRANT"
|
||||
;;
|
||||
|
||||
aix*)
|
||||
ax_pthread_check_macro="_THREAD_SAFE"
|
||||
;;
|
||||
|
||||
*)
|
||||
ax_pthread_check_macro="--"
|
||||
;;
|
||||
esac
|
||||
AS_IF([test "x$ax_pthread_check_macro" = "x--"],
|
||||
[ax_pthread_check_cond=0],
|
||||
[ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
|
||||
|
||||
# Are we compiling with Clang?
|
||||
|
||||
AC_CACHE_CHECK([whether $CC is Clang],
|
||||
[ax_cv_PTHREAD_CLANG],
|
||||
[ax_cv_PTHREAD_CLANG=no
|
||||
# Note that Autoconf sets GCC=yes for Clang as well as GCC
|
||||
if test "x$GCC" = "xyes"; then
|
||||
AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
|
||||
[/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
|
||||
# if defined(__clang__) && defined(__llvm__)
|
||||
AX_PTHREAD_CC_IS_CLANG
|
||||
# endif
|
||||
],
|
||||
[ax_cv_PTHREAD_CLANG=yes])
|
||||
fi
|
||||
])
|
||||
ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
|
||||
|
||||
ax_pthread_clang_warning=no
|
||||
|
||||
# Clang needs special handling, because older versions handle the -pthread
|
||||
# option in a rather... idiosyncratic way
|
||||
|
||||
if test "x$ax_pthread_clang" = "xyes"; then
|
||||
|
||||
# Clang takes -pthread; it has never supported any other flag
|
||||
|
||||
# (Note 1: This will need to be revisited if a system that Clang
|
||||
# supports has POSIX threads in a separate library. This tends not
|
||||
# to be the way of modern systems, but it's conceivable.)
|
||||
|
||||
# (Note 2: On some systems, notably Darwin, -pthread is not needed
|
||||
# to get POSIX threads support; the API is always present and
|
||||
# active. We could reasonably leave PTHREAD_CFLAGS empty. But
|
||||
# -pthread does define _REENTRANT, and while the Darwin headers
|
||||
# ignore this macro, third-party headers might not.)
|
||||
|
||||
PTHREAD_CFLAGS="-pthread"
|
||||
PTHREAD_LIBS=
|
||||
|
||||
ax_pthread_ok=yes
|
||||
|
||||
# However, older versions of Clang make a point of warning the user
|
||||
# that, in an invocation where only linking and no compilation is
|
||||
# taking place, the -pthread option has no effect ("argument unused
|
||||
# during compilation"). They expect -pthread to be passed in only
|
||||
# when source code is being compiled.
|
||||
#
|
||||
# Problem is, this is at odds with the way Automake and most other
|
||||
# C build frameworks function, which is that the same flags used in
|
||||
# compilation (CFLAGS) are also used in linking. Many systems
|
||||
# supported by AX_PTHREAD require exactly this for POSIX threads
|
||||
# support, and in fact it is often not straightforward to specify a
|
||||
# flag that is used only in the compilation phase and not in
|
||||
# linking. Such a scenario is extremely rare in practice.
|
||||
#
|
||||
# Even though use of the -pthread flag in linking would only print
|
||||
# a warning, this can be a nuisance for well-run software projects
|
||||
# that build with -Werror. So if the active version of Clang has
|
||||
# this misfeature, we search for an option to squash it.
|
||||
|
||||
AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
|
||||
[ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
|
||||
[ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
|
||||
# Create an alternate version of $ac_link that compiles and
|
||||
# links in two steps (.c -> .o, .o -> exe) instead of one
|
||||
# (.c -> exe), because the warning occurs only in the second
|
||||
# step
|
||||
ax_pthread_save_ac_link="$ac_link"
|
||||
ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
|
||||
ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
|
||||
ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
|
||||
ax_pthread_save_CFLAGS="$CFLAGS"
|
||||
for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
|
||||
AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
|
||||
CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
|
||||
ac_link="$ax_pthread_save_ac_link"
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
|
||||
[ac_link="$ax_pthread_2step_ac_link"
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
|
||||
[break])
|
||||
])
|
||||
done
|
||||
ac_link="$ax_pthread_save_ac_link"
|
||||
CFLAGS="$ax_pthread_save_CFLAGS"
|
||||
AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
|
||||
ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
|
||||
])
|
||||
|
||||
case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
|
||||
no | unknown) ;;
|
||||
*) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
|
||||
esac
|
||||
|
||||
fi # $ax_pthread_clang = yes
|
||||
|
||||
if test "x$ax_pthread_ok" = "xno"; then
|
||||
for ax_pthread_try_flag in $ax_pthread_flags; do
|
||||
|
||||
case $ax_pthread_try_flag in
|
||||
none)
|
||||
AC_MSG_CHECKING([whether pthreads work without any flags])
|
||||
;;
|
||||
|
||||
-mt,pthread)
|
||||
AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
|
||||
PTHREAD_CFLAGS="-mt"
|
||||
PTHREAD_LIBS="-lpthread"
|
||||
;;
|
||||
|
||||
-*)
|
||||
AC_MSG_CHECKING([whether pthreads work with $flag])
|
||||
PTHREAD_CFLAGS="$flag"
|
||||
AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
|
||||
PTHREAD_CFLAGS="$ax_pthread_try_flag"
|
||||
;;
|
||||
|
||||
pthread-config)
|
||||
AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
|
||||
if test x"$ax_pthread_config" = xno; then continue; fi
|
||||
AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
|
||||
PTHREAD_CFLAGS="`pthread-config --cflags`"
|
||||
PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_MSG_CHECKING([for the pthreads library -l$flag])
|
||||
PTHREAD_LIBS="-l$flag"
|
||||
AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
|
||||
PTHREAD_LIBS="-l$ax_pthread_try_flag"
|
||||
;;
|
||||
esac
|
||||
|
||||
save_LIBS="$LIBS"
|
||||
save_CFLAGS="$CFLAGS"
|
||||
ax_pthread_save_CFLAGS="$CFLAGS"
|
||||
ax_pthread_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
|
||||
|
||||
# Check for various functions. We must include pthread.h,
|
||||
# since some functions may be macros. (On the Sequent, we
|
||||
@@ -218,7 +366,11 @@ for flag in $ax_pthread_flags; do
|
||||
# pthread_cleanup_push because it is one of the few pthread
|
||||
# functions on Solaris that doesn't have a non-functional libc stub.
|
||||
# We try pthread_create on general principles.
|
||||
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
|
||||
# if $ax_pthread_check_cond
|
||||
# error "$ax_pthread_check_macro must be defined"
|
||||
# endif
|
||||
static void routine(void *a) { a = 0; }
|
||||
static void *start_routine(void *a) { return a; }],
|
||||
[pthread_t th; pthread_attr_t attr;
|
||||
@@ -227,16 +379,14 @@ for flag in $ax_pthread_flags; do
|
||||
pthread_attr_init(&attr);
|
||||
pthread_cleanup_push(routine, 0);
|
||||
pthread_cleanup_pop(0) /* ; */])],
|
||||
[ax_pthread_ok=yes],
|
||||
[])
|
||||
[ax_pthread_ok=yes],
|
||||
[])
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CFLAGS="$ax_pthread_save_CFLAGS"
|
||||
LIBS="$ax_pthread_save_LIBS"
|
||||
|
||||
AC_MSG_RESULT([$ax_pthread_ok])
|
||||
if test "x$ax_pthread_ok" = xyes; then
|
||||
break;
|
||||
fi
|
||||
AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
|
||||
|
||||
PTHREAD_LIBS=""
|
||||
PTHREAD_CFLAGS=""
|
||||
@@ -244,71 +394,74 @@ done
|
||||
fi
|
||||
|
||||
# Various other checks:
|
||||
if test "x$ax_pthread_ok" = xyes; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
save_CFLAGS="$CFLAGS"
|
||||
if test "x$ax_pthread_ok" = "xyes"; then
|
||||
ax_pthread_save_CFLAGS="$CFLAGS"
|
||||
ax_pthread_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
|
||||
# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
|
||||
AC_MSG_CHECKING([for joinable pthread attribute])
|
||||
attr_name=unknown
|
||||
for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
|
||||
[int attr = $attr; return attr /* ; */])],
|
||||
[attr_name=$attr; break],
|
||||
[])
|
||||
done
|
||||
AC_MSG_RESULT([$attr_name])
|
||||
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
|
||||
AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
|
||||
[Define to necessary symbol if this constant
|
||||
uses a non-standard name on your system.])
|
||||
fi
|
||||
AC_CACHE_CHECK([for joinable pthread attribute],
|
||||
[ax_cv_PTHREAD_JOINABLE_ATTR],
|
||||
[ax_cv_PTHREAD_JOINABLE_ATTR=unknown
|
||||
for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
|
||||
[int attr = $ax_pthread_attr; return attr /* ; */])],
|
||||
[ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
|
||||
[])
|
||||
done
|
||||
])
|
||||
AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
|
||||
test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
|
||||
test "x$ax_pthread_joinable_attr_defined" != "xyes"],
|
||||
[AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
|
||||
[$ax_cv_PTHREAD_JOINABLE_ATTR],
|
||||
[Define to necessary symbol if this constant
|
||||
uses a non-standard name on your system.])
|
||||
ax_pthread_joinable_attr_defined=yes
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([if more special flags are required for pthreads])
|
||||
flag=no
|
||||
case ${host_os} in
|
||||
aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
|
||||
osf* | hpux*) flag="-D_REENTRANT";;
|
||||
solaris*)
|
||||
if test "$GCC" = "yes"; then
|
||||
flag="-D_REENTRANT"
|
||||
else
|
||||
# TODO: What about Clang on Solaris?
|
||||
flag="-mt -D_REENTRANT"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$flag])
|
||||
if test "x$flag" != xno; then
|
||||
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
|
||||
fi
|
||||
AC_CACHE_CHECK([whether more special flags are required for pthreads],
|
||||
[ax_cv_PTHREAD_SPECIAL_FLAGS],
|
||||
[ax_cv_PTHREAD_SPECIAL_FLAGS=no
|
||||
case $host_os in
|
||||
solaris*)
|
||||
ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
|
||||
;;
|
||||
esac
|
||||
])
|
||||
AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
|
||||
test "x$ax_pthread_special_flags_added" != "xyes"],
|
||||
[PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
|
||||
ax_pthread_special_flags_added=yes])
|
||||
|
||||
AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
|
||||
[ax_cv_PTHREAD_PRIO_INHERIT], [
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
|
||||
[[int i = PTHREAD_PRIO_INHERIT;]])],
|
||||
[ax_cv_PTHREAD_PRIO_INHERIT=yes],
|
||||
[ax_cv_PTHREAD_PRIO_INHERIT=no])
|
||||
[ax_cv_PTHREAD_PRIO_INHERIT],
|
||||
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
|
||||
[[int i = PTHREAD_PRIO_INHERIT;]])],
|
||||
[ax_cv_PTHREAD_PRIO_INHERIT=yes],
|
||||
[ax_cv_PTHREAD_PRIO_INHERIT=no])
|
||||
])
|
||||
AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
|
||||
[AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
|
||||
AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
|
||||
test "x$ax_pthread_prio_inherit_defined" != "xyes"],
|
||||
[AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
|
||||
ax_pthread_prio_inherit_defined=yes
|
||||
])
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CFLAGS="$ax_pthread_save_CFLAGS"
|
||||
LIBS="$ax_pthread_save_LIBS"
|
||||
|
||||
# More AIX lossage: compile with *_r variant
|
||||
if test "x$GCC" != xyes; then
|
||||
if test "x$GCC" != "xyes"; then
|
||||
case $host_os in
|
||||
aix*)
|
||||
AS_CASE(["x/$CC"],
|
||||
[x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
|
||||
[#handle absolute path differently from PATH based program lookup
|
||||
AS_CASE(["x$CC"],
|
||||
[x/*],
|
||||
[AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
|
||||
[AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
|
||||
[x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
|
||||
[#handle absolute path differently from PATH based program lookup
|
||||
AS_CASE(["x$CC"],
|
||||
[x/*],
|
||||
[AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
|
||||
[AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -321,7 +474,7 @@ AC_SUBST([PTHREAD_CFLAGS])
|
||||
AC_SUBST([PTHREAD_CC])
|
||||
|
||||
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
|
||||
if test x"$ax_pthread_ok" = xyes; then
|
||||
if test "x$ax_pthread_ok" = "xyes"; then
|
||||
ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
|
||||
:
|
||||
else
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
class Ndpi < Formula
|
||||
desc "Deep Packet Inspection (DPI) library"
|
||||
homepage "http://www.ntop.org/products/ndpi/"
|
||||
url "https://downloads.sourceforge.net/project/ntop/nDPI/nDPI-1.7.tar.gz"
|
||||
sha256 "714b745103a072462130b0e14cf31b2eb5270f580b7c839da5cf5ea75150262d"
|
||||
url "https://downloads.sourceforge.net/project/ntop/nDPI/nDPI-1.8.tgz"
|
||||
sha256 "f490137a7387b69d0d55e990f2150b86d7b5eaae870e5326e8c2f18c17412443"
|
||||
|
||||
bottle do
|
||||
cellar :any
|
||||
sha256 "e9464d314479ba3e7a91422e0bc606cfd5f6e72e94d6441cc4fa30e9c925da5c" => :yosemite
|
||||
sha256 "1d6b1d860669b42766baa276ed948c342e2fa4fd28663ba64a90fd0e200ba9c4" => :mavericks
|
||||
sha256 "b814918b4fb9588de7126061ce4ac3eb41a5c3eee27c7432b669f6dc6921bfde" => :mountain_lion
|
||||
sha256 "05053767fc3c70557745c348c7352e7c2716c040ca54c5cf8d5306167c878fcb" => :el_capitan
|
||||
sha256 "34c0269039a0079820eeed862daa28158d9291f73f640a9415da60746d69a662" => :yosemite
|
||||
sha256 "a2af4dc62c24313593b3a20e45ca9d2d49f8efc0ea5e52fd064001ea441b93e4" => :mavericks
|
||||
sha256 "1bb200268a4d9df9bbe5d33bc773ee3bcf4b5d4fa00c76a040f16318438c284f" => :mountain_lion
|
||||
end
|
||||
|
||||
depends_on "autoconf" => :build
|
||||
@@ -17,6 +18,8 @@ class Ndpi < Formula
|
||||
depends_on "libtool" => :build
|
||||
depends_on "json-c"
|
||||
|
||||
head "https://github.com/ntop/nDPI.git", :branch => "dev"
|
||||
|
||||
def install
|
||||
system "./autogen.sh"
|
||||
system "./configure", "--prefix=#{prefix}"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#
|
||||
# debian/compat
|
||||
# We should use at least comparibily version 5
|
||||
# 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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
library_includedir=$(includedir)/libndpi-1.4/libndpi
|
||||
library_includedir=$(includedir)/libndpi-@VERSION@/libndpi
|
||||
|
||||
library_include_HEADERS = ndpi_api.h \
|
||||
ndpi_define.h \
|
||||
|
||||
+52
-65
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ndpi_api.h
|
||||
*
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
* 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
|
||||
@@ -31,6 +31,9 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#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 )
|
||||
|
||||
@@ -79,8 +82,9 @@ extern "C" {
|
||||
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
|
||||
@@ -122,7 +126,7 @@ extern "C" {
|
||||
* @return the initialized detection module
|
||||
*
|
||||
*/
|
||||
struct ndpi_detection_module_struct *ndpi_init_detection_module();
|
||||
struct ndpi_detection_module_struct *ndpi_init_detection_module(void);
|
||||
|
||||
/**
|
||||
* Frees the memory allocated in the specified flow
|
||||
@@ -224,52 +228,6 @@ extern "C" {
|
||||
struct ndpi_id_struct *src,
|
||||
struct ndpi_id_struct *dst);
|
||||
|
||||
|
||||
/**
|
||||
* Processes one packet of L4 and returns the ID of the detected protocol.
|
||||
* L3 and L4 packet headers are passed in the arguments while payload
|
||||
* points to the L4 body.
|
||||
* This function mimics ndpi_detection_process_packet behaviour.
|
||||
*
|
||||
* @par ndpi_struct = the detection module
|
||||
* @par flow = pointer to the connection state machine
|
||||
* @par iph = IP packet header for IPv4 or NULL
|
||||
* @par iph6 = IP packet header for IPv6 or NULL
|
||||
* @par tcp = TCP packet header for TCP or NULL
|
||||
* @par udp = UDP packet header for UDP or NULL
|
||||
* @par src_to_dst_direction = order of src/dst state machines in a flow.
|
||||
* @par l4_proto = L4 protocol of the packet.
|
||||
* @par src = pointer to the source subscriber state machine
|
||||
* @par dst = pointer to the destination subscriber state machine
|
||||
* @par sport = source port of L4 packet, used for protocol guessing.
|
||||
* @par dport = destination port of L4 packet, used for protocol guessing.
|
||||
* @par current_tick_l = the current timestamp for the packet
|
||||
* @par payload = unsigned char pointer to the Layer 4 (TCP/UDP body)
|
||||
* @par payload_len = the length of the payload
|
||||
* @return the detected ID of the protocol
|
||||
*
|
||||
* NOTE: in a current implementation flow->src and flow->dst are swapped with
|
||||
* the src_to_dst_direction flag while ndpi_detection_process_packet does not swap
|
||||
* these values.
|
||||
*
|
||||
*/
|
||||
|
||||
ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
const struct ndpi_iphdr *iph,
|
||||
struct ndpi_ipv6hdr *iph6,
|
||||
struct ndpi_tcphdr *tcp,
|
||||
struct ndpi_udphdr *udp,
|
||||
u_int8_t src_to_dst_direction,
|
||||
u_int8_t l4_proto,
|
||||
struct ndpi_id_struct *src,
|
||||
u_int16_t sport,
|
||||
struct ndpi_id_struct *dst,
|
||||
u_int16_t dport,
|
||||
const u_int64_t current_tick_l,
|
||||
u_int8_t *payload, u_int16_t payload_len);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Get the main protocol of the passed flows for the detected module
|
||||
@@ -301,20 +259,6 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
|
||||
u_int8_t *l4_protocol_return, u_int32_t flags);
|
||||
|
||||
|
||||
#if 0
|
||||
/**
|
||||
* returns true if the protocol history of the flow of the last packet given to the detection
|
||||
* contains the given protocol.
|
||||
*
|
||||
* @param ndpi_struct the detection module
|
||||
* @return 1 if protocol has been found, 0 otherwise
|
||||
*
|
||||
*/
|
||||
u_int8_t ndpi_detection_flow_protocol_history_contains_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int16_t protocol_id);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Search and return the protocol based on matched ports
|
||||
*
|
||||
@@ -431,6 +375,23 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
|
||||
*/
|
||||
char* ndpi_protocol2name(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol proto, char *buf, u_int buf_len);
|
||||
|
||||
/**
|
||||
* Get protocol category as string
|
||||
*
|
||||
* @par category = the category associated to the protocol
|
||||
* @return the string name of the category
|
||||
*
|
||||
*/
|
||||
const char* ndpi_category_str(ndpi_protocol_category_t category);
|
||||
|
||||
/**
|
||||
* 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
|
||||
@@ -588,7 +549,7 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
|
||||
* @return The requested automata, or NULL if an error occurred
|
||||
*
|
||||
*/
|
||||
void* ndpi_init_automa();
|
||||
void* ndpi_init_automa(void);
|
||||
|
||||
|
||||
/**
|
||||
@@ -605,6 +566,18 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
|
||||
*
|
||||
* @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.
|
||||
*
|
||||
*/
|
||||
@@ -631,10 +604,24 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
|
||||
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_debug_function(ndpi_debug_function_ptr ndpi_debug_printf);
|
||||
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);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -180,25 +180,22 @@
|
||||
#define NDPI_SOULSEEK_CONNECTION_IP_TICK_TIMEOUT 600
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
|
||||
#define NDPI_LOG(proto, mod, log_level, args...) \
|
||||
{ \
|
||||
if(mod != NULL) { \
|
||||
mod->ndpi_debug_print_file=__FILE__; \
|
||||
mod->ndpi_debug_print_function=__FUNCTION__; \
|
||||
mod->ndpi_debug_print_line=__LINE__; \
|
||||
mod->ndpi_debug_printf(proto, mod, log_level, args); \
|
||||
} \
|
||||
#define NDPI_LOG(proto, m, log_level, args...) \
|
||||
{ \
|
||||
struct ndpi_detection_module_struct *mod = (struct ndpi_detection_module_struct*) m; \
|
||||
if(mod != NULL) { \
|
||||
mod->ndpi_debug_print_file=__FILE__; \
|
||||
mod->ndpi_debug_print_function=__FUNCTION__; \
|
||||
mod->ndpi_debug_print_line=__LINE__; \
|
||||
(*(mod->ndpi_debug_printf))(proto, mod, log_level, args); \
|
||||
} \
|
||||
}
|
||||
|
||||
#else /* NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
|
||||
#ifdef WIN32
|
||||
#define NDPI_LOG(...) {}
|
||||
#else
|
||||
#define NDPI_LOG(proto, mod, log_level, args...) {}
|
||||
#endif
|
||||
|
||||
#endif /* NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
|
||||
/**
|
||||
|
||||
+69
-63
@@ -35,89 +35,95 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void *ndpi_tdelete(const void * __restrict, void ** __restrict,
|
||||
int (*)(const void *, const void *));
|
||||
void *ndpi_tfind(const void *, void *, int (*)(const void *, const void *));
|
||||
void *ndpi_tsearch(const void *, void**, int (*)(const void *, const void *));
|
||||
void ndpi_twalk(const void *, void (*)(const void *, ndpi_VISIT, int, void*), void *user_data);
|
||||
void ndpi_tdestroy(void *vrootp, void (*freefct)(void *));
|
||||
void *ndpi_tdelete(const void * __restrict, void ** __restrict,
|
||||
int (*)(const void *, const void *));
|
||||
void *ndpi_tfind(const void *, void *, int (*)(const void *, const void *));
|
||||
void *ndpi_tsearch(const void *, void**, int (*)(const void *, const void *));
|
||||
void ndpi_twalk(const void *, void (*)(const void *, ndpi_VISIT, int, void*), void *user_data);
|
||||
void ndpi_tdestroy(void *vrootp, void (*freefct)(void *));
|
||||
|
||||
int NDPI_BITMASK_COMPARE(NDPI_PROTOCOL_BITMASK a, NDPI_PROTOCOL_BITMASK b);
|
||||
int NDPI_BITMASK_IS_EMPTY(NDPI_PROTOCOL_BITMASK a);
|
||||
void NDPI_DUMP_BITMASK(NDPI_PROTOCOL_BITMASK a);
|
||||
int NDPI_BITMASK_COMPARE(NDPI_PROTOCOL_BITMASK a, NDPI_PROTOCOL_BITMASK b);
|
||||
int NDPI_BITMASK_IS_EMPTY(NDPI_PROTOCOL_BITMASK a);
|
||||
void NDPI_DUMP_BITMASK(NDPI_PROTOCOL_BITMASK a);
|
||||
|
||||
extern u_int8_t ndpi_net_match(u_int32_t ip_to_check,
|
||||
u_int32_t net,
|
||||
u_int32_t num_bits);
|
||||
extern u_int8_t ndpi_net_match(u_int32_t ip_to_check,
|
||||
u_int32_t net,
|
||||
u_int32_t num_bits);
|
||||
|
||||
extern u_int8_t ndpi_ips_match(u_int32_t src, u_int32_t dst,
|
||||
u_int32_t net, u_int32_t num_bits);
|
||||
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_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_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);
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
ndpi_port_range *tcpDefPorts, ndpi_port_range *udpDefPorts);
|
||||
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,
|
||||
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,
|
||||
ndpi_protocol_category_t protoCategory,
|
||||
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);
|
||||
extern void ndpi_int_reset_packet_protocol(struct ndpi_packet_struct *packet);
|
||||
extern void ndpi_int_reset_protocol(struct ndpi_flow_struct *flow);
|
||||
|
||||
extern int ndpi_packet_src_ip_eql(const struct ndpi_packet_struct *packet, const ndpi_ip_addr_t * ip);
|
||||
extern int ndpi_packet_dst_ip_eql(const struct ndpi_packet_struct *packet, const ndpi_ip_addr_t * ip);
|
||||
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 int ndpi_packet_src_ip_eql(const struct ndpi_packet_struct *packet, const ndpi_ip_addr_t * ip);
|
||||
extern int ndpi_packet_dst_ip_eql(const struct ndpi_packet_struct *packet, const ndpi_ip_addr_t * ip);
|
||||
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 char* ndpi_get_proto_by_id(struct ndpi_detection_module_struct *ndpi_mod, u_int id);
|
||||
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 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,
|
||||
u_int8_t proto, u_int16_t sport, u_int16_t dport);
|
||||
extern u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
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_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,
|
||||
u_int16_t** tcp_master_proto,
|
||||
u_int16_t** udp_master_proto);
|
||||
extern u_int8_t ndpi_is_proto(ndpi_protocol p, u_int16_t proto);
|
||||
|
||||
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,
|
||||
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
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
const char **file, const char **func, u_int32_t * line);
|
||||
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
const char **file, const char **func, u_int32_t * line);
|
||||
#endif
|
||||
|
||||
/** Checks when the @p payload starts with the string literal @p str.
|
||||
* When the string is larger than the payload, check fails.
|
||||
* @return non-zero if check succeeded
|
||||
*/
|
||||
int ndpi_match_prefix(const u_int8_t *payload, size_t payload_len,
|
||||
const char *str, size_t str_len);
|
||||
/** Checks when the @p payload starts with the string literal @p str.
|
||||
* When the string is larger than the payload, check fails.
|
||||
* @return non-zero if check succeeded
|
||||
*/
|
||||
int ndpi_match_prefix(const u_int8_t *payload, size_t payload_len,
|
||||
const char *str, size_t str_len);
|
||||
|
||||
/* version of ndpi_match_prefix with string literal */
|
||||
#define ndpi_match_strprefix(payload, payload_len, str) \
|
||||
/* version of ndpi_match_prefix with string literal */
|
||||
#define ndpi_match_strprefix(payload, payload_len, str) \
|
||||
ndpi_match_prefix((payload), (payload_len), (str), (sizeof(str)-1))
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
+238
-235
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ndpi_protocol_ids.h
|
||||
*
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
* 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
|
||||
@@ -30,251 +30,254 @@
|
||||
#define __NDPI_PROTOCOLS_DEFAULT_H__
|
||||
|
||||
#define NDPI_DETECTION_SUPPORT_IPV6
|
||||
#define NDPI_PROTOCOL_HISTORY_SIZE 2
|
||||
#define NDPI_PROTOCOL_SIZE 2
|
||||
|
||||
#define NDPI_PROTOCOL_UNKNOWN 0
|
||||
#define NDPI_PROTOCOL_UNKNOWN 0
|
||||
|
||||
#define NDPI_PROTOCOL_NO_MASTER_PROTO NDPI_PROTOCOL_UNKNOWN
|
||||
#define NDPI_PROTOCOL_NO_MASTER_PROTO NDPI_PROTOCOL_UNKNOWN
|
||||
|
||||
#define NDPI_PROTOCOL_IP_VRRP 73
|
||||
#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_IP_ICMPV6 102
|
||||
#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
|
||||
#define NDPI_PROTOCOL_MOVE 49
|
||||
#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_QUAKE 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
|
||||
#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
|
||||
#define NDPI_PROTOCOL_NETFLIX 133
|
||||
#define NDPI_PROTOCOL_LASTFM 134
|
||||
#define NDPI_PROTOCOL_WAZE 135
|
||||
#define NDPI_PROTOCOL_SKYFILE_PREPAID 136
|
||||
#define NDPI_PROTOCOL_SKYFILE_RUDICS 137
|
||||
#define NDPI_PROTOCOL_SKYFILE_POSTPAID 138
|
||||
#define NDPI_PROTOCOL_CITRIX_ONLINE 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_MS_LYNC 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_HTTP 7
|
||||
#define NDPI_PROTOCOL_HTTP_DOWNLOAD 60
|
||||
#define NDPI_PROTOCOL_SSL_NO_CERT 64 /* SSL without certificate (Skype, Ultrasurf?) - ntop.org */
|
||||
#define NDPI_PROTOCOL_SSL 91
|
||||
#define NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC 110
|
||||
#define NDPI_PROTOCOL_HTTP_CONNECT 130
|
||||
#define NDPI_PROTOCOL_HTTP_PROXY 131
|
||||
#define NDPI_PROTOCOL_SOCKS 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#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_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_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_TDS 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_IMESH 31
|
||||
#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_PROTOCOL_XBOX 47
|
||||
#define NDPI_PROTOCOL_QQ 48
|
||||
#define NDPI_PROTOCOL_MOVE 49
|
||||
#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_QQLIVE 61
|
||||
#define NDPI_PROTOCOL_THUNDER 62
|
||||
#define NDPI_PROTOCOL_SOULSEEK 63
|
||||
#define NDPI_PROTOCOL_IRC 65
|
||||
#define NDPI_PROTOCOL_AYIYA 66
|
||||
#define NDPI_PROTOCOL_UNENCRYPED_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_QUAKE 72
|
||||
#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_RTP 87
|
||||
#define NDPI_PROTOCOL_RDP 88
|
||||
#define NDPI_PROTOCOL_VNC 89
|
||||
#define NDPI_PROTOCOL_PCANYWHERE 90
|
||||
#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_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_KERBEROS 111
|
||||
#define NDPI_PROTOCOL_LDAP 112
|
||||
#define NDPI_PROTOCOL_MAPLESTORY 113
|
||||
#define NDPI_PROTOCOL_MSSQL 114
|
||||
#define NDPI_PROTOCOL_PPTP 115
|
||||
#define NDPI_PROTOCOL_WARCRAFT3 116
|
||||
#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU 117
|
||||
#define NDPI_PROTOCOL_MEEBO 118
|
||||
#define NDPI_PROTOCOL_DROPBOX 121
|
||||
#define NDPI_PROTOCOL_SKYPE 125
|
||||
#define NDPI_PROTOCOL_DCERPC 127
|
||||
#define NDPI_PROTOCOL_NETFLOW 128
|
||||
#define NDPI_PROTOCOL_SFLOW 129
|
||||
#define NDPI_PROTOCOL_CITRIX 132
|
||||
#define NDPI_PROTOCOL_SKYFILE_PREPAID 136
|
||||
#define NDPI_PROTOCOL_SKYFILE_RUDICS 137
|
||||
#define NDPI_PROTOCOL_SKYFILE_POSTPAID 138
|
||||
#define NDPI_PROTOCOL_CITRIX_ONLINE 139
|
||||
#define NDPI_PROTOCOL_WEBEX 141
|
||||
#define NDPI_PROTOCOL_VIBER 144
|
||||
#define NDPI_PROTOCOL_RADIUS 146
|
||||
#define NDPI_SERVICE_WINDOWS_UPDATE 147
|
||||
#define NDPI_PROTOCOL_TEAMVIEWER 148 /* xplico.org */
|
||||
#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_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_RTMP 174 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_FTP_DATA 175 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_ZMQ 177
|
||||
#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_QUIC 188 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
|
||||
#define NDPI_PROTOCOL_WHATSAPP_VOICE 189
|
||||
#define NDPI_PROTOCOL_STARCRAFT 213 /* Matteo Bracci <matteobracci1@gmail.com> */
|
||||
#define NDPI_PROTOCOL_TEREDO 214
|
||||
#define NDPI_PROTOCOL_HEP 216 /* Sipcapture.org QXIP BV */
|
||||
#define NDPI_PROTOCOL_UBNTAC2 217 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
|
||||
#define NDPI_PROTOCOL_MS_LYNC 173
|
||||
/* 209 free */
|
||||
#define NDPI_PROTOCOL_FREE_209 209
|
||||
|
||||
#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 */
|
||||
|
||||
/* 217 is free */
|
||||
#define NDPI_PROTOCOL_FREE_217 217
|
||||
|
||||
#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_CONTENT_WEBM 157
|
||||
#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
|
||||
|
||||
/* 224 is free */
|
||||
#define NDPI_PROTOCOL_FREE_224 224
|
||||
|
||||
#define NDPI_PROTOCOL_OPENDNS 225
|
||||
#define NDPI_PROTOCOL_GIT 226
|
||||
#define NDPI_PROTOCOL_DRDA 227
|
||||
|
||||
#define NDPI_SERVICE_FACEBOOK 119
|
||||
#define NDPI_SERVICE_TWITTER 120
|
||||
#define NDPI_SERVICE_GMAIL 122
|
||||
#define NDPI_SERVICE_GOOGLE_MAPS 123
|
||||
#define NDPI_SERVICE_YOUTUBE 124
|
||||
#define NDPI_SERVICE_VEVO 186
|
||||
#define NDPI_SERVICE_GOOGLE 126
|
||||
#define NDPI_SERVICE_NETFLIX 133
|
||||
#define NDPI_SERVICE_LASTFM 134
|
||||
#define NDPI_SERVICE_WAZE 135
|
||||
#define NDPI_SERVICE_APPLE 140
|
||||
#define NDPI_SERVICE_WHATSAPP 142
|
||||
#define NDPI_SERVICE_APPLE_ICLOUD 143
|
||||
#define NDPI_SERVICE_APPLE_ITUNES 145
|
||||
#define NDPI_SERVICE_TUENTI 149
|
||||
#define NDPI_SERVICE_WIKIPEDIA 176 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_MSN NDPI_PROTOCOL_MSN /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_AMAZON 178 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_EBAY 179 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_CNN 180 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_DROPBOX NDPI_PROTOCOL_DROPBOX /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_SKYPE NDPI_PROTOCOL_SKYPE /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_VIBER NDPI_PROTOCOL_VIBER
|
||||
#define NDPI_SERVICE_YAHOO NDPI_PROTOCOL_YAHOO /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_SERVICE_PANDORA 187
|
||||
#define NDPI_PROTOCOL_EAQ 190
|
||||
#define NDPI_SERVICE_TIMMEU 191
|
||||
#define NDPI_SERVICE_TORCEDOR 192
|
||||
#define NDPI_SERVICE_KAKAOTALK 193 /* KakaoTalk Chat (no voice call) */
|
||||
#define NDPI_SERVICE_KAKAOTALK_VOICE 194 /* KakaoTalk Voice */
|
||||
#define NDPI_SERVICE_TWITCH 195 /* Edoardo Dominici <edoaramis@gmail.com> */
|
||||
#define NDPI_SERVICE_QUICKPLAY 196 /* Streaming service used by various services such as hooq.tv */
|
||||
#define NDPI_SERVICE_TIM 197 /* Traffic for tim.com.br and tim.it */
|
||||
#define NDPI_PROTOCOL_MPEGTS 198
|
||||
#define NDPI_SERVICE_SNAPCHAT 199
|
||||
#define NDPI_SERVICE_SIMET 200
|
||||
#define NDPI_SERVICE_OPENSIGNAL 201
|
||||
#define NDPI_SERVICE_99TAXI 202
|
||||
#define NDPI_SERVICE_EASYTAXI 203
|
||||
#define NDPI_SERVICE_GLOBOTV 204
|
||||
#define NDPI_SERVICE_TIMSOMDECHAMADA 205
|
||||
#define NDPI_SERVICE_TIMMENU 206
|
||||
#define NDPI_SERVICE_TIMPORTASABERTAS 207
|
||||
#define NDPI_SERVICE_TIMRECARGA 208
|
||||
#define NDPI_SERVICE_TIMBETA 209
|
||||
#define NDPI_SERVICE_DEEZER 210
|
||||
#define NDPI_SERVICE_INSTAGRAM 211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
|
||||
#define NDPI_SERVICE_MICROSOFT 212
|
||||
#define NDPI_SERVICE_HOTSPOT_SHIELD 215
|
||||
#define NDPI_SERVICE_OCS 218
|
||||
#define NDPI_SERVICE_OFFICE_365 219
|
||||
#define NDPI_SERVICE_CLOUDFLARE 220
|
||||
#define NDPI_SERVICE_MS_ONE_DRIVE 221
|
||||
#define NDPI_PROTOCOL_MQTT 222
|
||||
#define NDPI_PROTOCOL_RX 223
|
||||
#define NDPI_SERVICE_WEIBO 224
|
||||
#define NDPI_SERVICE_OPENDNS 225
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_OPENDNS
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_DRDA
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
@@ -44,6 +44,7 @@ ndpi_port_range* ndpi_build_default_ports(ndpi_port_range *ports,
|
||||
|
||||
/* TCP/UDP protocols */
|
||||
u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int8_t protocol,
|
||||
u_int32_t saddr, u_int32_t daddr,
|
||||
u_int16_t sport, u_int16_t dport);
|
||||
@@ -80,7 +81,6 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
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_imesh_tcp_udp(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);
|
||||
@@ -126,7 +126,6 @@ void ndpi_search_rdp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
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_tds_tcp(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);
|
||||
@@ -135,11 +134,10 @@ void ndpi_search_warcraft3(struct ndpi_detection_module_struct *ndpi_struct, str
|
||||
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(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_meebo(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_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);
|
||||
@@ -182,7 +180,6 @@ void ndpi_search_pando(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
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_twitter(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);
|
||||
@@ -194,12 +191,18 @@ void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
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_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_kxun(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);
|
||||
/* --- INIT FUNCTIONS --- */
|
||||
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);
|
||||
void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
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);
|
||||
@@ -233,7 +236,6 @@ void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
void init_http_activesync_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_iax_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_imesh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ipp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_irc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -247,13 +249,12 @@ void init_mail_pop_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
|
||||
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_meebo_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_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_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mssql_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);
|
||||
void init_netbios_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_netflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -303,7 +304,6 @@ void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
|
||||
void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_ssdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_teamspeak_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_telegram_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
@@ -313,7 +313,6 @@ void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_
|
||||
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_twitter_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_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);
|
||||
@@ -334,4 +333,10 @@ void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_
|
||||
void init_coap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct,u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_rx_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_git_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_drda_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_bjnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_kxun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_smpp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
#endif /* __NDPI_PROTOCOLS_H__ */
|
||||
|
||||
+70
-22
@@ -138,14 +138,12 @@ struct ndpi_snap_extension
|
||||
} PACK_OFF;
|
||||
|
||||
PACK_ON
|
||||
struct ndpi_llc_header
|
||||
struct ndpi_llc_header_snap
|
||||
{
|
||||
u_int8_t dsap;
|
||||
u_int8_t ssap;
|
||||
u_int8_t ctrl;
|
||||
#ifdef SNAP_EXT
|
||||
struct ndpi_snap_extension snap;
|
||||
#endif
|
||||
} PACK_OFF;
|
||||
|
||||
/* ++++++++++ RADIO TAP header (for IEEE 802.11) +++++++++++++ */
|
||||
@@ -170,7 +168,7 @@ struct ndpi_wifi_header
|
||||
u_char trsm[6];
|
||||
u_char dest[6];
|
||||
u_int16_t seq_ctrl;
|
||||
/* u_int64_t ccmp - for data encription only - check fc.flag */
|
||||
/* u_int64_t ccmp - for data encryption only - check fc.flag */
|
||||
} PACK_OFF;
|
||||
|
||||
/* +++++++++++++++++++++++ MPLS header +++++++++++++++++++++++ */
|
||||
@@ -348,7 +346,7 @@ struct ndpi_id_struct {
|
||||
/**
|
||||
detected_protocol_bitmask:
|
||||
access this bitmask to find out whether an id has used skype or not
|
||||
if a flag is set here, it will not be resetted
|
||||
if a flag is set here, it will not be reset
|
||||
to compare this, use:
|
||||
**/
|
||||
NDPI_PROTOCOL_BITMASK detected_protocol_bitmask;
|
||||
@@ -385,7 +383,7 @@ struct ndpi_id_struct {
|
||||
#ifdef NDPI_PROTOCOL_ZATTOO
|
||||
u_int32_t zattoo_ts;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||
u_int32_t jabber_stun_or_ft_ts;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_DIRECTCONNECT
|
||||
@@ -404,7 +402,7 @@ struct ndpi_id_struct {
|
||||
u_int16_t bt_port_t[NDPI_BT_PORTS];
|
||||
u_int16_t bt_port_u[NDPI_BT_PORTS];
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||
#define JABBER_MAX_STUN_PORTS 6
|
||||
u_int16_t jabber_voice_stun_port[JABBER_MAX_STUN_PORTS];
|
||||
u_int16_t jabber_file_transfer_port[2];
|
||||
@@ -425,7 +423,7 @@ struct ndpi_id_struct {
|
||||
#ifdef NDPI_PROTOCOL_OSCAR
|
||||
u_int8_t oscar_ssl_session_id[33];
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||
u_int8_t jabber_voice_stun_used_ports;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_SIP
|
||||
@@ -554,7 +552,7 @@ struct ndpi_flow_tcp_struct {
|
||||
u_int32_t mail_pop_stage:2;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_MAIL_IMAP
|
||||
u_int32_t mail_imap_stage:3;
|
||||
u_int32_t mail_imap_stage:3, mail_imap_starttls:2;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_SKYPE
|
||||
u_int8_t skype_packet_id;
|
||||
@@ -572,6 +570,9 @@ struct ndpi_flow_tcp_struct {
|
||||
u_int8_t prev_zmq_pkt_len;
|
||||
u_char prev_zmq_pkt[10];
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_PPSTREAM
|
||||
u_int32_t ppstream_stage:3;
|
||||
#endif
|
||||
}
|
||||
#ifndef WIN32
|
||||
__attribute__ ((__packed__))
|
||||
@@ -651,8 +652,8 @@ struct ndpi_packet_struct {
|
||||
u_int32_t tick_timestamp;
|
||||
u_int64_t tick_timestamp_l;
|
||||
|
||||
u_int16_t detected_protocol_stack[NDPI_PROTOCOL_HISTORY_SIZE];
|
||||
u_int8_t detected_subprotocol_stack[NDPI_PROTOCOL_HISTORY_SIZE];
|
||||
u_int16_t detected_protocol_stack[NDPI_PROTOCOL_SIZE];
|
||||
u_int8_t detected_subprotocol_stack[NDPI_PROTOCOL_SIZE];
|
||||
|
||||
|
||||
#ifndef WIN32
|
||||
@@ -726,9 +727,40 @@ typedef enum {
|
||||
|
||||
#define NUM_BREEDS (NDPI_PROTOCOL_UNRATED+1)
|
||||
|
||||
/* Abstract categories to group the protocols. */
|
||||
typedef enum {
|
||||
NDPI_PROTOCOL_CATEGORY_UNSPECIFIED = 0, /* For general services and unknown protocols */
|
||||
NDPI_PROTOCOL_CATEGORY_MEDIA, /* Multimedia and streaming */
|
||||
NDPI_PROTOCOL_CATEGORY_VPN, /* Virtual Private Networks */
|
||||
NDPI_PROTOCOL_CATEGORY_MAIL_SEND, /* Protocols to send emails */
|
||||
NDPI_PROTOCOL_CATEGORY_MAIL_SYNC, /* Protocols to receive or sync emails */
|
||||
NDPI_PROTOCOL_CATEGORY_FILE_TRANSFER, /* FTP and similar protocols */
|
||||
NDPI_PROTOCOL_CATEGORY_WEB, /* Web protocols and services */
|
||||
NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, /* Social networks */
|
||||
NDPI_PROTOCOL_CATEGORY_P2P, /* File sharing and P2P */
|
||||
NDPI_PROTOCOL_CATEGORY_GAME, /* Online games */
|
||||
NDPI_PROTOCOL_CATEGORY_CHAT, /* Instant messaging */
|
||||
NDPI_PROTOCOL_CATEGORY_VOIP, /* Real-time communications and conferencing */
|
||||
NDPI_PROTOCOL_CATEGORY_DATABASE, /* Protocols for database communication */
|
||||
NDPI_PROTOCOL_CATEGORY_REMOTE_ACCESS, /* Remote access and control */
|
||||
NDPI_PROTOCOL_CATEGORY_CLOUD, /* Online cloud services */
|
||||
NDPI_PROTOCOL_CATEGORY_NETWORK, /* Network infrastructure protocols */
|
||||
NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, /* Software for collaborative development */
|
||||
NDPI_PROTOCOL_CATEGORY_RPC, /* High level network communication protocols */
|
||||
NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, /* Network administration and monitor protocols */
|
||||
NDPI_PROTOCOL_CATEGORY_SYSTEM, /* System level applications */
|
||||
|
||||
NDPI_PROTOCOL_NUM_CATEGORIES /*
|
||||
NOTE: Keep this as last member
|
||||
Unused as value but useful to getting the number of elements
|
||||
in this datastructure
|
||||
*/
|
||||
} ndpi_protocol_category_t;
|
||||
|
||||
/* ntop extensions */
|
||||
typedef struct ndpi_proto_defaults {
|
||||
char *protoName;
|
||||
ndpi_protocol_category_t protoCategory;
|
||||
u_int16_t protoId, protoIdx;
|
||||
u_int16_t master_tcp_protoId[2], master_udp_protoId[2]; /* The main protocols on which this sub-protocol sits on */
|
||||
ndpi_protocol_breed_t protoBreed;
|
||||
@@ -737,6 +769,7 @@ typedef struct ndpi_proto_defaults {
|
||||
|
||||
typedef struct ndpi_default_ports_tree_node {
|
||||
ndpi_proto_defaults_t *proto;
|
||||
u_int8_t customUserProto;
|
||||
u_int16_t default_port;
|
||||
} ndpi_default_ports_tree_node_t;
|
||||
|
||||
@@ -746,13 +779,12 @@ typedef struct _ndpi_automa {
|
||||
} ndpi_automa;
|
||||
|
||||
typedef struct ndpi_proto {
|
||||
u_int16_t master_protocol /* e.g. HTTP */, protocol /* e.g. FaceBook */;
|
||||
u_int16_t master_protocol /* e.g. HTTP */, app_protocol /* e.g. FaceBook */;
|
||||
} ndpi_protocol;
|
||||
|
||||
#define NDPI_PROTOCOL_NULL { NDPI_PROTOCOL_UNKNOWN , NDPI_PROTOCOL_UNKNOWN }
|
||||
|
||||
struct ndpi_detection_module_struct {
|
||||
|
||||
NDPI_PROTOCOL_BITMASK detection_bitmask;
|
||||
NDPI_PROTOCOL_BITMASK generic_http_packet_bitmask;
|
||||
|
||||
@@ -805,7 +837,7 @@ struct ndpi_detection_module_struct {
|
||||
content_automa, /* Used for HTTP subprotocol_detection */
|
||||
subprotocol_automa, /* Used for HTTP subprotocol_detection */
|
||||
bigrams_automa, impossible_bigrams_automa; /* TOR */
|
||||
|
||||
|
||||
/* IP-based protocol detection */
|
||||
void *protocols_ptree;
|
||||
|
||||
@@ -849,12 +881,12 @@ struct ndpi_detection_module_struct {
|
||||
|
||||
ndpi_proto_defaults_t proto_defaults[NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS];
|
||||
|
||||
u_int8_t http_dont_dissect_response:1;
|
||||
u_int8_t direction_detect_disable:1; /* disable internal detection of packet direction */
|
||||
u_int8_t http_dont_dissect_response:1, dns_dissect_response:1,
|
||||
direction_detect_disable:1; /* disable internal detection of packet direction */
|
||||
};
|
||||
|
||||
struct ndpi_flow_struct {
|
||||
u_int16_t detected_protocol_stack[NDPI_PROTOCOL_HISTORY_SIZE];
|
||||
u_int16_t detected_protocol_stack[NDPI_PROTOCOL_SIZE];
|
||||
#ifndef WIN32
|
||||
__attribute__ ((__packed__))
|
||||
#endif
|
||||
@@ -887,7 +919,7 @@ struct ndpi_flow_struct {
|
||||
*/
|
||||
struct ndpi_id_struct *server_id;
|
||||
/* HTTP host or DNS query */
|
||||
u_char host_server_name[192];
|
||||
u_char host_server_name[256];
|
||||
/* Via HTTP User-Agent */
|
||||
u_char detected_os[32];
|
||||
/* Via HTTP X-Forwarded-For */
|
||||
@@ -908,13 +940,12 @@ struct ndpi_flow_struct {
|
||||
} http;
|
||||
|
||||
union {
|
||||
|
||||
/* the only fields useful for nDPI and ntopng */
|
||||
struct {
|
||||
u_int8_t num_answers, ret_code;
|
||||
u_int16_t query_type;
|
||||
u_int8_t num_queries, num_answers, reply_code;
|
||||
u_int16_t query_type, query_class, rsp_type;
|
||||
} dns;
|
||||
|
||||
|
||||
struct {
|
||||
u_int8_t request_code;
|
||||
u_int8_t version;
|
||||
@@ -923,6 +954,18 @@ struct ndpi_flow_struct {
|
||||
struct {
|
||||
char client_certificate[48], server_certificate[48];
|
||||
} ssl;
|
||||
|
||||
struct {
|
||||
char client_signature[48], server_signature[48];
|
||||
} ssh;
|
||||
|
||||
struct {
|
||||
char answer[96];
|
||||
} mdns;
|
||||
|
||||
struct {
|
||||
char version[96];
|
||||
} ubntac2;
|
||||
} protos;
|
||||
|
||||
/*** ALL protocol specific 64 bit variables here ***/
|
||||
@@ -1005,6 +1048,10 @@ struct ndpi_flow_struct {
|
||||
#ifdef NDPI_PROTOCOL_STARCRAFT
|
||||
u_int32_t starcraft_udp_stage : 3; // 0-7
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_OPENVPN
|
||||
u_int8_t ovpn_session_id[8];
|
||||
u_int8_t ovpn_counter;
|
||||
#endif
|
||||
|
||||
/* internal structures to save functions calls */
|
||||
struct ndpi_packet_struct packet;
|
||||
@@ -1016,6 +1063,7 @@ struct ndpi_flow_struct {
|
||||
typedef struct {
|
||||
char *string_to_match, *proto_name;
|
||||
int protocol_id;
|
||||
ndpi_protocol_category_t proto_category;
|
||||
ndpi_protocol_breed_t protocol_breed;
|
||||
} ndpi_protocol_match;
|
||||
|
||||
|
||||
@@ -38,6 +38,8 @@
|
||||
|
||||
#define _WS2TCPIP_H_ /* Avoid compilation problems */
|
||||
|
||||
#define IPVERSION 4 /* on *nix it is defined in netinet/ip.h */
|
||||
|
||||
extern char* strsep(char **sp, const char *sep);
|
||||
|
||||
typedef unsigned char u_char;
|
||||
|
||||
+15
-9
@@ -1,6 +1,6 @@
|
||||
lib_LTLIBRARIES = libndpi.la
|
||||
|
||||
CFLAGS += -fPIC -DPIC
|
||||
CFLAGS += -fPIC -DPIC # --coverage
|
||||
libndpi_la_CPPFLAGS = -I$(top_srcdir)/src/include/ -I$(top_srcdir)/src/lib/third_party/include/
|
||||
libndpi_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/libndpi.sym
|
||||
|
||||
@@ -21,11 +21,14 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/applejuice.c \
|
||||
protocols/armagetron.c \
|
||||
protocols/ayiya.c \
|
||||
protocols/amqp.c \
|
||||
protocols/battlefield.c \
|
||||
protocols/bgp.c \
|
||||
protocols/bittorrent.c \
|
||||
protocols/bjnp.c \
|
||||
protocols/ciscovpn.c \
|
||||
protocols/citrix.c \
|
||||
protocols/coap.c \
|
||||
protocols/collectd.c \
|
||||
protocols/corba.c \
|
||||
protocols/crossfire.c \
|
||||
@@ -36,6 +39,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/directdownloadlink.c \
|
||||
protocols/dns.c \
|
||||
protocols/dofus.c \
|
||||
protocols/drda.c \
|
||||
protocols/dropbox.c \
|
||||
protocols/eaq.c \
|
||||
protocols/edonkey.c \
|
||||
@@ -45,9 +49,11 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
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 \
|
||||
@@ -55,13 +61,13 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/http.c \
|
||||
protocols/iax.c \
|
||||
protocols/icecast.c \
|
||||
protocols/imesh.c \
|
||||
protocols/ipp.c \
|
||||
protocols/irc.c \
|
||||
protocols/jabber.c \
|
||||
protocols/kakaotalk_voice.c \
|
||||
protocols/kerberos.c \
|
||||
protocols/kontiki.c \
|
||||
protocols/kxun.c \
|
||||
protocols/ldap.c \
|
||||
protocols/lotus_notes.c \
|
||||
protocols/mail_imap.c \
|
||||
@@ -69,13 +75,13 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/mail_smtp.c \
|
||||
protocols/maplestory.c \
|
||||
protocols/mdns.c \
|
||||
protocols/meebo.c \
|
||||
protocols/megaco.c \
|
||||
protocols/mgcp.c \
|
||||
protocols/mms.c \
|
||||
protocols/mpegts.c \
|
||||
protocols/mqtt.c \
|
||||
protocols/msn.c \
|
||||
protocols/mssql.c \
|
||||
protocols/mssql_tds.c \
|
||||
protocols/mysql.c \
|
||||
protocols/netbios.c \
|
||||
protocols/netflow.c \
|
||||
@@ -104,6 +110,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/rtmp.c \
|
||||
protocols/rtp.c \
|
||||
protocols/rtsp.c \
|
||||
protocols/rx.c \
|
||||
protocols/sflow.c \
|
||||
protocols/shoutcast.c \
|
||||
protocols/sip.c \
|
||||
@@ -125,7 +132,6 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/stun.c \
|
||||
protocols/syslog.c \
|
||||
protocols/tcp_udp.c \
|
||||
protocols/tds.c \
|
||||
protocols/teamspeak.c \
|
||||
protocols/teamviewer.c \
|
||||
protocols/telegram.c \
|
||||
@@ -136,7 +142,6 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/teredo.c \
|
||||
protocols/tvants.c \
|
||||
protocols/tvuplayer.c \
|
||||
protocols/twitter.c \
|
||||
protocols/ubntac2.c \
|
||||
protocols/usenet.c \
|
||||
protocols/viber.c \
|
||||
@@ -152,13 +157,14 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/yahoo.c \
|
||||
protocols/zattoo.c \
|
||||
protocols/zeromq.c \
|
||||
protocols/coap.c \
|
||||
protocols/mqtt.c \
|
||||
protocols/rx.c \
|
||||
protocols/smpp.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/src/ahocorasick.c \
|
||||
third_party/src/node.c \
|
||||
third_party/src/sort.c
|
||||
|
||||
EXTRA_DIST = third_party/src/ndpi_patricia.c
|
||||
|
||||
+8151
-7364
File diff suppressed because it is too large
Load Diff
+854
-694
File diff suppressed because it is too large
Load Diff
+41
-29
@@ -2,7 +2,7 @@
|
||||
* afp.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* 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
|
||||
@@ -27,6 +27,12 @@
|
||||
|
||||
#ifdef NDPI_PROTOCOL_AFP
|
||||
|
||||
struct afpHeader {
|
||||
u_int8_t flags, command;
|
||||
u_int16_t requestId;
|
||||
u_int32_t dataOffset, length, reserved;
|
||||
};
|
||||
|
||||
static void ndpi_int_afp_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AFP, NDPI_PROTOCOL_UNKNOWN);
|
||||
@@ -36,37 +42,43 @@ static void ndpi_int_afp_add_connection(struct ndpi_detection_module_struct *ndp
|
||||
void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
// struct ndpi_id_struct *src = flow->src;
|
||||
// struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
/*
|
||||
* this will detect the OpenSession command of the Data Stream Interface (DSI) protocol
|
||||
* which is exclusively used by the Apple Filing Protocol (AFP) on TCP/IP networks
|
||||
*/
|
||||
if (packet->payload_packet_len >= 22 && get_u_int16_t(packet->payload, 0) == htons(0x0004) &&
|
||||
get_u_int16_t(packet->payload, 2) == htons(0x0001) && get_u_int32_t(packet->payload, 4) == 0 &&
|
||||
get_u_int32_t(packet->payload, 8) == htonl(packet->payload_packet_len - 16) &&
|
||||
get_u_int32_t(packet->payload, 12) == 0 && get_u_int16_t(packet->payload, 16) == htons(0x0104)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP: DSI OpenSession detected.\n");
|
||||
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
if (packet->payload_packet_len >= sizeof(struct afpHeader)) {
|
||||
struct afpHeader *h = (struct afpHeader*)packet->payload;
|
||||
|
||||
if(packet->payload_packet_len > 128) {
|
||||
/*
|
||||
When we transfer a large data chunk, unless we have observed
|
||||
the initial connection, we need to discard these packets
|
||||
as they are not an indication that this flow is not AFP
|
||||
*/
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* this will detect the OpenSession command of the Data Stream Interface (DSI) protocol
|
||||
* which is exclusively used by the Apple Filing Protocol (AFP) on TCP/IP networks
|
||||
*/
|
||||
if (packet->payload_packet_len >= 22 && get_u_int16_t(packet->payload, 0) == htons(0x0004) &&
|
||||
get_u_int16_t(packet->payload, 2) == htons(0x0001) && get_u_int32_t(packet->payload, 4) == 0 &&
|
||||
get_u_int32_t(packet->payload, 8) == htonl(packet->payload_packet_len - 16) &&
|
||||
get_u_int32_t(packet->payload, 12) == 0 && get_u_int16_t(packet->payload, 16) == htons(0x0104)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP: DSI OpenSession detected.\n");
|
||||
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
if((h->flags <= 1)
|
||||
&& ((h->command >= 1) && (h->command <= 8))
|
||||
&& (h->reserved == 0)
|
||||
&& (packet->payload_packet_len >= (sizeof(struct afpHeader)+ntohl(h->length)))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP: DSI detected.\n");
|
||||
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* detection of GetStatus command of DSI protocl
|
||||
*/
|
||||
if (packet->payload_packet_len >= 18 && get_u_int16_t(packet->payload, 0) == htons(0x0003) &&
|
||||
get_u_int16_t(packet->payload, 2) == htons(0x0001) && get_u_int32_t(packet->payload, 4) == 0 &&
|
||||
get_u_int32_t(packet->payload, 8) == htonl(packet->payload_packet_len - 16) &&
|
||||
get_u_int32_t(packet->payload, 12) == 0 && get_u_int16_t(packet->payload, 16) == htons(0x0f00)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP: DSI GetStatus detected.\n");
|
||||
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP excluded.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_AFP);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
/*
|
||||
* amqp.c
|
||||
*
|
||||
* Copyright (C) 2011-17 - 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 "ndpi_protocols.h"
|
||||
#ifdef NDPI_PROTOCOL_AMQP
|
||||
|
||||
PACK_ON
|
||||
struct amqp_header {
|
||||
u_int8_t ptype;
|
||||
u_int16_t channel;
|
||||
u_int32_t length;
|
||||
u_int16_t class_id, method;
|
||||
} PACK_OFF;
|
||||
|
||||
static void ndpi_int_amqp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow/* , */
|
||||
/* ndpi_protocol_type_t protocol_type */) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AMQP, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_AMQP, ndpi_struct, NDPI_LOG_DEBUG, "search amqp. \n");
|
||||
|
||||
if (packet->tcp != NULL) {
|
||||
if(packet->payload_packet_len > sizeof(struct amqp_header)) {
|
||||
struct amqp_header *h = (struct amqp_header*)packet->payload;
|
||||
|
||||
if(h->ptype <= 3) {
|
||||
u_int32_t length = htonl(h->length);
|
||||
|
||||
if(((length+8) >= packet->payload_packet_len)
|
||||
&& (length < 32768) /* Upper bound */) {
|
||||
u_int16_t class_id = htons(h->class_id);
|
||||
|
||||
if((class_id >= 10) /* Connection */
|
||||
&& (class_id <= 110) /* Tunnel */) {
|
||||
u_int16_t method = htons(h->method);
|
||||
|
||||
if(method <= 120 /* Method basic NACK */) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_AMQP, ndpi_struct, NDPI_LOG_DEBUG, "found amqp over tcp. \n");
|
||||
ndpi_int_amqp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) {
|
||||
ndpi_set_bitmask_protocol_detection("AMQP", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_AMQP,
|
||||
ndpi_search_amqp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -51,11 +51,11 @@ void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
/* FINISH */
|
||||
struct ayiya *a = (struct ayiya*)packet->payload;
|
||||
u_int32_t epoch = ntohl(a->epoch), now;
|
||||
u_int32_t fireyears = 86400 * 365 * 5;
|
||||
u_int32_t fiveyears = 86400 * 365 * 5;
|
||||
|
||||
now = flow->packet.tick_timestamp;
|
||||
|
||||
if((epoch >= (now - fireyears)) && (epoch <= (now+86400 /* 1 day */)))
|
||||
if((epoch >= (now - fiveyears)) && (epoch <= (now+86400 /* 1 day */)))
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AYIYA, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
return;
|
||||
|
||||
+15
-22
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* bgp.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,36 +20,30 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_BGP
|
||||
|
||||
|
||||
static void ndpi_int_bgp_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BGP, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
/* this detection also works asymmetrically */
|
||||
void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int16_t bgp_port = htons(179);
|
||||
|
||||
if(packet->tcp
|
||||
&& (packet->payload[18] < 5)
|
||||
&& ((packet->tcp->dest == bgp_port) || (packet->tcp->source == bgp_port))
|
||||
&& (packet->payload_packet_len > 18)
|
||||
&& (get_u_int64_t(packet->payload, 0) == 0xffffffffffffffffULL)
|
||||
&& (get_u_int64_t(packet->payload, 8) == 0xffffffffffffffffULL)
|
||||
&& (ntohs(get_u_int16_t(packet->payload, 16)) <= packet->payload_packet_len)
|
||||
) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_BGP, ndpi_struct, NDPI_LOG_DEBUG, "BGP detected.\n");
|
||||
ndpi_int_bgp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
if(packet->tcp) {
|
||||
if(packet->payload_packet_len > 18
|
||||
&& packet->payload[18] < 5
|
||||
&& ((packet->tcp->dest == bgp_port) || (packet->tcp->source == bgp_port))
|
||||
&& (get_u_int64_t(packet->payload, 0) == 0xffffffffffffffffULL)
|
||||
&& (get_u_int64_t(packet->payload, 8) == 0xffffffffffffffffULL)
|
||||
&& (ntohs(get_u_int16_t(packet->payload, 16)) <= packet->payload_packet_len)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_BGP, ndpi_struct, NDPI_LOG_DEBUG, "BGP detected.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BGP, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* exclude BGP */
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BGP);
|
||||
}
|
||||
|
||||
|
||||
@@ -53,21 +53,19 @@ static u_int8_t is_utp_pkt(const u_int8_t *payload, u_int payload_len) {
|
||||
|
||||
static void ndpi_add_connection_as_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow,
|
||||
int bt_offset, int check_hash,
|
||||
const u_int8_t save_detection, const u_int8_t encrypted_connection/* , */
|
||||
/* ndpi_protocol_type_t protocol_type */)
|
||||
const u_int8_t save_detection, const u_int8_t encrypted_connection)
|
||||
{
|
||||
if(check_hash) {
|
||||
const char *bt_hash = NULL; /* 20 bytes long */
|
||||
const char *peer_id = NULL; /* 20 bytes long */
|
||||
|
||||
if(bt_offset == -1) {
|
||||
const char *bt_magic = ndpi_strnstr((const char *)flow->packet.payload,
|
||||
"BitTorrent protocol", flow->packet.payload_packet_len);
|
||||
|
||||
if(bt_magic)
|
||||
bt_hash = &bt_magic[19], peer_id = &bt_magic[39];
|
||||
bt_hash = &bt_magic[19];
|
||||
} else
|
||||
bt_hash = (const char*)&flow->packet.payload[28], peer_id = (const char*)&flow->packet.payload[48];
|
||||
bt_hash = (const char*)&flow->packet.payload[28];
|
||||
|
||||
if(bt_hash) memcpy(flow->bittorent_hash, bt_hash, 20);
|
||||
}
|
||||
@@ -92,8 +90,7 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
||||
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT,
|
||||
ndpi_struct, NDPI_LOG_TRACE, "BT: plain BitTorrent protocol detected\n");
|
||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, 19, 1,
|
||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION/* , */
|
||||
/* NDPI_REAL_PROTOCOL */);
|
||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -125,8 +122,7 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
||||
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||
NDPI_LOG_TRACE, "BT: plain Bitcomet persistent seed protocol detected\n");
|
||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION/* , */
|
||||
/* NDPI_CORRELATED_PROTOCOL */);
|
||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -388,7 +384,6 @@ static void ndpi_int_search_bittorrent_tcp(struct ndpi_detection_module_struct *
|
||||
void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
int no_bittorrent = 0;
|
||||
char *bt_proto = NULL;
|
||||
|
||||
/* This is broadcast */
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_BJNP
|
||||
|
||||
|
||||
static void ndpi_int_bjnp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int8_t due_to_correlation)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BJNP, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
|
||||
static void ndpi_check_bjnp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
if(packet->udp != NULL) {
|
||||
if(payload_len > 4) {
|
||||
if((memcmp((const char *)packet->payload, "BJNP", 4) == 0)
|
||||
|| (memcmp((const char *)packet->payload, "BNJB", 4) == 0)
|
||||
|| (memcmp((const char *)packet->payload, "BJNB", 4) == 0)
|
||||
|| (memcmp((const char *)packet->payload, "MFNP", 4) == 0)
|
||||
) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "Found bjnp.\n");
|
||||
ndpi_int_bjnp_add_connection(ndpi_struct, flow, 0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "exclude bjnp.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BJNP);
|
||||
}
|
||||
|
||||
void ndpi_search_bjnp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "bjnp detection...\n");
|
||||
|
||||
/* skip marked packets */
|
||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BJNP) {
|
||||
if (packet->tcp_retransmission == 0) {
|
||||
ndpi_check_bjnp(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_bjnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("BJNP", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_BJNP,
|
||||
ndpi_search_bjnp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
@@ -396,12 +396,12 @@ void cb_data(bt_parse_data_cb_t *cbd,int *ret) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(cbd->buf[0] == 'e' && !cbd->buf[0]) {
|
||||
if(cbd->buf[0] == 'e') {
|
||||
p->e_msg = s;
|
||||
p->e_len = cbd->v.s.l;
|
||||
return;
|
||||
}
|
||||
// DEBUG_TRACE(print_safe_str("UKNOWN",cbd));
|
||||
// DEBUG_TRACE(print_safe_str("UNKNOWN",cbd));
|
||||
}
|
||||
|
||||
|
||||
|
||||
+47
-11
@@ -24,44 +24,81 @@
|
||||
|
||||
#define BDEC_MAXDEPT 8
|
||||
|
||||
#ifdef WIN32
|
||||
#include "ndpi_win32.h"
|
||||
#endif
|
||||
|
||||
typedef struct b_elem_s {
|
||||
const u_int8_t *s;
|
||||
size_t l;
|
||||
} b_elem_s_t;
|
||||
|
||||
struct __attribute__ ((__packed__)) bt_nodes_data {
|
||||
u_int8_t id[20] ;
|
||||
#ifdef WIN32
|
||||
// enable 1 byte packing on Windows
|
||||
#include <pshpack1.h>
|
||||
#endif
|
||||
|
||||
struct
|
||||
#ifndef WIN32
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bt_nodes_data {
|
||||
u_int8_t id[20];
|
||||
u_int32_t ip;
|
||||
u_int16_t port;
|
||||
};
|
||||
|
||||
struct __attribute__ ((__packed__)) bt_ipv4p {
|
||||
struct
|
||||
#ifndef WIN32
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bt_ipv4p {
|
||||
u_int32_t ip;
|
||||
u_int16_t port;
|
||||
};
|
||||
|
||||
struct __attribute__ ((__packed__)) bt_ipv4p2 {
|
||||
struct
|
||||
#ifndef WIN32
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bt_ipv4p2 {
|
||||
struct bt_ipv4p d;
|
||||
u_int8_t pad[2];
|
||||
};
|
||||
|
||||
struct __attribute__ ((__packed__)) bt_nodes6_data {
|
||||
u_int8_t id[20] ;
|
||||
struct
|
||||
#ifndef WIN32
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bt_nodes6_data {
|
||||
u_int8_t id[20];
|
||||
u_int32_t ip[4];
|
||||
u_int16_t port;
|
||||
};
|
||||
|
||||
struct __attribute__ ((__packed__)) bt_ipv6p {
|
||||
struct
|
||||
#ifndef WIN32
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bt_ipv6p {
|
||||
u_int32_t ip[4];
|
||||
u_int16_t port;
|
||||
};
|
||||
|
||||
struct __attribute__ ((__packed__)) bt_ipv6p2 {
|
||||
struct
|
||||
#ifndef WIN32
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bt_ipv6p2 {
|
||||
struct bt_ipv6p d;
|
||||
u_int8_t pad[3];
|
||||
};
|
||||
|
||||
#ifdef WIN32
|
||||
// disable 1 byte packing
|
||||
#include <poppack.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
a.id S r.id S
|
||||
@@ -113,9 +150,9 @@ struct bt_parse_protocol {
|
||||
struct bt_nodes6_data *nodes6;
|
||||
u_int16_t name_len;
|
||||
u_int16_t nn; // nodes num
|
||||
u_int16_t nv; // valuse num
|
||||
u_int16_t nv; // values num
|
||||
u_int16_t nn6; // nodes6 num
|
||||
u_int16_t nv6; // valuse6 num
|
||||
u_int16_t nv6; // values6 num
|
||||
u_int16_t port;
|
||||
u_int16_t t_len;
|
||||
} r;
|
||||
@@ -142,4 +179,3 @@ typedef struct bt_parse_data_cb {
|
||||
extern int bt_parse_debug;
|
||||
void dump_bt_proto_struct(struct bt_parse_protocol *p);
|
||||
const u_int8_t *bt_decode(const u_int8_t *b, size_t *l, int *ret, bt_parse_data_cb_t *cbd);
|
||||
|
||||
|
||||
+27
-11
@@ -72,7 +72,7 @@ struct ndpi_coap_hdr
|
||||
[164] = "5.04 Gateway Timeout",
|
||||
[165] = "5.05 Proxying Not Supported"
|
||||
**/
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Entry point when protocol is identified.
|
||||
@@ -83,6 +83,20 @@ static void ndpi_int_coap_add_connection (struct ndpi_detection_module_struct *n
|
||||
ndpi_set_detected_protocol(ndpi_struct,flow,NDPI_PROTOCOL_COAP,NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the default port is acceptable
|
||||
*
|
||||
* UDP Port 5683 (mandatory)
|
||||
* UDP Ports 61616-61631 compressed 6lowPAN
|
||||
*/
|
||||
static int isCoAPport(u_int16_t port) {
|
||||
if((port == 5683)
|
||||
|| ((port >= 61616) && (port <= 61631)))
|
||||
return(1);
|
||||
else
|
||||
return(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dissector function that searches CoAP headers
|
||||
*/
|
||||
@@ -91,22 +105,24 @@ void ndpi_search_coap (struct ndpi_detection_module_struct *ndpi_struct,
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
struct ndpi_coap_hdr * h = (struct ndpi_coap_hdr*) packet->payload;
|
||||
|
||||
|
||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
||||
return;
|
||||
}
|
||||
|
||||
// search for udp packet
|
||||
if(packet->udp != NULL) {
|
||||
|
||||
// header too short
|
||||
if(packet->payload_packet_len < 4) {
|
||||
|
||||
u_int16_t s_port = ntohs(flow->packet.udp->source);
|
||||
u_int16_t d_port = ntohs(flow->packet.udp->dest);
|
||||
|
||||
if((!isCoAPport(s_port) && !isCoAPport(d_port))
|
||||
|| (packet->payload_packet_len < 4) // header too short
|
||||
) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_COAP, ndpi_struct, NDPI_LOG_DEBUG, "excluding Coap\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_COAP);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_COAP, ndpi_struct, NDPI_LOG_DEBUG, "calculating coap over udp.\n");
|
||||
|
||||
// check values in header
|
||||
@@ -116,21 +132,21 @@ void ndpi_search_coap (struct ndpi_detection_module_struct *ndpi_struct,
|
||||
if((h->code >= 0 && h->code <= 5) || (h->code >= 65 && h->code <= 69) ||
|
||||
(h->code >= 128 && h->code <= 134) || (h->code >= 140 && h->code <= 143) ||
|
||||
(h->code >= 160 && h->code <= 165)) {
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_COAP, ndpi_struct, NDPI_LOG_DEBUG, "Coap found...\n");
|
||||
ndpi_int_coap_add_connection(ndpi_struct,flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_COAP, ndpi_struct, NDPI_LOG_DEBUG, "Excluding Coap ...\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_COAP);
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Entry point for the ndpi library
|
||||
*/
|
||||
|
||||
+79
-15
@@ -1,11 +1,7 @@
|
||||
/*
|
||||
* dhcp.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - 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
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -19,7 +15,7 @@
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -27,6 +23,34 @@
|
||||
|
||||
#ifdef NDPI_PROTOCOL_DHCP
|
||||
|
||||
/* freeradius/src/lib/dhcp.c */
|
||||
#define DHCP_CHADDR_LEN 16
|
||||
#define DHCP_SNAME_LEN 64
|
||||
#define DHCP_FILE_LEN 128
|
||||
#define DHCP_VEND_LEN 308
|
||||
#define DHCP_OPTION_MAGIC_NUMBER 0x63825363
|
||||
|
||||
|
||||
typedef struct {
|
||||
uint8_t msgType;
|
||||
uint8_t htype;
|
||||
uint8_t hlen;
|
||||
uint8_t hops;
|
||||
uint32_t xid;/* 4 */
|
||||
uint16_t secs;/* 8 */
|
||||
uint16_t flags;
|
||||
uint32_t ciaddr;/* 12 */
|
||||
uint32_t yiaddr;/* 16 */
|
||||
uint32_t siaddr;/* 20 */
|
||||
uint32_t giaddr;/* 24 */
|
||||
uint8_t chaddr[DHCP_CHADDR_LEN]; /* 28 */
|
||||
uint8_t sname[DHCP_SNAME_LEN]; /* 44 */
|
||||
uint8_t file[DHCP_FILE_LEN]; /* 108 */
|
||||
uint32_t magic; /* 236 */
|
||||
uint8_t options[DHCP_VEND_LEN];
|
||||
} dhcp_packet_t;
|
||||
|
||||
|
||||
static void ndpi_int_dhcp_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DHCP, NDPI_PROTOCOL_UNKNOWN);
|
||||
@@ -36,23 +60,63 @@ static void ndpi_int_dhcp_add_connection(struct ndpi_detection_module_struct *nd
|
||||
void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
/* this detection also works for asymmetric dhcp traffic */
|
||||
|
||||
/*check standard DHCP 0.0.0.0:68 -> 255.255.255.255:67 */
|
||||
if (packet->payload_packet_len >= 244 && (packet->udp->source == htons(67)
|
||||
|| packet->udp->source == htons(68))
|
||||
&& (packet->udp->dest == htons(67) || packet->udp->dest == htons(68))
|
||||
&& get_u_int32_t(packet->payload, 236) == htonl(0x63825363)
|
||||
&& get_u_int16_t(packet->payload, 240) == htons(0x3501)) {
|
||||
if(packet->udp) {
|
||||
dhcp_packet_t *dhcp = (dhcp_packet_t*)packet->payload;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_DHCP, ndpi_struct, NDPI_LOG_DEBUG, "DHCP request\n");
|
||||
if((packet->payload_packet_len >= 244)
|
||||
&& (packet->udp->source == htons(67) || packet->udp->source == htons(68))
|
||||
&& (packet->udp->dest == htons(67) || packet->udp->dest == htons(68))
|
||||
&& (dhcp->magic == htonl(DHCP_OPTION_MAGIC_NUMBER))) {
|
||||
int i = 0, foundValidMsgType = 0;
|
||||
|
||||
ndpi_int_dhcp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
while(i < DHCP_VEND_LEN) {
|
||||
u_int8_t id = dhcp->options[i];
|
||||
if(id == 0xFF) break;
|
||||
else {
|
||||
u_int8_t len = dhcp->options[i+1];
|
||||
|
||||
if(len == 0) break;
|
||||
|
||||
#ifdef DHCP_DEBUG
|
||||
printf("[DHCP] Id=%d [len=%d]\n", id, len);
|
||||
#endif
|
||||
|
||||
if(id == 53 /* DHCP Message Type */) {
|
||||
u_int8_t msg_type = dhcp->options[i+2];
|
||||
|
||||
if(msg_type <= 8) foundValidMsgType = 1;
|
||||
} else if(id == 12 /* Host Name */) {
|
||||
char *name = (char*)&dhcp->options[i+2];
|
||||
int j = 0;
|
||||
|
||||
#ifdef DHCP_DEBUG
|
||||
printf("[DHCP] ");
|
||||
while(j < len) { printf("%c", name[j]); j++; }
|
||||
printf("\n");
|
||||
#endif
|
||||
j = ndpi_min(len, sizeof(flow->host_server_name)-1);
|
||||
strncpy((char*)flow->host_server_name, name, j);
|
||||
flow->host_server_name[j] = '\0';
|
||||
}
|
||||
i += len + 2;
|
||||
}
|
||||
}
|
||||
|
||||
//get_u_int16_t(packet->payload, 240) == htons(0x3501)) {
|
||||
|
||||
if(foundValidMsgType) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_DHCP, ndpi_struct, NDPI_LOG_DEBUG, "DHCP found\n");
|
||||
ndpi_int_dhcp_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DHCP);
|
||||
|
||||
+140
-54
@@ -3,8 +3,6 @@
|
||||
*
|
||||
* Copyright (C) 2012-16 - ntop.org
|
||||
*
|
||||
* Michele Campus - <campus@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
|
||||
*
|
||||
@@ -29,37 +27,60 @@
|
||||
|
||||
#define FLAGS_MASK 0x8000
|
||||
|
||||
void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
/* #define DNS_DEBUG 1 */
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
static u_int16_t get16(int *i, const u_int8_t *payload) {
|
||||
u_int16_t v = *(u_int16_t*)&payload[*i];
|
||||
|
||||
(*i) += 2;
|
||||
|
||||
return(ntohs(v));
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
static u_int getNameLength(u_int i, const u_int8_t *payload, u_int payloadLen) {
|
||||
if(payload[i] == 0x00)
|
||||
return(1);
|
||||
else if(payload[i] == 0xC0)
|
||||
return(2);
|
||||
else {
|
||||
u_int8_t len = payload[i];
|
||||
u_int8_t off = len + 1;
|
||||
|
||||
if(off == 0) /* Bad packet */
|
||||
return(0);
|
||||
else
|
||||
return(off + getNameLength(i+off, payload, payloadLen));
|
||||
}
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
int x;
|
||||
u_int8_t is_query, ret_code;
|
||||
u_int16_t s_port = 0;
|
||||
u_int16_t d_port = 0;
|
||||
u_int8_t is_query;
|
||||
u_int16_t s_port = 0, d_port = 0;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "search DNS.\n");
|
||||
|
||||
if(flow->packet.udp != NULL)
|
||||
{
|
||||
if(flow->packet.udp != NULL) {
|
||||
s_port = ntohs(flow->packet.udp->source);
|
||||
d_port = ntohs(flow->packet.udp->dest);
|
||||
x = 0;
|
||||
}
|
||||
else if(flow->packet.tcp != NULL) /* pkt size > 512 bytes */
|
||||
{
|
||||
} else if(flow->packet.tcp != NULL) /* pkt size > 512 bytes */ {
|
||||
s_port = ntohs(flow->packet.tcp->source);
|
||||
d_port = ntohs(flow->packet.tcp->dest);
|
||||
x = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS);
|
||||
}
|
||||
|
||||
if((s_port == 53 || d_port == 53 || d_port == 5355)
|
||||
&& (flow->packet.payload_packet_len > sizeof(struct ndpi_dns_packet_header)))
|
||||
{
|
||||
&& (flow->packet.payload_packet_len > sizeof(struct ndpi_dns_packet_header)+x)) {
|
||||
struct ndpi_dns_packet_header dns_header;
|
||||
int invalid = 0;
|
||||
|
||||
@@ -70,6 +91,7 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
dns_header.num_answers = ntohs(dns_header.num_answers);
|
||||
dns_header.authority_rrs = ntohs(dns_header.authority_rrs);
|
||||
dns_header.additional_rrs = ntohs(dns_header.additional_rrs);
|
||||
x += sizeof(struct ndpi_dns_packet_header);
|
||||
|
||||
/* 0x0000 QUERY */
|
||||
if((dns_header.flags & FLAGS_MASK) == 0x0000)
|
||||
@@ -87,65 +109,129 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
&& (((dns_header.flags & 0x2800) == 0x2800 /* Dynamic DNS Update */)
|
||||
|| ((dns_header.num_answers == 0) && (dns_header.authority_rrs == 0)))) {
|
||||
/* This is a good query */
|
||||
|
||||
if(dns_header.num_queries > 0) {
|
||||
while(x < flow->packet.payload_packet_len) {
|
||||
if(flow->packet.payload[x] == '\0') {
|
||||
x++;
|
||||
flow->protos.dns.query_type = get16(&x, flow->packet.payload);
|
||||
#ifdef DNS_DEBUG
|
||||
printf("[%s:%d] query_type=%2d\n", __FILE__, __LINE__, flow->protos.dns.query_type);
|
||||
#endif
|
||||
break;
|
||||
} else
|
||||
x++;
|
||||
}
|
||||
}
|
||||
} else
|
||||
invalid = 1;
|
||||
|
||||
} else {
|
||||
/* DNS Reply */
|
||||
|
||||
flow->protos.dns.reply_code = dns_header.flags & 0x0F;
|
||||
|
||||
if((dns_header.num_queries > 0) && (dns_header.num_queries <= NDPI_MAX_DNS_REQUESTS) /* Don't assume that num_queries must be zero */
|
||||
&& (((dns_header.num_answers > 0) && (dns_header.num_answers <= NDPI_MAX_DNS_REQUESTS))
|
||||
|| ((dns_header.authority_rrs > 0) && (dns_header.authority_rrs <= NDPI_MAX_DNS_REQUESTS))
|
||||
|| ((dns_header.additional_rrs > 0) && (dns_header.additional_rrs <= NDPI_MAX_DNS_REQUESTS)))
|
||||
) {
|
||||
/* This is a good reply */
|
||||
} else
|
||||
invalid = 1;
|
||||
if(ndpi_struct->dns_dissect_response) {
|
||||
x++;
|
||||
|
||||
if(flow->packet.payload[x] != '\0') {
|
||||
while((x < flow->packet.payload_packet_len)
|
||||
&& (flow->packet.payload[x] != '\0')) {
|
||||
x++;
|
||||
}
|
||||
|
||||
x++;
|
||||
}
|
||||
|
||||
x += 4;
|
||||
|
||||
if(dns_header.num_answers > 0) {
|
||||
u_int16_t rsp_type;
|
||||
u_int16_t num;
|
||||
|
||||
for(num = 0; num < dns_header.num_answers; num++) {
|
||||
u_int16_t data_len;
|
||||
|
||||
if((x+6) >= flow->packet.payload_packet_len) {
|
||||
break;
|
||||
}
|
||||
|
||||
if((data_len = getNameLength(x, flow->packet.payload, flow->packet.payload_packet_len)) == 0) {
|
||||
break;
|
||||
} else
|
||||
x += data_len;
|
||||
|
||||
rsp_type = get16(&x, flow->packet.payload);
|
||||
flow->protos.dns.rsp_type = rsp_type;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(invalid) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS);
|
||||
return;
|
||||
}
|
||||
if(invalid) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS);
|
||||
return;
|
||||
}
|
||||
|
||||
/* extract host name server */
|
||||
ret_code = (is_query == 0) ? 0 : (dns_header.flags & 0x0F);
|
||||
int j = 0;
|
||||
int off = sizeof(struct ndpi_dns_packet_header) + 1;
|
||||
while(flow->packet.payload[off] != '\0' && off < flow->packet.payload_packet_len)
|
||||
{
|
||||
/* extract host name server */
|
||||
int j = 0, max_len = sizeof(flow->host_server_name)-1, off = sizeof(struct ndpi_dns_packet_header) + 1;
|
||||
|
||||
while(off < flow->packet.payload_packet_len && flow->packet.payload[off] != '\0') {
|
||||
flow->host_server_name[j] = flow->packet.payload[off];
|
||||
if(j < strlen((char*)flow->host_server_name)) {
|
||||
if(j < max_len) {
|
||||
if(flow->host_server_name[j] < ' ')
|
||||
flow->host_server_name[j] = '.';
|
||||
j++;
|
||||
}
|
||||
} else
|
||||
break;
|
||||
|
||||
off++;
|
||||
}
|
||||
flow->host_server_name[j] = '\0';
|
||||
}
|
||||
|
||||
flow->protos.dns.num_answers = (u_int8_t) (dns_header.num_answers + dns_header.authority_rrs + dns_header.additional_rrs);
|
||||
flow->protos.dns.ret_code = ret_code;
|
||||
flow->host_server_name[j] = '\0';
|
||||
|
||||
if(j > 0)
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||
(char *)flow->host_server_name,
|
||||
strlen((const char*)flow->host_server_name),
|
||||
NDPI_PROTOCOL_DNS);
|
||||
flow->protos.dns.num_queries = (u_int8_t)dns_header.num_queries,
|
||||
flow->protos.dns.num_answers = (u_int8_t) (dns_header.num_answers + dns_header.authority_rrs + dns_header.additional_rrs);
|
||||
|
||||
if(j > 0)
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||
(char *)flow->host_server_name,
|
||||
strlen((const char*)flow->host_server_name),
|
||||
NDPI_PROTOCOL_DNS);
|
||||
|
||||
#ifdef DNS_DEBUG
|
||||
printf("[%s:%d] [num_queries=%d][num_answers=%d][reply_code=%u][rsp_type=%u][host_server_name=%s]\n",
|
||||
__FILE__, __LINE__,
|
||||
flow->protos.dns.num_queries, flow->protos.dns.num_answers,
|
||||
flow->protos.dns.reply_code, flow->protos.dns.rsp_type, flow->host_server_name
|
||||
);
|
||||
#endif
|
||||
|
||||
if(flow->packet.detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN)
|
||||
{
|
||||
/**
|
||||
Do not set the protocol with DNS if ndpi_match_host_subprotocol() has
|
||||
matched a subprotocol
|
||||
**/
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "found DNS.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, (d_port == 5355) ? NDPI_PROTOCOL_LLMNR : NDPI_PROTOCOL_DNS, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS);
|
||||
if(flow->packet.detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
|
||||
if(is_query && ndpi_struct->dns_dissect_response)
|
||||
return; /* The response will set the verdict */
|
||||
|
||||
/**
|
||||
Do not set the protocol with DNS if ndpi_match_host_subprotocol() has
|
||||
matched a subprotocol
|
||||
**/
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "found DNS.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, (d_port == 5355) ? NDPI_PROTOCOL_LLMNR : NDPI_PROTOCOL_DNS, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void init_dns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
/*
|
||||
* drda.c
|
||||
*
|
||||
* Copyright (C) 2012-16 - ntop.org
|
||||
*
|
||||
* This module 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.
|
||||
*
|
||||
* This module 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.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_DRDA
|
||||
|
||||
struct ndpi_drda_hdr {
|
||||
u_int16_t length;
|
||||
u_int8_t magic;
|
||||
u_int8_t format;
|
||||
u_int16_t correlID;
|
||||
u_int16_t length2;
|
||||
u_int16_t code_pnt;
|
||||
};
|
||||
|
||||
|
||||
void ndpi_search_drda(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct * packet = &flow->packet;
|
||||
u_int16_t payload_len = packet->payload_packet_len;
|
||||
u_int count = 0; // prevent integer overflow
|
||||
|
||||
if(packet->tcp != NULL) {
|
||||
|
||||
/* check port */
|
||||
if(payload_len >= sizeof(struct ndpi_drda_hdr)) {
|
||||
|
||||
struct ndpi_drda_hdr * drda = (struct ndpi_drda_hdr *) packet->payload;
|
||||
|
||||
u_int16_t len = ntohs(drda->length);
|
||||
|
||||
/* check first header */
|
||||
if(len != ntohs(drda->length2) + 6 ||
|
||||
drda->magic != 0xd0)
|
||||
goto no_drda;
|
||||
|
||||
/* check if there are more drda headers */
|
||||
if(payload_len > len) {
|
||||
|
||||
count = len;
|
||||
|
||||
while(count + sizeof(struct ndpi_drda_hdr) < payload_len)
|
||||
{
|
||||
/* update info */
|
||||
drda = (struct ndpi_drda_hdr *)(packet->payload + count);
|
||||
len = ntohs(drda->length);
|
||||
|
||||
if(len != ntohs(drda->length2) + 6 ||
|
||||
drda->magic != 0xd0)
|
||||
goto no_drda;
|
||||
|
||||
count += len;
|
||||
}
|
||||
if(count != payload_len) goto no_drda;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_DRDA, ndpi_struct, NDPI_LOG_DEBUG, "found DRDA.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DRDA, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
no_drda:
|
||||
NDPI_LOG(NDPI_PROTOCOL_DRDA, ndpi_struct, NDPI_LOG_DEBUG, "exclude DRDA.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DRDA);
|
||||
}
|
||||
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
|
||||
void init_drda_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
|
||||
NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("DRDA", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_DRDA,
|
||||
ndpi_search_drda,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_TCP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif /* NDPI_PROTOCOL_DRDA */
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* dropbox.c
|
||||
*
|
||||
* Copyright (C) 2011-13 by ntop.org
|
||||
* Copyright (C) 2012-16 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
|
||||
@@ -44,7 +44,6 @@ static void ndpi_check_dropbox(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
if(packet->udp != NULL) {
|
||||
|
||||
u_int16_t dropbox_port = htons(DB_LSP_PORT);
|
||||
|
||||
if((packet->udp->source == dropbox_port)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ftp_control.c
|
||||
*
|
||||
* Copyright (C) 2014 Tomasz Bujlow <tomasz@skatnet.dk>
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -935,51 +935,55 @@ static int ndpi_ftp_control_check_response(const u_int8_t *payload, size_t paylo
|
||||
}
|
||||
|
||||
static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
/* Check connection over TCP */
|
||||
if(packet->tcp) {
|
||||
|
||||
/* Exclude SMTP, which uses similar commands. */
|
||||
if (packet->tcp->dest == htons(25) || packet->tcp->source == htons(25)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_CONTROL.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_CONTROL);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Break after 20 packets. */
|
||||
if (flow->packet_counter > 20) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_CONTROL.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_CONTROL);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check if we so far detected the protocol in the request or not. */
|
||||
if (flow->ftp_control_stage == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL stage 0: \n");
|
||||
|
||||
if ((payload_len > 0) && ndpi_ftp_control_check_request(packet->payload, payload_len)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Possible FTP_CONTROL request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
flow->ftp_control_stage = packet->packet_direction + 1;
|
||||
}
|
||||
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL stage %u: \n", flow->ftp_control_stage);
|
||||
|
||||
/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
|
||||
if ((flow->ftp_control_stage - packet->packet_direction) == 1) {
|
||||
/* Exclude SMTP, which uses similar commands. */
|
||||
if (packet->tcp->dest == htons(25) || packet->tcp->source == htons(25)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_CONTROL.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_CONTROL);
|
||||
return;
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && ndpi_ftp_control_check_response(packet->payload, payload_len)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Found FTP_CONTROL.\n");
|
||||
ndpi_int_ftp_control_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "The reply did not seem to belong to FTP_CONTROL, resetting the stage to 0...\n");
|
||||
flow->ftp_control_stage = 0;
|
||||
|
||||
/* Break after 20 packets. */
|
||||
if (flow->packet_counter > 20) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_CONTROL.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_CONTROL);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check if we so far detected the protocol in the request or not. */
|
||||
if (flow->ftp_control_stage == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL stage 0: \n");
|
||||
|
||||
if ((payload_len > 0) && ndpi_ftp_control_check_request(packet->payload, payload_len)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Possible FTP_CONTROL request detected, we will look further for the response...\n");
|
||||
|
||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||
flow->ftp_control_stage = packet->packet_direction + 1;
|
||||
}
|
||||
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL stage %u: \n", flow->ftp_control_stage);
|
||||
|
||||
/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
|
||||
if ((flow->ftp_control_stage - packet->packet_direction) == 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
if ((payload_len > 0) && ndpi_ftp_control_check_response(packet->payload, payload_len)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Found FTP_CONTROL.\n");
|
||||
ndpi_int_ftp_control_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "The reply did not seem to belong to FTP_CONTROL, resetting the stage to 0...\n");
|
||||
flow->ftp_control_stage = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* ftp_data.c
|
||||
*
|
||||
* Copyright (C) 2014 Tomasz Bujlow <tomasz@skatnet.dk>
|
||||
* Copyright (C) 2014 - ntop.org
|
||||
* Copyright (C) 2016 - ntop.org
|
||||
*
|
||||
* The signature is based on the Libprotoident library.
|
||||
*
|
||||
@@ -34,12 +33,13 @@ static void ndpi_int_ftp_data_add_connection(struct ndpi_detection_module_struct
|
||||
static int ndpi_match_ftp_data_port(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if(packet->tcp->dest == htons(20) || packet->tcp->source == htons(20)) {
|
||||
return 1;
|
||||
/* Check connection over TCP */
|
||||
if(packet->tcp) {
|
||||
if(packet->tcp->dest == htons(20) || packet->tcp->source == htons(20)) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
static int ndpi_match_ftp_data_directory(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
@@ -62,7 +62,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
/* A FTP packet is pretty long so 256 is a bit consrvative but it should be OK */
|
||||
/* A FTP packet is pretty long so 256 is a bit conservative but it should be OK */
|
||||
if(packet->payload_packet_len < 256)
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
/*
|
||||
* git.c
|
||||
*
|
||||
* Copyright (C) 2012-16 - ntop.org
|
||||
*
|
||||
* This module 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.
|
||||
*
|
||||
* This module 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.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_GIT
|
||||
|
||||
#define GIT_PORT 9418
|
||||
|
||||
void ndpi_search_git(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct * packet = &flow->packet;
|
||||
|
||||
if((packet->tcp != NULL) && (packet->payload_packet_len > 4)) {
|
||||
if((ntohs(packet->tcp->source) == GIT_PORT)
|
||||
|| (ntohs(packet->tcp->dest) == GIT_PORT)) {
|
||||
const u_int8_t * pp = packet->payload;
|
||||
u_int16_t payload_len = packet->payload_packet_len;
|
||||
u_int8_t found_git = 1;
|
||||
u_int16_t offset = 0;
|
||||
|
||||
while((offset+4) < payload_len) {
|
||||
char len[5];
|
||||
u_int32_t git_pkt_len;
|
||||
|
||||
memcpy(&len, &pp[offset], 4), len[4] = 0;
|
||||
git_pkt_len = atoi(len);
|
||||
|
||||
if((payload_len < git_pkt_len) || (git_pkt_len == 0 /* Bad */)) {
|
||||
found_git = 0;
|
||||
break;
|
||||
} else
|
||||
offset += git_pkt_len, payload_len -= git_pkt_len;
|
||||
}
|
||||
|
||||
if(found_git) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_GIT, ndpi_struct, NDPI_LOG_DEBUG, "found Git.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GIT, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_GIT, ndpi_struct, NDPI_LOG_DEBUG, "exclude Git.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_GIT);
|
||||
}
|
||||
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
|
||||
void init_git_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
|
||||
NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("Git", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_GIT,
|
||||
ndpi_search_git,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_TCP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif /* NDPI_PROTOCOL_GIT */
|
||||
@@ -203,7 +203,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
||||
&& packet->payload[packet->payload_packet_len - 2] == 0x0a) {
|
||||
if (packet->payload_packet_len > 3 && memcmp(packet->payload, "GIV", 3) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "MORPHEUS GIV DETECTED\n");
|
||||
/* Not Excludeing the flow now.. We shall Check the next Packet too for Gnutella Patterns */
|
||||
/* Not Excluding the flow now.. We shall Check the next Packet too for Gnutella Patterns */
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
|
||||
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over udp.\n");
|
||||
|
||||
if(packet->payload_packet_len >= 5 && packet->payload[0] == 0x80 && packet->payload[1] == 0x08 &&
|
||||
if(packet->payload_packet_len >= 6 && packet->payload[0] == 0x80 && packet->payload[1] == 0x08 &&
|
||||
(packet->payload[2] == 0xe7 || packet->payload[2] == 0x26) &&
|
||||
packet->payload[4] == 0x00 && packet->payload[5] == 0x00)
|
||||
{
|
||||
@@ -81,7 +81,7 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
else if(packet->payload_packet_len >= 20 || packet->payload_packet_len <= 117)
|
||||
else if(packet->payload_packet_len >= 20 && packet->payload_packet_len <= 117)
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "found H323 broadcast.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
/*
|
||||
* hangout.c
|
||||
*
|
||||
* Copyright (C) 2012-16 - ntop.org
|
||||
*
|
||||
* This module 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.
|
||||
*
|
||||
* This module 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.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_HANGOUT
|
||||
|
||||
/* https://support.google.com/a/answer/1279090?hl=en */
|
||||
#define HANGOUT_UDP_LOW_PORT 19302
|
||||
#define HANGOUT_UDP_HIGH_PORT 19309
|
||||
#define HANGOUT_TCP_LOW_PORT 19305
|
||||
#define HANGOUT_TCP_HIGH_PORT 19309
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
static u_int8_t isHangoutUDPPort(u_int16_t port) {
|
||||
if((port >= HANGOUT_UDP_LOW_PORT) && (port <= HANGOUT_UDP_HIGH_PORT))
|
||||
return(1);
|
||||
else
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
static u_int8_t isHangoutTCPPort(u_int16_t port) {
|
||||
if((port >= HANGOUT_TCP_LOW_PORT) && (port <= HANGOUT_TCP_HIGH_PORT))
|
||||
return(1);
|
||||
else
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ******************************************* */
|
||||
|
||||
static u_int8_t google_ptree_match(struct ndpi_detection_module_struct *ndpi_struct, struct in_addr *pin) {
|
||||
return((ndpi_network_ptree_match(ndpi_struct, pin) == NDPI_PROTOCOL_GOOGLE) ? 1 : 0);
|
||||
}
|
||||
|
||||
/* ******************************************* */
|
||||
|
||||
static u_int8_t is_google_flow(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if(packet->iph) {
|
||||
if(google_ptree_match(ndpi_struct, (struct in_addr *)&packet->iph->saddr)
|
||||
|| google_ptree_match(ndpi_struct, (struct in_addr *)&packet->iph->daddr)) {
|
||||
return(1);
|
||||
}
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
void ndpi_search_hangout(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct * packet = &flow->packet;
|
||||
|
||||
if((packet->payload_packet_len > 24) && is_google_flow(ndpi_struct, flow)) {
|
||||
if(
|
||||
((packet->udp != NULL) && (isHangoutUDPPort(ntohs(packet->udp->source)) || isHangoutUDPPort(ntohs(packet->udp->dest))))
|
||||
||
|
||||
((packet->tcp != NULL) && (isHangoutTCPPort(ntohs(packet->tcp->source)) || isHangoutTCPPort(ntohs(packet->tcp->dest))))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HANGOUT, ndpi_struct, NDPI_LOG_DEBUG, "Found Hangout.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HANGOUT, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HANGOUT, ndpi_struct, NDPI_LOG_DEBUG, "No Hangout.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HANGOUT);
|
||||
}
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
|
||||
NDPI_PROTOCOL_BITMASK *detection_bitmask) {
|
||||
ndpi_set_bitmask_protocol_detection("GoogleHangout", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_HANGOUT,
|
||||
ndpi_search_hangout,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif /* NDPI_PROTOCOL_HANGOUT */
|
||||
+196
-319
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* http.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* 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
|
||||
@@ -21,11 +20,15 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
|
||||
|
||||
/* global variables used for 1kxun protocol and iqiyi service */
|
||||
static u_int16_t kxun_counter;
|
||||
static u_int16_t iqiyi_counter;
|
||||
|
||||
static void ndpi_int_http_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int32_t protocol) {
|
||||
@@ -36,11 +39,12 @@ static void ndpi_int_http_add_connection(struct ndpi_detection_module_struct *nd
|
||||
ndpi_search_tcp_or_udp(ndpi_struct, flow);
|
||||
|
||||
/* If no custom protocol has been detected */
|
||||
if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
|
||||
if(protocol == NDPI_PROTOCOL_HTTP)
|
||||
/* if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) */ {
|
||||
if(protocol == NDPI_PROTOCOL_HTTP) {
|
||||
ndpi_int_reset_protocol(flow);
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, protocol);
|
||||
} else
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_HTTP);
|
||||
}
|
||||
|
||||
flow->http_detected = 1;
|
||||
@@ -59,7 +63,6 @@ static void flash_check_http_payload(struct ndpi_detection_module_struct
|
||||
|
||||
pos = &packet->payload[packet->empty_line_position] + 2;
|
||||
|
||||
|
||||
if(memcmp(pos, "FLV", 3) == 0 && pos[3] == 0x01 && (pos[4] == 0x01 || pos[4] == 0x04 || pos[4] == 0x05)
|
||||
&& pos[5] == 0x00 && pos[6] == 0x00 && pos[7] == 0x00 && pos[8] == 0x09) {
|
||||
|
||||
@@ -97,11 +100,14 @@ static void avi_check_http_payload(struct ndpi_detection_module_struct *ndpi_str
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
for reference see http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c/directx/htm/avirifffilereference.asp
|
||||
**/
|
||||
if(packet->empty_line_position_set != 0) {
|
||||
// check for avi header
|
||||
// for reference see http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c/directx/htm/avirifffilereference.asp
|
||||
|
||||
u_int32_t p = packet->empty_line_position + 2;
|
||||
|
||||
// check for avi header
|
||||
NDPI_LOG(NDPI_CONTENT_AVI, ndpi_struct, NDPI_LOG_DEBUG, "p = %u\n", p);
|
||||
|
||||
if((p + 16) <= packet->payload_packet_len && memcmp(&packet->payload[p], "RIFF", 4) == 0
|
||||
@@ -153,54 +159,24 @@ static void setHttpUserAgent(struct ndpi_flow_struct *flow, char *ua) {
|
||||
else if(!strcmp(ua, "Windows NT 5.1")) ua = "Windows XP";
|
||||
else if(!strcmp(ua, "Windows NT 5.2")) ua = "Windows Server 2003";
|
||||
else if(!strcmp(ua, "Windows NT 6.0")) ua = "Windows Vista";
|
||||
// else if(!strcmp(ua, "Windows NT 7.0")) ua = "Windows 7";
|
||||
else if(!strcmp(ua, "Windows NT 6.1")) ua = "Windows 7";
|
||||
else if(!strcmp(ua, "Windows NT 6.2")) ua = "Windows 8";
|
||||
else if(!strcmp(ua, "Windows NT 6.3")) ua = "Windows 8.1";
|
||||
|
||||
//printf("==> %s\n", ua);
|
||||
// printf("==> %s\n", ua);
|
||||
snprintf((char*)flow->detected_os, sizeof(flow->detected_os), "%s", ua);
|
||||
}
|
||||
|
||||
static void parseHttpSubprotocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
// int i = 0;
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
if((flow->l4.tcp.http_stage == 0) || (flow->http.url && flow->http_detected)) {
|
||||
char *double_col = strchr((char*)flow->host_server_name, ':');
|
||||
|
||||
if(packet->iph /* IPv4 only */) {
|
||||
/*
|
||||
Twitter Inc. TWITTER-NETWORK (NET-199-59-148-0-1) 199.59.148.0 - 199.59.151.255
|
||||
199.59.148.0/22
|
||||
*/
|
||||
if(((ntohl(packet->iph->saddr) & 0xFFFFFC00 /* 255.255.252.0 */) == 0xC73B9400 /* 199.59.148.0 */)
|
||||
|| ((ntohl(packet->iph->daddr) & 0xFFFFFC00 /* 255.255.252.0 */) == 0xC73B9400 /* 199.59.148.0 */)) {
|
||||
packet->detected_protocol_stack[0] = NDPI_SERVICE_TWITTER,
|
||||
packet->detected_protocol_stack[1] = NDPI_PROTOCOL_HTTP;
|
||||
return;
|
||||
}
|
||||
if(double_col) double_col[0] = '\0';
|
||||
|
||||
/*
|
||||
CIDR: 69.53.224.0/19
|
||||
OriginAS: AS2906
|
||||
NetName: NETFLIX-INC
|
||||
*/
|
||||
if(((ntohl(packet->iph->saddr) & 0xFFFFE000 /* 255.255.224.0 */) == 0x4535E000 /* 69.53.224.0 */)
|
||||
|| ((ntohl(packet->iph->daddr) & 0xFFFFE000 /* 255.255.224.0 */) == 0x4535E000 /* 69.53.224.0 */)) {
|
||||
packet->detected_protocol_stack[0] = NDPI_SERVICE_NETFLIX,
|
||||
packet->detected_protocol_stack[1] = NDPI_PROTOCOL_HTTP;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if((flow->l4.tcp.http_stage == 0)
|
||||
|| (flow->http.url && flow->http_detected)) {
|
||||
/* Try matching subprotocols */
|
||||
// ndpi_match_host_subprotocol(ndpi_struct, flow, (char*)packet->host_line.ptr, packet->host_line.len);
|
||||
|
||||
/*
|
||||
NOTE
|
||||
|
||||
If http_dont_dissect_response = 1 dissection of HTTP response
|
||||
mime types won't happen
|
||||
/**
|
||||
NOTE
|
||||
If http_dont_dissect_response = 1 dissection of HTTP response
|
||||
mime types won't happen
|
||||
*/
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow, (char *)flow->host_server_name,
|
||||
strlen((const char *)flow->host_server_name),
|
||||
@@ -208,24 +184,37 @@ static void parseHttpSubprotocol(struct ndpi_detection_module_struct *ndpi_struc
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
NOTE
|
||||
|
||||
ndpi_parse_packet_line_info @ ndpi_main.c
|
||||
is the code that parses the packet
|
||||
/**
|
||||
NOTE
|
||||
ndpi_parse_packet_line_info is in ndpi_main.c
|
||||
*/
|
||||
static void check_content_type_and_change_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
#ifdef NDPI_CONTENT_MPEG
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
#endif
|
||||
#ifdef NDPI_CONTENT_AVI
|
||||
#endif
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int8_t a;
|
||||
|
||||
|
||||
#ifdef NDPI_PROTOCOL_PPSTREAM
|
||||
/* PPStream */
|
||||
if(flow->l4.tcp.ppstream_stage > 0 && iqiyi_counter == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG, "PPStream found.\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_PPSTREAM);
|
||||
}
|
||||
else if(iqiyi_counter > 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IQIYI, ndpi_struct, NDPI_LOG_DEBUG, "iQiyi found.\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_IQIYI);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef NDPI_PROTOCOL_1KXUN
|
||||
/* 1KXUN */
|
||||
if(kxun_counter > 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_1KXUN, ndpi_struct, NDPI_LOG_DEBUG, "1kxun found.\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_1KXUN);
|
||||
}
|
||||
#endif
|
||||
|
||||
if(!ndpi_struct->http_dont_dissect_response) {
|
||||
if((flow->http.url == NULL)
|
||||
&& (packet->http_url_name.len > 0)
|
||||
@@ -279,7 +268,8 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
}
|
||||
|
||||
if(packet->user_agent_line.ptr != NULL && packet->user_agent_line.len != 0) {
|
||||
/* Format:
|
||||
/**
|
||||
Format:
|
||||
Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) ....
|
||||
*/
|
||||
if(packet->user_agent_line.len > 7) {
|
||||
@@ -334,6 +324,10 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(memcmp(ua, "netflix-ios-app", 15) == 0) {
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_NETFLIX);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "User Agent Type Line found %.*s\n",
|
||||
@@ -347,6 +341,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HOST Line found %.*s\n",
|
||||
packet->host_line.len, packet->host_line.ptr);
|
||||
|
||||
/* call ndpi_match_host_subprotocol to see if there is a match with known-host http subprotocol */
|
||||
if((ndpi_struct->http_dont_dissect_response) || flow->http_detected)
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||
(char*)packet->host_line.ptr,
|
||||
@@ -365,20 +360,31 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
if(ndpi_struct->http_dont_dissect_response)
|
||||
parseHttpSubprotocol(ndpi_struct, flow);
|
||||
|
||||
if((flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN)
|
||||
&& ((ndpi_struct->http_dont_dissect_response) || flow->http_detected))
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||
(char *)flow->host_server_name,
|
||||
strlen((const char *)flow->host_server_name),
|
||||
NDPI_PROTOCOL_HTTP);
|
||||
/**
|
||||
check result of host subprotocol detection
|
||||
|
||||
if "detected" in flow == 0 then "detected" = "guess"
|
||||
else "guess" = "detected"
|
||||
**/
|
||||
if(flow->detected_protocol_stack[1] == 0) {
|
||||
flow->detected_protocol_stack[1] = flow->guessed_protocol_id;
|
||||
if(flow->detected_protocol_stack[0] == 0)
|
||||
flow->detected_protocol_stack[0] = flow->guessed_host_protocol_id;
|
||||
}
|
||||
else {
|
||||
if(flow->detected_protocol_stack[1] != flow->guessed_protocol_id)
|
||||
flow->guessed_protocol_id = flow->detected_protocol_stack[1];
|
||||
if(flow->detected_protocol_stack[0] != flow->guessed_host_protocol_id)
|
||||
flow->guessed_host_protocol_id = flow->detected_protocol_stack[0];
|
||||
}
|
||||
|
||||
if((flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN)
|
||||
&& ((ndpi_struct->http_dont_dissect_response) || flow->http_detected)
|
||||
&& (packet->http_origin.len > 0))
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||
(char *)packet->http_origin.ptr,
|
||||
packet->http_origin.len,
|
||||
NDPI_PROTOCOL_HTTP);
|
||||
(char *)packet->http_origin.ptr,
|
||||
packet->http_origin.len,
|
||||
NDPI_PROTOCOL_HTTP);
|
||||
|
||||
if(flow->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_HTTP) {
|
||||
@@ -391,6 +397,9 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
if(!ndpi_struct->http_dont_dissect_response && flow->http_detected)
|
||||
parseHttpSubprotocol(ndpi_struct, flow);
|
||||
|
||||
if(flow->guessed_protocol_id == NDPI_PROTOCOL_UNKNOWN)
|
||||
flow->guessed_protocol_id = NDPI_PROTOCOL_HTTP;
|
||||
|
||||
/* check for accept line */
|
||||
if(packet->accept_line.ptr != NULL) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Accept Line found %.*s\n",
|
||||
@@ -424,8 +433,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
(char*)packet->content_line.ptr, packet->content_line.len,
|
||||
NDPI_PROTOCOL_HTTP);
|
||||
}
|
||||
|
||||
/* check user agent here too */
|
||||
}
|
||||
|
||||
static void check_http_payload(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
@@ -447,7 +454,7 @@ static void check_http_payload(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
}
|
||||
|
||||
/**
|
||||
* this functions checks whether the packet begins with a valid http request
|
||||
* Functions to check whether the packet begins with a valid http request
|
||||
* @param ndpi_struct
|
||||
* @returnvalue 0 if no valid request has been found
|
||||
* @returnvalue >0 indicates start of filename but not necessarily in packet limit
|
||||
@@ -460,7 +467,10 @@ static u_int16_t http_request_url_offset(struct ndpi_detection_module_struct *nd
|
||||
packet->payload[0], packet->payload[1], packet->payload[2], packet->payload[3],
|
||||
packet->payload_packet_len);
|
||||
|
||||
/* FIRST PAYLOAD PACKET FROM CLIENT */
|
||||
/**
|
||||
FIRST PAYLOAD PACKET FROM CLIENT
|
||||
**/
|
||||
|
||||
/* check if the packet starts with POST or GET */
|
||||
if(packet->payload_packet_len >= 4 && memcmp(packet->payload, "GET ", 4) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: GET FOUND\n");
|
||||
@@ -523,228 +533,6 @@ static void http_bitmask_exclude(struct ndpi_flow_struct *flow)
|
||||
#endif
|
||||
}
|
||||
|
||||
void _org_ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
u_int16_t filename_start;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "search http\n");
|
||||
|
||||
/* set client-server_direction */
|
||||
if(flow->l4.tcp.http_setup_dir == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "initializes http to stage: 1 \n");
|
||||
flow->l4.tcp.http_setup_dir = 1 + packet->packet_direction;
|
||||
}
|
||||
|
||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK
|
||||
(ndpi_struct->generic_http_packet_bitmask, packet->detected_protocol_stack[0]) != 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"protocol might be detected earlier as http jump to payload type detection\n");
|
||||
goto http_parse_detection;
|
||||
}
|
||||
|
||||
if(flow->l4.tcp.http_setup_dir == 1 + packet->packet_direction) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "http stage: 1\n");
|
||||
|
||||
if(flow->l4.tcp.http_wait_for_retransmission) {
|
||||
if(!packet->tcp_retransmission) {
|
||||
if(flow->packet_counter <= 5) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "still waiting for retransmission\n");
|
||||
return;
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "retransmission not found, exclude\n");
|
||||
http_bitmask_exclude(flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(flow->l4.tcp.http_stage == 0) {
|
||||
filename_start = http_request_url_offset(ndpi_struct, flow);
|
||||
if(filename_start == 0) {
|
||||
if(packet->payload_packet_len >= 7 && memcmp(packet->payload, "HTTP/1.", 7) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP response found (truncated flow ?)\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "filename not found, exclude\n");
|
||||
http_bitmask_exclude(flow);
|
||||
return;
|
||||
}
|
||||
// parse packet
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if(packet->parsed_lines <= 1) {
|
||||
/* parse one more packet .. */
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "just one line, search next packet\n");
|
||||
|
||||
packet->http_method.ptr = packet->line[0].ptr;
|
||||
packet->http_method.len = filename_start - 1;
|
||||
flow->l4.tcp.http_stage = 1;
|
||||
return;
|
||||
}
|
||||
// parsed_lines > 1 here
|
||||
if(packet->line[0].len >= (9 + filename_start)
|
||||
&& memcmp(&packet->line[0].ptr[packet->line[0].len - 9], " HTTP/1.", 8) == 0) {
|
||||
u_int16_t proto_id;
|
||||
|
||||
packet->http_url_name.ptr = &packet->payload[filename_start];
|
||||
packet->http_url_name.len = packet->line[0].len - (filename_start + 9);
|
||||
|
||||
packet->http_method.ptr = packet->line[0].ptr;
|
||||
packet->http_method.len = filename_start - 1;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "http structure detected, adding\n");
|
||||
|
||||
if(filename_start == 8 && (memcmp(packet->payload, "CONNECT ", 8) == 0)) /* nathan@getoffmalawn.com */
|
||||
proto_id = NDPI_PROTOCOL_HTTP_CONNECT;
|
||||
else {
|
||||
if((packet->http_url_name.len > 7) && (!strncmp((const char*)packet->http_url_name.ptr, "http://", 7)))
|
||||
proto_id = NDPI_PROTOCOL_HTTP_PROXY;
|
||||
else {
|
||||
proto_id = NDPI_PROTOCOL_HTTP;
|
||||
}
|
||||
}
|
||||
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, proto_id);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
/* HTTP found, look for host... */
|
||||
if(packet->host_line.ptr != NULL) {
|
||||
/* aaahh, skip this direction and wait for a server reply here */
|
||||
flow->l4.tcp.http_stage = 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP START HOST found\n");
|
||||
return;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP START HOST found\n");
|
||||
|
||||
/* host not found, check in next packet after */
|
||||
flow->l4.tcp.http_stage = 1;
|
||||
return;
|
||||
}
|
||||
} else if(flow->l4.tcp.http_stage == 1) {
|
||||
/* SECOND PAYLOAD TRAFFIC FROM CLIENT, FIRST PACKET MIGHT HAVE BEEN HTTP... */
|
||||
/* UNKNOWN TRAFFIC, HERE FOR HTTP again.. */
|
||||
// parse packet
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if(packet->parsed_lines <= 1) {
|
||||
/* wait some packets in case request is split over more than 2 packets */
|
||||
if(flow->packet_counter < 5) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"line still not finished, search next packet\n");
|
||||
return;
|
||||
} else {
|
||||
/* stop parsing here */
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP: PACKET DOES NOT HAVE A LINE STRUCTURE\n");
|
||||
http_bitmask_exclude(flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
// http://www.slideshare.net/DSPIP/rtsp-analysis-wireshark
|
||||
if(packet->line[0].len >= 9 && memcmp(&packet->line[0].ptr[packet->line[0].len - 9], " HTTP/1.", 8) == 0) {
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP START HTTP found in 2. packet, check host here...\n");
|
||||
/* HTTP found, look for host... */
|
||||
flow->l4.tcp.http_stage = 2;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* We have received a response for a previously identified partial HTTP request */
|
||||
|
||||
if((packet->parsed_lines == 1) && (packet->packet_direction == 1 /* server -> client */)) {
|
||||
/*
|
||||
In apache if you do "GET /\n\n" the response comes without any header so we can assume that
|
||||
this can be the case
|
||||
*/
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: REQUEST NOT HTTP CONFORM\n");
|
||||
http_bitmask_exclude(flow);
|
||||
return;
|
||||
|
||||
http_parse_detection:
|
||||
if(flow->l4.tcp.http_setup_dir == 1 + packet->packet_direction) {
|
||||
/* we have something like http here, so check for host and content type if possible */
|
||||
if(flow->l4.tcp.http_stage == 0 || flow->l4.tcp.http_stage == 3) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP RUN MAYBE NEXT GET/POST...\n");
|
||||
// parse packet
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
/* check for url here */
|
||||
filename_start = http_request_url_offset(ndpi_struct, flow);
|
||||
if(filename_start != 0 && packet->parsed_lines > 1 && packet->line[0].len >= (9 + filename_start)
|
||||
&& memcmp(&packet->line[0].ptr[packet->line[0].len - 9], " HTTP/1.", 8) == 0) {
|
||||
packet->http_url_name.ptr = &packet->payload[filename_start];
|
||||
packet->http_url_name.len = packet->line[0].len - (filename_start + 9);
|
||||
|
||||
packet->http_method.ptr = packet->line[0].ptr;
|
||||
packet->http_method.len = filename_start - 1;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "next http action, "
|
||||
"resetting to http and search for other protocols later.\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||
}
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
/* HTTP found, look for host... */
|
||||
if(packet->host_line.ptr != NULL) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP RUN MAYBE NEXT HOST found, skipping all packets from this direction\n");
|
||||
/* aaahh, skip this direction and wait for a server reply here */
|
||||
flow->l4.tcp.http_stage = 2;
|
||||
return;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP RUN MAYBE NEXT HOST NOT found, scanning one more packet from this direction\n");
|
||||
flow->l4.tcp.http_stage = 1;
|
||||
} else if(flow->l4.tcp.http_stage == 1) {
|
||||
// parse packet and maybe find a packet info with host ptr,...
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP RUN second packet scanned\n");
|
||||
/* HTTP found, look for host... */
|
||||
flow->l4.tcp.http_stage = 2;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP skipping client packets after second packet\n");
|
||||
return;
|
||||
}
|
||||
/* server response */
|
||||
if(flow->l4.tcp.http_stage > 0) {
|
||||
/* first packet from server direction, might have a content line */
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
|
||||
if(packet->empty_line_position_set != 0 || flow->l4.tcp.http_empty_line_seen == 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "empty line. check_http_payload.\n");
|
||||
check_http_payload(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
if(flow->l4.tcp.http_stage == 2) {
|
||||
flow->l4.tcp.http_stage = 3;
|
||||
} else {
|
||||
flow->l4.tcp.http_stage = 0;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP response first or second packet scanned,new stage is: %u\n", flow->l4.tcp.http_stage);
|
||||
return;
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP response next packet skipped\n");
|
||||
}
|
||||
}
|
||||
|
||||
/*************************************************************************************************/
|
||||
|
||||
static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
@@ -763,10 +551,10 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
|
||||
filename_start = http_request_url_offset(ndpi_struct, flow);
|
||||
|
||||
|
||||
if(filename_start == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Filename HTTP not found, we look for possible truncate flow...\n");
|
||||
|
||||
if(packet->payload_packet_len >= 7 && memcmp(packet->payload, "HTTP/1.", 7) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"HTTP response found (truncated flow ?)\n");
|
||||
@@ -775,6 +563,24 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
return;
|
||||
}
|
||||
|
||||
if((packet->payload_packet_len == 3) && memcmp(packet->payload, "HI\n", 3) == 0) {
|
||||
/* This looks like Ookla: we don't give up with HTTP yet */
|
||||
flow->l4.tcp.http_stage = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
if((packet->payload_packet_len == 23) && (memcmp(packet->payload, "<policy-file-request/>", 23) == 0)) {
|
||||
/*
|
||||
<policy-file-request/>
|
||||
<cross-domain-policy>
|
||||
<allow-access-from domain="*.ookla.com" to-ports="8080"/>
|
||||
<allow-access-from domain="*.speedtest.net" to-ports="8080"/>
|
||||
</cross-domain-policy>
|
||||
*/
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Exclude HTTP\n");
|
||||
http_bitmask_exclude(flow);
|
||||
return;
|
||||
@@ -809,6 +615,70 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
packet->http_method.ptr = packet->line[0].ptr;
|
||||
packet->http_method.len = filename_start - 1;
|
||||
|
||||
/* Check for Ookla */
|
||||
if((packet->referer_line.len > 0)
|
||||
&& ndpi_strnstr((const char *)packet->referer_line.ptr, "www.speedtest.net", packet->referer_line.len)) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_HTTP);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check for additional field introduced by Steam */
|
||||
int x = 1;
|
||||
if((memcmp(packet->line[x].ptr, "x-steam-sid", 11)) == 0) {
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_STEAM);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check for additional field introduced by Facebook */
|
||||
x = 1;
|
||||
while(packet->line[x].len != 0) {
|
||||
if(packet->line[x].len >= 12 && (memcmp(packet->line[x].ptr, "X-FB-SIM-HNI", 12)) == 0) {
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_FACEBOOK);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
x++;
|
||||
}
|
||||
|
||||
/* check PPStream protocol or iQiyi service
|
||||
(iqiyi is delivered by ppstream) */
|
||||
// substring in url
|
||||
if(ndpi_strnstr((const char*) &packet->payload[filename_start], "iqiyi.com", (packet->payload_packet_len - filename_start)) != NULL) {
|
||||
if(kxun_counter == 0) {
|
||||
flow->l4.tcp.ppstream_stage++;
|
||||
iqiyi_counter++;
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow); /* ***** CHECK ****** */
|
||||
return;
|
||||
}
|
||||
}
|
||||
// additional field in http payload
|
||||
x = 1;
|
||||
while((packet->line[x].len >= 4) && (packet->line[x+1].len >= 5) && (packet->line[x+2].len >= 10)) {
|
||||
if(packet->line[x].ptr && ((memcmp(packet->line[x].ptr, "qyid", 4)) == 0)
|
||||
&& packet->line[x+1].ptr && ((memcmp(packet->line[x+1].ptr, "qypid", 5)) == 0)
|
||||
&& packet->line[x+2].ptr && ((memcmp(packet->line[x+2].ptr, "qyplatform", 10)) == 0)
|
||||
) {
|
||||
flow->l4.tcp.ppstream_stage++;
|
||||
iqiyi_counter++;
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
x++;
|
||||
}
|
||||
|
||||
/* Check for 1kxun packet */
|
||||
int a;
|
||||
for (a = 0; a < packet->parsed_lines; a++) {
|
||||
if(packet->line[a].len >= 14 && (memcmp(packet->line[a].ptr, "Client-Source:", 14)) == 0) {
|
||||
if((memcmp(packet->line[a].ptr+15, "1kxun", 5)) == 0) {
|
||||
kxun_counter++;
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if((packet->http_url_name.len > 7)
|
||||
&& (!strncmp((const char*) packet->http_url_name.ptr, "http://", 7))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP_PROXY Found.\n");
|
||||
@@ -816,8 +686,8 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
if(filename_start == 8 && (memcmp(packet->payload, "CONNECT ", 8) == 0)) /* nathan@getoffmalawn.com */
|
||||
{
|
||||
if(filename_start == 8 && (memcmp(packet->payload, "CONNECT ", 8) == 0)) {
|
||||
/* nathan@getoffmalawn.com */
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP_CONNECT Found.\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_CONNECT);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
@@ -827,11 +697,11 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
"HTTP START Found, we will look for sub-protocols (content and host)...\n");
|
||||
|
||||
if(packet->host_line.ptr != NULL) {
|
||||
/*
|
||||
nDPI is pretty scrupoulous about HTTP so it waits until the
|
||||
HTTP response is received just to check that it conforms
|
||||
with the HTTP specs. However this might be a waste of time as
|
||||
in 99.99% of the cases is like that.
|
||||
/**
|
||||
nDPI is pretty scrupulous about HTTP so it waits until the
|
||||
HTTP response is received just to check that it conforms
|
||||
with the HTTP specs. However this might be a waste of time as
|
||||
in 99.99% of the cases is like that.
|
||||
*/
|
||||
|
||||
if(ndpi_struct->http_dont_dissect_response) {
|
||||
@@ -845,7 +715,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
}
|
||||
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -856,8 +725,20 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP stage %u: \n",
|
||||
flow->l4.tcp.http_stage);
|
||||
|
||||
/* At first check, if this is for sure a response packet (in another direction. If not, if http is detected do nothing now and return,
|
||||
* otherwise check the second packet for the http request . */
|
||||
|
||||
if(flow->l4.tcp.http_stage == 1) {
|
||||
if((packet->payload_packet_len > 6) && memcmp(packet->payload, "HELLO ", 6) == 0) {
|
||||
/* This looks like Ookla */
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OOKLA);
|
||||
}
|
||||
|
||||
/**
|
||||
At first check, if this is for sure a response packet (in another direction. If not, if http is detected do nothing now and return,
|
||||
otherwise check the second packet for the http request
|
||||
*/
|
||||
if((flow->l4.tcp.http_stage - packet->packet_direction) == 1) {
|
||||
|
||||
if(flow->http_detected)
|
||||
@@ -898,21 +779,20 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
return;
|
||||
}
|
||||
|
||||
/* This is a packet in another direction. Check if we find the proper response. */
|
||||
/* We have received a response for a previously identified partial HTTP request */
|
||||
/**
|
||||
This is a packet in another direction. Check if we find the proper response.
|
||||
We have received a response for a previously identified partial HTTP request
|
||||
*/
|
||||
|
||||
if((packet->parsed_lines == 1) && (packet->packet_direction == 1 /* server -> client */)) {
|
||||
/*
|
||||
In apache if you do "GET /\n\n" the response comes without any header so we can assume that
|
||||
this can be the case
|
||||
*/
|
||||
/* In apache if you do "GET /\n\n" the response comes without any header */
|
||||
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Found HTTP. (apache)\n");
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
/* If we already detected the http request, we can add the connection and then check for the sub-protocol*/
|
||||
/* If we already detected the http request, we can add the connection and then check for the sub-protocol */
|
||||
if(flow->http_detected)
|
||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||
|
||||
@@ -1106,7 +986,7 @@ void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
|
||||
ndpi_struct->callback_buffer[a].detection_bitmask);
|
||||
|
||||
/*Delete protocol from exluded protocol bitmask*/
|
||||
/*Delete protocol from excluded protocol bitmask*/
|
||||
NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_QQ);
|
||||
@@ -1116,10 +996,7 @@ void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
#endif
|
||||
|
||||
NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_CONTENT_MMS);
|
||||
/* #ifdef NDPI_PROTOCOL_RTSP */
|
||||
/* NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, */
|
||||
/* NDPI_PROTOCOL_RTSP); */
|
||||
/* #endif */
|
||||
|
||||
NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX);
|
||||
|
||||
NDPI_BITMASK_SET(ndpi_struct->generic_http_packet_bitmask, ndpi_struct->callback_buffer[a].detection_bitmask);
|
||||
|
||||
@@ -1,308 +0,0 @@
|
||||
/*
|
||||
* imesh.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - 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_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_IMESH
|
||||
|
||||
|
||||
static void ndpi_int_imesh_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_IMESH, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
|
||||
void ndpi_search_imesh_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if (packet->udp != NULL) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "UDP FOUND\n");
|
||||
|
||||
// this is the login packet
|
||||
if (packet->payload_packet_len == 28 && (get_u_int32_t(packet->payload, 0)) == htonl(0x02000000) &&
|
||||
get_u_int32_t(packet->payload, 24) == 0 &&
|
||||
(packet->udp->dest == htons(1864) || packet->udp->source == htons(1864))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh Login detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len == 36) {
|
||||
if (get_u_int32_t(packet->payload, 0) == htonl(0x02000000) && packet->payload[4] != 0 &&
|
||||
packet->payload[5] == 0 && get_u_int16_t(packet->payload, 6) == htons(0x0083) &&
|
||||
get_u_int32_t(packet->payload, 24) == htonl(0x40000000) &&
|
||||
(packet->payload[packet->payload_packet_len - 1] == packet->payload[packet->payload_packet_len - 5] ||
|
||||
packet->payload[packet->payload_packet_len - 1] - 1 == packet->payload[packet->payload_packet_len - 5]
|
||||
|| packet->payload[packet->payload_packet_len - 1] ==
|
||||
packet->payload[packet->payload_packet_len - 5] - 1)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (get_u_int16_t(packet->payload, 0) == htons(0x0200) && get_u_int16_t(packet->payload, 2) != 0 &&
|
||||
get_u_int32_t(packet->payload, 4) == htonl(0x02000083) && get_u_int32_t(packet->payload, 24) == htonl(0x40000000) &&
|
||||
(packet->payload[packet->payload_packet_len - 1] == packet->payload[packet->payload_packet_len - 5] ||
|
||||
packet->payload[packet->payload_packet_len - 1] - 1 == packet->payload[packet->payload_packet_len - 5]
|
||||
|| packet->payload[packet->payload_packet_len - 1] ==
|
||||
packet->payload[packet->payload_packet_len - 5] - 1)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (packet->payload_packet_len == 24 && get_u_int16_t(packet->payload, 0) == htons(0x0200)
|
||||
&& get_u_int16_t(packet->payload, 2) != 0 && get_u_int32_t(packet->payload, 4) == htonl(0x03000084) &&
|
||||
(packet->payload[packet->payload_packet_len - 1] == packet->payload[packet->payload_packet_len - 5] ||
|
||||
packet->payload[packet->payload_packet_len - 1] - 1 == packet->payload[packet->payload_packet_len - 5] ||
|
||||
packet->payload[packet->payload_packet_len - 1] == packet->payload[packet->payload_packet_len - 5] - 1)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len == 32 && get_u_int32_t(packet->payload, 0) == htonl(0x02000000) &&
|
||||
get_u_int16_t(packet->payload, 21) == 0 && get_u_int16_t(packet->payload, 26) == htons(0x0100)) {
|
||||
if (get_u_int32_t(packet->payload, 4) == htonl(0x00000081) && packet->payload[11] == packet->payload[15] &&
|
||||
get_l16(packet->payload, 24) == htons(packet->udp->source)) {
|
||||
/* packet->payload[28] = source address */
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (get_u_int32_t(packet->payload, 4) == htonl(0x01000082)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh UDP packetlen: %d\n",
|
||||
packet->payload_packet_len);
|
||||
|
||||
}
|
||||
|
||||
if (packet->tcp != NULL) {
|
||||
if (packet->payload_packet_len == 64 && get_u_int32_t(packet->payload, 0) == htonl(0x40000000) &&
|
||||
get_u_int32_t(packet->payload, 4) == 0 && get_u_int32_t(packet->payload, 8) == htonl(0x0000fcff) &&
|
||||
get_u_int32_t(packet->payload, 12) == htonl(0x04800100) && get_u_int32_t(packet->payload, 45) == htonl(0xff020000) &&
|
||||
get_u_int16_t(packet->payload, 49) == htons(0x001a)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "found imesh.\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len == 95 && get_u_int32_t(packet->payload, 0) == htonl(0x5f000000) &&
|
||||
get_u_int16_t(packet->payload, 4) == 0 && get_u_int16_t(packet->payload, 7) == htons(0x0004) &&
|
||||
get_u_int32_t(packet->payload, 20) == 0 && get_u_int32_t(packet->payload, 28) == htonl(0xc8000400) &&
|
||||
packet->payload[9] == 0x80 && get_u_int32_t(packet->payload, 10) == get_u_int32_t(packet->payload, 24)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "found imesh.\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len == 28 && get_u_int32_t(packet->payload, 0) == htonl(0x1c000000) &&
|
||||
get_u_int16_t(packet->payload, 10) == htons(0xfcff) && get_u_int32_t(packet->payload, 12) == htonl(0x07801800) &&
|
||||
(get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == htons(0x1900) ||
|
||||
get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == htons(0x1a00))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "found imesh.\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "TCP FOUND :: Payload %u\n",
|
||||
packet->payload_packet_len);
|
||||
|
||||
if (packet->actual_payload_len == 0) {
|
||||
return;
|
||||
}
|
||||
if ((packet->actual_payload_len == 8 || packet->payload_packet_len == 10) /* PATTERN:: 04 00 00 00 00 00 00 00 [00 00] */
|
||||
&&get_u_int32_t(packet->payload, 0) == htonl(0x04000000)
|
||||
&& get_u_int32_t(packet->payload, 4) == 0) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 10 /* PATTERN:: ?? ?? 04|00 00 64|00 00 */
|
||||
&& (packet->payload[2] == 0x04 || packet->payload[2] == 0x00)
|
||||
&& packet->payload[3] == 0x00 && (packet->payload[4] == 0x00 || packet->payload[4] == 0x64)
|
||||
&& packet->payload[5] == 0x00
|
||||
&& (packet->payload[2] != packet->payload[4]) /* We do not want that the packet is ?? ?? 00 00 00 00 */
|
||||
) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 2 && packet->payload[0] == 0x06 && packet->payload[1] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage++;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 10 /* PATTERN:: 06 00 04|00 00 01|00 00 01|00 00 ?? 00 */
|
||||
&& packet->payload[0] == 0x06
|
||||
&& packet->payload[1] == 0x00 && (packet->payload[2] == 0x04 || packet->payload[2] == 0x00)
|
||||
&& packet->payload[3] == 0x00 && (packet->payload[4] == 0x00 || packet->payload[4] == 0x01)
|
||||
&& packet->payload[5] == 0x00 && (packet->payload[6] == 0x01 || packet->payload[6] == 0x00)
|
||||
&& packet->payload[7] == 0x00 && packet->payload[9] == 0x00
|
||||
&& (packet->payload[2] || packet->payload[4] || packet->payload[6]) /* We do not want that the packet is all 06 00 00 ... */
|
||||
) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 24 && packet->payload[0] == 0x06 // PATTERN :: 06 00 12 00 00 00 34 00 00
|
||||
&& packet->payload[1] == 0x00
|
||||
&& packet->payload[2] == 0x12
|
||||
&& packet->payload[3] == 0x00
|
||||
&& packet->payload[4] == 0x00
|
||||
&& packet->payload[5] == 0x00
|
||||
&& packet->payload[6] == 0x34 && packet->payload[7] == 0x00 && packet->payload[8] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 8 /* PATTERN:: 06|00 00 02 00 00 00 33 00 */
|
||||
&& (packet->payload[0] == 0x06 || packet->payload[0] == 0x00)
|
||||
&& packet->payload[1] == 0x00
|
||||
&& packet->payload[2] == 0x02
|
||||
&& packet->payload[3] == 0x00
|
||||
&& packet->payload[4] == 0x00
|
||||
&& packet->payload[5] == 0x00 && packet->payload[6] == 0x33 && packet->payload[7] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->payload_packet_len == 6 /* PATTERN:: 02 00 00 00 33 00 */
|
||||
&& packet->payload[0] == 0x02
|
||||
&& packet->payload[1] == 0x00
|
||||
&& packet->payload[2] == 0x00
|
||||
&& packet->payload[3] == 0x00 && packet->payload[4] == 0x33 && packet->payload[5] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 12 && packet->payload[0] == 0x06 // PATTERN : 06 00 06 00 00 00 64 00
|
||||
&& packet->payload[1] == 0x00
|
||||
&& packet->payload[2] == 0x06
|
||||
&& packet->payload[3] == 0x00
|
||||
&& packet->payload[4] == 0x00
|
||||
&& packet->payload[5] == 0x00 && packet->payload[6] == 0x64 && packet->payload[7] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 10 /* PATTERN:: 06 00 04|01 00 00 00 01|00 00 ?? 00 */
|
||||
&& packet->payload[0] == 0x06
|
||||
&& packet->payload[1] == 0x00 && (packet->payload[2] == 0x04 || packet->payload[2] == 0x01)
|
||||
&& packet->payload[3] == 0x00
|
||||
&& packet->payload[4] == 0x00
|
||||
&& packet->payload[5] == 0x00 && (packet->payload[6] == 0x01 || packet->payload[6] == 0x00)
|
||||
&& packet->payload[7] == 0x00
|
||||
/* && packet->payload[8]==0x00 */
|
||||
&& packet->payload[9] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if ((packet->actual_payload_len == 64 || packet->actual_payload_len == 52 /* PATTERN:: [len] 00 00 00 00 */
|
||||
|| packet->actual_payload_len == 95)
|
||||
&& get_u_int16_t(packet->payload, 0) == (packet->actual_payload_len)
|
||||
&& packet->payload[1] == 0x00 && packet->payload[2] == 0x00
|
||||
&& packet->payload[3] == 0x00 && packet->payload[4] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 6 && packet->payload[0] == 0x06 // PATTERN : 06 00 04|6c 00|01 00 00
|
||||
&& packet->payload[1] == 0x00 && (packet->payload[2] == 0x04 || packet->payload[2] == 0x6c)
|
||||
&& (packet->payload[3] == 0x00 || packet->payload[3] == 0x01)
|
||||
&& packet->payload[4] == 0x00 && packet->payload[5] == 0x00) {
|
||||
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 6 /* PATTERN:: [len] ?? ee 00 00 00 */
|
||||
&& get_u_int16_t(packet->payload, 0) == (packet->actual_payload_len)
|
||||
&& packet->payload[2] == 0xee
|
||||
&& packet->payload[3] == 0x00 && packet->payload[4] == 0x00 && packet->payload[5] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
} else if (packet->actual_payload_len == 10 /* PATTERN:: 06 00 00 00 00 00 00 00 */
|
||||
&& packet->payload[0] == 0x06
|
||||
&& packet->payload[1] == 0x00
|
||||
&& packet->payload[2] == 0x00
|
||||
&& packet->payload[3] == 0x00
|
||||
&& packet->payload[4] == 0x00
|
||||
&& packet->payload[5] == 0x00 && packet->payload[6] == 0x00 && packet->payload[7] == 0x00) {
|
||||
flow->l4.tcp.imesh_stage += 2;
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"IMESH FOUND :: Payload %u\n", packet->actual_payload_len);
|
||||
}
|
||||
|
||||
|
||||
/* http login */
|
||||
if (packet->payload_packet_len > NDPI_STATICSTRING_LEN("POST /registration") &&
|
||||
memcmp(packet->payload, "POST /registration", NDPI_STATICSTRING_LEN("POST /registration")) == 0) {
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (packet->parsed_lines > 6 &&
|
||||
packet->host_line.ptr != NULL &&
|
||||
packet->host_line.len == NDPI_STATICSTRING_LEN("login.bearshare.com") &&
|
||||
packet->line[1].ptr != NULL &&
|
||||
packet->line[1].len == NDPI_STATICSTRING_LEN("Authorization: Basic Og==") &&
|
||||
packet->line[4].ptr != NULL &&
|
||||
packet->line[4].len == NDPI_STATICSTRING_LEN("Accept-Encoding: identity") &&
|
||||
memcmp(packet->line[1].ptr, "Authorization: Basic Og==",
|
||||
NDPI_STATICSTRING_LEN("Authorization: Basic Og==")) == 0 &&
|
||||
memcmp(packet->host_line.ptr, "login.bearshare.com",
|
||||
NDPI_STATICSTRING_LEN("login.bearshare.com")) == 0 &&
|
||||
memcmp(packet->line[4].ptr, "Accept-Encoding: identity",
|
||||
NDPI_STATICSTRING_LEN("Accept-Encoding: identity")) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh Login detected\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
/*give one packet tolerance for detection */
|
||||
if((flow->l4.tcp.imesh_stage >= 4)
|
||||
&& (flow->l4.tcp.seen_syn && flow->l4.tcp.seen_syn_ack && flow->l4.tcp.seen_ack) /* We have seen the 3-way handshake */)
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "found imesh.\n");
|
||||
ndpi_int_imesh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if ((flow->packet_counter < 5) || packet->actual_payload_len == 0) {
|
||||
return;
|
||||
}
|
||||
//imesh_not_found_end:
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IMESH);
|
||||
NDPI_LOG(NDPI_PROTOCOL_IMESH, ndpi_struct, NDPI_LOG_DEBUG, "iMesh excluded at stage %d\n",
|
||||
packet->tcp != NULL ? flow->l4.tcp.imesh_stage : 0);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void init_imesh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("iMESH", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_IMESH,
|
||||
ndpi_search_imesh_tcp_udp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -141,14 +141,14 @@ static u_int8_t ndpi_check_for_IRC_traces(const u_int8_t * ptr, u_int16_t len)
|
||||
}
|
||||
|
||||
|
||||
u_int8_t ndpi_search_irc_ssl_detect_ninty_percent_but_very_fast(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"called ndpi_search_irc_ssl_detect_ninty_percent_but_very_fast\n");
|
||||
"called ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast\n");
|
||||
|
||||
/* case 1: len 1460, len 1460, len 1176 several times in one direction, than len = 4, 4096, 8192 in the other direction */
|
||||
if (packet->payload_packet_len == 1460
|
||||
@@ -475,7 +475,7 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
}
|
||||
}
|
||||
if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_IRC &&
|
||||
ndpi_search_irc_ssl_detect_ninty_percent_but_very_fast(ndpi_struct, flow) != 0) {
|
||||
ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(ndpi_struct, flow) != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+34
-34
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||
struct jabber_string {
|
||||
char *string;
|
||||
u_int ndpi_protocol;
|
||||
@@ -70,19 +70,19 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
u_int16_t x;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER detection....\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER detection....\n");
|
||||
|
||||
/* search for jabber file transfer */
|
||||
/* this part is working asymmetrically */
|
||||
if (packet->tcp != NULL && packet->tcp->syn != 0 && packet->payload_packet_len == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "check jabber syn\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "check jabber syn\n");
|
||||
if (src != NULL && src->jabber_file_transfer_port[0] != 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"src jabber ft port set, ports are: %u, %u\n", ntohs(src->jabber_file_transfer_port[0]),
|
||||
ntohs(src->jabber_file_transfer_port[1]));
|
||||
if (((u_int32_t)
|
||||
(packet->tick_timestamp - src->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "JABBER src stun timeout %u %u\n", src->jabber_stun_or_ft_ts,
|
||||
packet->tick_timestamp);
|
||||
src->jabber_file_transfer_port[0] = 0;
|
||||
@@ -91,20 +91,20 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|| src->jabber_file_transfer_port[0] == packet->tcp->source
|
||||
|| src->jabber_file_transfer_port[1] == packet->tcp->dest
|
||||
|| src->jabber_file_transfer_port[1] == packet->tcp->source) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found jabber file transfer.\n");
|
||||
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
||||
NDPI_PROTOCOL_UNENCRYPED_JABBER);
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
}
|
||||
}
|
||||
if (dst != NULL && dst->jabber_file_transfer_port[0] != 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"dst jabber ft port set, ports are: %u, %u\n", ntohs(dst->jabber_file_transfer_port[0]),
|
||||
ntohs(dst->jabber_file_transfer_port[1]));
|
||||
if (((u_int32_t)
|
||||
(packet->tick_timestamp - dst->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "JABBER dst stun timeout %u %u\n", dst->jabber_stun_or_ft_ts,
|
||||
packet->tick_timestamp);
|
||||
dst->jabber_file_transfer_port[0] = 0;
|
||||
@@ -113,11 +113,11 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|| dst->jabber_file_transfer_port[0] == packet->tcp->source
|
||||
|| dst->jabber_file_transfer_port[1] == packet->tcp->dest
|
||||
|| dst->jabber_file_transfer_port[1] == packet->tcp->source) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found jabber file transfer.\n");
|
||||
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
||||
NDPI_PROTOCOL_UNENCRYPED_JABBER);
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
}
|
||||
}
|
||||
return;
|
||||
@@ -129,23 +129,23 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
|
||||
/* this part parses a packet and searches for port=. it works asymmetrically. */
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNENCRYPED_JABBER) {
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNENCRYPTED_JABBER) {
|
||||
u_int16_t lastlen;
|
||||
u_int16_t j_port = 0;
|
||||
/* check for google jabber voip connections ... */
|
||||
/* need big packet */
|
||||
if (packet->payload_packet_len < 100) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "packet too small, return.\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "packet too small, return.\n");
|
||||
return;
|
||||
}
|
||||
/* need message to or type for file-transfer */
|
||||
if (memcmp(packet->payload, "<iq from=\"", 8) == 0 || memcmp(packet->payload, "<iq from=\'", 8) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq from=\".\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq from=\".\n");
|
||||
lastlen = packet->payload_packet_len - 11;
|
||||
for (x = 10; x < lastlen; x++) {
|
||||
if (packet->payload[x] == 'p') {
|
||||
if (memcmp(&packet->payload[x], "port=", 5) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
|
||||
if (src != NULL) {
|
||||
src->jabber_stun_or_ft_ts = packet->tick_timestamp;
|
||||
}
|
||||
@@ -155,16 +155,16 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
}
|
||||
x += 6;
|
||||
j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "JABBER port : %u\n", ntohs(j_port));
|
||||
if (src != NULL) {
|
||||
if (src->jabber_file_transfer_port[0] == 0 || src->jabber_file_transfer_port[0] == j_port) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[0] = j_port = %u;\n",
|
||||
ntohs(j_port));
|
||||
src->jabber_file_transfer_port[0] = j_port;
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||
ntohs(j_port));
|
||||
src->jabber_file_transfer_port[1] = j_port;
|
||||
@@ -172,12 +172,12 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
}
|
||||
if (dst != NULL) {
|
||||
if (dst->jabber_file_transfer_port[0] == 0 || dst->jabber_file_transfer_port[0] == j_port) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[0] = j_port = %u;\n",
|
||||
ntohs(j_port));
|
||||
dst->jabber_file_transfer_port[0] = j_port;
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||
ntohs(j_port));
|
||||
dst->jabber_file_transfer_port[1] = j_port;
|
||||
@@ -191,7 +191,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
} else if (memcmp(packet->payload, "<iq to=\"", 8) == 0 || memcmp(packet->payload, "<iq to=\'", 8) == 0
|
||||
|| memcmp(packet->payload, "<iq type=", 9) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq to=\"/type=\"\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq to=\"/type=\"\n");
|
||||
lastlen = packet->payload_packet_len - 21;
|
||||
for (x = 8; x < lastlen; x++) {
|
||||
/* invalid character */
|
||||
@@ -199,7 +199,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
return;
|
||||
}
|
||||
if (packet->payload[x] == '@') {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER @\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER @\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -211,7 +211,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
for (; x < lastlen; x++) {
|
||||
if (packet->payload[x] == 'p') {
|
||||
if (memcmp(&packet->payload[x], "port=", 5) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
|
||||
if (src != NULL) {
|
||||
src->jabber_stun_or_ft_ts = packet->tick_timestamp;
|
||||
}
|
||||
@@ -222,7 +222,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
x += 6;
|
||||
j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "JABBER port : %u\n", ntohs(j_port));
|
||||
|
||||
if (src != NULL && src->jabber_voice_stun_used_ports < JABBER_MAX_STUN_PORTS - 1) {
|
||||
@@ -232,11 +232,11 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
} else {
|
||||
if (src->jabber_file_transfer_port[0] == 0
|
||||
|| src->jabber_file_transfer_port[0] == j_port) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"src->jabber_file_transfer_port[0] = j_port = %u;\n", ntohs(j_port));
|
||||
src->jabber_file_transfer_port[0] = j_port;
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||
ntohs(j_port));
|
||||
src->jabber_file_transfer_port[1] = j_port;
|
||||
@@ -251,11 +251,11 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
} else {
|
||||
if (dst->jabber_file_transfer_port[0] == 0
|
||||
|| dst->jabber_file_transfer_port[0] == j_port) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"dst->jabber_file_transfer_port[0] = j_port = %u;\n", ntohs(j_port));
|
||||
dst->jabber_file_transfer_port[0] = j_port;
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||
ntohs(j_port));
|
||||
dst->jabber_file_transfer_port[1] = j_port;
|
||||
@@ -282,7 +282,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|| ndpi_strnstr((const char *)&packet->payload[13], "xmlns:stream=\"http://etherx.jabber.org/streams\"", start)) {
|
||||
|
||||
/* Protocol family */
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPED_JABBER);
|
||||
ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
|
||||
/* search for subprotocols */
|
||||
check_content_type_and_change_protocol(ndpi_struct, flow, 13);
|
||||
@@ -291,13 +291,13 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
}
|
||||
|
||||
if (flow->packet_counter < 3) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "packet_counter: %u\n", flow->packet_counter);
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER Excluded.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER);
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER Excluded.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
|
||||
#ifdef NDPI_PROTOCOL_TRUPHONE
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TRUPHONE);
|
||||
@@ -307,8 +307,8 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("Unencryped_Jabber", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_UNENCRYPED_JABBER,
|
||||
ndpi_set_bitmask_protocol_detection("Unencrypted_Jabber", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER,
|
||||
ndpi_search_jabber_tcp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "ndpi_api.h"
|
||||
|
||||
|
||||
#ifdef NDPI_SERVICE_KAKAOTALK_VOICE
|
||||
#ifdef NDPI_PROTOCOL_KAKAOTALK_VOICE
|
||||
void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
@@ -48,21 +48,21 @@ void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struc
|
||||
|
||||
if(((ntohl(packet->iph->saddr) & 0xFFFF0000 /* 255.255.0.0 */) == 0x01C90000 /* 1.201.0.0/16 */)
|
||||
|| ((ntohl(packet->iph->daddr) & 0xFFFF0000 /* 255.255.0.0 */) == 0x01C90000 /* 1.201.0.0/16 */)) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_SERVICE_KAKAOTALK_VOICE, NDPI_PROTOCOL_UNKNOWN);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_KAKAOTALK_VOICE, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_SERVICE_KAKAOTALK_VOICE, ndpi_struct, NDPI_LOG_DEBUG, "Exclude kakaotalk_voice.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_SERVICE_KAKAOTALK_VOICE);
|
||||
NDPI_LOG(NDPI_PROTOCOL_KAKAOTALK_VOICE, ndpi_struct, NDPI_LOG_DEBUG, "Exclude kakaotalk_voice.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_KAKAOTALK_VOICE);
|
||||
}
|
||||
|
||||
|
||||
void init_kakaotalk_voice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("KakaoTalk_Voice", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_SERVICE_KAKAOTALK_VOICE,
|
||||
NDPI_PROTOCOL_KAKAOTALK_VOICE,
|
||||
ndpi_search_kakaotalk_voice,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
* kxun.c
|
||||
*
|
||||
* Copyright (C) 2016 - 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 "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_1KXUN
|
||||
|
||||
|
||||
static void ndpi_int_kxun_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
|
||||
void ndpi_search_kxun(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
/* 1KXUN over TCP is detected inside HTTP dissector */
|
||||
|
||||
/* check 1KXUN over UDP */
|
||||
if(packet->udp != NULL) {
|
||||
/* check ipv6 */
|
||||
if(packet->iphv6 != NULL) {
|
||||
if(packet->iphv6->ip6_dst.u6_addr.u6_addr32[0] == 0x2ff &&
|
||||
packet->payload_packet_len == 329) {
|
||||
if(packet->payload[0] == 0xff &&
|
||||
packet->payload[1] == 0x0f &&
|
||||
packet->payload[4] == 0xa0 &&
|
||||
packet->payload[5] == 0x00) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_1KXUN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found 1kxun over udp.\n");
|
||||
ndpi_int_kxun_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(packet->iph != NULL) {
|
||||
if(packet->iph->daddr == 0xffffffff) {
|
||||
if(packet->payload_packet_len == 40 &&
|
||||
packet->payload[8] == 0x41 &&
|
||||
packet->payload[9] == 0x41 &&
|
||||
packet->payload[10] == 0x42) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_1KXUN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found 1kxun over udp.\n");
|
||||
ndpi_int_kxun_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if(packet->payload_packet_len == 317 &&
|
||||
packet->payload[0] == 0xff &&
|
||||
packet->payload[1] == 0xff &&
|
||||
packet->payload[4] == 0xa0 &&
|
||||
packet->payload[5] == 0x00) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_1KXUN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found 1kxun over udp.\n");
|
||||
ndpi_int_kxun_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/* EXCLUDE 1KXUN */
|
||||
NDPI_LOG(NDPI_PROTOCOL_1KXUN, ndpi_struct, NDPI_LOG_DEBUG, "exclude 1kxun.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_1KXUN);
|
||||
}
|
||||
|
||||
|
||||
void init_kxun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("1kxun", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_1KXUN,
|
||||
ndpi_search_kxun,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* mail_imap.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
@@ -42,6 +41,15 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
/* const u_int8_t *command = 0; */
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG, "search IMAP.\n");
|
||||
|
||||
if (flow->l4.tcp.mail_imap_starttls == 2) {
|
||||
#ifdef NDPI_PROTOCOL_SSL
|
||||
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG, "starttls detected\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAIL_IMAP);
|
||||
NDPI_DEL_PROTOCOL_FROM_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSL);
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (packet->payload_packet_len >= 4 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a) {
|
||||
// the DONE command appears without a tag
|
||||
@@ -62,7 +70,7 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
}
|
||||
if (!((packet->payload[i] >= 'a' && packet->payload[i] <= 'z') ||
|
||||
(packet->payload[i] >= 'A' && packet->payload[i] <= 'Z') ||
|
||||
(packet->payload[i] >= '0' && packet->payload[i] <= '9') || packet->payload[i] == '*')) {
|
||||
(packet->payload[i] >= '0' && packet->payload[i] <= '9') || packet->payload[i] == '*' || packet->payload[i] == '.')) {
|
||||
goto imap_excluded;
|
||||
}
|
||||
i++;
|
||||
@@ -99,6 +107,8 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
&& (packet->payload[command_start + 1] == 'K' || packet->payload[command_start + 1] == 'k')
|
||||
&& packet->payload[command_start + 2] == ' ') {
|
||||
flow->l4.tcp.mail_imap_stage += 1;
|
||||
if (flow->l4.tcp.mail_imap_starttls == 1)
|
||||
flow->l4.tcp.mail_imap_starttls = 2;
|
||||
saw_command = 1;
|
||||
} else if ((packet->payload[command_start] == 'U' || packet->payload[command_start] == 'u')
|
||||
&& (packet->payload[command_start + 1] == 'I' || packet->payload[command_start + 1] == 'i')
|
||||
@@ -131,8 +141,10 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
&& (packet->payload[command_start + 5] == 'T' || packet->payload[command_start + 5] == 't')
|
||||
&& (packet->payload[command_start + 6] == 'L' || packet->payload[command_start + 6] == 'l')
|
||||
&& (packet->payload[command_start + 7] == 'S' || packet->payload[command_start + 7] == 's')) {
|
||||
flow->l4.tcp.mail_imap_stage += 1;
|
||||
saw_command = 1;
|
||||
flow->l4.tcp.mail_imap_stage += 1;
|
||||
flow->l4.tcp.mail_imap_starttls = 1;
|
||||
flow->detected_protocol_stack[0] = NDPI_PROTOCOL_MAIL_IMAPS;
|
||||
saw_command = 1;
|
||||
}
|
||||
}
|
||||
if ((command_start + 5) < packet->payload_packet_len) {
|
||||
|
||||
+64
-68
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* mdns.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,13 +20,31 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MDNS
|
||||
|
||||
#define NDPI_MAX_MDNS_REQUESTS 128
|
||||
#define NDPI_MAX_MDNS_REQUESTS 128
|
||||
|
||||
|
||||
/**
|
||||
MDNS header is similar to dns header
|
||||
|
||||
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| ID = 0x0000 |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| FLAGS |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| QDCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| ANCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| NSCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| ARCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
*/
|
||||
|
||||
|
||||
static void ndpi_int_mdns_add_connection(struct ndpi_detection_module_struct
|
||||
@@ -41,101 +58,80 @@ static int ndpi_int_check_mdns_payload(struct ndpi_detection_module_struct
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if ((packet->payload[2] & 0x80) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) <= NDPI_MAX_MDNS_REQUESTS &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) <= NDPI_MAX_MDNS_REQUESTS) {
|
||||
|
||||
if((packet->payload[2] & 0x80) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) <= NDPI_MAX_MDNS_REQUESTS &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) <= NDPI_MAX_MDNS_REQUESTS) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct, NDPI_LOG_DEBUG, "found MDNS with question query.\n");
|
||||
return 1;
|
||||
}
|
||||
else if((packet->payload[2] & 0x80) != 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) <= NDPI_MAX_MDNS_REQUESTS &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) != 0) {
|
||||
char answer[256];
|
||||
int i, j, len;
|
||||
|
||||
for(i=13, j=0; (packet->payload[i] != 0) && (i < packet->payload_packet_len) && (i < (sizeof(answer)-1)); i++)
|
||||
answer[j++] = (packet->payload[i] < 13) ? '.' : packet->payload[i];
|
||||
|
||||
answer[j] = '\0';
|
||||
|
||||
/* printf("==> [%d] %s\n", j, answer); */
|
||||
|
||||
len = ndpi_min(sizeof(flow->protos.mdns.answer)-1, j);
|
||||
strncpy(flow->protos.mdns.answer, (const char *)answer, len);
|
||||
flow->protos.mdns.answer[len] = '\0';
|
||||
|
||||
return 1;
|
||||
} else if ((packet->payload[2] & 0x80) != 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) <= NDPI_MAX_MDNS_REQUESTS &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) != 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct, NDPI_LOG_DEBUG, "found MDNS with answer query.\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
u_int16_t dport;
|
||||
// const u_int16_t sport=ntohs(packet->udp->source);
|
||||
|
||||
/* check if UDP and */
|
||||
if (packet->udp != NULL) {
|
||||
/*read destination port */
|
||||
|
||||
/**
|
||||
information from http://www.it-administrator.de/lexikon/multicast-dns.html
|
||||
*/
|
||||
|
||||
/* check if UDP packet */
|
||||
if(packet->udp != NULL) {
|
||||
/* read destination port */
|
||||
dport = ntohs(packet->udp->dest);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct, NDPI_LOG_DEBUG, "MDNS udp start \n");
|
||||
|
||||
|
||||
|
||||
/*check standard MDNS to port 5353 */
|
||||
/*took this information from http://www.it-administrator.de/lexikon/multicast-dns.html */
|
||||
|
||||
if (dport == 5353 && packet->payload_packet_len >= 12) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct, NDPI_LOG_DEBUG, "found MDNS with destination port 5353\n");
|
||||
|
||||
/* MDNS header is similar to dns header */
|
||||
/* dns header
|
||||
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| ID |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
|QR| Opcode |AA|TC|RD|RA| Z | RCODE |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| QDCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| ANCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| NSCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
| ARCOUNT |
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
*
|
||||
* dns query check: query: QR set, ancount = 0, nscount = 0, QDCOUNT < MAX_MDNS, ARCOUNT < MAX_MDNS
|
||||
*
|
||||
*/
|
||||
|
||||
/* mdns protocol must have destination address 224.0.0.251 */
|
||||
/* took this information from http://www.it-administrator.de/lexikon/multicast-dns.html */
|
||||
|
||||
if (packet->iph != NULL && ntohl(packet->iph->daddr) == 0xe00000fb) {
|
||||
/* check standard MDNS ON port 5353 */
|
||||
if(dport == 5353 && packet->payload_packet_len >= 12) {
|
||||
/* mdns protocol must have destination address 224.0.0.251 */
|
||||
if(packet->iph != NULL && ntohl(packet->iph->daddr) == 0xe00000fb) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found MDNS with destination address 224.0.0.251 (=0xe00000fb)\n");
|
||||
|
||||
if (ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
||||
|
||||
if(ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
||||
ndpi_int_mdns_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
#ifdef NDPI_DETECTION_SUPPORT_IPV6
|
||||
if (packet->iphv6 != NULL) {
|
||||
if(packet->iphv6 != NULL) {
|
||||
const u_int32_t *daddr = packet->iphv6->ip6_dst.u6_addr.u6_addr32;
|
||||
if (daddr[0] == htonl(0xff020000) && daddr[1] == 0 && daddr[2] == 0 && daddr[3] == htonl(0xfb)) {
|
||||
if(daddr[0] == htonl(0xff020000) && daddr[1] == 0 && daddr[2] == 0 && daddr[3] == htonl(0xfb)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found MDNS with destination address ff02::fb\n");
|
||||
|
||||
if (ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
||||
|
||||
if(ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
||||
ndpi_int_mdns_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MDNS);
|
||||
|
||||
@@ -1,181 +0,0 @@
|
||||
/*
|
||||
* meebo.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - 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_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MEEBO
|
||||
|
||||
static void ndpi_int_meebo_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MEEBO, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_meebo(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "search meebo.\n");
|
||||
|
||||
/* catch audio/video flows which are flash (rtmp) */
|
||||
if (
|
||||
#ifdef NDPI_CONTENT_FLASH
|
||||
packet->detected_protocol_stack[0] == NDPI_CONTENT_FLASH
|
||||
#else
|
||||
(packet->tcp->source == htons(1935) || packet->tcp->dest == htons(1935))
|
||||
#endif
|
||||
) {
|
||||
|
||||
/* TODO: once we have an amf decoder we can more directly access the rtmp fields
|
||||
* if so, we may also exclude earlier */
|
||||
if (packet->payload_packet_len > 900) {
|
||||
if (memcmp(packet->payload + 116, "tokbox/", NDPI_STATICSTRING_LEN("tokbox/")) == 0 ||
|
||||
memcmp(packet->payload + 316, "tokbox/", NDPI_STATICSTRING_LEN("tokbox/")) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "found meebo/tokbox flash flow.\n");
|
||||
ndpi_int_meebo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (flow->packet_counter < 16 && flow->packet_direction_counter[flow->setup_packet_direction] < 6) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "exclude meebo.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MEEBO);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
((packet->payload_packet_len > 3 && memcmp(packet->payload, "GET ", 4) == 0)
|
||||
|| (packet->payload_packet_len > 4 && memcmp(packet->payload, "POST ", 5) == 0))
|
||||
) && flow->packet_counter == 1) {
|
||||
u_int8_t host_or_referer_match = 0;
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (packet->host_line.ptr != NULL
|
||||
&& packet->host_line.len >= 9
|
||||
&& memcmp(&packet->host_line.ptr[packet->host_line.len - 9], "meebo.com", 9) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found Meebo host\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->host_line.ptr != NULL
|
||||
&& packet->host_line.len >= 10
|
||||
&& memcmp(&packet->host_line.ptr[packet->host_line.len - 10], "tokbox.com", 10) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found tokbox host\n");
|
||||
/* set it to 2 to avoid having plain tokbox traffic detected as meebo */
|
||||
host_or_referer_match = 2;
|
||||
} else if (packet->host_line.ptr != NULL && packet->host_line.len >= NDPI_STATICSTRING_LEN("74.114.28.110")
|
||||
&& memcmp(&packet->host_line.ptr[packet->host_line.len - NDPI_STATICSTRING_LEN("74.114.28.110")],
|
||||
"74.114.28.110", NDPI_STATICSTRING_LEN("74.114.28.110")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found meebo IP\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->referer_line.ptr != NULL &&
|
||||
packet->referer_line.len >= NDPI_STATICSTRING_LEN("http://www.meebo.com/") &&
|
||||
memcmp(packet->referer_line.ptr, "http://www.meebo.com/",
|
||||
NDPI_STATICSTRING_LEN("http://www.meebo.com/")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found meebo referer\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->referer_line.ptr != NULL &&
|
||||
packet->referer_line.len >= NDPI_STATICSTRING_LEN("http://mee.tokbox.com/") &&
|
||||
memcmp(packet->referer_line.ptr, "http://mee.tokbox.com/",
|
||||
NDPI_STATICSTRING_LEN("http://mee.tokbox.com/")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found tokbox referer\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->referer_line.ptr != NULL &&
|
||||
packet->referer_line.len >= NDPI_STATICSTRING_LEN("http://74.114.28.110/") &&
|
||||
memcmp(packet->referer_line.ptr, "http://74.114.28.110/",
|
||||
NDPI_STATICSTRING_LEN("http://74.114.28.110/")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found meebo IP referer\n");
|
||||
host_or_referer_match = 1;
|
||||
}
|
||||
|
||||
if (host_or_referer_match) {
|
||||
if (host_or_referer_match == 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Found Meebo traffic based on host/referer\n");
|
||||
ndpi_int_meebo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_MEEBO) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"in case that ssl meebo has been detected return.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (flow->packet_counter < 5 && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSL) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "ssl not yet excluded. need next packet.\n");
|
||||
return;
|
||||
}
|
||||
#ifdef NDPI_CONTENT_FLASH
|
||||
if (flow->packet_counter < 5 && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN &&
|
||||
!NDPI_FLOW_PROTOCOL_EXCLUDED(ndpi_struct, flow, NDPI_CONTENT_FLASH)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "flash not yet excluded. need next packet.\n");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "exclude meebo.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MEEBO);
|
||||
}
|
||||
|
||||
|
||||
void init_meebo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("Meebo", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_MEEBO,
|
||||
ndpi_search_meebo,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
/* Add protocol bitmask dependencies to detected bitmask*/
|
||||
#ifdef NDPI_CONTENT_FLASH
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[*id].detection_bitmask, NDPI_CONTENT_FLASH);
|
||||
#endif
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
+41
-64
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* mgcp.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2017 - 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
|
||||
@@ -21,12 +20,11 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MGCP
|
||||
|
||||
|
||||
static void ndpi_int_mgcp_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
@@ -34,68 +32,47 @@ static void ndpi_int_mgcp_add_connection(struct ndpi_detection_module_struct
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if !defined(WIN32)
|
||||
static inline
|
||||
#else
|
||||
__forceinline static
|
||||
#endif
|
||||
void ndpi_search_mgcp_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
/* information about MGCP taken from http://en.wikipedia.org/wiki/MGCP */
|
||||
|
||||
u_int16_t pos = 4;
|
||||
|
||||
if (packet->payload_packet_len < 8) {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
|
||||
/* packet must end with 0x0d0a or with 0x0a */
|
||||
if (packet->payload[packet->payload_packet_len - 1] != 0x0a
|
||||
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) != htons(0x0d0a)) {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (packet->payload[0] != 'A' && packet->payload[0] != 'C' && packet->payload[0] != 'D' &&
|
||||
packet->payload[0] != 'E' && packet->payload[0] != 'M' && packet->payload[0] != 'N' &&
|
||||
packet->payload[0] != 'R') {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
if (memcmp(packet->payload, "AUEP ", 5) != 0 && memcmp(packet->payload, "AUCX ", 5) != 0 &&
|
||||
memcmp(packet->payload, "CRCX ", 5) != 0 && memcmp(packet->payload, "DLCX ", 5) != 0 &&
|
||||
memcmp(packet->payload, "EPCF ", 5) != 0 && memcmp(packet->payload, "MDCX ", 5) != 0 &&
|
||||
memcmp(packet->payload, "NTFY ", 5) != 0 && memcmp(packet->payload, "RQNT ", 5) != 0 &&
|
||||
memcmp(packet->payload, "RSIP ", 5) != 0) {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
// now search for string "MGCP " in the rest of the message
|
||||
while ((pos + 5) < packet->payload_packet_len) {
|
||||
if (memcmp(&packet->payload[pos], "MGCP ", 5) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MGCP, ndpi_struct, NDPI_LOG_DEBUG, "MGCP match.\n");
|
||||
ndpi_int_mgcp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
pos++;
|
||||
}
|
||||
|
||||
mgcp_excluded:
|
||||
NDPI_LOG(NDPI_PROTOCOL_MGCP, ndpi_struct, NDPI_LOG_DEBUG, "exclude MGCP.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MGCP);
|
||||
}
|
||||
|
||||
|
||||
void ndpi_search_mgcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_search_mgcp_connection(ndpi_struct, flow);
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
u_int16_t pos = 5;
|
||||
|
||||
if (packet->payload_packet_len < 8) {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
|
||||
/* packet must end with 0x0d0a or with 0x0a */
|
||||
if (packet->payload[packet->payload_packet_len - 1] != 0x0a) {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
|
||||
if (packet->payload[0] != 'A' && packet->payload[0] != 'C' && packet->payload[0] != 'D' &&
|
||||
packet->payload[0] != 'E' && packet->payload[0] != 'M' && packet->payload[0] != 'N' &&
|
||||
packet->payload[0] != 'R') {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
if (memcmp(packet->payload, "AUEP ", 5) != 0 && memcmp(packet->payload, "AUCX ", 5) != 0 &&
|
||||
memcmp(packet->payload, "CRCX ", 5) != 0 && memcmp(packet->payload, "DLCX ", 5) != 0 &&
|
||||
memcmp(packet->payload, "EPCF ", 5) != 0 && memcmp(packet->payload, "MDCX ", 5) != 0 &&
|
||||
memcmp(packet->payload, "NTFY ", 5) != 0 && memcmp(packet->payload, "RQNT ", 5) != 0 &&
|
||||
memcmp(packet->payload, "RSIP ", 5) != 0) {
|
||||
goto mgcp_excluded;
|
||||
}
|
||||
// now search for string "MGCP " in the rest of the message
|
||||
while ((pos + 4) < packet->payload_packet_len) {
|
||||
if (memcmp(&packet->payload[pos], "MGCP ", 5) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MGCP, ndpi_struct, NDPI_LOG_DEBUG, "MGCP match.\n");
|
||||
ndpi_int_mgcp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
pos++;
|
||||
}
|
||||
|
||||
mgcp_excluded:
|
||||
NDPI_LOG(NDPI_PROTOCOL_MGCP, ndpi_struct, NDPI_LOG_DEBUG, "exclude MGCP.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MGCP);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
void ndpi_search_mpegts(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int16_t dport = 0, sport = 0;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MPEGTS, ndpi_struct, NDPI_LOG_DEBUG, "search for MPEGTS.\n");
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ void ndpi_search_mqtt (struct ndpi_detection_module_struct *ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG,"====>>>> Passed second stage of identification\n");
|
||||
// third stage verification (payload)
|
||||
if (pt == CONNECT) {
|
||||
if (memcmp(&(packet->payload[4]),"MQTT",4) == 0) {
|
||||
if (packet->payload_packet_len >= 8 && memcmp(&(packet->payload[4]),"MQTT",4) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MQTT, ndpi_struct, NDPI_LOG_DEBUG, "Mqtt found CONNECT\n");
|
||||
ndpi_int_mqtt_add_connection(ndpi_struct,flow);
|
||||
return;
|
||||
|
||||
+160
-186
@@ -21,15 +21,13 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MSN
|
||||
|
||||
#define MAX_PACKETS_FOR_MSN 100
|
||||
static void ndpi_int_msn_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow/* , */
|
||||
/* ndpi_protocol_type_t protocol_type */)
|
||||
|
||||
static void ndpi_int_msn_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
@@ -38,11 +36,11 @@ static u_int8_t ndpi_int_find_xmsn(struct ndpi_detection_module_struct *ndpi_str
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if (packet->parsed_lines > 3) {
|
||||
if(packet->parsed_lines > 3) {
|
||||
u_int16_t i;
|
||||
for (i = 2; i < packet->parsed_lines; i++) {
|
||||
if (packet->line[i].ptr != NULL && packet->line[i].len > NDPI_STATICSTRING_LEN("X-MSN") &&
|
||||
memcmp(packet->line[i].ptr, "X-MSN", NDPI_STATICSTRING_LEN("X-MSN")) == 0) {
|
||||
for(i = 2; i < packet->parsed_lines; i++) {
|
||||
if(packet->line[i].ptr != NULL && packet->line[i].len > NDPI_STATICSTRING_LEN("X-MSN") &&
|
||||
memcmp(packet->line[i].ptr, "X-MSN", NDPI_STATICSTRING_LEN("X-MSN")) == 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -50,7 +48,7 @@ static u_int8_t ndpi_int_find_xmsn(struct ndpi_detection_module_struct *ndpi_str
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* search over TCP */
|
||||
static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
@@ -60,35 +58,36 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
|
||||
u_int16_t plen;
|
||||
u_int16_t status = 0;
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "MSN tcp detection...\n");
|
||||
#ifdef NDPI_PROTOCOL_SSL
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL) {
|
||||
if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "msn ssl ft test\n");
|
||||
if (flow->packet_counter < 10) {
|
||||
}
|
||||
|
||||
if (flow->packet_counter == 7 && packet->payload_packet_len > 300) {
|
||||
if (memcmp(packet->payload + 24, "MSNSLP", 6) == 0
|
||||
|| (get_u_int32_t(packet->payload, 0) == htonl(0x30000000) && get_u_int32_t(packet->payload, 4) == 0x00000000)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "detected MSN File Transfer, ifdef ssl.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
if(flow->packet_counter < 10) {
|
||||
if(flow->packet_counter == 7 && packet->payload_packet_len > 300) {
|
||||
if(memcmp(packet->payload + 24, "MSNSLP", 6) == 0
|
||||
|| (get_u_int32_t(packet->payload, 0) == htonl(0x30000000) && get_u_int32_t(packet->payload, 4) == 0x00000000)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "detected MSN File Transfer, ifdef ssl.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(flow->packet_counter >= 5 && flow->packet_counter <= 10 && (get_u_int32_t(packet->payload, 0) == htonl(0x18000000)
|
||||
&& get_u_int32_t(packet->payload, 4) == 0x00000000)) {
|
||||
flow->l4.tcp.msn_ssl_ft++;
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"increased msn ft ssl stage to: %u at packet nr: %u\n", flow->l4.tcp.msn_ssl_ft,
|
||||
flow->packet_counter);
|
||||
if (flow->l4.tcp.msn_ssl_ft == 2) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"detected MSN File Transfer, ifdef ssl 2.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (flow->packet_counter >= 5 && flow->packet_counter <= 10 && (get_u_int32_t(packet->payload, 0) == htonl(0x18000000)
|
||||
&& get_u_int32_t(packet->payload, 4) == 0x00000000)) {
|
||||
flow->l4.tcp.msn_ssl_ft++;
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"increased msn ft ssl stage to: %u at packet nr: %u\n", flow->l4.tcp.msn_ssl_ft,
|
||||
flow->packet_counter);
|
||||
if (flow->l4.tcp.msn_ssl_ft == 2) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"detected MSN File Transfer, ifdef ssl 2.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -98,25 +97,25 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
* x is now "0", but can be increased
|
||||
*/
|
||||
/* now we have a look at the first packet only. */
|
||||
if (flow->packet_counter == 1
|
||||
if(flow->packet_counter == 1
|
||||
#ifdef NDPI_PROTOCOL_SSL
|
||||
|| ((packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL) && flow->packet_counter <= 3)
|
||||
#endif
|
||||
) {
|
||||
|
||||
|
||||
/* this part is working asymmetrically */
|
||||
if (packet->payload_packet_len > 32 && (packet->payload[0] == 0x02 || packet->payload[0] == 0x00)
|
||||
&& (ntohl(get_u_int32_t(packet->payload, 8)) == 0x2112a442 || ntohl(get_u_int32_t(packet->payload, 4)) == 0x2112a442)
|
||||
&& ((ntohl(get_u_int32_t(packet->payload, 24)) == 0x000f0004 && ntohl(get_u_int32_t(packet->payload, 28)) == 0x72c64bc6)
|
||||
|| (ntohl(get_u_int32_t(packet->payload, 20)) == 0x000f0004
|
||||
&& ntohl(get_u_int32_t(packet->payload, 24)) == 0x72c64bc6))) {
|
||||
if(packet->payload_packet_len > 32 && (packet->payload[0] == 0x02 || packet->payload[0] == 0x00)
|
||||
&& (ntohl(get_u_int32_t(packet->payload, 8)) == 0x2112a442 || ntohl(get_u_int32_t(packet->payload, 4)) == 0x2112a442)
|
||||
&& ((ntohl(get_u_int32_t(packet->payload, 24)) == 0x000f0004 && ntohl(get_u_int32_t(packet->payload, 28)) == 0x72c64bc6)
|
||||
|| (ntohl(get_u_int32_t(packet->payload, 20)) == 0x000f0004
|
||||
&& ntohl(get_u_int32_t(packet->payload, 24)) == 0x72c64bc6))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN in packets that also contain voice.messenger.live.com.\n");
|
||||
|
||||
/* TODO this is an alternative pattern for video detection */
|
||||
/* if (packet->payload_packet_len > 100 &&
|
||||
get_u_int16_t(packet->payload, 86) == htons(0x05dc)) { */
|
||||
if (packet->payload_packet_len > 101 && packet->payload[101] == 0x02) {
|
||||
if(packet->payload_packet_len > 101 && packet->payload[101] == 0x02) {
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
} else {
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
@@ -148,13 +147,12 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
if(
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "GET ") ||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "POST ")) {
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "GET ") ||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "POST ")) {
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (packet->user_agent_line.ptr != NULL &&
|
||||
packet->user_agent_line.len > NDPI_STATICSTRING_LEN("Messenger/") &&
|
||||
@@ -163,29 +161,29 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
return;
|
||||
}
|
||||
}
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
/* we have to examine two http packets */
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP) {
|
||||
}
|
||||
#endif
|
||||
/* #ifdef NDPI_PROTOCOL_HTTP */
|
||||
/* /\* we have to examine two http packets *\/ */
|
||||
/* if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP) { */
|
||||
/* } */
|
||||
/* #endif */
|
||||
/* not seen this pattern in any trace */
|
||||
/* now test for http login, at least 100 a bytes packet */
|
||||
if (packet->payload_packet_len > 100) {
|
||||
if (
|
||||
if(packet->payload_packet_len > 100) {
|
||||
if(
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
memcmp(packet->payload, "POST http://", 12) == 0) {
|
||||
/* scan packet if not already done... */
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if (packet->content_line.ptr != NULL &&
|
||||
((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") &&
|
||||
memcmp(packet->content_line.ptr, "application/x-msn-messenger",
|
||||
NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) ||
|
||||
(packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") &&
|
||||
memcmp(packet->content_line.ptr, "text/x-msnmsgr",
|
||||
NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) {
|
||||
|
||||
if(packet->content_line.ptr != NULL &&
|
||||
((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") &&
|
||||
memcmp(packet->content_line.ptr, "application/x-msn-messenger",
|
||||
NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) ||
|
||||
(packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") &&
|
||||
memcmp(packet->content_line.ptr, "text/x-msnmsgr",
|
||||
NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN by pattern POST http:// .... application/x-msn-messenger.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
@@ -193,25 +191,24 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* now test for http login that uses a gateway, at least 400 a bytes packet */
|
||||
/* for this case the asymmetric detection is asym (1) */
|
||||
if (packet->payload_packet_len > 400) {
|
||||
if ((
|
||||
if(packet->payload_packet_len > 400) {
|
||||
if((
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
(memcmp(packet->payload, "POST ", 5) == 0))) {
|
||||
(memcmp(packet->payload, "POST ", 5) == 0))) {
|
||||
u_int16_t c;
|
||||
if (memcmp(&packet->payload[5], "http://", 7) == 0) {
|
||||
if(memcmp(&packet->payload[5], "http://", 7) == 0) {
|
||||
/*
|
||||
* We are searching for a paten "POST http://gateway.messenger.hotmail.com/gateway/gateway.dll" or
|
||||
* "POST http://<some ip addres here like 172.0.0.0>/gateway/gateway.dll"
|
||||
* We are searching for a pattern "POST http://gateway.messenger.hotmail.com/gateway/gateway.dll" or
|
||||
* "POST http://<some ip address here like 172.0.0.0>/gateway/gateway.dll"
|
||||
* POST http:// is 12 byte so we are searching for 13 to 70 byte for this paten.
|
||||
*/
|
||||
for (c = 13; c < 50; c++) {
|
||||
if (memcmp(&packet->payload[c], "/", 1) == 0) {
|
||||
if (memcmp(&packet->payload[c], "/gateway/gateway.dll", 20) == 0) {
|
||||
for(c = 13; c < 50; c++) {
|
||||
if(memcmp(&packet->payload[c], "/", 1) == 0) {
|
||||
if(memcmp(&packet->payload[c], "/gateway/gateway.dll", 20) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found pattern http://.../gateway/gateway.ddl.\n");
|
||||
status = 1;
|
||||
@@ -219,44 +216,38 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if ((memcmp(&packet->payload[5], "/gateway/gateway.dll", 20) == 0)) {
|
||||
} else if((memcmp(&packet->payload[5], "/gateway/gateway.dll", 20) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found pattern http://.../gateway/gateway.ddl.\n");
|
||||
status = 1;
|
||||
}
|
||||
}
|
||||
if (status) {
|
||||
if(status) {
|
||||
u_int16_t a;
|
||||
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if (packet->content_line.ptr != NULL
|
||||
&&
|
||||
((packet->content_line.len == 23
|
||||
&& memcmp(packet->content_line.ptr, "text/xml; charset=utf-8", 23) == 0)
|
||||
||
|
||||
(packet->content_line.len == 24
|
||||
&& memcmp(packet->content_line.ptr, "text/html; charset=utf-8", 24) == 0)
|
||||
||
|
||||
(packet->content_line.len == 33
|
||||
&& memcmp(packet->content_line.ptr, "application/x-www-form-urlencoded", 33) == 0)
|
||||
)) {
|
||||
if ((src != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN)
|
||||
!= 0) || (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask,
|
||||
NDPI_PROTOCOL_MSN)
|
||||
!= 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN with pattern text/xml; charset=utf-8.\n");
|
||||
if(packet->content_line.ptr != NULL && ((packet->content_line.len == 23
|
||||
&& memcmp(packet->content_line.ptr, "text/xml; charset=utf-8", 23) == 0)
|
||||
||
|
||||
(packet->content_line.len == 24
|
||||
&& memcmp(packet->content_line.ptr, "text/html; charset=utf-8", 24) == 0)
|
||||
||
|
||||
(packet->content_line.len == 33
|
||||
&& memcmp(packet->content_line.ptr, "application/x-www-form-urlencoded", 33) == 0))) {
|
||||
|
||||
if ((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)
|
||||
|| (dst != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "found MSN with pattern text/xml; charset=utf-8.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
for (a = 0; a < packet->parsed_lines; a++) {
|
||||
if (packet->line[a].len >= 4 &&
|
||||
(memcmp(packet->line[a].ptr, "CVR ", 4) == 0
|
||||
|| memcmp(packet->line[a].ptr, "VER ",
|
||||
4) == 0 || memcmp(packet->line[a].ptr, "ANS ", 4) == 0)) {
|
||||
for(a = 0; a < packet->parsed_lines; a++) {
|
||||
if(packet->line[a].len >= 4 && (memcmp(packet->line[a].ptr, "CVR ", 4) == 0
|
||||
|| memcmp(packet->line[a].ptr, "VER ", 4) == 0 ||
|
||||
memcmp(packet->line[a].ptr, "ANS ", 4) == 0)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN with pattern text/sml; charset0utf-8.\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct,
|
||||
@@ -269,52 +260,47 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
}
|
||||
}
|
||||
/* asym (1) ; possibly occurs in symmetric cases also. */
|
||||
if (flow->packet_counter <= 10 &&
|
||||
(flow->packet_direction_counter[0] <= 2 || flow->packet_direction_counter[1] <= 2)
|
||||
&& packet->payload_packet_len > 100) {
|
||||
if(flow->packet_counter <= 10 &&
|
||||
(flow->packet_direction_counter[0] <= 2 || flow->packet_direction_counter[1] <= 2)
|
||||
&& packet->payload_packet_len > 100) {
|
||||
/* not necessary to check the length, because this has been done : >400. */
|
||||
if (
|
||||
if(
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.0 200 OK") ||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.1 200 OK")
|
||||
) {
|
||||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.0 200 OK") ||
|
||||
ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.1 200 OK")
|
||||
) {
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if (packet->content_line.ptr != NULL &&
|
||||
if(packet->content_line.ptr != NULL &&
|
||||
((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") &&
|
||||
memcmp(packet->content_line.ptr, "application/x-msn-messenger",
|
||||
NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) ||
|
||||
memcmp(packet->content_line.ptr, "application/x-msn-messenger", NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) ||
|
||||
(packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") &&
|
||||
memcmp(packet->content_line.ptr, "text/x-msnmsgr",
|
||||
NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) {
|
||||
memcmp(packet->content_line.ptr, "text/x-msnmsgr", NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"HTTP/1.0 200 OK .... application/x-msn-messenger.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ndpi_int_find_xmsn(ndpi_struct, flow) == 1) {
|
||||
if(ndpi_int_find_xmsn(ndpi_struct, flow) == 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "HTTP/1.0 200 OK .... X-MSN.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* did not find any trace with this pattern !!!!! */
|
||||
/* did not find any trace with this pattern */
|
||||
/* now block proxy connection */
|
||||
if (packet->payload_packet_len >= 42) {
|
||||
if (memcmp(packet->payload, "CONNECT messenger.hotmail.com:1863 HTTP/1.", 42) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN with pattern CONNECT messenger.hotmail.com:1863 HTTP/1..\n");
|
||||
if(packet->payload_packet_len >= 42) {
|
||||
if(memcmp(packet->payload, "CONNECT messenger.hotmail.com:1863 HTTP/1.", 42) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "found MSN with pattern CONNECT messenger.hotmail.com:1863 HTTP/1..\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->payload_packet_len >= 18) {
|
||||
|
||||
if (memcmp(packet->payload, "USR ", 4) == 0 || memcmp(packet->payload, "ANS ", 4) == 0) {
|
||||
@@ -347,59 +333,52 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
if (plen >= endlen) {
|
||||
goto ndpi_msn_exclude;
|
||||
}
|
||||
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"found MSN with pattern USR/ANS ...mail_address.\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "found MSN with pattern USR/ANS ...mail_address.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* finished examining the first packet only. */
|
||||
|
||||
|
||||
/* asym (1) ; possibly occurs in symmetric cases also. */
|
||||
if (flow->packet_counter <= 10 &&
|
||||
if(flow->packet_counter <= 10 &&
|
||||
(flow->packet_direction_counter[0] <= 2 || flow->packet_direction_counter[1] <= 2) &&
|
||||
packet->payload_packet_len > 100) {
|
||||
/* not necessary to check the length, because this has been done : >400. */
|
||||
if (
|
||||
if(
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
(memcmp(packet->payload, "HTTP/1.0 200 OK", 15) == 0) ||
|
||||
(memcmp(packet->payload, "HTTP/1.1 200 OK", 15) == 0)
|
||||
) {
|
||||
|
||||
(memcmp(packet->payload, "HTTP/1.0 200 OK", 15) == 0) ||
|
||||
(memcmp(packet->payload, "HTTP/1.1 200 OK", 15) == 0)) {
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if (packet->content_line.ptr != NULL &&
|
||||
((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") &&
|
||||
memcmp(packet->content_line.ptr, "application/x-msn-messenger",
|
||||
NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) ||
|
||||
(packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") &&
|
||||
memcmp(packet->content_line.ptr, "text/x-msnmsgr", NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"HTTP/1.0 200 OK .... application/x-msn-messenger.\n");
|
||||
|
||||
if(packet->content_line.ptr != NULL && ((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") &&
|
||||
memcmp(packet->content_line.ptr, "application/x-msn-messenger",
|
||||
NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) ||
|
||||
(packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") &&
|
||||
memcmp(packet->content_line.ptr, "text/x-msnmsgr", NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "HTTP/1.0 200 OK .... application/x-msn-messenger.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ndpi_int_find_xmsn(ndpi_struct, flow) == 1) {
|
||||
if(ndpi_int_find_xmsn(ndpi_struct, flow) == 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "HTTP/1.0 200 OK .... X-MSN.\n");
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* finished examining the secone packet only */
|
||||
/* finished examining the second packet only */
|
||||
/* direct user connection (file transfer,...) */
|
||||
|
||||
if ((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)
|
||||
|| (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)) {
|
||||
|
||||
if((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)
|
||||
|| (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)) {
|
||||
if (flow->packet_counter == 1 &&
|
||||
packet->payload_packet_len > 12 && memcmp(packet->payload, "recipientid=", 12) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_DEBUG, "detected file transfer.\n");
|
||||
@@ -407,23 +386,22 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* MSN File Transfer of MSN 8.1 and 8.5
|
||||
* first packet with length 4 and pattern 0x04000000
|
||||
* second packet (in the same direction), with length 56 and pattern 0x00000000 from payload[16]
|
||||
* third packet (in the opposite direction to 1 & 2), with length 4 and pattern 0x30000000
|
||||
*/
|
||||
if (flow->l4.tcp.msn_stage == 0) {
|
||||
if(flow->l4.tcp.msn_stage == 0) {
|
||||
/* asymmetric detection to this pattern is asym (2) */
|
||||
if ((packet->payload_packet_len == 4 || packet->payload_packet_len == 8)
|
||||
&& get_u_int32_t(packet->payload, 0) == htonl(0x04000000)) {
|
||||
if((packet->payload_packet_len == 4 || packet->payload_packet_len == 8)
|
||||
&& get_u_int32_t(packet->payload, 0) == htonl(0x04000000)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_DEBUG, "maybe first TCP MSN detected\n");
|
||||
|
||||
if (packet->payload_packet_len == 8 && get_u_int32_t(packet->payload, 4) == htonl(0x666f6f00)) {
|
||||
|
||||
if(packet->payload_packet_len == 8 && get_u_int32_t(packet->payload, 4) == htonl(0x666f6f00)) {
|
||||
flow->l4.tcp.msn_stage = 5 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
|
||||
flow->l4.tcp.msn_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
@@ -469,32 +447,29 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_DEBUG, "msn 7.\n");
|
||||
if (flow->packet_counter <= MAX_PACKETS_FOR_MSN) {
|
||||
if (packet->tcp->source == htons(443)
|
||||
|| packet->tcp->dest == htons(443)) {
|
||||
if (packet->payload_packet_len > 300) {
|
||||
if (memcmp(&packet->payload[40], "INVITE MSNMSGR", 14) == 0
|
||||
|| memcmp(&packet->payload[56], "INVITE MSNMSGR", 14) == 0
|
||||
|| memcmp(&packet->payload[172], "INVITE MSNMSGR", 14) == 0) {
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "MSN File Transfer detected 3\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (flow->packet_counter <= MAX_PACKETS_FOR_MSN) {
|
||||
if (memcmp(&packet->payload[0], "MSG ", 4) == 0
|
||||
|| memcmp(&packet->payload[0], "PNG", 3) == 0
|
||||
|| memcmp(&packet->payload[0], "QNG ", 4) == 0
|
||||
|| memcmp(&packet->payload[0], "OUT", 3) == 0
|
||||
|| memcmp(&packet->payload[0], "RNG ", 4) == 0
|
||||
|| memcmp(&packet->payload[0], "NLN ", 4) == 0
|
||||
|| memcmp(&packet->payload[0], "UBX ", 4) == 0
|
||||
|| memcmp(&packet->payload[0], "XFR ", 4) == 0) {
|
||||
ndpi_int_msn_add_connection(ndpi_struct, flow);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "MSN detected\n");
|
||||
return;
|
||||
}
|
||||
/* For no
|
||||
n port 443 flows exclude flow bitmask after first packet itself */
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSN, ndpi_struct, NDPI_LOG_TRACE, "MSN tcp excluded.\n");
|
||||
ndpi_msn_exclude:
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSN);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void ndpi_search_udp_msn_misc(struct ndpi_detection_module_struct
|
||||
/* search over UDP */
|
||||
static void ndpi_search_msn_udp_misc(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
@@ -530,27 +505,26 @@ void ndpi_search_msn(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
/* this if request should always be true */
|
||||
if (NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSN) == 0) {
|
||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSN) == 0) {
|
||||
/* we deal with tcp now */
|
||||
if (packet->tcp != NULL) {
|
||||
if(packet->tcp != NULL) {
|
||||
/* msn can use http or ssl for connection. That's why every http, ssl and ukn packet must enter in the msn detection */
|
||||
/* the detection can swich out the http or the ssl detection. In this case we need not check those protocols */
|
||||
/* the detection can switch out the http or the ssl detection. In this case we need not check those protocols */
|
||||
// need to do the ceck when protocol == http too (POST /gateway ...)
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
#if defined(NDPI_PROTOCOL_HTTP)
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP
|
||||
if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP
|
||||
#endif
|
||||
#if defined(NDPI_PROTOCOL_SSL)
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL
|
||||
#ifdef NDPI_PROTOCOL_SSL
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL
|
||||
#endif
|
||||
#if defined(NDPI_PROTOCOL_STUN)
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_STUN
|
||||
#ifdef NDPI_PROTOCOL_STUN
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_STUN
|
||||
#endif
|
||||
) {
|
||||
)
|
||||
ndpi_search_msn_tcp(ndpi_struct, flow);
|
||||
}
|
||||
} else if (packet->udp != NULL) {
|
||||
ndpi_search_udp_msn_misc(ndpi_struct, flow);
|
||||
ndpi_search_msn_udp_misc(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
/*
|
||||
* mssql.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - 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_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MSSQL
|
||||
|
||||
static void ndpi_int_mssql_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MSSQL, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_mssql(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSSQL, ndpi_struct, NDPI_LOG_DEBUG, "search mssql.\n");
|
||||
|
||||
if (packet->payload_packet_len > 51 && ntohs(get_u_int32_t(packet->payload, 0)) == 0x1201
|
||||
&& ntohs(get_u_int16_t(packet->payload, 2)) == packet->payload_packet_len
|
||||
&& ntohl(get_u_int32_t(packet->payload, 4)) == 0x00000100 && memcmp(&packet->payload[41], "sqlexpress", 10) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSSQL, ndpi_struct, NDPI_LOG_DEBUG, "found mssql.\n");
|
||||
ndpi_int_mssql_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSSQL, ndpi_struct, NDPI_LOG_DEBUG, "exclude mssql.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSSQL);
|
||||
}
|
||||
|
||||
|
||||
void init_mssql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("MsSQL", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_MSSQL,
|
||||
ndpi_search_mssql,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,82 @@
|
||||
/*
|
||||
* mssql.c
|
||||
*
|
||||
* Copyright (C) 2016 - 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_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MSSQL_TDS
|
||||
|
||||
struct tds_packet_header {
|
||||
u_int8_t type;
|
||||
u_int8_t status;
|
||||
u_int16_t length;
|
||||
u_int16_t channel;
|
||||
u_int8_t number;
|
||||
u_int8_t window;
|
||||
};
|
||||
|
||||
static void ndpi_int_mssql_tds_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MSSQL_TDS, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_mssql_tds(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
struct tds_packet_header *h = (struct tds_packet_header*) packet->payload;
|
||||
|
||||
if(packet->payload_packet_len < sizeof(struct tds_packet_header)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSSQL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "exclude mssql_tds\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSSQL_TDS);
|
||||
return;
|
||||
}
|
||||
|
||||
if((h->type >= 1 && h->type <= 8) || (h->type >= 14 && h->type <= 18)) {
|
||||
if(h->status == 0x00 || h->status == 0x01 || h->status == 0x02 || h->status == 0x04 || h->status == 0x08 || h->status == 0x09 || h->status == 0x10) {
|
||||
if(ntohs(h->length) == packet->payload_packet_len && h->window == 0x00) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSSQL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "found mssql_tds\n");
|
||||
ndpi_int_mssql_tds_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MSSQL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "exclude mssql_tds\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSSQL_TDS);
|
||||
}
|
||||
|
||||
|
||||
void init_mssql_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("MsSQL_TDS", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_MSSQL_TDS,
|
||||
ndpi_search_mssql_tds,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
+21
-20
@@ -39,27 +39,28 @@ void ndpi_search_mysql_tcp(struct ndpi_detection_module_struct *ndpi_struct, str
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
if (packet->payload_packet_len > 37 //min length
|
||||
&& get_u_int16_t(packet->payload, 0) == packet->payload_packet_len - 4 //first 3 bytes are length
|
||||
&& get_u_int8_t(packet->payload, 2) == 0x00 //3rd byte of packet length
|
||||
&& get_u_int8_t(packet->payload, 3) == 0x00 //packet sequence number is 0 for startup packet
|
||||
&& get_u_int8_t(packet->payload, 5) > 0x30 //server version > 0
|
||||
&& get_u_int8_t(packet->payload, 5) < 0x37 //server version < 7
|
||||
&& get_u_int8_t(packet->payload, 6) == 0x2e //dot
|
||||
) {
|
||||
u_int32_t a;
|
||||
for (a = 7; a + 31 < packet->payload_packet_len; a++) {
|
||||
if (packet->payload[a] == 0x00) {
|
||||
if (get_u_int8_t(packet->payload, a + 13) == 0x00 //filler byte
|
||||
&& get_u_int64_t(packet->payload, a + 19) == 0x0ULL //13 more
|
||||
&& get_u_int32_t(packet->payload, a + 27) == 0x0 //filler bytes
|
||||
&& get_u_int8_t(packet->payload, a + 31) == 0x0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MYSQL, ndpi_struct, NDPI_LOG_DEBUG, "MySQL detected.\n");
|
||||
ndpi_int_mysql_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
if(packet->tcp) {
|
||||
if (packet->payload_packet_len > 38 //min length
|
||||
&& get_u_int16_t(packet->payload, 0) == packet->payload_packet_len - 4 //first 3 bytes are length
|
||||
&& get_u_int8_t(packet->payload, 2) == 0x00 //3rd byte of packet length
|
||||
&& get_u_int8_t(packet->payload, 3) == 0x00 //packet sequence number is 0 for startup packet
|
||||
&& get_u_int8_t(packet->payload, 5) > 0x30 //server version > 0
|
||||
&& get_u_int8_t(packet->payload, 5) < 0x37 //server version < 7
|
||||
&& get_u_int8_t(packet->payload, 6) == 0x2e //dot
|
||||
) {
|
||||
u_int32_t a;
|
||||
for (a = 7; a + 31 < packet->payload_packet_len; a++) {
|
||||
if (packet->payload[a] == 0x00) {
|
||||
if (get_u_int8_t(packet->payload, a + 13) == 0x00 //filler byte
|
||||
&& get_u_int64_t(packet->payload, a + 19) == 0x0ULL //13 more
|
||||
&& get_u_int32_t(packet->payload, a + 27) == 0x0 //filler bytes
|
||||
&& get_u_int8_t(packet->payload, a + 31) == 0x0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MYSQL, ndpi_struct, NDPI_LOG_DEBUG, "MySQL detected.\n");
|
||||
ndpi_int_mysql_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+90
-71
@@ -2,7 +2,7 @@
|
||||
* netbios.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* 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
|
||||
@@ -27,8 +27,12 @@
|
||||
|
||||
#ifdef NDPI_PROTOCOL_NETBIOS
|
||||
|
||||
struct netbios_header {
|
||||
u_int16_t transaction_id, flags, questions, answer_rrs, authority_rrs, additional_rrs;
|
||||
};
|
||||
|
||||
/* The function below has been inherited by tcpdump */
|
||||
static int netbios_name_interpret(char *in, char *out, u_int out_len) {
|
||||
int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
|
||||
int ret = 0, len;
|
||||
char *b;
|
||||
|
||||
@@ -46,8 +50,11 @@ static int netbios_name_interpret(char *in, char *out, u_int out_len) {
|
||||
}
|
||||
|
||||
*out = ((in[0]-'A')<<4) + (in[1]-'A');
|
||||
|
||||
in += 2;
|
||||
out++, ret++;
|
||||
|
||||
if(isprint(*out))
|
||||
out++, ret++;
|
||||
}
|
||||
|
||||
*out = 0;
|
||||
@@ -63,6 +70,7 @@ static int netbios_name_interpret(char *in, char *out, u_int out_len) {
|
||||
static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
@@ -70,28 +78,30 @@ static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
|
||||
void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
|
||||
u_int16_t dport;
|
||||
|
||||
if (packet->udp != NULL) {
|
||||
char name[64];
|
||||
|
||||
if(packet->udp != NULL) {
|
||||
dport = ntohs(packet->udp->dest);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG, "netbios udp start\n");
|
||||
|
||||
/*check standard NETBIOS over udp to port 137 */
|
||||
if ((dport == 137 || 0) && packet->payload_packet_len >= 50) {
|
||||
if((dport == 137 || 0) && packet->payload_packet_len >= 50) {
|
||||
struct netbios_header h;
|
||||
|
||||
memcpy(&h, packet->payload, sizeof(struct netbios_header));
|
||||
h.transaction_id = ntohs(h.transaction_id), h.flags = ntohs(h.flags),
|
||||
h.questions = ntohs(h.questions), h.answer_rrs = ntohs(h.answer_rrs),
|
||||
h.authority_rrs = ntohs(h.authority_rrs), h.additional_rrs = ntohs(h.additional_rrs);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios port 137 and payload_packet_len 50\n");
|
||||
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 0) {
|
||||
if(h.flags == 0 &&
|
||||
h.questions == 1 &&
|
||||
h.answer_rrs == 0 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with questions = 1 and answers = 0, authority = 0 \n");
|
||||
@@ -99,10 +109,24 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (packet->payload[2] == 0x80 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 1) {
|
||||
if(((h.flags & 0x8710) == 0x10) &&
|
||||
h.questions == 1 &&
|
||||
h.answer_rrs == 0 &&
|
||||
h.authority_rrs == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with questions = 1 and answers = 0, authority = 0 and broadcast \n");
|
||||
|
||||
if(ndpi_netbios_name_interpret((char*)&packet->payload[12], name, sizeof(name)) > 0)
|
||||
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);
|
||||
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if(packet->payload[2] == 0x80 &&
|
||||
h.questions == 1 &&
|
||||
h.answer_rrs == 0 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 1) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with questions = 1 and answers, authority, additional = 0 \n");
|
||||
@@ -110,10 +134,10 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0x4000 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 1) {
|
||||
if(h.flags == 0x4000 &&
|
||||
h.questions == 1 &&
|
||||
h.answer_rrs == 0 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 1) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with questions = 1 and answers = 0, authority = 0 \n");
|
||||
@@ -121,10 +145,10 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0x8400 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 0) {
|
||||
if(h.flags == 0x8400 &&
|
||||
h.questions == 0 &&
|
||||
h.answer_rrs == 1 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
@@ -133,10 +157,10 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0x8500 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 0) {
|
||||
if(h.flags == 0x8500 &&
|
||||
h.questions == 0 &&
|
||||
h.answer_rrs == 1 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
@@ -145,10 +169,10 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0x2910 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 1) {
|
||||
if(h.flags == 0x2910 &&
|
||||
h.questions == 1 &&
|
||||
h.answer_rrs == 0 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 1) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
@@ -157,10 +181,10 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0xAD86 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 0) {
|
||||
if(h.flags == 0xAD86 &&
|
||||
h.questions == 0 &&
|
||||
h.answer_rrs == 1 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
@@ -169,10 +193,10 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (ntohs(get_u_int16_t(packet->payload, 2)) == 0x0110 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 4)) == 1 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 6)) == 0 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) == 0) {
|
||||
if(h.flags == 0x0110 &&
|
||||
h.questions == 1 &&
|
||||
h.answer_rrs == 0 &&
|
||||
h.authority_rrs == 0 && h.additional_rrs == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
@@ -182,11 +206,11 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
return;
|
||||
}
|
||||
|
||||
if ((ntohs(get_u_int16_t(packet->payload, 2)) & 0xf800) == 0) {
|
||||
if((h.flags & 0xf800) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG, "possible netbios name query request\n");
|
||||
|
||||
if (get_u_int16_t(packet->payload, 4) == htons(1) &&
|
||||
if(get_u_int16_t(packet->payload, 4) == htons(1) &&
|
||||
get_u_int16_t(packet->payload, 6) == 0 &&
|
||||
get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
|
||||
|
||||
@@ -196,13 +220,13 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios name query request, one question\n");
|
||||
|
||||
if (packet->payload_packet_len == 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
if(packet->payload_packet_len == 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios name query request, length matches\n");
|
||||
|
||||
/* null terminated? */
|
||||
if (packet->payload[12 + name_length + 1] == 0 &&
|
||||
if(packet->payload[12 + name_length + 1] == 0 &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0020) &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
|
||||
|
||||
@@ -213,12 +237,11 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if ((ntohs(get_u_int16_t(packet->payload, 2)) & 0xf800) == 0x8000) {
|
||||
|
||||
} else if((h.flags & 0xf800) == 0x8000) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios name query response\n");
|
||||
|
||||
if (get_u_int16_t(packet->payload, 4) == 0 &&
|
||||
if(get_u_int16_t(packet->payload, 4) == 0 &&
|
||||
get_u_int16_t(packet->payload, 6) == htons(1) &&
|
||||
get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
|
||||
|
||||
@@ -228,13 +251,13 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios positive name query response, one answer\n");
|
||||
|
||||
if (packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
if(packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios name query response, length matches\n");
|
||||
|
||||
/* null terminated? */
|
||||
if (packet->payload[12 + name_length + 1] == 0 &&
|
||||
if(packet->payload[12 + name_length + 1] == 0 &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0020) &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
|
||||
|
||||
@@ -244,7 +267,7 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if (get_u_int16_t(packet->payload, 4) == 0 &&
|
||||
} else if(get_u_int16_t(packet->payload, 4) == 0 &&
|
||||
get_u_int16_t(packet->payload, 6) == 0 &&
|
||||
get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
|
||||
|
||||
@@ -254,13 +277,13 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios negative name query response, one answer\n");
|
||||
|
||||
if (packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
if(packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios name query response, length matches\n");
|
||||
|
||||
/* null terminated? */
|
||||
if (packet->payload[12 + name_length + 1] == 0 &&
|
||||
if(packet->payload[12 + name_length + 1] == 0 &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x000A) &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
|
||||
|
||||
@@ -270,7 +293,7 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if (get_u_int16_t(packet->payload, 4) == 0 &&
|
||||
} else if(get_u_int16_t(packet->payload, 4) == 0 &&
|
||||
get_u_int16_t(packet->payload, 6) == 0 &&
|
||||
get_u_int16_t(packet->payload, 8) == htons(1) && get_u_int16_t(packet->payload, 10) == htons(1)) {
|
||||
|
||||
@@ -280,13 +303,13 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios redirect name query response, one answer\n");
|
||||
|
||||
if (packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
if(packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"possible netbios name query response, length matches\n");
|
||||
|
||||
/* null terminated? */
|
||||
if (packet->payload[12 + name_length + 1] == 0 &&
|
||||
if(packet->payload[12 + name_length + 1] == 0 &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0002) &&
|
||||
get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
|
||||
|
||||
@@ -305,26 +328,24 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
|
||||
/*netbios header token from http://www.protocolbase.net/protocols/protocol_NBDGM.php */
|
||||
|
||||
if ((dport == 138) &&
|
||||
if((dport == 138) &&
|
||||
packet->payload_packet_len >= 14 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 10)) == packet->payload_packet_len - 14) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios port 138 and payload length >= 112 \n");
|
||||
|
||||
if (packet->payload[0] >= 0x11 && packet->payload[0] <= 0x16) {
|
||||
if(packet->payload[0] >= 0x11 && packet->payload[0] <= 0x16) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with MSG-type 0x11,0x12,0x13,0x14,0x15 or 0x16\n");
|
||||
|
||||
if (ntohl(get_u_int32_t(packet->payload, 4)) == ntohl(packet->iph->saddr)) {
|
||||
char name[64];
|
||||
|
||||
if(ntohl(get_u_int32_t(packet->payload, 4)) == ntohl(packet->iph->saddr)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with checked ip-address.\n");
|
||||
|
||||
if(netbios_name_interpret((char*)&packet->payload[12], name, sizeof(name)) > 0)
|
||||
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name), "%s", name);
|
||||
if(ndpi_netbios_name_interpret((char*)&packet->payload[12], name, sizeof(name)) > 0)
|
||||
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);
|
||||
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
@@ -333,22 +354,22 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->tcp != NULL) {
|
||||
if(packet->tcp != NULL) {
|
||||
dport = ntohs(packet->tcp->dest);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG, "netbios tcp start\n");
|
||||
|
||||
/* destination port must be 139 */
|
||||
if (dport == 139) {
|
||||
if(dport == 139) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG, "found netbios with destination port 139\n");
|
||||
|
||||
/* payload_packet_len must be 72 */
|
||||
if (packet->payload_packet_len == 72) {
|
||||
if(packet->payload_packet_len == 72) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "found netbios with payload_packen_len = 72. \n");
|
||||
|
||||
if (packet->payload[0] == 0x81 && packet->payload[1] == 0 && ntohs(get_u_int16_t(packet->payload, 2)) == 68) {
|
||||
if(packet->payload[0] == 0x81 && packet->payload[1] == 0 && ntohs(get_u_int16_t(packet->payload, 2)) == 68) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
"found netbios with session request = 81, flags=0 and length od following bytes = 68. \n");
|
||||
@@ -363,10 +384,8 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_NETBIOS, ndpi_struct, NDPI_LOG_DEBUG, "exclude netbios\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_NETBIOS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void init_netbios_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("NETBIOS", ndpi_struct, detection_bitmask, *id,
|
||||
|
||||
+98
-45
@@ -1,68 +1,121 @@
|
||||
/*
|
||||
* h323.c
|
||||
* openvpn.c
|
||||
*
|
||||
* Copyright (C) 2013 Remy Mudingay <mudingay@ill.fr>
|
||||
* Copyright (C) 2011-16 - ntop.org
|
||||
*
|
||||
* OpenVPN TCP / UDP Detection - 128/160 hmac
|
||||
*
|
||||
* Detection based upon these openvpn protocol properties:
|
||||
* - opcode
|
||||
* - packet ID
|
||||
* - session ID
|
||||
*
|
||||
* Two (good) packets are needed to perform detection.
|
||||
* - First packet from client: save session ID
|
||||
* - Second packet from server: report saved session ID
|
||||
*
|
||||
* TODO
|
||||
* - Support PSK only mode (instead of TLS)
|
||||
* - Support PSK + TLS mode (PSK used for early authentication)
|
||||
* - TLS certificate extraction
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
|
||||
#ifdef NDPI_PROTOCOL_OPENVPN
|
||||
|
||||
#define P_CONTROL_HARD_RESET_CLIENT_V1 (0x01 << 3)
|
||||
#define P_CONTROL_HARD_RESET_CLIENT_V2 (0x07 << 3)
|
||||
#define P_CONTROL_HARD_RESET_SERVER_V1 (0x02 << 3)
|
||||
#define P_CONTROL_HARD_RESET_SERVER_V2 (0x08 << 3)
|
||||
#define P_OPCODE_MASK 0xF8
|
||||
#define P_SHA1_HMAC_SIZE 20
|
||||
#define P_HMAC_128 16 // (RSA-)MD5, (RSA-)MD4, ..others
|
||||
#define P_HMAC_160 20 // (RSA-|DSA-)SHA(1), ..others, SHA1 is openvpn default
|
||||
#define P_HARD_RESET_PACKET_ID_OFFSET(hmac_size) (9 + hmac_size)
|
||||
#define P_PACKET_ID_ARRAY_LEN_OFFSET(hmac_size) (P_HARD_RESET_PACKET_ID_OFFSET(hmac_size) + 8)
|
||||
#define P_HARD_RESET_CLIENT_MAX_COUNT 5
|
||||
|
||||
static
|
||||
#ifndef WIN32
|
||||
inline
|
||||
#endif
|
||||
u_int32_t get_packet_id(const u_int8_t * payload, u_int8_t hms) {
|
||||
return ntohl(*(u_int32_t*)(payload + P_HARD_RESET_PACKET_ID_OFFSET(hms)));
|
||||
}
|
||||
|
||||
static
|
||||
#ifndef WIN32
|
||||
inline
|
||||
#endif
|
||||
int8_t check_pkid_and_detect_hmac_size(const u_int8_t * payload) {
|
||||
// try to guess
|
||||
if (get_packet_id(payload, P_HMAC_160) == 1)
|
||||
return P_HMAC_160;
|
||||
if (get_packet_id(payload, P_HMAC_128) == 1)
|
||||
return P_HMAC_128;
|
||||
return -1;
|
||||
}
|
||||
|
||||
void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct,
|
||||
struct ndpi_flow_struct* flow) {
|
||||
struct ndpi_packet_struct* packet = &flow->packet;
|
||||
u_int16_t dport = 0, sport = 0;
|
||||
const u_int8_t * ovpn_payload = packet->payload;
|
||||
const u_int8_t * session_remote;
|
||||
u_int8_t opcode;
|
||||
u_int8_t alen;
|
||||
int8_t hmac_size;
|
||||
int8_t failed = 0;
|
||||
|
||||
if (packet->udp != NULL) {
|
||||
if (packet->payload_packet_len >= 40) {
|
||||
// skip openvpn TCP transport packet size
|
||||
if (packet->tcp != NULL)
|
||||
ovpn_payload += 2;
|
||||
|
||||
sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
|
||||
opcode = ovpn_payload[0] & P_OPCODE_MASK;
|
||||
|
||||
if ((packet->payload_packet_len >= 25) && (sport == 443 || dport == 443) &&
|
||||
(packet->payload[0] == 0x17 && packet->payload[1] == 0x01 &&
|
||||
packet->payload[2] == 0x00 && packet->payload[3] == 0x00)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_OPENVPN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found openvpn udp 443.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OPENVPN, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if (flow->ovpn_counter < P_HARD_RESET_CLIENT_MAX_COUNT && (opcode == P_CONTROL_HARD_RESET_CLIENT_V1 ||
|
||||
opcode == P_CONTROL_HARD_RESET_CLIENT_V2)) {
|
||||
|
||||
if ( ( (packet->payload_packet_len > 40) ||
|
||||
(packet->payload_packet_len <= 14) ) && // hard-reset
|
||||
(sport == 1194 || dport == 1194) &&
|
||||
(packet->payload[0] == 0x30 || packet->payload[0] == 0x31 ||
|
||||
packet->payload[0] == 0x32 || packet->payload[0] == 0x33 ||
|
||||
packet->payload[0] == 0x34 || packet->payload[0] == 0x35 ||
|
||||
packet->payload[0] == 0x36 || packet->payload[0] == 0x37 ||
|
||||
packet->payload[0] == 0x38 || packet->payload[0] == 0x39)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_OPENVPN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found openvpn broadcast udp STD.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OPENVPN, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if (check_pkid_and_detect_hmac_size(ovpn_payload) > 0) {
|
||||
memcpy(flow->ovpn_session_id, ovpn_payload+1, 8);
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_OPENVPN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"session key: %02x%02x%02x%02x%02x%02x%02x%02x\n",
|
||||
flow->ovpn_session_id[0], flow->ovpn_session_id[1], flow->ovpn_session_id[2], flow->ovpn_session_id[3],
|
||||
flow->ovpn_session_id[4], flow->ovpn_session_id[5], flow->ovpn_session_id[6], flow->ovpn_session_id[7]);
|
||||
}
|
||||
} else if (flow->ovpn_counter >= 1 && flow->ovpn_counter <= P_HARD_RESET_CLIENT_MAX_COUNT &&
|
||||
(opcode == P_CONTROL_HARD_RESET_SERVER_V1 || opcode == P_CONTROL_HARD_RESET_SERVER_V2)) {
|
||||
|
||||
hmac_size = check_pkid_and_detect_hmac_size(ovpn_payload);
|
||||
|
||||
if (hmac_size > 0) {
|
||||
alen = ovpn_payload[P_PACKET_ID_ARRAY_LEN_OFFSET(hmac_size)];
|
||||
session_remote = ovpn_payload + P_PACKET_ID_ARRAY_LEN_OFFSET(hmac_size) + 1 + alen * 4;
|
||||
|
||||
if (memcmp(flow->ovpn_session_id, session_remote, 8) == 0)
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OPENVPN, NDPI_PROTOCOL_UNKNOWN);
|
||||
else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_OPENVPN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"key mismatch: %02x%02x%02x%02x%02x%02x%02x%02x\n",
|
||||
session_remote[0], session_remote[1], session_remote[2], session_remote[3],
|
||||
session_remote[4], session_remote[5], session_remote[6], session_remote[7]);
|
||||
failed = 1;
|
||||
}
|
||||
} else
|
||||
failed = 1;
|
||||
} else
|
||||
failed = 1;
|
||||
|
||||
flow->ovpn_counter++;
|
||||
|
||||
if (failed)
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OPENVPN);
|
||||
}
|
||||
|
||||
if (packet->tcp != NULL) {
|
||||
|
||||
sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest);
|
||||
|
||||
if ((packet->payload_packet_len >= 40) &&
|
||||
(sport == 1194 || dport == 1194) &&
|
||||
((packet->payload[0] == 0x00) && (packet->payload[1] == 0x2a) &&
|
||||
(packet->payload[2] == 0x38))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_OPENVPN, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found openvpn broadcast udp STD.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OPENVPN, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OPENVPN);
|
||||
}
|
||||
|
||||
|
||||
void init_openvpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("OpenVPN", ndpi_struct, detection_bitmask, *id,
|
||||
|
||||
@@ -244,11 +244,19 @@ static void ndpi_search_oscar_tcp_connect(struct ndpi_detection_module_struct
|
||||
*/
|
||||
if (channel == DATA)
|
||||
{
|
||||
family = get_u_int16_t(packet->payload, 6);
|
||||
if (packet->payload_packet_len >= 8)
|
||||
family = get_u_int16_t(packet->payload, 6);
|
||||
else
|
||||
family = 0;
|
||||
if (packet->payload_packet_len >= 10)
|
||||
type = get_u_int16_t(packet->payload, 8);
|
||||
else
|
||||
type = 0;
|
||||
if (family == 0 || type == 0)
|
||||
{
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OSCAR);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Family 0x0001 */
|
||||
if (family == htons(GE_SE_CTL))
|
||||
@@ -571,7 +579,7 @@ static void ndpi_search_oscar_tcp_connect(struct ndpi_detection_module_struct
|
||||
{
|
||||
/* request ID */
|
||||
req_ID = get_u_int32_t(packet->payload, 12);
|
||||
if((req_ID <= 4294967295))
|
||||
if((req_ID <= ((u_int32_t)-1)))
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_OSCAR, ndpi_struct, NDPI_LOG_DEBUG, "OSCAR Detected \n");
|
||||
ndpi_int_oscar_add_connection(ndpi_struct, flow);
|
||||
|
||||
+197
-61
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* ppstream.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,83 +20,220 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_PPSTREAM
|
||||
|
||||
#define PPS_PORT 17788
|
||||
|
||||
|
||||
static void ndpi_int_ppstream_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
|
||||
void ndpi_search_ppstream(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
/**
|
||||
PPS over TCP is detected inside HTTP dissector
|
||||
*/
|
||||
|
||||
/* check PPS over UDP */
|
||||
if(packet->udp != NULL) {
|
||||
/*** on port 17788 ***/
|
||||
if(packet->payload_packet_len > 12 && ((ntohs(packet->udp->source) == PPS_PORT) || (ntohs(packet->udp->dest) == PPS_PORT))) {
|
||||
if(((packet->payload_packet_len - 4 == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len >= 6 && packet->payload_packet_len - 6 == get_l16(packet->payload, 0)))) {
|
||||
/* check 43 and */
|
||||
if(packet->payload[2] == 0x43) {
|
||||
if(packet->payload[5] == 0xff &&
|
||||
packet->payload[6] == 0x00 &&
|
||||
packet->payload[7] == 0x01 &&
|
||||
packet->payload[8] == 0x00 &&
|
||||
packet->payload[9] == 0x00 &&
|
||||
packet->payload[10] == 0x00 &&
|
||||
packet->payload[11] == 0x00 &&
|
||||
packet->payload[12] == 0x00 &&
|
||||
packet->payload[13] == 0x00 &&
|
||||
packet->payload[14] == 0x00) {
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/* check 44 */
|
||||
else if(packet->payload[2] == 0x44) {
|
||||
/** b1 71 **/
|
||||
if(packet->payload[3] == 0xb1 && packet->payload[4] == 0x71) {
|
||||
if(packet->payload[13] == 0x00 &&
|
||||
packet->payload[14] == 0x00 &&
|
||||
packet->payload[15] == 0x01 &&
|
||||
packet->payload[16] == 0x00) {
|
||||
/* 02 03 04 05 */
|
||||
if(packet->payload[17] == 0x02 ||
|
||||
packet->payload[17] == 0x03 ||
|
||||
packet->payload[17] == 0x04 ||
|
||||
packet->payload[17] == 0x05) {
|
||||
if(packet->payload[18] == 0x00 &&
|
||||
packet->payload[19] == 0x00 &&
|
||||
packet->payload[20] == 0x00) {
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
|
||||
/* check TCP Connections -> Videodata */
|
||||
if (packet->tcp != NULL) {
|
||||
if (packet->payload_packet_len >= 60 && get_u_int32_t(packet->payload, 52) == 0
|
||||
&& memcmp(packet->payload, "PSProtocol\x0", 11) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG, "found ppstream over tcp.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
/* ff */
|
||||
else if(packet->payload[17] == 0xff) {
|
||||
if(packet->payload[18] == 0xff &&
|
||||
packet->payload[19] == 0xff &&
|
||||
packet->payload[20] == 0xff) {
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/** 73 17 **/
|
||||
else if(packet->payload[3] == 0x73 && packet->payload[4] == 0x17) {
|
||||
if(packet->payload[5] == 0x00 &&
|
||||
packet->payload[6] == 0x00 &&
|
||||
packet->payload[7] == 0x00 &&
|
||||
packet->payload[8] == 0x00 &&
|
||||
packet->payload[14] == 0x00 &&
|
||||
packet->payload[15] == 0x00 &&
|
||||
packet->payload[16] == 0x00 &&
|
||||
packet->payload[17] == 0x00 &&
|
||||
packet->payload[18] == 0x00 &&
|
||||
packet->payload[19] == 0x00 &&
|
||||
packet->payload[20] == 0x00) {
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
/** 74 71 **/
|
||||
else if(packet->payload[3] == 0x74 && packet->payload[4] == 0x71 && packet->payload_packet_len == 113) {
|
||||
/* check "PPStream" string in hex */
|
||||
if(packet->payload[94] == 0x50 &&
|
||||
packet->payload[95] == 0x50 &&
|
||||
packet->payload[96] == 0x53 &&
|
||||
packet->payload[97] == 0x74 &&
|
||||
packet->payload[98] == 0x72 &&
|
||||
packet->payload[99] == 0x65 &&
|
||||
packet->payload[100] == 0x61 &&
|
||||
packet->payload[101] == 0x6d) {
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
/** check 55 (1) **/
|
||||
else if(packet->payload[2] == 0x55 && (packet->payload[13] == 0x1b &&
|
||||
packet->payload[14] == 0xa0 &&
|
||||
packet->payload[15] == 0x00 &&
|
||||
packet->payload[16] == 0x00 &&
|
||||
packet->payload[17] == 0x00 &&
|
||||
packet->payload[18] == 0x00 &&
|
||||
packet->payload[19] == 0x00 &&
|
||||
packet->payload[20] == 0x00 )) {
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/** check 55 (2) **/
|
||||
else if(packet->payload[2] == 0x55 && packet->payload[1] == 0x00 &&
|
||||
(packet->payload[5] == 0x00 &&
|
||||
packet->payload[6] == 0x00 &&
|
||||
packet->payload[7] == 0x00 &&
|
||||
packet->payload[8] == 0x00 &&
|
||||
packet->payload[14] == 0x00 &&
|
||||
packet->payload[15] == 0x00 &&
|
||||
packet->payload[16] == 0x00 &&
|
||||
packet->payload[17] == 0x00 &&
|
||||
packet->payload[18] == 0x00 &&
|
||||
packet->payload[19] == 0x00 &&
|
||||
packet->payload[20] == 0x00 )) {
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* No port detection */
|
||||
if(packet->payload_packet_len > 17) {
|
||||
/* 80 */
|
||||
if(packet->payload[1] == 0x80 || packet->payload[1] == 0x84 ) {
|
||||
if(packet->payload[3] == packet->payload[4]) {
|
||||
|
||||
if (packet->udp != NULL) {
|
||||
if (packet->payload_packet_len > 2 && packet->payload[2] == 0x43
|
||||
&& ((packet->payload_packet_len - 4 == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len >= 6 && packet->payload_packet_len - 6 == get_l16(packet->payload, 0)))) {
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
if (flow->l4.udp.ppstream_stage == 5) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found ppstream over udp pattern len, 43.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (flow->l4.udp.ppstream_stage == 0
|
||||
&& packet->payload_packet_len > 4 && ((packet->payload_packet_len - 4 == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len >= 6
|
||||
&& packet->payload_packet_len - 6 == get_l16(packet->payload,
|
||||
0)))) {
|
||||
|
||||
if (packet->payload[2] == 0x00 && packet->payload[3] == 0x00 && packet->payload[4] == 0x03) {
|
||||
flow->l4.udp.ppstream_stage = 7;
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG, "need next packet I.\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (flow->l4.udp.ppstream_stage == 7
|
||||
&& packet->payload_packet_len > 4 && packet->payload[3] == 0x00
|
||||
&& ((packet->payload_packet_len - 4 == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len == get_l16(packet->payload, 0))
|
||||
|| (packet->payload_packet_len >= 6 && packet->payload_packet_len - 6 == get_l16(packet->payload, 0)))
|
||||
&& (packet->payload[2] == 0x00 && packet->payload[4] == 0x03)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found ppstream over udp with pattern Vb.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over UDP.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
/* 53 */
|
||||
else if(packet->payload[1] == 0x53 && packet->payload[3] == 0x00 &&
|
||||
(packet->payload[0] == 0x08 || packet->payload[0] == 0x0c)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG, "exclude ppstream.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_PPSTREAM);
|
||||
/* increase count pkt ppstream over udp */
|
||||
flow->l4.udp.ppstream_stage++;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found PPStream over udp.\n");
|
||||
ndpi_int_ppstream_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* EXCLUDE PPS */
|
||||
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG, "exclude PPStream.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_PPSTREAM);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -109,7 +245,7 @@ void init_ppstream_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
|
||||
+32
-35
@@ -22,7 +22,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_QUIC
|
||||
@@ -38,18 +37,6 @@ static int quic_ports(u_int16_t sport, u_int16_t dport)
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
static int quic_payload(const u_int8_t *payload) {
|
||||
if((payload[0] == 'Q')
|
||||
&& isdigit(payload[1])
|
||||
&& isdigit(payload[2])
|
||||
&& isdigit(payload[3]))
|
||||
return(1);
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ***************************************************************** */
|
||||
|
||||
static int quic_len(u_int8_t l) {
|
||||
switch(l) {
|
||||
case 0:
|
||||
@@ -86,7 +73,6 @@ void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
&& ((packet->payload[0] & 0xC2) == 0x00)
|
||||
&& (quic_ports(ntohs(packet->udp->source), ntohs(packet->udp->dest)))
|
||||
) {
|
||||
char *begin;
|
||||
int i;
|
||||
|
||||
if((version_len > 0) && (packet->payload[1+cid_len] != 'Q'))
|
||||
@@ -95,33 +81,44 @@ void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
NDPI_LOG(NDPI_PROTOCOL_QUIC, ndpi_struct, NDPI_LOG_DEBUG, "found QUIC.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_QUIC, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
if(!strncmp((char*)&packet->payload[quic_hlen+17], "CHLO" /* Client Hello */, 4)) {
|
||||
/* Check if SNI (Server Name Identification) is present */
|
||||
for(i=quic_hlen+12; i<udp_len-3; i++) {
|
||||
if((packet->payload[i] == 'S')
|
||||
&& (packet->payload[i+1] == 'N')
|
||||
&& (packet->payload[i+2] == 'I')
|
||||
&& (packet->payload[i+3] == 0)) {
|
||||
u_int32_t offset = *((u_int32_t*)&packet->payload[i+4]);
|
||||
u_int32_t prev_offset = *((u_int32_t*)&packet->payload[i-4]);
|
||||
int len = offset-prev_offset;
|
||||
int sni_offset = i+prev_offset+1;
|
||||
if(packet->payload[quic_hlen+12] != 0xA0)
|
||||
quic_hlen++;
|
||||
|
||||
if(udp_len > quic_hlen + 16 + 4) {
|
||||
if(!strncmp((char*)&packet->payload[quic_hlen+16], "CHLO" /* Client Hello */, 4)) {
|
||||
/* Check if SNI (Server Name Identification) is present */
|
||||
for(i=quic_hlen+12; i<udp_len-3; i++) {
|
||||
if((packet->payload[i] == 'S')
|
||||
&& (packet->payload[i+1] == 'N')
|
||||
&& (packet->payload[i+2] == 'I')
|
||||
&& (packet->payload[i+3] == 0)) {
|
||||
u_int32_t offset = *((u_int32_t*)&packet->payload[i+4]);
|
||||
u_int32_t prev_offset = *((u_int32_t*)&packet->payload[i-4]);
|
||||
int len = offset-prev_offset;
|
||||
int sni_offset = i+prev_offset+1;
|
||||
|
||||
while((packet->payload[sni_offset] == '-') && (sni_offset < udp_len))
|
||||
sni_offset++;
|
||||
while((sni_offset < udp_len) && (packet->payload[sni_offset] == '-'))
|
||||
sni_offset++;
|
||||
|
||||
if((sni_offset+len) < udp_len) {
|
||||
int max_len = sizeof(flow->host_server_name)-1, j = 0;
|
||||
if((sni_offset+len) < udp_len) {
|
||||
int max_len = sizeof(flow->host_server_name)-1, j = 0;
|
||||
|
||||
if(len > max_len) len = max_len;
|
||||
if(len > max_len) len = max_len;
|
||||
|
||||
while((len > 0) && (sni_offset < udp_len)) {
|
||||
flow->host_server_name[j++] = packet->payload[sni_offset];
|
||||
sni_offset++, len--;
|
||||
while((len > 0) && (sni_offset < udp_len)) {
|
||||
flow->host_server_name[j++] = packet->payload[sni_offset];
|
||||
sni_offset++, len--;
|
||||
}
|
||||
|
||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||
(char *)flow->host_server_name,
|
||||
strlen((const char*)flow->host_server_name),
|
||||
NDPI_PROTOCOL_QUIC);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
* rsync.c
|
||||
*
|
||||
* Copyright (C) 2013 Remy Mudingay <mudingay@ill.fr>
|
||||
* Copyright (C) 2016 ntop.org
|
||||
*
|
||||
* This module is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
@@ -21,7 +22,6 @@
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
|
||||
#ifdef NDPI_PROTOCOL_RSYNC
|
||||
static void ndpi_int_rsync_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
@@ -35,10 +35,10 @@ void ndpi_search_rsync(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_RSYNC, ndpi_struct, NDPI_LOG_DEBUG, "search for RSYNC.\n");
|
||||
|
||||
if(packet->tcp != NULL) {
|
||||
if(packet->tcp) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RSYNC, ndpi_struct, NDPI_LOG_DEBUG, "calculating RSYNC over tcp.\n");
|
||||
/*
|
||||
* Should match: memcmp(packet->payload, "@RSYN NCD: 28", 14) == 0)
|
||||
* Should match: memcmp(packet->payload, "@RSYNCD: 28", 14) == 0)
|
||||
*/
|
||||
if (packet->payload_packet_len == 12 && packet->payload[0] == 0x40 &&
|
||||
packet->payload[1] == 0x52 && packet->payload[2] == 0x53 &&
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
|
||||
#ifdef NDPI_PROTOCOL_RX
|
||||
|
||||
/* See http://web.mit.edu/kolya/afs/rx/rx-spec for procotol description. */
|
||||
/* See http://web.mit.edu/kolya/afs/rx/rx-spec for protocol description. */
|
||||
|
||||
/* The should be no need for explicit packing, but just in case... */
|
||||
struct __attribute__((__packed__)) ndpi_rx_header {
|
||||
PACK_ON
|
||||
struct ndpi_rx_header {
|
||||
u_int32_t conn_epoch;
|
||||
u_int32_t conn_id;
|
||||
u_int32_t call_number;
|
||||
@@ -42,7 +43,7 @@ struct __attribute__((__packed__)) ndpi_rx_header {
|
||||
u_int8_t security;
|
||||
u_int16_t checksum;
|
||||
u_int16_t service_id;
|
||||
};
|
||||
} PACK_OFF;
|
||||
|
||||
/* Type values */
|
||||
#define DATA 1
|
||||
@@ -77,8 +78,6 @@ void ndpi_check_rx(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
int found = 0;
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "RX: pck: %d, dir[0]: %d, dir[1]: %d\n",
|
||||
flow->packet_counter, flow->packet_direction_counter[0], flow->packet_direction_counter[1]);
|
||||
@@ -108,7 +107,7 @@ void ndpi_check_rx(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
**/
|
||||
|
||||
/* TYPE field */
|
||||
if((header->type < DATA) && (header->type > VERSION)) {
|
||||
if((header->type < DATA) || (header->type > VERSION)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "excluding RX\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RX);
|
||||
return;
|
||||
@@ -170,8 +169,7 @@ void ndpi_check_rx(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
security:
|
||||
/* SECURITY field */
|
||||
if(header->security != 0 && header->security != 1 &&
|
||||
header->security != 2 && header->security != 3)
|
||||
if(header->security > 3)
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_RX, ndpi_struct, NDPI_LOG_DEBUG, "excluding RX\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RX);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* skype.c
|
||||
*
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2017 - 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
|
||||
@@ -17,56 +17,21 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_SKYPE
|
||||
|
||||
static u_int8_t is_skype_host(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t host) {
|
||||
struct in_addr pin;
|
||||
|
||||
pin.s_addr = host;
|
||||
|
||||
return((ndpi_network_ptree_match(ndpi_struct, &pin) == NDPI_PROTOCOL_SKYPE) ? 1 : 0);
|
||||
}
|
||||
|
||||
u_int8_t is_skype_flow(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if(packet->iph) {
|
||||
/*
|
||||
Skype connections are identified by some SSL-like communications
|
||||
without SSL certificate being exchanged
|
||||
*/
|
||||
if(is_skype_host(ndpi_struct, packet->iph->saddr)
|
||||
|| is_skype_host(ndpi_struct, packet->iph->daddr)) {
|
||||
return(1);
|
||||
}
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
static void ndpi_check_skype(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
// const u_int8_t *packet_payload = packet->payload;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
|
||||
|
||||
if(flow->host_server_name[0] != '\0')
|
||||
return;
|
||||
|
||||
/*
|
||||
Skype AS8220
|
||||
212.161.8.0/24
|
||||
*/
|
||||
if(is_skype_flow(ndpi_struct, flow)) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
// UDP check
|
||||
if(packet->udp != NULL) {
|
||||
flow->l4.udp.skype_packet_id++;
|
||||
|
||||
@@ -75,20 +40,20 @@ static void ndpi_check_skype(struct ndpi_detection_module_struct *ndpi_struct, s
|
||||
|
||||
/* skype-to-skype */
|
||||
if(dport != 1119) /* It can be confused with battle.net */ {
|
||||
if(((payload_len == 3) && ((packet->payload[2] & 0x0F)== 0x0d))
|
||||
|| ((payload_len >= 16)
|
||||
&& (packet->payload[0] != 0x30) /* Avoid invalid SNMP detection */
|
||||
&& (packet->payload[2] == 0x02))) {
|
||||
if(((payload_len == 3) && ((packet->payload[2] & 0x0F)== 0x0d)) ||
|
||||
((payload_len >= 16)
|
||||
&& (packet->payload[0] != 0x30) /* Avoid invalid SNMP detection */
|
||||
&& (packet->payload[2] == 0x02))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SKYPE, ndpi_struct, NDPI_LOG_DEBUG, "Found skype.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SKYPE);
|
||||
return;
|
||||
|
||||
// TCP check
|
||||
} else if(packet->tcp != NULL) {
|
||||
flow->l4.tcp.skype_packet_id++;
|
||||
|
||||
|
||||
+12
-17
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* smb.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,32 +20,28 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_SMB
|
||||
|
||||
static void ndpi_int_smb_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SMB, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_smb_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if(packet && packet->tcp) {
|
||||
/* Check connection over TCP */
|
||||
if(packet->tcp) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMB, ndpi_struct, NDPI_LOG_DEBUG, "search SMB.\n");
|
||||
|
||||
if (packet->tcp->dest == htons(445)
|
||||
&& packet->payload_packet_len > (32 + 4 + 4)
|
||||
&& (packet->payload_packet_len - 4) == ntohl(get_u_int32_t(packet->payload, 0))
|
||||
&& get_u_int32_t(packet->payload, 4) == htonl(0xff534d42)) {
|
||||
|
||||
if(packet->tcp->dest == htons(445)
|
||||
&& packet->payload_packet_len > (32 + 4 + 4)
|
||||
&& (packet->payload_packet_len - 4) == ntohl(get_u_int32_t(packet->payload, 0))
|
||||
&& get_u_int32_t(packet->payload, 4) == htonl(0xff534d42)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMB, ndpi_struct, NDPI_LOG_DEBUG, "found SMB.\n");
|
||||
ndpi_int_smb_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SMB, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,330 @@
|
||||
/*
|
||||
* smpp.c
|
||||
*
|
||||
* Copyright (C) 2016 - Damir Franusic <df@release14.org>
|
||||
* Copyright (C) 2016 - 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 "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_SMPP
|
||||
|
||||
|
||||
static void ndpi_int_smpp_add_connection(struct ndpi_detection_module_struct* ndpi_struct,
|
||||
struct ndpi_flow_struct* flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SMPP, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
static u_int8_t ndpi_check_overflow(u_int32_t current_length, u_int32_t total_lenth)
|
||||
{
|
||||
return (current_length > 0 && current_length > INT_MAX - total_lenth);
|
||||
}
|
||||
|
||||
void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct,
|
||||
struct ndpi_flow_struct* flow)
|
||||
{
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP, ndpi_struct, NDPI_LOG_DEBUG, "SMPP protocol detection...\n");
|
||||
if (flow->packet.detected_protocol_stack[0] != NDPI_PROTOCOL_SMPP){
|
||||
struct ndpi_packet_struct* packet = &flow->packet;
|
||||
// min SMPP packet length = 16 bytes
|
||||
if (packet->payload_packet_len < 16) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP, ndpi_struct, NDPI_LOG_DEBUG, "SMPP excluded\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SMPP);
|
||||
return;
|
||||
}
|
||||
// get PDU length
|
||||
u_int32_t pdu_l = ntohl(get_u_int32_t(packet->payload, 0));
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP,
|
||||
ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
"calculated PDU Length: %d, received PDU Length: %d\n",
|
||||
pdu_l, packet->payload_packet_len);
|
||||
|
||||
// if PDU size was invalid, try the following TCP segments, 3 attempts max
|
||||
if(flow->packet_counter > 3) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP, ndpi_struct, NDPI_LOG_DEBUG, "SMPP excluded\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SMPP);
|
||||
return;
|
||||
}
|
||||
// verify PDU length
|
||||
if(pdu_l != packet->payload_packet_len) {
|
||||
// check if multiple PDUs included
|
||||
u_int32_t total_pdu_l = pdu_l;
|
||||
u_int32_t tmp_pdu_l = 0;
|
||||
u_int16_t pdu_c = 1;
|
||||
// loop PDUs (check if lengths are valid)
|
||||
while(total_pdu_l < packet->payload_packet_len) {
|
||||
// get next PDU length
|
||||
tmp_pdu_l = ntohl(get_u_int32_t(packet->payload, total_pdu_l));
|
||||
// if zero or overflowing , return, will try the next TCP segment
|
||||
if(tmp_pdu_l == 0 || ndpi_check_overflow(tmp_pdu_l, total_pdu_l) ) return;
|
||||
// inc total PDU length
|
||||
total_pdu_l += ntohl(get_u_int32_t(packet->payload, total_pdu_l));
|
||||
// inc total PDU count
|
||||
++pdu_c;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP,
|
||||
ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
"multiple PDUs included, calculated total PDU Length: %d, PDU count: %d, TCP payload length: %d\n",
|
||||
total_pdu_l, pdu_c, packet->payload_packet_len);
|
||||
|
||||
// verify multi PDU total length
|
||||
if(total_pdu_l != packet->payload_packet_len){
|
||||
// return, will try the next TCP segment
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// *** check PDU type ***
|
||||
u_int32_t pdu_type = ntohl(get_u_int32_t(packet->payload, 4));
|
||||
// first byte of PDU type is either 0x00 of 0x80
|
||||
if(!(packet->payload[4] == 0x00 || packet->payload[4] == 0x80)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP, ndpi_struct, NDPI_LOG_DEBUG, "SMPP excluded\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SMPP);
|
||||
return;
|
||||
}
|
||||
// remove 0x80, get request type pdu
|
||||
u_int32_t pdu_req = pdu_type & 0x00FFFFFF;
|
||||
// list of known PDU types
|
||||
if((pdu_req > 0x00000000 && pdu_req <= 0x00000009) ||
|
||||
(pdu_req == 0x0000000B || pdu_req == 0x00000015 ||
|
||||
pdu_req == 0x00000021 || pdu_req == 0x00000102 ||
|
||||
pdu_req == 0x00000103)){
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP,
|
||||
ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
"PDU type: %x, Request PDU type = %x\n",
|
||||
pdu_type, pdu_req);
|
||||
|
||||
// fresult flag
|
||||
char extra_passed = 1;
|
||||
// check PDU type specifics
|
||||
switch(pdu_type){
|
||||
// GENERIC_NACK
|
||||
case 0x80000000:
|
||||
// body length must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// BIND_RECEIVER
|
||||
// BIND_TRANSMITTER
|
||||
// BIND_TRANSCEIVER
|
||||
case 0x00000001:
|
||||
case 0x00000002:
|
||||
case 0x00000009:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 10 bytes (+16 in header)
|
||||
if(pdu_l < 26) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// BIND_RECEIVER_RESP
|
||||
// BIND_TRANSMITTER_RESP
|
||||
// BIND_TRANSCEIVER_RESP
|
||||
case 0x80000001:
|
||||
case 0x80000002:
|
||||
case 0x80000009:
|
||||
// min body length = 2 bytes (+16 in header)
|
||||
if(pdu_l < 18) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// OUTBIND
|
||||
case 0x0000000B:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 4 bytes (+16 in header)
|
||||
if(pdu_l < 20) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// UNBIND
|
||||
case 0x00000006:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// body length must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// UNBIND_RESP
|
||||
case 0x80000006:
|
||||
// body length must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
|
||||
// SUBMIT_SM
|
||||
case 0x00000004:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 17 bytes (+16 in header)
|
||||
if(pdu_l < 33) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// SUBMIT_SM_RESP
|
||||
case 0x80000004:
|
||||
// - if status != 0, body length is 2 bytes min
|
||||
// - if status > 0, body lenth must be zero
|
||||
if(get_u_int32_t(packet->payload, 8) != 0){
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
|
||||
}else if(pdu_l < 18) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// SUBMIT_MULTI
|
||||
case 0x00000021:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 17 bytes (+16 in header)
|
||||
if(pdu_l < 33) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// SUBMIT_MULTI_RESP
|
||||
case 0x80000021:
|
||||
// min body length = 10 bytes (+16 in header)
|
||||
if(pdu_l < 26) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// DELIVER_SM
|
||||
case 0x00000005:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 17 bytes (+16 in header)
|
||||
if(pdu_l < 33) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// DELIVER_SM_RESP
|
||||
case 0x80000005:
|
||||
// min body length = 1 byte (+16 in header)
|
||||
if(pdu_l < 17) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// DATA_SM
|
||||
case 0x00000103:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 10 bytes (+16 in header)
|
||||
if(pdu_l < 26) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// DATA_SM_RESP
|
||||
case 0x80000103:
|
||||
// min body length = 2 bytes (+16 in header)
|
||||
if(pdu_l < 18) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// QUERY_SM
|
||||
case 0x00000003:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 4 bytes (+16 in header)
|
||||
if(pdu_l < 20) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// QUERY_SM_RESP
|
||||
case 0x80000003:
|
||||
// min body length = 5 bytes (+16 in header)
|
||||
if(pdu_l < 21) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// CANCEL_SM
|
||||
case 0x00000008:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 8 bytes (+16 in header)
|
||||
if(pdu_l < 24) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// CANCEL_SM_RESP
|
||||
case 0x80000008:
|
||||
// body lenth must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// REPLACE_SM
|
||||
case 0x00000007:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 9 bytes (+16 in header)
|
||||
if(pdu_l < 25) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// REPLACE_SM_RESP
|
||||
case 0x80000007:
|
||||
// body lenth must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// ENQUIRE_LINK
|
||||
case 0x00000015:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// body length must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// ENQUIRE_LINK_RESP
|
||||
case 0x80000015:
|
||||
// body length must be zero
|
||||
if(pdu_l > 16) extra_passed = 0;
|
||||
break;
|
||||
|
||||
// ALERT_NOTIFICATION
|
||||
case 0x00000102:
|
||||
// status field must be NULL
|
||||
if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
|
||||
// min body length = 6 bytes (+16 in header)
|
||||
if(pdu_l < 22) extra_passed = 0;
|
||||
break;
|
||||
|
||||
default: break;
|
||||
}
|
||||
|
||||
// if extra checks passed, set as identified
|
||||
if(extra_passed) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP, ndpi_struct, NDPI_LOG_DEBUG, "SMPP identified...\n");
|
||||
ndpi_int_smpp_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// exclude
|
||||
NDPI_LOG(NDPI_PROTOCOL_SMPP, ndpi_struct, NDPI_LOG_DEBUG, "SMPP excluded\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SMPP);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_smpp_dissector(struct ndpi_detection_module_struct* ndpi_struct,
|
||||
u_int32_t* id,
|
||||
NDPI_PROTOCOL_BITMASK* detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("SMPP", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_SMPP,
|
||||
ndpi_search_smpp_tcp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif // NDPI_PROTOCOL_SMPP
|
||||
@@ -41,6 +41,8 @@ void ndpi_search_snmp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
|
||||
if (packet->payload_packet_len > 32 && packet->payload[0] == 0x30) {
|
||||
int offset;
|
||||
u_int16_t u16;
|
||||
|
||||
switch (packet->payload[1]) {
|
||||
case 0x81:
|
||||
offset = 3;
|
||||
@@ -56,8 +58,10 @@ void ndpi_search_snmp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
offset = 2;
|
||||
}
|
||||
|
||||
if (get_u_int16_t(packet->payload, offset) != htons(0x0201)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SNMP, ndpi_struct, NDPI_LOG_DEBUG, "SNMP excluded, 0x0201 pattern not found\n");
|
||||
u16 = ntohs(get_u_int16_t(packet->payload, offset));
|
||||
|
||||
if((u16 != 0x0201) && (u16 != 0x0204)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SNMP, ndpi_struct, NDPI_LOG_DEBUG, "SNMP excluded, 0x0201/0x0204 pattern not found\n");
|
||||
goto excl;
|
||||
}
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ static void ndpi_search_sopcast_udp(struct ndpi_detection_module_struct
|
||||
ndpi_int_sopcast_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/* this case has been seen once. Please revome this comment, if you see it another time */
|
||||
/* this case has been seen once. Please remove this comment, if you see it another time */
|
||||
if (packet->payload_packet_len == 60 && packet->payload[0] == 0x00
|
||||
&& packet->payload[2] == 0x01
|
||||
&& packet->payload[8] == 0x03 && packet->payload[9] == 0xff
|
||||
@@ -174,7 +174,7 @@ static void ndpi_search_sopcast_udp(struct ndpi_detection_module_struct
|
||||
ndpi_int_sopcast_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/* this case has been seen once. Please revome this comment, if you see it another time */
|
||||
/* this case has been seen once. Please remove this comment, if you see it another time */
|
||||
if (packet->payload_packet_len == 286 && packet->payload[0] == 0x00
|
||||
&& packet->payload[1] == 0x02 && packet->payload[2] == 0x01
|
||||
&& packet->payload[3] == 0x07 && packet->payload[4] == 0x03
|
||||
|
||||
+252
-225
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* soulseek.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,265 +20,293 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_SOULSEEK
|
||||
|
||||
static void ndpi_int_soulseek_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
struct ndpi_id_struct *src = flow->src;
|
||||
struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
if (src != NULL) {
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
if (dst != NULL) {
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void ndpi_search_soulseek_tcp(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)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
struct ndpi_id_struct *src = flow->src;
|
||||
struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "Soulseek: search soulseec tcp \n");
|
||||
if(packet->tcp) {
|
||||
|
||||
if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SOULSEEK) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "packet marked as Soulseek\n");
|
||||
if(src != NULL)
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
" SRC bitmask: %u, packet tick %llu , last safe access timestamp: %llu\n",
|
||||
NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK)
|
||||
!= 0 ? 1 : 0, (u_int64_t) packet->tick_timestamp, (u_int64_t) src->soulseek_last_safe_access_time);
|
||||
if(dst != NULL)
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
" DST bitmask: %u, packet tick %llu , last safe ts: %llu\n",
|
||||
NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK)
|
||||
!= 0 ? 1 : 0, (u_int64_t) packet->tick_timestamp, (u_int64_t) dst->soulseek_last_safe_access_time);
|
||||
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SOULSEEK) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "packet marked as Soulseek\n");
|
||||
if (src != NULL)
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
" SRC bitmask: %u, packet tick %llu , last safe access timestamp: %llu\n",
|
||||
NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK)
|
||||
!= 0 ? 1 : 0, (u_int64_t) packet->tick_timestamp, (u_int64_t) src->soulseek_last_safe_access_time);
|
||||
if (dst != NULL)
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
" DST bitmask: %u, packet tick %llu , last safe ts: %llu\n",
|
||||
NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK)
|
||||
!= 0 ? 1 : 0, (u_int64_t) packet->tick_timestamp, (u_int64_t) dst->soulseek_last_safe_access_time);
|
||||
|
||||
if (packet->payload_packet_len == 431) {
|
||||
if (dst != NULL) {
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len == 12 && get_l32(packet->payload, 4) == 0x02) {
|
||||
if (src != NULL) {
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if (packet->tcp != NULL && src->soulseek_listen_port == 0) {
|
||||
src->soulseek_listen_port = get_l32(packet->payload, 8);
|
||||
return;
|
||||
if(packet->payload_packet_len == 431) {
|
||||
if(dst != NULL) {
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (src != NULL && ((u_int32_t)
|
||||
(packet->tick_timestamp -
|
||||
src->soulseek_last_safe_access_time) <
|
||||
ndpi_struct->soulseek_connection_ip_tick_timeout)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Soulseek: SRC update last safe access time and SKIP_FOR_TIME \n");
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
|
||||
if (dst != NULL && ((u_int32_t)
|
||||
(packet->tick_timestamp -
|
||||
dst->soulseek_last_safe_access_time) <
|
||||
ndpi_struct->soulseek_connection_ip_tick_timeout)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Soulseek: DST update last safe access time and SKIP_FOR_TIME \n");
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (dst != NULL && dst->soulseek_listen_port != 0 && dst->soulseek_listen_port == ntohs(packet->tcp->dest)
|
||||
&& ((u_int32_t)
|
||||
(packet->tick_timestamp - dst->soulseek_last_safe_access_time) <
|
||||
ndpi_struct->soulseek_connection_ip_tick_timeout)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Soulseek: Plain detection on Port : %u packet_tick_timestamp: %u soulseeek_last_safe_access_time: %u soulseek_connection_ip_ticktimeout: %u\n",
|
||||
dst->soulseek_listen_port, packet->tick_timestamp,
|
||||
dst->soulseek_last_safe_access_time, ndpi_struct->soulseek_connection_ip_tick_timeout);
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
if (flow->l4.tcp.soulseek_stage == 0) {
|
||||
|
||||
u_int32_t index = 0;
|
||||
|
||||
if (packet->payload_packet_len >= 12 && packet->payload_packet_len < 300 && get_l32(packet->payload, 4) == 1) {
|
||||
while (!get_u_int16_t(packet->payload, index + 2)
|
||||
&& (index + get_l32(packet->payload, index)) < packet->payload_packet_len - 4) {
|
||||
if (get_l32(packet->payload, index) < 8) /*Minimum soulsek login msg is 8B */
|
||||
break;
|
||||
|
||||
if (index + get_l32(packet->payload, index) + 4 <= index) {
|
||||
/* avoid overflow */
|
||||
break;
|
||||
}
|
||||
|
||||
index += get_l32(packet->payload, index) + 4;
|
||||
}
|
||||
if (index + get_l32(packet->payload, index) ==
|
||||
packet->payload_packet_len - 4 && !get_u_int16_t(packet->payload, 10)) {
|
||||
/*This structure seems to be soulseek proto */
|
||||
index = get_l32(packet->payload, 8) + 12; // end of "user name"
|
||||
if ((index + 4) <= packet->payload_packet_len && !get_u_int16_t(packet->payload, index + 2)) // for passwd len
|
||||
{
|
||||
index += get_l32(packet->payload, index) + 4; //end of "Passwd"
|
||||
if ((index + 4 + 4) <= packet->payload_packet_len && !get_u_int16_t(packet->payload, index + 6)) // to read version,hashlen
|
||||
{
|
||||
index += get_l32(packet->payload, index + 4) + 8; // enf of "hash value"
|
||||
if (index == get_l32(packet->payload, 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK,
|
||||
ndpi_struct, NDPI_LOG_DEBUG, "Soulseek Login Detected\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (packet->payload_packet_len > 8
|
||||
&& packet->payload_packet_len < 200 && get_l32(packet->payload, 0) == packet->payload_packet_len - 4) {
|
||||
//Server Messages:
|
||||
const u_int32_t msgcode = get_l32(packet->payload, 4);
|
||||
|
||||
if (msgcode == 0x7d) {
|
||||
flow->l4.tcp.soulseek_stage = 1 + packet->packet_direction;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "Soulseek Messages Search\n");
|
||||
return;
|
||||
} else if (msgcode == 0x02 && packet->payload_packet_len == 12) {
|
||||
const u_int32_t soulseek_listen_port = get_l32(packet->payload, 8);
|
||||
|
||||
if (src != NULL) {
|
||||
}
|
||||
if(packet->payload_packet_len == 12 && get_l32(packet->payload, 4) == 0x02) {
|
||||
if(src != NULL) {
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
if (packet->tcp != NULL && src->soulseek_listen_port == 0) {
|
||||
src->soulseek_listen_port = soulseek_listen_port;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "\n Listen Port Saved : %u", src->soulseek_listen_port);
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
if(packet->tcp != NULL && src->soulseek_listen_port == 0) {
|
||||
src->soulseek_listen_port = get_l32(packet->payload, 8);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//Peer Messages : Peer Init Message Detection
|
||||
if (get_l32(packet->payload, 0) == packet->payload_packet_len - 4) {
|
||||
const u_int32_t typelen = get_l32(packet->payload, packet->payload_packet_len - 9);
|
||||
const u_int8_t type = packet->payload[packet->payload_packet_len - 5];
|
||||
const u_int32_t namelen = get_l32(packet->payload, 5);
|
||||
if (packet->payload[4] == 0x01 && typelen == 1
|
||||
&& namelen <= packet->payload_packet_len
|
||||
&& (4 + 1 + 4 + namelen + 4 + 1 + 4) ==
|
||||
packet->payload_packet_len && (type == 'F' || type == 'P' || type == 'D')) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "1\n");
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "3\n");
|
||||
//Peer Message : Pierce Firewall
|
||||
if (packet->payload_packet_len == 9 && get_l32(packet->payload, 0) == 5
|
||||
&& packet->payload[4] <= 0x10 && get_u_int32_t(packet->payload, 5) != 0x00000000) {
|
||||
flow->l4.tcp.soulseek_stage = 1 + packet->packet_direction;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_TRACE, "Soulseek Size 9 Pierce Firewall\n");
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
if(src != NULL && ((u_int32_t)(packet->tick_timestamp - src->soulseek_last_safe_access_time) < ndpi_struct->soulseek_connection_ip_tick_timeout)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Soulseek: SRC update last safe access time and SKIP_FOR_TIME \n");
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
|
||||
if (packet->payload_packet_len > 25 && packet->payload[4] == 0x01 && !get_u_int16_t(packet->payload, 7)
|
||||
&& !get_u_int16_t(packet->payload, 2)) {
|
||||
const u_int32_t usrlen = get_l32(packet->payload, 5);
|
||||
|
||||
if (usrlen <= packet->payload_packet_len - 4 + 1 + 4 + 4 + 1 + 4) {
|
||||
const u_int32_t typelen = get_l32(packet->payload, 4 + 1 + 4 + usrlen);
|
||||
const u_int8_t type = packet->payload[4 + 1 + 4 + usrlen + 4];
|
||||
if (typelen == 1 && (type == 'F' || type == 'P' || type == 'D')) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "soulseek detected Pattern command(D|P|F).\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if(dst != NULL && ((u_int32_t)(packet->tick_timestamp - dst->soulseek_last_safe_access_time) < ndpi_struct->soulseek_connection_ip_tick_timeout)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Soulseek: DST update last safe access time and SKIP_FOR_TIME \n");
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
}
|
||||
}
|
||||
|
||||
} else if (flow->l4.tcp.soulseek_stage == 2 - packet->packet_direction) {
|
||||
if (packet->payload_packet_len > 8) {
|
||||
if ((packet->payload[0] || packet->payload[1]) && get_l32(packet->payload, 4) == 9) {
|
||||
/* 9 is search result */
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected Second Pkt\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
|
||||
if(dst != NULL && dst->soulseek_listen_port != 0 && dst->soulseek_listen_port == ntohs(packet->tcp->dest)
|
||||
&& ((u_int32_t)(packet->tick_timestamp - dst->soulseek_last_safe_access_time) < ndpi_struct->soulseek_connection_ip_tick_timeout)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Soulseek: Plain detection on Port : %u packet_tick_timestamp: %u soulseek_last_safe_access_time: %u soulseek_connection_ip_ticktimeout: %u\n",
|
||||
dst->soulseek_listen_port, packet->tick_timestamp, dst->soulseek_last_safe_access_time, ndpi_struct->soulseek_connection_ip_tick_timeout);
|
||||
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
if(flow->l4.tcp.soulseek_stage == 0) {
|
||||
|
||||
u_int32_t index = 0;
|
||||
|
||||
if(packet->payload_packet_len >= 12 && packet->payload_packet_len < 300 && get_l32(packet->payload, 4) == 1) {
|
||||
while (!get_u_int16_t(packet->payload, index + 2)
|
||||
&& (index + get_l32(packet->payload, index)) < packet->payload_packet_len - 4) {
|
||||
if(get_l32(packet->payload, index) < 8) /*Minimum soulseek login msg is 8B */
|
||||
break;
|
||||
|
||||
if(index + get_l32(packet->payload, index) + 4 <= index) {
|
||||
/* avoid overflow */
|
||||
break;
|
||||
}
|
||||
|
||||
index += get_l32(packet->payload, index) + 4;
|
||||
}
|
||||
if(index + get_l32(packet->payload, index) == packet->payload_packet_len - 4 && !get_u_int16_t(packet->payload, 10)) {
|
||||
/* This structure seems to be soulseek proto */
|
||||
index = get_l32(packet->payload, 8) + 12; // end of "user name"
|
||||
if((index + 4) <= packet->payload_packet_len && !get_u_int16_t(packet->payload, index + 2)) // for passwd len
|
||||
{
|
||||
index += get_l32(packet->payload, index) + 4; //end of "Passwd"
|
||||
if((index + 4 + 4) <= packet->payload_packet_len && !get_u_int16_t(packet->payload, index + 6)) // to read version,hashlen
|
||||
{
|
||||
index += get_l32(packet->payload, index + 4) + 8; // enf of "hash value"
|
||||
if(index == get_l32(packet->payload, 0)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "Soulseek Login Detected\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (get_l32(packet->payload, 0) == packet->payload_packet_len - 4) {
|
||||
if (packet->payload_packet_len > 8
|
||||
&& packet->payload_packet_len < 200 && get_l32(packet->payload, 0) == packet->payload_packet_len - 4) {
|
||||
//Server Messages:
|
||||
const u_int32_t msgcode = get_l32(packet->payload, 4);
|
||||
if (msgcode == 0x03 && packet->payload_packet_len >= 12) //Server Message : Get Peer Address
|
||||
{
|
||||
const u_int32_t usrlen = get_l32(packet->payload, 8);
|
||||
if (usrlen <= packet->payload_packet_len && 4 + 4 + 4 + usrlen == packet->payload_packet_len) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "Soulseek Request Get Peer Address Detected\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
|
||||
if(msgcode == 0x7d) {
|
||||
flow->l4.tcp.soulseek_stage = 1 + packet->packet_direction;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "Soulseek Messages Search\n");
|
||||
return;
|
||||
} else if(msgcode == 0x02 && packet->payload_packet_len == 12) {
|
||||
const u_int32_t soulseek_listen_port = get_l32(packet->payload, 8);
|
||||
|
||||
if(src != NULL) {
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
if(packet->tcp != NULL && src->soulseek_listen_port == 0) {
|
||||
src->soulseek_listen_port = soulseek_listen_port;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "\n Listen Port Saved : %u", src->soulseek_listen_port);
|
||||
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
//Peer Messages : Peer Init Message Detection
|
||||
if(get_l32(packet->payload, 0) == packet->payload_packet_len - 4) {
|
||||
const u_int32_t typelen = get_l32(packet->payload, packet->payload_packet_len - 9);
|
||||
const u_int8_t type = packet->payload[packet->payload_packet_len - 5];
|
||||
const u_int32_t namelen = get_l32(packet->payload, 5);
|
||||
if(packet->payload[4] == 0x01 && typelen == 1
|
||||
&& namelen <= packet->payload_packet_len
|
||||
&& (4 + 1 + 4 + namelen + 4 + 1 + 4) ==
|
||||
packet->payload_packet_len && (type == 'F' || type == 'P' || type == 'D')) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "1\n");
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "3\n");
|
||||
//Peer Message : Pierce Firewall
|
||||
if(packet->payload_packet_len == 9 && get_l32(packet->payload, 0) == 5
|
||||
&& packet->payload[4] <= 0x10 && get_u_int32_t(packet->payload, 5) != 0x00000000) {
|
||||
flow->l4.tcp.soulseek_stage = 1 + packet->packet_direction;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_TRACE, "Soulseek Size 9 Pierce Firewall\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->payload_packet_len == 8 && get_l32(packet->payload, 4) == 0x00000004) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if(packet->payload_packet_len > 25 && packet->payload[4] == 0x01 && !get_u_int16_t(packet->payload, 7)
|
||||
&& !get_u_int16_t(packet->payload, 2)) {
|
||||
const u_int32_t usrlen = get_l32(packet->payload, 5);
|
||||
|
||||
if (packet->payload_packet_len == 4
|
||||
&& get_u_int16_t(packet->payload, 2) == 0x00 && get_u_int16_t(packet->payload, 0) != 0x00) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
} else if (packet->payload_packet_len == 4) {
|
||||
flow->l4.tcp.soulseek_stage = 3;
|
||||
return;
|
||||
}
|
||||
} else if (flow->l4.tcp.soulseek_stage == 1 + packet->packet_direction) {
|
||||
if (packet->payload_packet_len > 8) {
|
||||
if (packet->payload[4] == 0x03 && get_l32(packet->payload, 5) == 0x00000031) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "soulseek detected Second Pkt with SIGNATURE :: 0x0331000000 \n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
if(usrlen <= packet->payload_packet_len - 4 + 1 + 4 + 4 + 1 + 4) {
|
||||
const u_int32_t typelen = get_l32(packet->payload, 4 + 1 + 4 + usrlen);
|
||||
const u_int8_t type = packet->payload[4 + 1 + 4 + usrlen + 4];
|
||||
if(typelen == 1 && (type == 'F' || type == 'P' || type == 'D')) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected Pattern command(D|P|F).\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else if(flow->l4.tcp.soulseek_stage == 2 - packet->packet_direction) {
|
||||
if(packet->payload_packet_len > 8) {
|
||||
if((packet->payload[0] || packet->payload[1]) && get_l32(packet->payload, 4) == 9) {
|
||||
/* 9 is search result */
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected Second Pkt\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if(get_l32(packet->payload, 0) == packet->payload_packet_len - 4) {
|
||||
const u_int32_t msgcode = get_l32(packet->payload, 4);
|
||||
if(msgcode == 0x03 && packet->payload_packet_len >= 12) //Server Message : Get Peer Address
|
||||
{
|
||||
const u_int32_t usrlen = get_l32(packet->payload, 8);
|
||||
if(usrlen <= packet->payload_packet_len && 4 + 4 + 4 + usrlen == packet->payload_packet_len) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "Soulseek Request Get Peer Address Detected\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(packet->payload_packet_len == 8 && get_l32(packet->payload, 4) == 0x00000004) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (flow->l4.tcp.soulseek_stage == 3 && packet->payload_packet_len == 8 && !get_u_int32_t(packet->payload, 4)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected bcz of 8B pkt\n");
|
||||
ndpi_int_soulseek_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (flow->l4.tcp.soulseek_stage && flow->packet_counter < 11) {
|
||||
} else {
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK);
|
||||
if(packet->payload_packet_len == 4
|
||||
&& get_u_int16_t(packet->payload, 2) == 0x00 && get_u_int16_t(packet->payload, 0) != 0x00) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else if(packet->payload_packet_len == 4) {
|
||||
flow->l4.tcp.soulseek_stage = 3;
|
||||
return;
|
||||
}
|
||||
} else if(flow->l4.tcp.soulseek_stage == 1 + packet->packet_direction) {
|
||||
if(packet->payload_packet_len > 8) {
|
||||
if(packet->payload[4] == 0x03 && get_l32(packet->payload, 5) == 0x00000031) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected Second Pkt with SIGNATURE :: 0x0331000000 \n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(flow->l4.tcp.soulseek_stage == 3 && packet->payload_packet_len == 8 && !get_u_int32_t(packet->payload, 4)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG, "soulseek detected bcz of 8B pkt\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->soulseek_last_safe_access_time = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOULSEEK, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if(flow->l4.tcp.soulseek_stage && flow->packet_counter < 11) {
|
||||
} else {
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -31,6 +31,18 @@ static void ndpi_int_ssh_add_connection(struct ndpi_detection_module_struct
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSH, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
static void ndpi_ssh_zap_cr(char *str, int len) {
|
||||
len--;
|
||||
|
||||
while(len > 0) {
|
||||
if((str[len] == '\n') || (str[len] == '\r')) {
|
||||
str[len] = '\0';
|
||||
len--;
|
||||
} else
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
@@ -40,6 +52,10 @@ void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
if (flow->l4.tcp.ssh_stage == 0) {
|
||||
if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
|
||||
&& memcmp(packet->payload, "SSH-", 4) == 0) {
|
||||
int len = ndpi_min(sizeof(flow->protos.ssh.client_signature)-1, packet->payload_packet_len);
|
||||
strncpy(flow->protos.ssh.client_signature, (const char *)packet->payload, len);
|
||||
flow->protos.ssh.client_signature[len] = '\0';
|
||||
ndpi_ssh_zap_cr(flow->protos.ssh.client_signature, len);
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "ssh stage 0 passed\n");
|
||||
flow->l4.tcp.ssh_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
@@ -47,7 +63,12 @@ void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
} else if (flow->l4.tcp.ssh_stage == (2 - packet->packet_direction)) {
|
||||
if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
|
||||
&& memcmp(packet->payload, "SSH-", 4) == 0) {
|
||||
int len = ndpi_min(sizeof(flow->protos.ssh.server_signature)-1, packet->payload_packet_len);
|
||||
strncpy(flow->protos.ssh.server_signature, (const char *)packet->payload, len);
|
||||
flow->protos.ssh.server_signature[len] = '\0';
|
||||
ndpi_ssh_zap_cr(flow->protos.ssh.server_signature, len);
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "found ssh\n");
|
||||
|
||||
ndpi_int_ssh_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
|
||||
|
||||
+152
-139
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* ssl.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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,16 +24,56 @@
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
/* #define CERTIFICATE_DEBUG 1 */
|
||||
|
||||
#ifdef NDPI_PROTOCOL_SSL
|
||||
|
||||
/* #define CERTIFICATE_DEBUG 1 */
|
||||
#define NDPI_MAX_SSL_REQUEST_SIZE 10000
|
||||
|
||||
/* Skype.c */
|
||||
extern u_int8_t is_skype_flow(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow);
|
||||
|
||||
static u_int32_t ndpi_ssl_refine_master_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow, u_int32_t protocol)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if((flow->protos.ssl.client_certificate[0] != '\0')
|
||||
|| (flow->protos.ssl.server_certificate[0] != '\0')
|
||||
|| (flow->host_server_name[0] != '\0'))
|
||||
protocol = NDPI_PROTOCOL_SSL;
|
||||
else
|
||||
protocol = NDPI_PROTOCOL_SSL_NO_CERT;
|
||||
|
||||
if(packet->tcp != NULL) {
|
||||
switch(protocol) {
|
||||
|
||||
case NDPI_PROTOCOL_SSL:
|
||||
case NDPI_PROTOCOL_SSL_NO_CERT:
|
||||
{
|
||||
/*
|
||||
In case of SSL there are probably sub-protocols
|
||||
such as IMAPS that can be otherwise detected
|
||||
*/
|
||||
u_int16_t sport = ntohs(packet->tcp->source);
|
||||
u_int16_t dport = ntohs(packet->tcp->dest);
|
||||
|
||||
if((sport == 465) || (dport == 465))
|
||||
protocol = NDPI_PROTOCOL_MAIL_SMTPS;
|
||||
else if((sport == 993) || (dport == 993)
|
||||
#ifdef NDPI_PROTOCOL_MAIL_IMAP
|
||||
|| (flow->l4.tcp.mail_imap_starttls)
|
||||
#endif
|
||||
) protocol = NDPI_PROTOCOL_MAIL_IMAPS;
|
||||
else if((sport == 995) || (dport == 995)) protocol = NDPI_PROTOCOL_MAIL_POPS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return protocol;
|
||||
}
|
||||
|
||||
static void ndpi_int_ssl_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow, u_int32_t protocol)
|
||||
{
|
||||
@@ -42,40 +81,7 @@ static void ndpi_int_ssl_add_connection(struct ndpi_detection_module_struct *ndp
|
||||
&& (protocol != NDPI_PROTOCOL_SSL_NO_CERT)) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if((flow->protos.ssl.client_certificate[0] != '\0')
|
||||
|| (flow->protos.ssl.server_certificate[0] != '\0')
|
||||
|| (flow->host_server_name[0] != '\0'))
|
||||
protocol = NDPI_PROTOCOL_SSL;
|
||||
else
|
||||
protocol = NDPI_PROTOCOL_SSL_NO_CERT;
|
||||
|
||||
if(packet->tcp != NULL) {
|
||||
switch(protocol) {
|
||||
case NDPI_PROTOCOL_SSL:
|
||||
case NDPI_PROTOCOL_SSL_NO_CERT:
|
||||
{
|
||||
/*
|
||||
In case of SSL there are probably sub-protocols
|
||||
such as IMAPS that can be otherwise detected
|
||||
*/
|
||||
u_int16_t sport = ntohs(packet->tcp->source);
|
||||
u_int16_t dport = ntohs(packet->tcp->dest);
|
||||
|
||||
if((sport == 465) || (dport == 465)) protocol = NDPI_PROTOCOL_MAIL_SMTPS;
|
||||
else if((sport == 993) || (dport == 993)) protocol = NDPI_PROTOCOL_MAIL_IMAPS;
|
||||
else if((sport == 995) || (dport == 995)) protocol = NDPI_PROTOCOL_MAIL_POPS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if((protocol == NDPI_PROTOCOL_SSL_NO_CERT)
|
||||
&& is_skype_flow(ndpi_struct, flow)) {
|
||||
protocol = NDPI_PROTOCOL_SKYPE;
|
||||
}
|
||||
}
|
||||
|
||||
protocol = ndpi_ssl_refine_master_protocol(ndpi_struct, flow, protocol);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
}
|
||||
@@ -86,22 +92,23 @@ static void ndpi_int_ssl_add_connection(struct ndpi_detection_module_struct *ndp
|
||||
#define ndpi_isdigit(ch) ((ch) >= '0' && (ch) <= '9')
|
||||
#define ndpi_isspace(ch) (((ch) >= '\t' && (ch) <= '\r') || ((ch) == ' '))
|
||||
#define ndpi_isprint(ch) ((ch) >= 0x20 && (ch) <= 0x7e)
|
||||
#define ndpi_ispunct(ch) (((ch) >= '!' && (ch) <= '/') || \
|
||||
((ch) >= ':' && (ch) <= '@') || \
|
||||
((ch) >= '[' && (ch) <= '`') || \
|
||||
((ch) >= '{' && (ch) <= '~'))
|
||||
#define ndpi_ispunct(ch) (((ch) >= '!' && (ch) <= '/') || \
|
||||
((ch) >= ':' && (ch) <= '@') || \
|
||||
((ch) >= '[' && (ch) <= '`') || \
|
||||
((ch) >= '{' && (ch) <= '~'))
|
||||
|
||||
static void stripCertificateTrailer(char *buffer, int buffer_len) {
|
||||
|
||||
|
||||
int i, is_puny;
|
||||
|
||||
|
||||
// printf("->%s<-\n", buffer);
|
||||
|
||||
|
||||
for(i = 0; i < buffer_len; i++) {
|
||||
// printf("%c [%d]\n", buffer[i], buffer[i]);
|
||||
|
||||
|
||||
if((buffer[i] != '.')
|
||||
&& (buffer[i] != '-')
|
||||
&& (buffer[i] != '_')
|
||||
&& (buffer[i] != '*')
|
||||
&& (!ndpi_isalpha(buffer[i]))
|
||||
&& (!ndpi_isdigit(buffer[i]))) {
|
||||
@@ -153,7 +160,7 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
/*
|
||||
Nothing matched so far: let's decode the certificate with some heuristics
|
||||
Patches courtesy of Denys Fedoryshchenko <nuclearcat@nuclearcat.com>
|
||||
*/
|
||||
*/
|
||||
if(packet->payload[0] == 0x16 /* Handshake */) {
|
||||
u_int16_t total_len = (packet->payload[3] << 8) + packet->payload[4] + 5 /* SSL Header */;
|
||||
u_int8_t handshake_protocol = packet->payload[5]; /* handshake protocol a bit misleading, it is message type according TLS specs */
|
||||
@@ -162,7 +169,7 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
/* Truncate total len, search at least in incomplete packet */
|
||||
if(total_len > packet->payload_packet_len)
|
||||
total_len = packet->payload_packet_len;
|
||||
total_len = packet->payload_packet_len;
|
||||
|
||||
/* At least "magic" 3 bytes, null for string end, otherwise no need to waste cpu cycles */
|
||||
if(total_len > 4) {
|
||||
@@ -176,6 +183,7 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
/* Check after handshake protocol header (5 bytes) and message header (4 bytes) */
|
||||
for(i = 9; i < packet->payload_packet_len-3; i++) {
|
||||
if(((packet->payload[i] == 0x04) && (packet->payload[i+1] == 0x03) && (packet->payload[i+2] == 0x0c))
|
||||
|| ((packet->payload[i] == 0x04) && (packet->payload[i+1] == 0x03) && (packet->payload[i+2] == 0x13))
|
||||
|| ((packet->payload[i] == 0x55) && (packet->payload[i+1] == 0x04) && (packet->payload[i+2] == 0x03))) {
|
||||
u_int8_t server_len = packet->payload[i+3];
|
||||
|
||||
@@ -224,71 +232,73 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
} else if(handshake_protocol == 0x01 /* Client Hello */) {
|
||||
u_int offset, base_offset = 43;
|
||||
if (base_offset + 2 <= packet->payload_packet_len)
|
||||
{
|
||||
u_int16_t session_id_len = packet->payload[base_offset];
|
||||
{
|
||||
u_int16_t session_id_len = packet->payload[base_offset];
|
||||
|
||||
if((session_id_len+base_offset+2) <= total_len) {
|
||||
u_int16_t cypher_len = packet->payload[session_id_len+base_offset+2] + (packet->payload[session_id_len+base_offset+1] << 8);
|
||||
offset = base_offset + session_id_len + cypher_len + 2;
|
||||
if((session_id_len+base_offset+2) <= total_len) {
|
||||
u_int16_t cypher_len = packet->payload[session_id_len+base_offset+2] + (packet->payload[session_id_len+base_offset+1] << 8);
|
||||
offset = base_offset + session_id_len + cypher_len + 2;
|
||||
|
||||
flow->l4.tcp.ssl_seen_client_cert = 1;
|
||||
|
||||
if(offset < total_len) {
|
||||
u_int16_t compression_len;
|
||||
u_int16_t extensions_len;
|
||||
|
||||
compression_len = packet->payload[offset+1];
|
||||
offset += compression_len + 3;
|
||||
flow->l4.tcp.ssl_seen_client_cert = 1;
|
||||
|
||||
if(offset < total_len) {
|
||||
extensions_len = packet->payload[offset];
|
||||
u_int16_t compression_len;
|
||||
u_int16_t extensions_len;
|
||||
|
||||
if((extensions_len+offset) < total_len) {
|
||||
u_int16_t extension_offset = 1; /* Move to the first extension */
|
||||
compression_len = packet->payload[offset+1];
|
||||
offset += compression_len + 3;
|
||||
|
||||
while(extension_offset < extensions_len) {
|
||||
u_int16_t extension_id, extension_len;
|
||||
if(offset < total_len) {
|
||||
extensions_len = packet->payload[offset];
|
||||
|
||||
memcpy(&extension_id, &packet->payload[offset+extension_offset], 2);
|
||||
extension_offset += 2;
|
||||
if((extensions_len+offset) < total_len) {
|
||||
/* Move to the first extension
|
||||
Type is u_int to avoid possible overflow on extension_len addition */
|
||||
u_int extension_offset = 1;
|
||||
|
||||
memcpy(&extension_len, &packet->payload[offset+extension_offset], 2);
|
||||
extension_offset += 2;
|
||||
while(extension_offset < extensions_len) {
|
||||
u_int16_t extension_id, extension_len;
|
||||
|
||||
extension_id = ntohs(extension_id), extension_len = ntohs(extension_len);
|
||||
memcpy(&extension_id, &packet->payload[offset+extension_offset], 2);
|
||||
extension_offset += 2;
|
||||
|
||||
if(extension_id == 0) {
|
||||
u_int begin = 0,len;
|
||||
char *server_name = (char*)&packet->payload[offset+extension_offset];
|
||||
memcpy(&extension_len, &packet->payload[offset+extension_offset], 2);
|
||||
extension_offset += 2;
|
||||
|
||||
while(begin < extension_len) {
|
||||
if((!ndpi_isprint(server_name[begin]))
|
||||
|| ndpi_ispunct(server_name[begin])
|
||||
|| ndpi_isspace(server_name[begin]))
|
||||
begin++;
|
||||
else
|
||||
break;
|
||||
extension_id = ntohs(extension_id), extension_len = ntohs(extension_len);
|
||||
|
||||
if(extension_id == 0) {
|
||||
u_int begin = 0,len;
|
||||
char *server_name = (char*)&packet->payload[offset+extension_offset];
|
||||
|
||||
while(begin < extension_len) {
|
||||
if((!ndpi_isprint(server_name[begin]))
|
||||
|| ndpi_ispunct(server_name[begin])
|
||||
|| ndpi_isspace(server_name[begin]))
|
||||
begin++;
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
len = (u_int)ndpi_min(extension_len-begin, buffer_len-1);
|
||||
strncpy(buffer, &server_name[begin], len);
|
||||
buffer[len] = '\0';
|
||||
stripCertificateTrailer(buffer, buffer_len);
|
||||
|
||||
snprintf(flow->protos.ssl.client_certificate,
|
||||
sizeof(flow->protos.ssl.client_certificate), "%s", buffer);
|
||||
|
||||
/* We're happy now */
|
||||
return(2 /* Client Certificate */);
|
||||
}
|
||||
|
||||
len = (u_int)ndpi_min(extension_len-begin, buffer_len-1);
|
||||
strncpy(buffer, &server_name[begin], len);
|
||||
buffer[len] = '\0';
|
||||
stripCertificateTrailer(buffer, buffer_len);
|
||||
|
||||
snprintf(flow->protos.ssl.client_certificate,
|
||||
sizeof(flow->protos.ssl.client_certificate), "%s", buffer);
|
||||
|
||||
/* We're happy now */
|
||||
return(2 /* Client Certificate */);
|
||||
extension_offset += extension_len;
|
||||
}
|
||||
|
||||
extension_offset += extension_len;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -315,11 +325,14 @@ int sslDetectProtocolFromCertificate(struct ndpi_detection_module_struct *ndpi_s
|
||||
#ifdef CERTIFICATE_DEBUG
|
||||
printf("***** [SSL] %s\n", certificate);
|
||||
#endif
|
||||
|
||||
if(ndpi_match_host_subprotocol(ndpi_struct, flow, certificate,
|
||||
strlen(certificate),
|
||||
NDPI_PROTOCOL_SSL) != NDPI_PROTOCOL_UNKNOWN)
|
||||
u_int32_t subproto = ndpi_match_host_subprotocol(ndpi_struct, flow, certificate,
|
||||
strlen(certificate), NDPI_PROTOCOL_SSL);
|
||||
|
||||
if(subproto != NDPI_PROTOCOL_UNKNOWN) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, subproto,
|
||||
ndpi_ssl_refine_master_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSL));
|
||||
return(rc); /* Fix courtesy of Gianluca Costa <g.costa@xplico.org> */
|
||||
}
|
||||
|
||||
#ifdef NDPI_PROTOCOL_TOR
|
||||
if(ndpi_is_ssl_tor(ndpi_struct, flow, certificate) != 0)
|
||||
@@ -332,7 +345,7 @@ int sslDetectProtocolFromCertificate(struct ndpi_detection_module_struct *ndpi_s
|
||||
&& flow->l4.tcp.seen_syn_ack
|
||||
&& flow->l4.tcp.seen_ack /* We have seen the 3-way handshake */)
|
||||
|| (flow->protos.ssl.server_certificate[0] != '\0')
|
||||
|| (flow->protos.ssl.client_certificate[0] != '\0')
|
||||
/* || (flow->protos.ssl.client_certificate[0] != '\0') */
|
||||
)
|
||||
ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_SSL);
|
||||
}
|
||||
@@ -345,14 +358,14 @@ static void ssl_mark_and_payload_search_for_other_protocols(struct
|
||||
ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
#if defined(NDPI_PROTOCOL_MEEBO)|| defined(NDPI_PROTOCOL_TOR) || defined(NDPI_PROTOCOL_VPN_X) || defined(NDPI_PROTOCOL_UNENCRYPED_JABBER) || defined (NDPI_PROTOCOL_OSCAR) || defined (NDPI_PROTOCOL_ITUNES) || defined (NDPI_SERVICE_GMAIL)
|
||||
#if defined(NDPI_PROTOCOL_TOR) || defined(NDPI_PROTOCOL_VPN_X) || defined(NDPI_PROTOCOL_UNENCRYPTED_JABBER) || defined (NDPI_PROTOCOL_OSCAR) || defined (NDPI_PROTOCOL_ITUNES) || defined (NDPI_PROTOCOL_GMAIL)
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
// struct ndpi_id_struct *src=flow->src;
|
||||
// struct ndpi_id_struct *dst=flow->dst;
|
||||
u_int32_t a;
|
||||
u_int32_t end;
|
||||
#if defined(NDPI_PROTOCOL_UNENCRYPED_JABBER)
|
||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER) != 0)
|
||||
#if defined(NDPI_PROTOCOL_UNENCRYPTED_JABBER)
|
||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER) != 0)
|
||||
goto check_for_ssl_payload;
|
||||
#endif
|
||||
#if defined(NDPI_PROTOCOL_OSCAR)
|
||||
@@ -364,13 +377,13 @@ static void ssl_mark_and_payload_search_for_other_protocols(struct
|
||||
check_for_ssl_payload:
|
||||
end = packet->payload_packet_len - 20;
|
||||
for (a = 5; a < end; a++) {
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
|
||||
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||
if(packet->payload[a] == 't') {
|
||||
if(memcmp(&packet->payload[a], "talk.google.com", 15) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "ssl jabber packet match\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "ssl jabber packet match\n");
|
||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK
|
||||
(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER) != 0) {
|
||||
ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPED_JABBER);
|
||||
(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER) != 0) {
|
||||
ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -378,18 +391,18 @@ static void ssl_mark_and_payload_search_for_other_protocols(struct
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_OSCAR
|
||||
if(packet->payload[a] == 'A' || packet->payload[a] == 'k' || packet->payload[a] == 'c'
|
||||
|| packet->payload[a] == 'h') {
|
||||
|| packet->payload[a] == 'h') {
|
||||
if(((a + 19) < packet->payload_packet_len && memcmp(&packet->payload[a], "America Online Inc.", 19) == 0)
|
||||
// || (end - c > 3 memcmp (&packet->payload[c],"AOL", 3) == 0 )
|
||||
// || (end - c > 7 && memcmp (&packet->payload[c], "AOL LLC", 7) == 0)
|
||||
|| ((a + 15) < packet->payload_packet_len && memcmp(&packet->payload[a], "kdc.uas.aol.com", 15) == 0)
|
||||
|| ((a + 14) < packet->payload_packet_len && memcmp(&packet->payload[a], "corehc@aol.net", 14) == 0)
|
||||
|| ((a + 41) < packet->payload_packet_len
|
||||
&& memcmp(&packet->payload[a], "http://crl.aol.com/AOLMSPKI/aolServerCert", 41) == 0)
|
||||
|| ((a + 28) < packet->payload_packet_len
|
||||
&& memcmp(&packet->payload[a], "http://ocsp.web.aol.com/ocsp", 28) == 0)
|
||||
|| ((a + 32) < packet->payload_packet_len
|
||||
&& memcmp(&packet->payload[a], "http://pki-info.aol.com/AOLMSPKI", 32) == 0)) {
|
||||
// || (end - c > 3 memcmp (&packet->payload[c],"AOL", 3) == 0 )
|
||||
// || (end - c > 7 && memcmp (&packet->payload[c], "AOL LLC", 7) == 0)
|
||||
|| ((a + 15) < packet->payload_packet_len && memcmp(&packet->payload[a], "kdc.uas.aol.com", 15) == 0)
|
||||
|| ((a + 14) < packet->payload_packet_len && memcmp(&packet->payload[a], "corehc@aol.net", 14) == 0)
|
||||
|| ((a + 41) < packet->payload_packet_len
|
||||
&& memcmp(&packet->payload[a], "http://crl.aol.com/AOLMSPKI/aolServerCert", 41) == 0)
|
||||
|| ((a + 28) < packet->payload_packet_len
|
||||
&& memcmp(&packet->payload[a], "http://ocsp.web.aol.com/ocsp", 28) == 0)
|
||||
|| ((a + 32) < packet->payload_packet_len
|
||||
&& memcmp(&packet->payload[a], "http://pki-info.aol.com/AOLMSPKI", 32) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_OSCAR, ndpi_struct, NDPI_LOG_DEBUG, "OSCAR SERVER SSL DETECTED\n");
|
||||
|
||||
if(flow->dst != NULL && packet->payload_packet_len > 75) {
|
||||
@@ -405,8 +418,8 @@ static void ssl_mark_and_payload_search_for_other_protocols(struct
|
||||
|
||||
if(packet->payload[a] == 'm' || packet->payload[a] == 's') {
|
||||
if((a + 21) < packet->payload_packet_len &&
|
||||
(memcmp(&packet->payload[a], "my.screenname.aol.com", 21) == 0
|
||||
|| memcmp(&packet->payload[a], "sns-static.aolcdn.com", 21) == 0)) {
|
||||
(memcmp(&packet->payload[a], "my.screenname.aol.com", 21) == 0
|
||||
|| memcmp(&packet->payload[a], "sns-static.aolcdn.com", 21) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_OSCAR, ndpi_struct, NDPI_LOG_DEBUG, "OSCAR SERVER SSL DETECTED\n");
|
||||
ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_OSCAR);
|
||||
return;
|
||||
@@ -441,13 +454,13 @@ static u_int8_t ndpi_search_sslv3_direction1(struct ndpi_detection_module_struct
|
||||
|
||||
|
||||
if((packet->payload_packet_len >= 5)
|
||||
&& (packet->payload[0] == 0x16)
|
||||
&& (packet->payload[1] == 0x03)
|
||||
&& ((packet->payload[2] == 0x00)
|
||||
|| (packet->payload[2] == 0x01)
|
||||
|| (packet->payload[2] == 0x02)
|
||||
|| (packet->payload[2] == 0x03)
|
||||
)) {
|
||||
&& (packet->payload[0] == 0x16)
|
||||
&& (packet->payload[1] == 0x03)
|
||||
&& ((packet->payload[2] == 0x00)
|
||||
|| (packet->payload[2] == 0x01)
|
||||
|| (packet->payload[2] == 0x02)
|
||||
|| (packet->payload[2] == 0x03)
|
||||
)) {
|
||||
u_int32_t temp;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "search sslv3\n");
|
||||
// SSLv3 Record
|
||||
@@ -457,7 +470,7 @@ static u_int8_t ndpi_search_sslv3_direction1(struct ndpi_detection_module_struct
|
||||
temp = ntohs(get_u_int16_t(packet->payload, 3)) + 5;
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "temp = %u.\n", temp);
|
||||
if(packet->payload_packet_len == temp
|
||||
|| (temp < packet->payload_packet_len && packet->payload_packet_len > 500)) {
|
||||
|| (temp < packet->payload_packet_len && packet->payload_packet_len > 500)) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -502,7 +515,7 @@ static u_int8_t ndpi_search_sslv3_direction1(struct ndpi_detection_module_struct
|
||||
|
||||
|
||||
if(packet->payload_packet_len >= temp + 5 && (packet->payload[temp] == 0x14 || packet->payload[temp] == 0x16)
|
||||
&& packet->payload[temp + 1] == 0x03) {
|
||||
&& packet->payload[temp + 1] == 0x03) {
|
||||
u_int32_t temp2 = ntohs(get_u_int16_t(packet->payload, temp + 3)) + 5;
|
||||
if(temp + temp2 > NDPI_MAX_SSL_REQUEST_SIZE) {
|
||||
return 1;
|
||||
@@ -513,7 +526,7 @@ static u_int8_t ndpi_search_sslv3_direction1(struct ndpi_detection_module_struct
|
||||
return 1;
|
||||
}
|
||||
if(packet->payload_packet_len >= temp + 5 &&
|
||||
packet->payload[temp] == 0x16 && packet->payload[temp + 1] == 0x03) {
|
||||
packet->payload[temp] == 0x16 && packet->payload[temp + 1] == 0x03) {
|
||||
temp2 = ntohs(get_u_int16_t(packet->payload, temp + 3)) + 5;
|
||||
if(temp + temp2 > NDPI_MAX_SSL_REQUEST_SIZE) {
|
||||
return 1;
|
||||
@@ -524,7 +537,7 @@ static u_int8_t ndpi_search_sslv3_direction1(struct ndpi_detection_module_struct
|
||||
return 1;
|
||||
}
|
||||
if(packet->payload_packet_len >= temp + 5 &&
|
||||
packet->payload[temp] == 0x16 && packet->payload[temp + 1] == 0x03) {
|
||||
packet->payload[temp] == 0x16 && packet->payload[temp + 1] == 0x03) {
|
||||
temp2 = ntohs(get_u_int16_t(packet->payload, temp + 3)) + 5;
|
||||
if(temp + temp2 > NDPI_MAX_SSL_REQUEST_SIZE) {
|
||||
return 1;
|
||||
@@ -580,7 +593,7 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
&& (packet->payload[4] == 0)
|
||||
&& (packet->payload[2] <= 9)
|
||||
&& (packet->payload[3] <= 9))) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_SERVICE_WHATSAPP, NDPI_PROTOCOL_UNKNOWN);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else {
|
||||
/* No whatsapp, let's try SSL */
|
||||
@@ -593,16 +606,16 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "first ssl packet\n");
|
||||
// SSLv2 Record
|
||||
if(packet->payload[2] == 0x01 && packet->payload[3] == 0x03
|
||||
&& (packet->payload[4] == 0x00 || packet->payload[4] == 0x01 || packet->payload[4] == 0x02)
|
||||
&& (packet->payload_packet_len - packet->payload[1] == 2)) {
|
||||
&& (packet->payload[4] == 0x00 || packet->payload[4] == 0x01 || packet->payload[4] == 0x02)
|
||||
&& (packet->payload_packet_len - packet->payload[1] == 2)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "sslv2 len match\n");
|
||||
flow->l4.tcp.ssl_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
|
||||
if(packet->payload[0] == 0x16 && packet->payload[1] == 0x03
|
||||
&& (packet->payload[2] == 0x00 || packet->payload[2] == 0x01 || packet->payload[2] == 0x02)
|
||||
&& (packet->payload_packet_len - ntohs(get_u_int16_t(packet->payload, 3)) == 5)) {
|
||||
&& (packet->payload[2] == 0x00 || packet->payload[2] == 0x01 || packet->payload[2] == 0x02)
|
||||
&& (packet->payload_packet_len - ntohs(get_u_int16_t(packet->payload, 3)) == 5)) {
|
||||
// SSLv3 Record
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "sslv3 len match\n");
|
||||
flow->l4.tcp.ssl_stage = 1 + packet->packet_direction;
|
||||
@@ -611,8 +624,8 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
}
|
||||
|
||||
if(packet->payload_packet_len > 40 &&
|
||||
flow->l4.tcp.ssl_stage == 1 + packet->packet_direction
|
||||
&& flow->packet_direction_counter[packet->packet_direction] < 5) {
|
||||
flow->l4.tcp.ssl_stage == 1 + packet->packet_direction
|
||||
&& flow->packet_direction_counter[packet->packet_direction] < 5) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -620,8 +633,8 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "second ssl packet\n");
|
||||
// SSLv2 Record
|
||||
if(packet->payload[2] == 0x01 && packet->payload[3] == 0x03
|
||||
&& (packet->payload[4] == 0x00 || packet->payload[4] == 0x01 || packet->payload[4] == 0x02)
|
||||
&& (packet->payload_packet_len - 2) >= packet->payload[1]) {
|
||||
&& (packet->payload[4] == 0x00 || packet->payload[4] == 0x01 || packet->payload[4] == 0x02)
|
||||
&& (packet->payload_packet_len - 2) >= packet->payload[1]) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SSL, ndpi_struct, NDPI_LOG_DEBUG, "sslv2 server len match\n");
|
||||
ssl_mark_and_payload_search_for_other_protocols(ndpi_struct, flow);
|
||||
return;
|
||||
|
||||
+32
-21
@@ -21,15 +21,13 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_STUN
|
||||
|
||||
|
||||
#define MAX_NUM_STUN_PKTS 10
|
||||
|
||||
|
||||
struct stun_packet_header {
|
||||
u_int16_t msg_type, msg_len;
|
||||
u_int32_t cookie;
|
||||
@@ -48,13 +46,14 @@ typedef enum {
|
||||
|
||||
static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
const u_int8_t * payload,
|
||||
const u_int8_t * payload,
|
||||
const u_int16_t payload_length,
|
||||
u_int8_t *is_whatsapp,
|
||||
u_int8_t *is_lync) {
|
||||
u_int16_t msg_type, msg_len;
|
||||
struct stun_packet_header *h = (struct stun_packet_header*)payload;
|
||||
|
||||
u_int8_t can_this_be_whatsapp_voice = 1;
|
||||
|
||||
if(payload_length < sizeof(struct stun_packet_header)) {
|
||||
if(flow->num_stun_udp_pkts > 0) {
|
||||
*is_whatsapp = 1;
|
||||
@@ -68,18 +67,18 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
NDPI_LOG(NDPI_PROTOCOL_STUN, ndpi_struct, NDPI_LOG_DEBUG, "Found stun.\n");
|
||||
goto udp_stun_found;
|
||||
}
|
||||
|
||||
|
||||
msg_type = ntohs(h->msg_type) & 0x3EEF, msg_len = ntohs(h->msg_len);
|
||||
|
||||
if((payload[0] != 0x80) && ((msg_len+20) > payload_length))
|
||||
return(NDPI_IS_NOT_STUN);
|
||||
|
||||
/* printf("msg_type=%04X, msg_len=%u\n", msg_type, msg_len); */
|
||||
|
||||
|
||||
if((payload_length == (msg_len+20))
|
||||
&& ((msg_type <= 0x000b) /* http://www.3cx.com/blog/voip-howto/stun-details/ */)) {
|
||||
u_int offset = 20;
|
||||
|
||||
|
||||
/*
|
||||
This can either be the standard RTCP or Ms Lync RTCP that
|
||||
later will becomg Ms Lync RTP. In this case we need to
|
||||
@@ -87,10 +86,17 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
*/
|
||||
|
||||
while(offset < payload_length) {
|
||||
|
||||
u_int16_t attribute = ntohs(*((u_int16_t*)&payload[offset]));
|
||||
u_int16_t len = ntohs(*((u_int16_t*)&payload[offset+2]));
|
||||
|
||||
switch(attribute) {
|
||||
case 0x0008: /* Message Integrity */
|
||||
case 0x0020: /* XOR-MAPPED-ADDRESSES */
|
||||
case 0x4002:
|
||||
/* These are the only messages apparently whatsapp voice can use */
|
||||
break;
|
||||
|
||||
case 0x8054: /* Candidate Identifier */
|
||||
if((len == 4)
|
||||
&& (payload[offset+4] == 0x31)
|
||||
@@ -101,7 +107,7 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
return(NDPI_IS_STUN);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 0x8070: /* Implementation Version */
|
||||
if((len == 4)
|
||||
&& (payload[offset+4] == 0x00)
|
||||
@@ -110,15 +116,19 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
&& (payload[offset+7] == 0x02)) {
|
||||
*is_lync = 1;
|
||||
return(NDPI_IS_STUN);
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
/* This means this STUN packet cannot be confused with whatsapp voice */
|
||||
can_this_be_whatsapp_voice = 0;
|
||||
break;
|
||||
}
|
||||
offset += len + 4;
|
||||
}
|
||||
|
||||
goto udp_stun_found;
|
||||
goto udp_stun_found;
|
||||
}
|
||||
|
||||
|
||||
#ifdef ORIGINAL_CODE
|
||||
/*
|
||||
* token list of message types and attribute types from
|
||||
@@ -224,11 +234,12 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
*is_whatsapp = 1;
|
||||
return NDPI_IS_STUN; /* This is WhatsApp Voice */
|
||||
} else
|
||||
return NDPI_IS_NOT_STUN;
|
||||
return NDPI_IS_NOT_STUN;
|
||||
|
||||
udp_stun_found:
|
||||
flow->num_stun_udp_pkts++;
|
||||
|
||||
if(can_this_be_whatsapp_voice)
|
||||
flow->num_stun_udp_pkts++;
|
||||
|
||||
return((flow->num_stun_udp_pkts < MAX_NUM_STUN_PKTS) ? NDPI_IS_NOT_STUN : NDPI_IS_STUN);
|
||||
}
|
||||
|
||||
@@ -244,11 +255,11 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
|
||||
if(packet->payload_packet_len >= 2 + 20 &&
|
||||
ntohs(get_u_int16_t(packet->payload, 0)) + 2 == packet->payload_packet_len) {
|
||||
|
||||
|
||||
/* TODO there could be several STUN packets in a single TCP packet so maybe the detection could be
|
||||
* improved by checking only the STUN packet of given length */
|
||||
|
||||
if(ndpi_int_check_stun(ndpi_struct, flow, packet->payload + 2,
|
||||
if(ndpi_int_check_stun(ndpi_struct, flow, packet->payload + 2,
|
||||
packet->payload_packet_len - 2, &is_whatsapp, &is_lync) == NDPI_IS_STUN) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STUN, ndpi_struct, NDPI_LOG_DEBUG, "found TCP stun.\n");
|
||||
ndpi_int_stun_add_connection(ndpi_struct, NDPI_PROTOCOL_STUN, flow);
|
||||
@@ -257,14 +268,14 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
}
|
||||
}
|
||||
|
||||
if(ndpi_int_check_stun(ndpi_struct, flow, packet->payload,
|
||||
if(ndpi_int_check_stun(ndpi_struct, flow, packet->payload,
|
||||
packet->payload_packet_len, &is_whatsapp, &is_lync) == NDPI_IS_STUN) {
|
||||
if(is_lync) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STUN, ndpi_struct, NDPI_LOG_DEBUG, "Found MS Lync\n");
|
||||
ndpi_int_stun_add_connection(ndpi_struct, NDPI_PROTOCOL_MS_LYNC, flow);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_STUN, ndpi_struct, NDPI_LOG_DEBUG, "found UDP stun.\n");
|
||||
ndpi_int_stun_add_connection(ndpi_struct,
|
||||
ndpi_int_stun_add_connection(ndpi_struct,
|
||||
is_whatsapp ? NDPI_PROTOCOL_WHATSAPP_VOICE : NDPI_PROTOCOL_STUN, flow);
|
||||
}
|
||||
return;
|
||||
|
||||
@@ -46,15 +46,14 @@ void ndpi_search_syslog(struct ndpi_detection_module_struct
|
||||
|
||||
if (packet->payload_packet_len > 20 && packet->payload_packet_len <= 1024 && packet->payload[0] == '<') {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SYSLOG, ndpi_struct, NDPI_LOG_DEBUG, "checked len>20 and <1024 and first symbol=<.\n");
|
||||
i = 1;
|
||||
|
||||
for (;;) {
|
||||
if (packet->payload[i] < '0' || packet->payload[i] > '9' || i++ > 3) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SYSLOG, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"read symbols while the symbol is a number.\n");
|
||||
break;
|
||||
for (i = 1; i <= 3; i++) {
|
||||
if (packet->payload[i] < '0' || packet->payload[i] > '9') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_SYSLOG, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"read symbols while the symbol is a number.\n");
|
||||
|
||||
if (packet->payload[i++] != '>') {
|
||||
NDPI_LOG(NDPI_PROTOCOL_SYSLOG, ndpi_struct, NDPI_LOG_DEBUG, "there is no > following the number.\n");
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
/* ndpi_main.c */
|
||||
extern u_int8_t ndpi_is_tor_flow(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
|
||||
u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow,
|
||||
u_int8_t protocol,
|
||||
u_int32_t saddr, u_int32_t daddr, /* host endianess */
|
||||
u_int16_t sport, u_int16_t dport) /* host endianess */
|
||||
@@ -38,12 +39,15 @@ u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struc
|
||||
}
|
||||
}
|
||||
|
||||
host.s_addr = htonl(saddr);
|
||||
if((rc = ndpi_network_ptree_match(ndpi_struct, &host)) != NDPI_PROTOCOL_UNKNOWN)
|
||||
return (rc);
|
||||
|
||||
host.s_addr = htonl(daddr);
|
||||
return (ndpi_network_ptree_match(ndpi_struct, &host));
|
||||
if(flow)
|
||||
return(flow->guessed_host_protocol_id);
|
||||
else {
|
||||
if((rc = ndpi_network_ptree_match(ndpi_struct, &host)) != NDPI_PROTOCOL_UNKNOWN)
|
||||
return (rc);
|
||||
|
||||
host.s_addr = htonl(daddr);
|
||||
return (ndpi_network_ptree_match(ndpi_struct, &host));
|
||||
}
|
||||
}
|
||||
|
||||
void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
@@ -66,6 +70,7 @@ void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, st
|
||||
|
||||
if(packet->iph /* IPv4 Only: we need to support packet->iphv6 at some point */) {
|
||||
proto = ndpi_search_tcp_or_udp_raw(ndpi_struct,
|
||||
flow,
|
||||
flow->packet.iph ? flow->packet.iph->protocol :
|
||||
#ifdef NDPI_DETECTION_SUPPORT_IPV6
|
||||
flow->packet.iphv6->ip6_ctlun.ip6_un1.ip6_un1_nxt,
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
/*
|
||||
* tds.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - 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_protocols.h"
|
||||
#ifdef NDPI_PROTOCOL_TDS
|
||||
|
||||
static void ndpi_int_tds_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TDS, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_tds_tcp(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
if (packet->payload_packet_len > 8
|
||||
&& packet->payload_packet_len < 512
|
||||
&& packet->payload[1] < 0x02
|
||||
&& ntohs(get_u_int16_t(packet->payload, 2)) == packet->payload_packet_len && get_u_int16_t(packet->payload, 4) == 0x0000) {
|
||||
|
||||
if (flow->l4.tcp.tds_stage == 0) {
|
||||
if (packet->payload[0] != 0x02 && packet->payload[0] != 0x07 && packet->payload[0] != 0x12) {
|
||||
goto exclude_tds;
|
||||
} else {
|
||||
flow->l4.tcp.tds_stage = 1 + packet->packet_direction;
|
||||
flow->l4.tcp.tds_login_version = packet->payload[0];
|
||||
return;
|
||||
}
|
||||
} else if (flow->l4.tcp.tds_stage == 2 - packet->packet_direction) {
|
||||
switch (flow->l4.tcp.tds_login_version) {
|
||||
case 0x12:
|
||||
if (packet->payload[0] == 0x04) {
|
||||
flow->l4.tcp.tds_stage = 3 + packet->packet_direction;
|
||||
return;
|
||||
} else {
|
||||
goto exclude_tds;
|
||||
}
|
||||
//TODO: add more cases for other versions
|
||||
default:
|
||||
goto exclude_tds;
|
||||
}
|
||||
} else if (flow->l4.tcp.tds_stage == 4 - packet->packet_direction) {
|
||||
switch (flow->l4.tcp.tds_login_version) {
|
||||
case 0x12:
|
||||
if (packet->payload[0] == 0x12) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "TDS detected\n");
|
||||
ndpi_int_tds_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
} else {
|
||||
goto exclude_tds;
|
||||
}
|
||||
//TODO: add more cases for other versions
|
||||
default:
|
||||
goto exclude_tds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exclude_tds:
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TDS);
|
||||
}
|
||||
|
||||
|
||||
void init_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("TDS", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_TDS,
|
||||
ndpi_search_tds_tcp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -29,6 +29,8 @@ void ndpi_search_teredo(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if(packet->udp
|
||||
&& packet->iph
|
||||
&& ((ntohl(packet->iph->daddr) & 0xF0000000) == 0xE0000000 /* A multicast address */)
|
||||
&& ((ntohs(packet->udp->source) == 3544) || (ntohs(packet->udp->dest) == 3544))
|
||||
&& (packet->payload_packet_len >= 40 /* IPv6 header */))
|
||||
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TEREDO, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
/*
|
||||
* tor.c
|
||||
*
|
||||
* Copyright (C) 2015 ntop.org
|
||||
* Copyright (C) 2016 ntop.org
|
||||
* Copyright (C) 2013 Remy Mudingay <mudingay@ill.fr>
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_TOR
|
||||
@@ -19,12 +17,13 @@ static void ndpi_int_tor_add_connection(struct ndpi_detection_module_struct
|
||||
|
||||
int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow, char *certificate) {
|
||||
|
||||
int prev_num = 0, numbers_found = 0, num_found = 0, i, len;
|
||||
char dummy[48], *dot, *name;
|
||||
|
||||
if((certificate == NULL)
|
||||
|| (strlen(certificate) < 6)
|
||||
|| !(strncmp(certificate, "www.", 4)))
|
||||
|| (strncmp(certificate, "www.", 4)))
|
||||
return(0);
|
||||
|
||||
// printf("***** [SSL] %s(): %s\n", __FUNCTION__, certificate);
|
||||
@@ -39,10 +38,11 @@ int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
len = strlen(name);
|
||||
|
||||
if(len > 6) {
|
||||
if(len >= 5) {
|
||||
for(i = 0; name[i+1] != '\0'; i++) {
|
||||
// printf("***** [SSL] %s(): [%d][%c]", __FUNCTION__, i, name[i]);
|
||||
|
||||
if((name[i] >= '0') && (name[i] <= '9')) {
|
||||
|
||||
if(prev_num != 1) {
|
||||
numbers_found++;
|
||||
|
||||
@@ -69,7 +69,7 @@ int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
ndpi_int_tor_add_connection(ndpi_struct, flow);
|
||||
return(1);
|
||||
} else {
|
||||
#ifdef PENDANTIC_TOR_CHECK
|
||||
#ifdef PEDANTIC_TOR_CHECK
|
||||
if(gethostbyname(certificate) == NULL) {
|
||||
ndpi_int_tor_add_connection(ndpi_struct, flow);
|
||||
return(1);
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
/*
|
||||
* twitter.c
|
||||
*
|
||||
* Copyright (C) 2014 - 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_protocols.h"
|
||||
|
||||
#ifdef NDPI_SERVICE_TWITTER
|
||||
|
||||
static void ndpi_int_twitter_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_SERVICE_TWITTER, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
|
||||
void ndpi_search_twitter(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
|
||||
/*
|
||||
Twitter AS34702
|
||||
|
||||
http://bgp.he.net/AS13414
|
||||
*/
|
||||
if(flow->packet.iph) {
|
||||
// IPv4
|
||||
u_int32_t src = ntohl(flow->packet.iph->saddr);
|
||||
u_int32_t dst = ntohl(flow->packet.iph->daddr);
|
||||
|
||||
if(ndpi_ips_match(src, dst, 0xC0854C00, 22) /* 192.133.76.0/22 */
|
||||
|| ndpi_ips_match(src, dst, 0xC7109C00, 22) /* 199.16.156.0/22 */
|
||||
|| ndpi_ips_match(src, dst, 0xC73B9400, 22) /* 199.59.148.0/22 */
|
||||
|| ndpi_ips_match(src, dst, 0xC7603A00, 23) /* 199.96.58.0/23 */
|
||||
|| ndpi_ips_match(src, dst, 0xC7603E00, 23) /* 199.96.62.0/23 */
|
||||
) {
|
||||
ndpi_int_twitter_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_SERVICE_TWITTER);
|
||||
}
|
||||
|
||||
|
||||
void init_twitter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("TWITTER", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_SERVICE_TWITTER,
|
||||
ndpi_search_twitter,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_TCP,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -35,14 +35,41 @@ void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_UBNTAC2, ndpi_struct, NDPI_LOG_TRACE, "UBNTAC2 detection... plen:%i %i:%i\n", packet->payload_packet_len, ntohs(packet->udp->source), ntohs(packet->udp->dest));
|
||||
|
||||
if (packet->payload_packet_len >= 135 &&
|
||||
(packet->udp->source == htons(10001) || packet->udp->dest == htons(10001)) &&
|
||||
memcmp(&(packet->payload[36]), "UBNT", 4) == 0) {
|
||||
if(packet->udp) {
|
||||
if(packet->payload_packet_len >= 135 &&
|
||||
(packet->udp->source == htons(10001) || packet->udp->dest == htons(10001))) {
|
||||
int found = 0;
|
||||
|
||||
if(memcmp(&(packet->payload[36]), "UBNT", 4) == 0) {
|
||||
found = 36+5;
|
||||
} else if(memcmp(&(packet->payload[49]), "ubnt", 4) == 0) {
|
||||
found = 49+5;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_UBNTAC2, ndpi_struct, NDPI_LOG_DEBUG, "UBNT AirControl 2 request\n");
|
||||
|
||||
ndpi_int_ubntac2_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
if(found) {
|
||||
char version[256];
|
||||
int i, j, len;
|
||||
|
||||
found += packet->payload[found+1] + 4; /* Skip model name */
|
||||
found++; /* Skip len*/
|
||||
|
||||
if(found < packet->payload_packet_len) {
|
||||
for(i=found, j=0; (packet->payload[i] != 0) && (i < packet->payload_packet_len) && (i < (sizeof(version)-1)); i++)
|
||||
version[j++] = packet->payload[i];
|
||||
|
||||
version[j] = '\0';
|
||||
|
||||
len = ndpi_min(sizeof(flow->protos.ubntac2.version)-1, j);
|
||||
strncpy(flow->protos.ubntac2.version, (const char *)version, len);
|
||||
flow->protos.ubntac2.version[len] = '\0';
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_UBNTAC2, ndpi_struct, NDPI_LOG_DEBUG, "UBNT AirControl 2 request\n");
|
||||
|
||||
ndpi_int_ubntac2_add_connection(ndpi_struct, flow);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UBNTAC2);
|
||||
|
||||
+13
-14
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* vmware.c
|
||||
*
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -17,8 +17,6 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_VMWARE
|
||||
@@ -29,18 +27,20 @@ void ndpi_search_vmware(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
/* Check whether this is an VMWARE flow */
|
||||
if((packet->payload_packet_len == 66)
|
||||
&& (ntohs(packet->udp->dest) == 902)
|
||||
&& ((packet->payload[0] & 0xFF) == 0xA4)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_VMWARE, ndpi_struct, NDPI_LOG_DEBUG, "Found vmware.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VMWARE, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_VMWARE, ndpi_struct, NDPI_LOG_DEBUG, "exclude vmware.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_VMWARE);
|
||||
if(packet->udp != NULL){
|
||||
if((packet->payload_packet_len == 66) &&
|
||||
(ntohs(packet->udp->dest) == 902) &&
|
||||
((packet->payload[0] & 0xFF) == 0xA4)){
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_VMWARE, ndpi_struct, NDPI_LOG_DEBUG, "Found vmware.\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VMWARE, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_VMWARE, ndpi_struct, NDPI_LOG_DEBUG, "exclude vmware.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_VMWARE);
|
||||
}
|
||||
|
||||
|
||||
void init_vmware_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("VMWARE", ndpi_struct, detection_bitmask, *id,
|
||||
@@ -49,9 +49,8 @@ void init_vmware_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
+29
-33
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* vnc.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,48 +20,45 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_VNC
|
||||
|
||||
static void ndpi_int_vnc_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VNC, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
/*
|
||||
return 0 if nothing has been detected
|
||||
return 1 if it is a http packet
|
||||
*/
|
||||
|
||||
void ndpi_search_vnc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
|
||||
if (flow->l4.tcp.vnc_stage == 0) {
|
||||
if (packet->payload_packet_len == 12
|
||||
&& memcmp(packet->payload, "RFB 003.00", 10) == 0 && packet->payload[11] == 0x0a) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "reached vnc stage one\n");
|
||||
flow->l4.tcp.vnc_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
} else if (flow->l4.tcp.vnc_stage == 2 - packet->packet_direction) {
|
||||
if (packet->payload_packet_len == 12
|
||||
&& memcmp(packet->payload, "RFB 003.00", 10) == 0 && packet->payload[11] == 0x0a) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "found vnc\n");
|
||||
ndpi_int_vnc_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
/* search over TCP */
|
||||
if(packet->tcp) {
|
||||
|
||||
if(flow->l4.tcp.vnc_stage == 0) {
|
||||
|
||||
if((packet->payload_packet_len == 12) &&
|
||||
((memcmp(packet->payload, "RFB 003.003", 11) == 0 && packet->payload[11] == 0x0a) ||
|
||||
(memcmp(packet->payload, "RFB 003.007", 11) == 0 && packet->payload[11] == 0x0a) ||
|
||||
(memcmp(packet->payload, "RFB 003.008", 11) == 0 && packet->payload[11] == 0x0a) ||
|
||||
(memcmp(packet->payload, "RFB 004.001", 11) == 0 && packet->payload[11] == 0x0a))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "reached vnc stage one\n");
|
||||
flow->l4.tcp.vnc_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
} else if(flow->l4.tcp.vnc_stage == 2 - packet->packet_direction) {
|
||||
|
||||
if((packet->payload_packet_len == 12) &&
|
||||
((memcmp(packet->payload, "RFB 003.003", 11) == 0 && packet->payload[11] == 0x0a) ||
|
||||
(memcmp(packet->payload, "RFB 003.007", 11) == 0 && packet->payload[11] == 0x0a) ||
|
||||
(memcmp(packet->payload, "RFB 003.008", 11) == 0 && packet->payload[11] == 0x0a) ||
|
||||
(memcmp(packet->payload, "RFB 004.001", 11) == 0 && packet->payload[11] == 0x0a))) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "found vnc\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VNC, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* exclude VNC */
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_VNC);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -74,7 +70,7 @@ void init_vnc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* whoisdas.c
|
||||
*
|
||||
* Copyright (C) 2013 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -17,44 +17,43 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_WHOIS_DAS
|
||||
|
||||
void ndpi_search_whois_das(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int16_t sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest);
|
||||
|
||||
if ((packet->tcp != NULL)
|
||||
&& (
|
||||
((sport == 43) || (dport == 43))
|
||||
||
|
||||
((sport == 4343) || (dport == 4343))
|
||||
)
|
||||
) {
|
||||
if(packet->payload_packet_len > 0) {
|
||||
u_int max_len = sizeof(flow->host_server_name)-1;
|
||||
u_int i, j;
|
||||
if(packet->tcp != NULL) {
|
||||
u_int16_t sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest);
|
||||
|
||||
if(((sport == 43) || (dport == 43)) || ((sport == 4343) || (dport == 4343))) {
|
||||
|
||||
for(i=strlen((const char *)flow->host_server_name), j=0; (i<max_len) && (j<packet->payload_packet_len); i++, j++) {
|
||||
if((packet->payload[j] == '\n') || (packet->payload[j] == '\r')) break;
|
||||
if(packet->payload_packet_len > 0) {
|
||||
|
||||
u_int max_len = sizeof(flow->host_server_name) - 1;
|
||||
u_int i, j;
|
||||
|
||||
for(i=strlen((const char *)flow->host_server_name), j=0; (i<max_len) && (j<packet->payload_packet_len); i++, j++) {
|
||||
|
||||
flow->host_server_name[i] = packet->payload[j];
|
||||
if((packet->payload[j] == '\n') || (packet->payload[j] == '\r')) break;
|
||||
|
||||
flow->host_server_name[i] = packet->payload[j];
|
||||
}
|
||||
|
||||
flow->host_server_name[i] = '\0';
|
||||
flow->server_id = ((sport == 43) || (sport == 4343)) ? flow->src : flow->dst;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_DEBUG, "[WHOIS/DAS] %s\n", flow->host_server_name);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHOIS_DAS, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
flow->host_server_name[i] = '\0';
|
||||
flow->server_id = ((sport == 43) || (sport == 4343)) ? flow->src : flow->dst;
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_DEBUG, "[WHOIS/DAS] %s\n", flow->host_server_name);
|
||||
}
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHOIS_DAS, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_TRACE, "WHOIS Excluded.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_WHOIS_DAS);
|
||||
}
|
||||
/* exclude WHOIS */
|
||||
NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_TRACE, "WHOIS Excluded.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_WHOIS_DAS);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* xbox.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -22,8 +21,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_protocols.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_XBOX
|
||||
|
||||
static void ndpi_int_xbox_add_connection(struct ndpi_detection_module_struct
|
||||
@@ -41,13 +40,11 @@ void ndpi_search_xbox(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
// struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
/*
|
||||
* THIS IS TH XBOX UDP DETCTION ONLY !!!
|
||||
* the xbox tcp detection is done by http code
|
||||
* XBOX UDP DETCTION ONLY
|
||||
* the xbox TCP detection is done by http code
|
||||
* this detection also works for asymmetric xbox udp traffic
|
||||
*/
|
||||
|
||||
|
||||
/* this detection also works for asymmetric xbox udp traffic */
|
||||
if (packet->udp != NULL) {
|
||||
if(packet->udp != NULL) {
|
||||
|
||||
u_int16_t dport = ntohs(packet->udp->dest);
|
||||
u_int16_t sport = ntohs(packet->udp->source);
|
||||
@@ -88,11 +85,9 @@ void ndpi_search_xbox(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
||||
}
|
||||
|
||||
/* exclude here all non matched udp traffic, exclude here tcp only if http has been excluded, because xbox could use http */
|
||||
if (packet->tcp == NULL
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
|| NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HTTP) != 0
|
||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HTTP) != 0) {
|
||||
#endif
|
||||
) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_XBOX, ndpi_struct, NDPI_LOG_DEBUG, "xbox udp excluded.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX);
|
||||
}
|
||||
|
||||
+276
-302
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* yahoo.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,8 +20,6 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_YAHOO
|
||||
@@ -54,383 +51,360 @@ static u_int8_t ndpi_check_for_YmsgCommand(u_int16_t len, const u_int8_t * ptr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ndpi_int_yahoo_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
#if !defined(WIN32)
|
||||
#ifndef WIN32
|
||||
static inline
|
||||
#else
|
||||
__forceinline static
|
||||
#endif
|
||||
u_int8_t check_ymsg(const u_int8_t * payload, u_int16_t payload_packet_len)
|
||||
{
|
||||
|
||||
const struct ndpi_yahoo_header *yahoo = (struct ndpi_yahoo_header *) payload;
|
||||
|
||||
|
||||
u_int16_t yahoo_len_parsed = 0;
|
||||
do {
|
||||
u_int16_t ylen = ntohs(yahoo->len);
|
||||
|
||||
|
||||
yahoo_len_parsed += 20 + ylen; /* possible overflow here: 20 + ylen = 0x10000 --> 0 --> infinite loop */
|
||||
|
||||
if (ylen >= payload_packet_len || yahoo_len_parsed >= payload_packet_len)
|
||||
if(ylen >= payload_packet_len || yahoo_len_parsed >= payload_packet_len)
|
||||
break;
|
||||
|
||||
yahoo = (struct ndpi_yahoo_header *) (payload + yahoo_len_parsed);
|
||||
}
|
||||
while (memcmp(yahoo->YMSG_str, "YMSG", 4) == 0);
|
||||
while(memcmp(yahoo->YMSG_str, "YMSG", 4) == 0);
|
||||
|
||||
if (yahoo_len_parsed == payload_packet_len)
|
||||
if(yahoo_len_parsed == payload_packet_len)
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ndpi_search_yahoo_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
struct ndpi_id_struct *src = flow->src;
|
||||
struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
const struct ndpi_yahoo_header *yahoo = (struct ndpi_yahoo_header *) packet->payload;
|
||||
if (packet->payload_packet_len == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(packet->tcp) {
|
||||
|
||||
/* packet must be at least 20 bytes long */
|
||||
if (packet->payload_packet_len >= 20
|
||||
&& memcmp(yahoo->YMSG_str, "YMSG", 4) == 0 && ((packet->payload_packet_len - 20) == ntohs(yahoo->len)
|
||||
|| check_ymsg(packet->payload, packet->payload_packet_len))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO FOUND\n");
|
||||
flow->yahoo_detection_finished = 2;
|
||||
if (ntohs(yahoo->service) == 24 || ntohs(yahoo->service) == 152 || ntohs(yahoo->service) == 74) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO conference or chat invite found");
|
||||
if (src != NULL) {
|
||||
src->yahoo_conf_logged_in = 1;
|
||||
}
|
||||
if (dst != NULL) {
|
||||
dst->yahoo_conf_logged_in = 1;
|
||||
}
|
||||
}
|
||||
if (ntohs(yahoo->service) == 27 || ntohs(yahoo->service) == 155 || ntohs(yahoo->service) == 160) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO conference or chat logoff found");
|
||||
if (src != NULL) {
|
||||
src->yahoo_conf_logged_in = 0;
|
||||
src->yahoo_voice_conf_logged_in = 0;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
} else if (flow->yahoo_detection_finished == 2 && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_YAHOO) {
|
||||
return;
|
||||
} else if (packet->payload_packet_len == 4 && memcmp(yahoo->YMSG_str, "YMSG", 4) == 0) {
|
||||
flow->l4.tcp.yahoo_sip_comm = 1;
|
||||
return;
|
||||
} else if (flow->l4.tcp.yahoo_sip_comm && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
&& flow->packet_counter < 3) {
|
||||
return;
|
||||
}
|
||||
if(packet->payload_packet_len > 0) {
|
||||
/* packet must be at least 20 bytes long */
|
||||
if(packet->payload_packet_len >= 20
|
||||
&& memcmp(yahoo->YMSG_str, "YMSG", 4) == 0 && ((packet->payload_packet_len - 20) == ntohs(yahoo->len)
|
||||
|| check_ymsg(packet->payload, packet->payload_packet_len))) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO FOUND\n");
|
||||
flow->yahoo_detection_finished = 2;
|
||||
|
||||
/* now test for http login, at least 100 a bytes packet */
|
||||
if (ndpi_struct->yahoo_detect_http_connections != 0 && packet->payload_packet_len > 100) {
|
||||
if (memcmp(packet->payload, "POST /relay?token=", 18) == 0
|
||||
|| memcmp(packet->payload, "GET /relay?token=", 17) == 0
|
||||
|| memcmp(packet->payload, "GET /?token=", 12) == 0
|
||||
|| memcmp(packet->payload, "HEAD /relay?token=", 18) == 0) {
|
||||
if ((src != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO)
|
||||
!= 0) || (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO)
|
||||
!= 0)) {
|
||||
/* this is mostly a file transfer */
|
||||
if(ntohs(yahoo->service) == 24 || ntohs(yahoo->service) == 152 || ntohs(yahoo->service) == 74) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO conference or chat invite found");
|
||||
|
||||
if(src != NULL)
|
||||
src->yahoo_conf_logged_in = 1;
|
||||
if(dst != NULL)
|
||||
dst->yahoo_conf_logged_in = 1;
|
||||
}
|
||||
if(ntohs(yahoo->service) == 27 || ntohs(yahoo->service) == 155 || ntohs(yahoo->service) == 160) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO conference or chat logoff found");
|
||||
if(src != NULL) {
|
||||
src->yahoo_conf_logged_in = 0;
|
||||
src->yahoo_voice_conf_logged_in = 0;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (memcmp(packet->payload, "POST ", 5) == 0) {
|
||||
u_int16_t a;
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if ((packet->user_agent_line.len >= 21)
|
||||
&& (memcmp(packet->user_agent_line.ptr, "YahooMobileMessenger/", 21) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO(Mobile)");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
} else if(flow->yahoo_detection_finished == 2 && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_YAHOO) {
|
||||
return;
|
||||
} else if(packet->payload_packet_len == 4 && memcmp(yahoo->YMSG_str, "YMSG", 4) == 0) {
|
||||
flow->l4.tcp.yahoo_sip_comm = 1;
|
||||
return;
|
||||
} else if(flow->l4.tcp.yahoo_sip_comm && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
&& flow->packet_counter < 3) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (NDPI_SRC_OR_DST_HAS_PROTOCOL(src, dst, NDPI_PROTOCOL_YAHOO)
|
||||
&& packet->parsed_lines > 5
|
||||
&& memcmp(&packet->payload[5], "/Messenger.", 11) == 0
|
||||
&& packet->line[1].len >= 17
|
||||
&& memcmp(packet->line[1].ptr, "Connection: Close",
|
||||
17) == 0 && packet->line[2].len >= 6
|
||||
&& memcmp(packet->line[2].ptr, "Host: ", 6) == 0
|
||||
&& packet->line[3].len >= 16
|
||||
&& memcmp(packet->line[3].ptr, "Content-Length: ",
|
||||
16) == 0 && packet->line[4].len >= 23
|
||||
&& memcmp(packet->line[4].ptr, "User-Agent: Mozilla/5.0",
|
||||
23) == 0 && packet->line[5].len >= 23
|
||||
&& memcmp(packet->line[5].ptr, "Cache-Control: no-cache", 23) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"YAHOO HTTP POST P2P FILETRANSFER FOUND\n");
|
||||
/* now test for http login, at least 100 a bytes packet */
|
||||
if(ndpi_struct->yahoo_detect_http_connections != 0 && packet->payload_packet_len > 100) {
|
||||
if(memcmp(packet->payload, "POST /relay?token=", 18) == 0
|
||||
|| memcmp(packet->payload, "GET /relay?token=", 17) == 0
|
||||
|| memcmp(packet->payload, "GET /?token=", 12) == 0
|
||||
|| memcmp(packet->payload, "HEAD /relay?token=", 18) == 0) {
|
||||
if((src != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO)
|
||||
!= 0) || (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO)
|
||||
!= 0)) {
|
||||
/* this is mostly a file transfer */
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(memcmp(packet->payload, "POST ", 5) == 0) {
|
||||
u_int16_t a;
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if ((packet->user_agent_line.len >= 21)
|
||||
&& (memcmp(packet->user_agent_line.ptr, "YahooMobileMessenger/", 21) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO(Mobile)");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
if (NDPI_SRC_OR_DST_HAS_PROTOCOL(src, dst, NDPI_PROTOCOL_YAHOO)
|
||||
&& packet->parsed_lines > 5
|
||||
&& memcmp(&packet->payload[5], "/Messenger.", 11) == 0
|
||||
&& packet->line[1].len >= 17
|
||||
&& memcmp(packet->line[1].ptr, "Connection: Close",
|
||||
17) == 0 && packet->line[2].len >= 6
|
||||
&& memcmp(packet->line[2].ptr, "Host: ", 6) == 0
|
||||
&& packet->line[3].len >= 16
|
||||
&& memcmp(packet->line[3].ptr, "Content-Length: ",
|
||||
16) == 0 && packet->line[4].len >= 23
|
||||
&& memcmp(packet->line[4].ptr, "User-Agent: Mozilla/5.0",
|
||||
23) == 0 && packet->line[5].len >= 23
|
||||
&& memcmp(packet->line[5].ptr, "Cache-Control: no-cache", 23) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"YAHOO HTTP POST P2P FILETRANSFER FOUND\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
if (packet->host_line.ptr != NULL && packet->host_line.len >= 26 &&
|
||||
memcmp(packet->host_line.ptr, "filetransfer.msg.yahoo.com", 26) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO HTTP POST FILETRANSFER FOUND\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
/* now check every line */
|
||||
for (a = 0; a < packet->parsed_lines; a++) {
|
||||
if (packet->line[a].len >= 4 && memcmp(packet->line[a].ptr, "YMSG", 4) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct,
|
||||
NDPI_LOG_TRACE,
|
||||
"YAHOO HTTP POST FOUND, line is: %.*s\n", packet->line[a].len, packet->line[a].ptr);
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (packet->parsed_lines > 8 && packet->line[8].len > 250 && packet->line[8].ptr != NULL) {
|
||||
if (memcmp(packet->line[8].ptr, "<Session ", 9) == 0) {
|
||||
if (ndpi_check_for_YmsgCommand(packet->line[8].len, packet->line[8].ptr)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found HTTP Proxy Yahoo Chat <Ymsg Command= pattern \n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(memcmp(packet->payload, "GET /Messenger.", 15) == 0) {
|
||||
if((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) != 0)
|
||||
|| (dst != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) != 0)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO HTTP GET /Messenger. match\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if((memcmp(packet->payload, "GET /", 5) == 0)) {
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if((packet->user_agent_line.ptr != NULL && packet->user_agent_line.len >= NDPI_STATICSTRING_LEN("YahooMobileMessenger/")
|
||||
&& memcmp(packet->user_agent_line.ptr, "YahooMobileMessenger/", NDPI_STATICSTRING_LEN("YahooMobileMessenger/")) == 0)
|
||||
|| (packet->user_agent_line.len >= 15 && (memcmp(packet->user_agent_line.ptr, "Y!%20Messenger/", 15) == 0))) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO(Mobile)");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if(packet->host_line.ptr != NULL && packet->host_line.len >= NDPI_STATICSTRING_LEN("msg.yahoo.com") &&
|
||||
memcmp(&packet->host_line.ptr[packet->host_line.len - NDPI_STATICSTRING_LEN("msg.yahoo.com")], "msg.yahoo.com", NDPI_STATICSTRING_LEN("msg.yahoo.com")) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* found another http login command for yahoo, it is like OSCAR */
|
||||
/* detect http connections */
|
||||
if (packet->payload_packet_len > 50 && (memcmp(packet->payload, "content-length: ", 16) == 0)) {
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
if (packet->parsed_lines > 2 && packet->line[1].len == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "first line is empty.\n");
|
||||
if (packet->line[2].len > 13 && memcmp(packet->line[2].ptr, "<Ymsg Command=", 14) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO web chat found\n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->payload_packet_len > 38 && memcmp(packet->payload, "CONNECT scs.msg.yahoo.com:5050 HTTP/1.", 38) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO-HTTP FOUND\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
if (packet->host_line.ptr != NULL && packet->host_line.len >= 26 &&
|
||||
memcmp(packet->host_line.ptr, "filetransfer.msg.yahoo.com", 26) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO HTTP POST FILETRANSFER FOUND\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/* now check every line */
|
||||
for (a = 0; a < packet->parsed_lines; a++) {
|
||||
if (packet->line[a].len >= 4 && memcmp(packet->line[a].ptr, "YMSG", 4) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct,
|
||||
NDPI_LOG_TRACE,
|
||||
"YAHOO HTTP POST FOUND, line is: %.*s\n", packet->line[a].len, packet->line[a].ptr);
|
||||
if ((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) != 0)
|
||||
|| (dst != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) != 0)) {
|
||||
if (packet->payload_packet_len == 6 && memcmp(packet->payload, "YAHOO!", 6) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (packet->parsed_lines > 8 && packet->line[8].len > 250 && packet->line[8].ptr != NULL) {
|
||||
if (memcmp(packet->line[8].ptr, "<Session ", 9) == 0) {
|
||||
if (ndpi_check_for_YmsgCommand(packet->line[8].len, packet->line[8].ptr)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found HTTP Proxy Yahoo Chat <Ymsg Command= pattern \n");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
/* asymmetric detection for SNDIMG not done yet.
|
||||
* See ./Yahoo8.1-VideoCall-LAN.pcap and ./Yahoo-VideoCall-inPublicIP.pcap */
|
||||
|
||||
if (packet->payload_packet_len == 8 && (memcmp(packet->payload, "<SNDIMG>", 8) == 0 || memcmp(packet->payload, "<REQIMG>", 8) == 0
|
||||
|| memcmp(packet->payload, "<RVWCFG>", 8) == 0 || memcmp(packet->payload, "<RUPCFG>", 8) == 0)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO SNDIMG or REQIMG or RVWCFG or RUPCFG FOUND\n");
|
||||
|
||||
if(src != NULL) {
|
||||
if (memcmp(packet->payload, "<SNDIMG>", 8) == 0) {
|
||||
src->yahoo_video_lan_dir = 0;
|
||||
} else {
|
||||
src->yahoo_video_lan_dir = 1;
|
||||
}
|
||||
src->yahoo_video_lan_timer = packet->tick_timestamp;
|
||||
}
|
||||
if(dst != NULL) {
|
||||
if (memcmp(packet->payload, "<SNDIMG>", 8) == 0) {
|
||||
dst->yahoo_video_lan_dir = 0;
|
||||
} else {
|
||||
dst->yahoo_video_lan_dir = 1;
|
||||
}
|
||||
dst->yahoo_video_lan_timer = packet->tick_timestamp;
|
||||
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO subtype VIDEO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if(src != NULL && packet->tcp->dest == htons(5100)
|
||||
&& ((u_int32_t) (packet->tick_timestamp - src->yahoo_video_lan_timer) < ndpi_struct->yahoo_lan_video_timeout)) {
|
||||
|
||||
if (src->yahoo_video_lan_dir == 1) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "IMG MARKED");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (dst != NULL && packet->tcp->dest == htons(5100)
|
||||
&& ((u_int32_t) (packet->tick_timestamp - dst->yahoo_video_lan_timer) < ndpi_struct->yahoo_lan_video_timeout)) {
|
||||
if (dst->yahoo_video_lan_dir == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "IMG MARKED");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (memcmp(packet->payload, "GET /Messenger.", 15) == 0) {
|
||||
if ((src != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO)
|
||||
!= 0) || (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO)
|
||||
!= 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO HTTP GET /Messenger. match\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if ((memcmp(packet->payload, "GET /", 5) == 0)) {
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if ((packet->user_agent_line.ptr != NULL
|
||||
&& packet->user_agent_line.len >= NDPI_STATICSTRING_LEN("YahooMobileMessenger/")
|
||||
&& memcmp(packet->user_agent_line.ptr, "YahooMobileMessenger/",
|
||||
NDPI_STATICSTRING_LEN("YahooMobileMessenger/")) == 0)
|
||||
|| (packet->user_agent_line.len >= 15
|
||||
&& (memcmp(packet->user_agent_line.ptr, "Y!%20Messenger/", 15) == 0))) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO(Mobile)");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (packet->host_line.ptr != NULL && packet->host_line.len >= NDPI_STATICSTRING_LEN("msg.yahoo.com") &&
|
||||
memcmp(&packet->host_line.ptr[packet->host_line.len - NDPI_STATICSTRING_LEN("msg.yahoo.com")],
|
||||
"msg.yahoo.com", NDPI_STATICSTRING_LEN("msg.yahoo.com")) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
/* found another http login command for yahoo, it is like OSCAR */
|
||||
/* detect http connections */
|
||||
|
||||
if (packet->payload_packet_len > 50 && (memcmp(packet->payload, "content-length: ", 16) == 0)) {
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (packet->parsed_lines > 2 && packet->line[1].len == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "first line is empty.\n");
|
||||
if (packet->line[2].len > 13 && memcmp(packet->line[2].ptr, "<Ymsg Command=", 14) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO web chat found\n");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->payload_packet_len > 38 && memcmp(packet->payload, "CONNECT scs.msg.yahoo.com:5050 HTTP/1.", 38) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE, "YAHOO-HTTP FOUND\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) != 0)
|
||||
|| (dst != NULL
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) != 0)) {
|
||||
if (packet->payload_packet_len == 6 && memcmp(packet->payload, "YAHOO!", 6) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/* asymmetric detection for SNDIMG not done yet.
|
||||
* See ./Yahoo8.1-VideoCall-LAN.pcap and ./Yahoo-VideoCall-inPublicIP.pcap */
|
||||
|
||||
|
||||
if (packet->payload_packet_len == 8
|
||||
&& (memcmp(packet->payload, "<SNDIMG>", 8) == 0 || memcmp(packet->payload, "<REQIMG>", 8) == 0
|
||||
|| memcmp(packet->payload, "<RVWCFG>", 8) == 0 || memcmp(packet->payload, "<RUPCFG>", 8) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_TRACE,
|
||||
"YAHOO SNDIMG or REQIMG or RVWCFG or RUPCFG FOUND\n");
|
||||
if (src != NULL) {
|
||||
if (memcmp(packet->payload, "<SNDIMG>", 8) == 0) {
|
||||
src->yahoo_video_lan_dir = 0;
|
||||
} else {
|
||||
src->yahoo_video_lan_dir = 1;
|
||||
}
|
||||
src->yahoo_video_lan_timer = packet->tick_timestamp;
|
||||
}
|
||||
if (dst != NULL) {
|
||||
if (memcmp(packet->payload, "<SNDIMG>", 8) == 0) {
|
||||
dst->yahoo_video_lan_dir = 0;
|
||||
} else {
|
||||
dst->yahoo_video_lan_dir = 1;
|
||||
}
|
||||
dst->yahoo_video_lan_timer = packet->tick_timestamp;
|
||||
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO subtype VIDEO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
if (src != NULL && packet->tcp->dest == htons(5100)
|
||||
&& ((u_int32_t)
|
||||
(packet->tick_timestamp - src->yahoo_video_lan_timer) < ndpi_struct->yahoo_lan_video_timeout)) {
|
||||
if (src->yahoo_video_lan_dir == 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "IMG MARKED");
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
if (dst != NULL && packet->tcp->dest == htons(5100)
|
||||
&& ((u_int32_t)
|
||||
(packet->tick_timestamp - dst->yahoo_video_lan_timer) < ndpi_struct->yahoo_lan_video_timeout)) {
|
||||
if (dst->yahoo_video_lan_dir == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "IMG MARKED");
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* detect YAHOO over HTTP proxy */
|
||||
/* detect YAHOO over HTTP proxy */
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP)
|
||||
if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP)
|
||||
#endif
|
||||
{
|
||||
|
||||
if (flow->l4.tcp.yahoo_http_proxy_stage == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"YAHOO maybe HTTP proxy packet 1 => need next packet\n");
|
||||
flow->l4.tcp.yahoo_http_proxy_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
if (flow->l4.tcp.yahoo_http_proxy_stage == 1 + packet->packet_direction) {
|
||||
if ((packet->payload_packet_len > 250) && (memcmp(packet->payload, "<Session ", 9) == 0)) {
|
||||
if (ndpi_check_for_YmsgCommand(packet->payload_packet_len, packet->payload)) {
|
||||
{
|
||||
if (flow->l4.tcp.yahoo_http_proxy_stage == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"found HTTP Proxy Yahoo Chat <Ymsg Command= pattern \n");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
"YAHOO maybe HTTP proxy packet 1 => need next packet\n");
|
||||
flow->l4.tcp.yahoo_http_proxy_stage = 1 + packet->packet_direction;
|
||||
return;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"YAHOO maybe HTTP proxy still initial direction => need next packet\n");
|
||||
return;
|
||||
}
|
||||
if (flow->l4.tcp.yahoo_http_proxy_stage == 2 - packet->packet_direction) {
|
||||
|
||||
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
||||
|
||||
if (packet->parsed_lines >= 9) {
|
||||
|
||||
if (packet->line[4].ptr != NULL && packet->line[4].len >= 9 &&
|
||||
packet->line[8].ptr != NULL && packet->line[8].len >= 6 &&
|
||||
memcmp(packet->line[4].ptr, "<Session ", 9) == 0 &&
|
||||
memcmp(packet->line[8].ptr, "<Ymsg ", 6) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO over HTTP proxy");
|
||||
ndpi_int_yahoo_add_connection(ndpi_struct, flow);
|
||||
if (flow->l4.tcp.yahoo_http_proxy_stage == 1 + packet->packet_direction) {
|
||||
if ((packet->payload_packet_len > 250) && (memcmp(packet->payload, "<Session ", 9) == 0)) {
|
||||
if (ndpi_check_for_YmsgCommand(packet->payload_packet_len, packet->payload)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found HTTP Proxy Yahoo Chat <Ymsg Command= pattern \n");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "YAHOO maybe HTTP proxy still initial direction => need next packet\n");
|
||||
return;
|
||||
}
|
||||
if (flow->l4.tcp.yahoo_http_proxy_stage == 2 - packet->packet_direction) {
|
||||
|
||||
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
||||
|
||||
if (packet->parsed_lines >= 9) {
|
||||
|
||||
if (packet->line[4].ptr != NULL && packet->line[4].len >= 9 &&
|
||||
packet->line[8].ptr != NULL && packet->line[8].len >= 6 &&
|
||||
memcmp(packet->line[4].ptr, "<Session ", 9) == 0 &&
|
||||
memcmp(packet->line[8].ptr, "<Ymsg ", 6) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "found YAHOO over HTTP proxy");
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_YAHOO);
|
||||
}
|
||||
|
||||
|
||||
#if !defined(WIN32)
|
||||
static inline
|
||||
#else
|
||||
__forceinline static
|
||||
#endif
|
||||
void ndpi_search_yahoo_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
|
||||
|
||||
|
||||
struct ndpi_id_struct *src = flow->src;
|
||||
if (src == NULL || NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) == 0) {
|
||||
goto excl_yahoo_udp;
|
||||
/* exclude YAHOO */
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_YAHOO);
|
||||
}
|
||||
excl_yahoo_udp:
|
||||
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_YAHOO);
|
||||
}
|
||||
|
||||
void ndpi_search_yahoo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_YAHOO, ndpi_struct, NDPI_LOG_DEBUG, "search yahoo\n");
|
||||
|
||||
if(packet->payload_packet_len > 0 && flow->yahoo_detection_finished == 0) {
|
||||
|
||||
if (packet->payload_packet_len > 0 && flow->yahoo_detection_finished == 0) {
|
||||
if (packet->tcp != NULL && packet->tcp_retransmission == 0) {
|
||||
/* search over TCP */
|
||||
if(packet->tcp != NULL && packet->tcp_retransmission == 0) {
|
||||
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_SSL
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL
|
||||
|| packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL) {
|
||||
#endif
|
||||
) {
|
||||
ndpi_search_yahoo_tcp(ndpi_struct, flow);
|
||||
}
|
||||
} else if (packet->udp != NULL) {
|
||||
ndpi_search_yahoo_udp(ndpi_struct, flow);
|
||||
}
|
||||
/* search over UDP */
|
||||
else if(packet->udp != NULL) {
|
||||
if(flow->src == NULL || NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->src->detected_protocol_bitmask, NDPI_PROTOCOL_YAHOO) == 0)
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_YAHOO);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (packet->payload_packet_len > 0 && flow->yahoo_detection_finished == 2) {
|
||||
if (packet->tcp != NULL && packet->tcp_retransmission == 0) {
|
||||
|
||||
if(packet->payload_packet_len > 0 && flow->yahoo_detection_finished == 2) {
|
||||
if(packet->tcp != NULL && packet->tcp_retransmission == 0) {
|
||||
/* search over TCP */
|
||||
ndpi_search_yahoo_tcp(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_yahoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
|
||||
|
||||
+155
-119
@@ -1,8 +1,7 @@
|
||||
/*
|
||||
* zattoo.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - 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
|
||||
@@ -21,43 +20,19 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_ZATTOO
|
||||
|
||||
static void ndpi_int_zattoo_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow/* , */
|
||||
/* ndpi_protocol_type_t protocol_type */)
|
||||
{
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
struct ndpi_id_struct *src = flow->src;
|
||||
struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
if (src != NULL) {
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
}
|
||||
if (dst != NULL) {
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if !defined(WIN32)
|
||||
#ifndef WIN32
|
||||
static inline
|
||||
#else
|
||||
__forceinline static
|
||||
#endif
|
||||
u_int8_t ndpi_int_zattoo_user_agent_set(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
if (flow->packet.user_agent_line.ptr != NULL && flow->packet.user_agent_line.len == 111) {
|
||||
if (memcmp(flow->packet.user_agent_line.ptr +
|
||||
flow->packet.user_agent_line.len - 25, "Zattoo/4", sizeof("Zattoo/4") - 1) == 0) {
|
||||
if(flow->packet.user_agent_line.ptr != NULL && flow->packet.user_agent_line.len == 111) {
|
||||
if(memcmp(flow->packet.user_agent_line.ptr + flow->packet.user_agent_line.len - 25, "Zattoo/4", sizeof("Zattoo/4") - 1) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "found zattoo useragent\n");
|
||||
return 1;
|
||||
}
|
||||
@@ -68,155 +43,216 @@ u_int8_t ndpi_int_zattoo_user_agent_set(struct ndpi_detection_module_struct *ndp
|
||||
void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
|
||||
struct ndpi_id_struct *src = flow->src;
|
||||
struct ndpi_id_struct *dst = flow->dst;
|
||||
|
||||
u_int16_t i;
|
||||
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_ZATTOO) {
|
||||
if (src != NULL && ((u_int32_t)
|
||||
(packet->tick_timestamp - src->zattoo_ts) < ndpi_struct->zattoo_connection_timeout)) {
|
||||
if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_ZATTOO) {
|
||||
if(src != NULL && ((u_int32_t) (packet->tick_timestamp - src->zattoo_ts) < ndpi_struct->zattoo_connection_timeout))
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
}
|
||||
if (dst != NULL && ((u_int32_t)
|
||||
(packet->tick_timestamp - dst->zattoo_ts) < ndpi_struct->zattoo_connection_timeout)) {
|
||||
if (dst != NULL && ((u_int32_t) (packet->tick_timestamp - dst->zattoo_ts) < ndpi_struct->zattoo_connection_timeout))
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
}
|
||||
return;
|
||||
}
|
||||
/* search over TCP */
|
||||
if(packet->tcp != NULL) {
|
||||
if(packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /frontdoor/fd?brand=Zattoo&v=", 33) == 0) {
|
||||
|
||||
if (packet->tcp != NULL) {
|
||||
if (packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /frontdoor/fd?brand=Zattoo&v=", 33) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "add connection over tcp with pattern GET /frontdoor/fd?brand=Zattoo&v=\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with pattern GET /frontdoor/fd?brand=Zattoo&v=\n");
|
||||
|
||||
if (src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if (dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len > 50
|
||||
&& memcmp(packet->payload, "GET /ZattooAdRedirect/redirect.jsp?user=", 40) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "add connection over tcp with pattern GET /ZattooAdRedirect/redirect.jsp?user=\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
if(packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /ZattooAdRedirect/redirect.jsp?user=", 40) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with pattern GET /ZattooAdRedirect/redirect.jsp?user=\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len > 50
|
||||
&& (memcmp(packet->payload, "POST /channelserver/player/channel/update HTTP/1.1", 50) == 0
|
||||
|| memcmp(packet->payload, "GET /epg/query", 14) == 0)) {
|
||||
if(packet->payload_packet_len > 50 && (memcmp(packet->payload, "POST /channelserver/player/channel/update HTTP/1.1", 50) == 0
|
||||
|| memcmp(packet->payload, "GET /epg/query", 14) == 0)) {
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
for (i = 0; i < packet->parsed_lines; i++) {
|
||||
if (packet->line[i].len >= 18 && (memcmp(packet->line[i].ptr, "User-Agent: Zattoo", 18) == 0)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
|
||||
NDPI_LOG_DEBUG,
|
||||
"add connection over tcp with pattern POST /channelserver/player/channel/update HTTP/1.1\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
for(i = 0; i < packet->parsed_lines; i++) {
|
||||
if(packet->line[i].len >= 18 && (memcmp(packet->line[i].ptr, "User-Agent: Zattoo", 18) == 0)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with pattern POST /channelserver/player/channel/update HTTP/1.1\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if (packet->payload_packet_len > 50
|
||||
&& (memcmp(packet->payload, "GET /", 5) == 0
|
||||
|| memcmp(packet->payload, "POST /", NDPI_STATICSTRING_LEN("POST /")) == 0)) {
|
||||
} else if(packet->payload_packet_len > 50 && (memcmp(packet->payload, "GET /", 5) == 0 || memcmp(packet->payload, "POST /", NDPI_STATICSTRING_LEN("POST /")) == 0)) {
|
||||
/* TODO to avoid searching currently only a specific length and offset is used
|
||||
* that might be changed later */
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (ndpi_int_zattoo_user_agent_set(ndpi_struct, flow)) {
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
if(ndpi_int_zattoo_user_agent_set(ndpi_struct, flow)) {
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
} else if (packet->payload_packet_len > 50 && memcmp(packet->payload, "POST http://", 12) == 0) {
|
||||
} else if(packet->payload_packet_len > 50 && memcmp(packet->payload, "POST http://", 12) == 0) {
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
|
||||
// test for unique character of the zattoo header
|
||||
if (packet->parsed_lines == 4 && packet->host_line.ptr != NULL) {
|
||||
if(packet->parsed_lines == 4 && packet->host_line.ptr != NULL) {
|
||||
u_int32_t ip;
|
||||
u_int16_t bytes_read = 0;
|
||||
|
||||
ip = ndpi_bytestream_to_ipv4(&packet->payload[12], packet->payload_packet_len, &bytes_read);
|
||||
|
||||
|
||||
// and now test the firt 5 bytes of the payload for zattoo pattern
|
||||
if (ip == packet->iph->daddr
|
||||
&& packet->empty_line_position_set != 0
|
||||
&& ((packet->payload_packet_len - packet->empty_line_position) > 10)
|
||||
&& packet->payload[packet->empty_line_position + 2] ==
|
||||
0x03
|
||||
&& packet->payload[packet->empty_line_position + 3] ==
|
||||
0x04
|
||||
&& packet->payload[packet->empty_line_position + 4] ==
|
||||
0x00
|
||||
&& packet->payload[packet->empty_line_position + 5] ==
|
||||
0x04
|
||||
&& packet->payload[packet->empty_line_position + 6] ==
|
||||
0x0a && packet->payload[packet->empty_line_position + 7] == 0x00) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "add connection over tcp with pattern POST http://\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
if(ip == packet->iph->daddr
|
||||
&& packet->empty_line_position_set != 0
|
||||
&& ((packet->payload_packet_len - packet->empty_line_position) > 10)
|
||||
&& packet->payload[packet->empty_line_position + 2] ==
|
||||
0x03
|
||||
&& packet->payload[packet->empty_line_position + 3] ==
|
||||
0x04
|
||||
&& packet->payload[packet->empty_line_position + 4] ==
|
||||
0x00
|
||||
&& packet->payload[packet->empty_line_position + 5] ==
|
||||
0x04
|
||||
&& packet->payload[packet->empty_line_position + 6] ==
|
||||
0x0a && packet->payload[packet->empty_line_position + 7] == 0x00) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with pattern POST http://\n");
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if (flow->zattoo_stage == 0) {
|
||||
} else if(flow->zattoo_stage == 0) {
|
||||
|
||||
if (packet->payload_packet_len > 50
|
||||
&& packet->payload[0] == 0x03
|
||||
&& packet->payload[1] == 0x04
|
||||
&& packet->payload[2] == 0x00
|
||||
&& packet->payload[3] == 0x04 && packet->payload[4] == 0x0a && packet->payload[5] == 0x00) {
|
||||
if(packet->payload_packet_len > 50
|
||||
&& packet->payload[0] == 0x03
|
||||
&& packet->payload[1] == 0x04
|
||||
&& packet->payload[2] == 0x00
|
||||
&& packet->payload[3] == 0x04 && packet->payload[4] == 0x0a && packet->payload[5] == 0x00) {
|
||||
flow->zattoo_stage = 1 + packet->packet_direction;
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "need next packet, seen pattern 0x030400040a00\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet, seen pattern 0x030400040a00\n");
|
||||
return;
|
||||
}
|
||||
/* the following is is searching for flash, not for zattoo. cust1 wants to do so. */
|
||||
} else if (flow->zattoo_stage == 2 - packet->packet_direction
|
||||
&& packet->payload_packet_len > 50 && packet->payload[0] == 0x03 && packet->payload[1] == 0x04) {
|
||||
/* the following is searching for flash, not for zattoo. */
|
||||
} else if(flow->zattoo_stage == 2 - packet->packet_direction && packet->payload_packet_len > 50 && packet->payload[0] == 0x03 && packet->payload[1] == 0x04) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with 0x0304.\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else if (flow->zattoo_stage == 1 + packet->packet_direction) {
|
||||
if (packet->payload_packet_len > 500 && packet->payload[0] == 0x00 && packet->payload[1] == 0x00) {
|
||||
|
||||
} else if(flow->zattoo_stage == 1 + packet->packet_direction) {
|
||||
if(packet->payload_packet_len > 500 && packet->payload[0] == 0x00 && packet->payload[1] == 0x00) {
|
||||
|
||||
flow->zattoo_stage = 3 + packet->packet_direction;
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
|
||||
NDPI_LOG_DEBUG, "need next packet, seen pattern 0x0000\n");
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet, seen pattern 0x0000\n");
|
||||
return;
|
||||
}
|
||||
if (packet->payload_packet_len > 50
|
||||
if(packet->payload_packet_len > 50
|
||||
&& packet->payload[0] == 0x03
|
||||
&& packet->payload[1] == 0x04
|
||||
&& packet->payload[2] == 0x00
|
||||
&& packet->payload[3] == 0x04 && packet->payload[4] == 0x0a && packet->payload[5] == 0x00) {
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"need next packet, seen pattern 0x030400040a00\n");
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet, seen pattern 0x030400040a00\n");
|
||||
return;
|
||||
} else if (flow->zattoo_stage == 4 - packet->packet_direction
|
||||
&& packet->payload_packet_len > 50 && packet->payload[0] == 0x03 && packet->payload[1] == 0x04) {
|
||||
|
||||
} else if(flow->zattoo_stage == 4 - packet->packet_direction && packet->payload_packet_len > 50 && packet->payload[0] == 0x03 && packet->payload[1] == 0x04) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with 0x0304.\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else if (flow->zattoo_stage == 5 + packet->packet_direction && (packet->payload_packet_len == 125)) {
|
||||
|
||||
} else if(flow->zattoo_stage == 5 + packet->packet_direction && (packet->payload_packet_len == 125)) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "detected zattoo.\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else if (flow->zattoo_stage == 6 - packet->packet_direction && packet->payload_packet_len == 1412) {
|
||||
|
||||
} else if(flow->zattoo_stage == 6 - packet->packet_direction && packet->payload_packet_len == 1412) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "found zattoo.\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"ZATTOO: discarted the flow (TCP): packet_size: %u; Flowstage: %u\n",
|
||||
"ZATTOO: discarded the flow (TCP): packet_size: %u; Flowstage: %u\n",
|
||||
packet->payload_packet_len, flow->zattoo_stage);
|
||||
|
||||
} else if (packet->udp != NULL) {
|
||||
}
|
||||
/* search over UDP */
|
||||
else if(packet->udp != NULL) {
|
||||
|
||||
if(packet->payload_packet_len > 20 && (packet->udp->dest == htons(5003) || packet->udp->source == htons(5003))
|
||||
&& (get_u_int16_t(packet->payload, 0) == htons(0x037a)
|
||||
|| get_u_int16_t(packet->payload, 0) == htons(0x0378)
|
||||
|| get_u_int16_t(packet->payload, 0) == htons(0x0305)
|
||||
|| get_u_int32_t(packet->payload, 0) == htonl(0x03040004)
|
||||
|| get_u_int32_t(packet->payload, 0) == htonl(0x03010005))) {
|
||||
|
||||
if(++flow->zattoo_stage == 2) {
|
||||
|
||||
if (packet->payload_packet_len > 20 && (packet->udp->dest == htons(5003)
|
||||
|| packet->udp->source == htons(5003))
|
||||
&& (get_u_int16_t(packet->payload, 0) == htons(0x037a)
|
||||
|| get_u_int16_t(packet->payload, 0) == htons(0x0378)
|
||||
|| get_u_int16_t(packet->payload, 0) == htons(0x0305)
|
||||
|| get_u_int32_t(packet->payload, 0) == htonl(0x03040004)
|
||||
|| get_u_int32_t(packet->payload, 0) == htonl(0x03010005))) {
|
||||
if (++flow->zattoo_stage == 2) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over udp.\n");
|
||||
ndpi_int_zattoo_add_connection(ndpi_struct, flow);
|
||||
if(src != NULL)
|
||||
src->zattoo_ts = packet->tick_timestamp;
|
||||
if(dst != NULL)
|
||||
dst->zattoo_ts = packet->tick_timestamp;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
}
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet udp.\n");
|
||||
@@ -228,7 +264,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
|
||||
packet->payload_packet_len, flow->zattoo_stage);
|
||||
|
||||
}
|
||||
|
||||
/* exclude ZATTOO */
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "exclude zattoo.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_ZATTOO);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* zmq.c
|
||||
*
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
* Copyright (C) 2016 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can zmqtribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
@@ -17,8 +17,6 @@
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_ZMQ
|
||||
@@ -30,6 +28,7 @@ static void ndpi_int_zmq_add_connection(struct ndpi_detection_module_struct *ndp
|
||||
|
||||
|
||||
static void ndpi_check_zmq(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
u_int32_t payload_len = packet->payload_packet_len;
|
||||
u_char p0[] = { 0x00, 0x00, 0x00, 0x05, 0x01, 0x66, 0x6c, 0x6f, 0x77 };
|
||||
@@ -50,7 +49,6 @@ static void ndpi_check_zmq(struct ndpi_detection_module_struct *ndpi_struct, str
|
||||
memcpy(flow->l4.tcp.prev_zmq_pkt, packet->payload, flow->l4.tcp.prev_zmq_pkt_len);
|
||||
return; /* Too early */
|
||||
}
|
||||
|
||||
if(payload_len == 2) {
|
||||
if(flow->l4.tcp.prev_zmq_pkt_len == 2) {
|
||||
if((memcmp(packet->payload, "\01\01", 2) == 0)
|
||||
@@ -90,8 +88,8 @@ void ndpi_search_zmq(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
NDPI_LOG(NDPI_PROTOCOL_ZMQ, ndpi_struct, NDPI_LOG_TRACE, "ZMQ detection...\n");
|
||||
|
||||
/* skip marked packets */
|
||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_ZMQ) {
|
||||
if (packet->tcp_retransmission == 0) {
|
||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_ZMQ) {
|
||||
if(packet->tcp && packet->tcp_retransmission == 0) {
|
||||
ndpi_check_zmq(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -236,7 +236,7 @@ MRT Credits
|
||||
originally written by him.
|
||||
|
||||
Alexey Kuznetsov made enhancements to 1.4.3a and fixed the Linux
|
||||
kernel intarface. Linux's netlink interface was written, referring to
|
||||
kernel interface. Linux's netlink interface was written, referring to
|
||||
his code "iproute2".
|
||||
|
||||
We would also like to thank our other colleagues in Japan, Portugal,
|
||||
|
||||
+5
-2
@@ -84,7 +84,7 @@ int ndpi_comp_with_mask (void *addr, void *dest, u_int mask) {
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* this allows imcomplete prefix */
|
||||
/* this allows incomplete prefix */
|
||||
int
|
||||
ndpi_my_inet_pton (int af, const char *src, void *dst)
|
||||
{
|
||||
@@ -769,6 +769,7 @@ ndpi_patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
|
||||
}
|
||||
|
||||
new_node = (patricia_node_t*)ndpi_calloc(1, sizeof *new_node);
|
||||
if(!new_node) return NULL;
|
||||
new_node->bit = prefix->bitlen;
|
||||
new_node->prefix = ndpi_Ref_Prefix (prefix);
|
||||
new_node->parent = NULL;
|
||||
@@ -821,6 +822,8 @@ ndpi_patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
|
||||
}
|
||||
else {
|
||||
glue = (patricia_node_t*)ndpi_calloc(1, sizeof *glue);
|
||||
|
||||
if(!glue) return(NULL);
|
||||
glue->bit = differ_bit;
|
||||
glue->prefix = NULL;
|
||||
glue->parent = node->parent;
|
||||
@@ -872,7 +875,7 @@ ndpi_patricia_remove (patricia_tree_t *patricia, patricia_node_t *node)
|
||||
#endif /* PATRICIA_DEBUG */
|
||||
|
||||
/* this might be a placeholder node -- have to check and make sure
|
||||
* there is a prefix aossciated with it ! */
|
||||
* there is a prefix associated with it ! */
|
||||
if(node->prefix != NULL)
|
||||
ndpi_Deref_Prefix (node->prefix);
|
||||
node->prefix = NULL;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user