Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09c1765766 |
+27
-38
@@ -1,56 +1,45 @@
|
|||||||
|
*.[oa]
|
||||||
*~
|
*~
|
||||||
/aclocal.m4
|
*o.cmd
|
||||||
/autom4te.cache/
|
*.lo
|
||||||
.autotools
|
*.obj
|
||||||
compile
|
*o.cmd
|
||||||
/compile
|
*.ko
|
||||||
|
*.swp
|
||||||
|
*.in
|
||||||
|
*.la
|
||||||
|
.libs
|
||||||
|
.dirstamp
|
||||||
|
stamp-h1
|
||||||
|
/configure
|
||||||
/config.guess
|
/config.guess
|
||||||
/config.h
|
/config.h
|
||||||
/config.h.in
|
/config.h.in
|
||||||
|
/config.sub
|
||||||
/config.log
|
/config.log
|
||||||
/config.status
|
/config.status
|
||||||
/config.sub
|
|
||||||
/configure
|
|
||||||
/configure.ac
|
|
||||||
/configure.tmp
|
|
||||||
.cproject
|
|
||||||
/depcomp
|
/depcomp
|
||||||
.dirstamp
|
|
||||||
/example/.deps/
|
|
||||||
/example/Makefile
|
|
||||||
/example/ndpiReader
|
|
||||||
/example/Makefile.dpdk
|
|
||||||
/example/build
|
|
||||||
*.in
|
|
||||||
/install-sh
|
/install-sh
|
||||||
*.ko
|
|
||||||
*.la
|
|
||||||
/libndpi.pc
|
|
||||||
.libs
|
|
||||||
/libtool
|
|
||||||
*.lo
|
|
||||||
/ltmain.sh
|
/ltmain.sh
|
||||||
|
/missing
|
||||||
|
/Makefile
|
||||||
|
/libndpi.pc
|
||||||
|
/libtool
|
||||||
|
/src/lib/Makefile
|
||||||
|
/src/include/Makefile
|
||||||
|
/example/ndpiReader
|
||||||
|
/example/Makefile
|
||||||
|
/aclocal.m4
|
||||||
/m4/libtool.m4
|
/m4/libtool.m4
|
||||||
/m4/lt~obsolete.m4
|
|
||||||
/m4/ltoptions.m4
|
/m4/ltoptions.m4
|
||||||
/m4/ltsugar.m4
|
/m4/ltsugar.m4
|
||||||
/m4/ltversion.m4
|
/m4/ltversion.m4
|
||||||
/Makefile
|
/m4/lt~obsolete.m4
|
||||||
/missing
|
/autom4te.cache/
|
||||||
*.[o]
|
/compile
|
||||||
*.obj
|
/example/.deps/
|
||||||
*o.cmd
|
|
||||||
*o.cmd
|
|
||||||
.project
|
|
||||||
.settings
|
|
||||||
/src/include/Makefile
|
|
||||||
/src/include/ndpi_config.h
|
|
||||||
/src/include/ndpi_define.h
|
|
||||||
/src/lib/.deps/
|
/src/lib/.deps/
|
||||||
/src/lib/Makefile
|
|
||||||
/src/lib/protocols/.deps/
|
/src/lib/protocols/.deps/
|
||||||
/src/lib/third_party/src/.deps/
|
/src/lib/third_party/src/.deps/
|
||||||
stamp-h1
|
|
||||||
*.swp
|
|
||||||
/test-driver
|
/test-driver
|
||||||
/tests/Makefile
|
/tests/Makefile
|
||||||
|
|||||||
+2
-181
@@ -1,184 +1,5 @@
|
|||||||
# CHANGELOG
|
# CHANGELOG
|
||||||
|
|
||||||
#### nDPI 2.6 (December 2018)
|
|
||||||
|
|
||||||
## New Supported Protocols and Services
|
|
||||||
|
|
||||||
* New Bitcoin, Ethereum, ZCash, Monero dissectors all identified as Mining
|
|
||||||
* New Signal.org dissector
|
|
||||||
* New Nest Log Sink dissector
|
|
||||||
* New UPnP dissector
|
|
||||||
* Added support for SMBv1 traffic, split from SMBv23
|
|
||||||
|
|
||||||
## Improvements
|
|
||||||
|
|
||||||
* Improved Skype detection, merged Skype call in/out into Skype Call
|
|
||||||
* Improved heuristics for Skype, Teredo, Netbios
|
|
||||||
* Improved SpeedTest (Ookla) detection
|
|
||||||
* Improved WhatsApp detection
|
|
||||||
* Improved WeChat detection
|
|
||||||
* Improved Facebook Messenger detection
|
|
||||||
* Improved Messenger/Hangout detection
|
|
||||||
* Improved SSL detection, prevent false positives
|
|
||||||
* Improved guess for UDP protocols
|
|
||||||
* Improved STUN detection
|
|
||||||
* Added more Ubuntu servers
|
|
||||||
* Added missing categorization with giveup/guess
|
|
||||||
* Optimizations for TCP flows that do not start with a SYN packet (early giveup)
|
|
||||||
|
|
||||||
## Fixes
|
|
||||||
|
|
||||||
* Fixed eDonkey false positives
|
|
||||||
* Fixed Dropbox dissector
|
|
||||||
* Fixed Spotify dissector
|
|
||||||
* Fixed custom protocol loading
|
|
||||||
* Fixed missing Application Data packet for TLS
|
|
||||||
* Fixed buffer overflows
|
|
||||||
* Fixed custom categories match by IP
|
|
||||||
* Fixed category field not accounted in ndpi_get_proto_category
|
|
||||||
* Fixed null pointer dereference in ndpi_detection_process_packet
|
|
||||||
* Fixed compilation on Mac
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
* Deb and RPM packages: ndpi with shared libraries and binaries, ndpi-dev with headers and static libraries
|
|
||||||
* Protocols now have an optional subprotocol: Spotify cannot have subprotocols, DNS can (DNS.Spotify)
|
|
||||||
* New API functions:
|
|
||||||
- ndpi_fill_ip_protocol_category to handle ICMP flows category
|
|
||||||
- ndpi_flowv4_flow_hash and ndpi_flowv6_flow_hash to support the Community ID Flow Hashing (https://github.com/corelight/community-id-spec)
|
|
||||||
- ndpi_protocol2id to print the protocol as ID
|
|
||||||
- ndpi_get_custom_category_match to search host in custom categories
|
|
||||||
* Changed ndpi_detection_giveup API: guess is now part of the call
|
|
||||||
* Added DPDK support to ndpiReader
|
|
||||||
* Removed Musical.ly protocol (service no longer used)
|
|
||||||
* Custom categories have now priority over protocol related categories
|
|
||||||
* Improved clang support
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#### nDPI 2.4 (August 2018)
|
|
||||||
|
|
||||||
## New Supported Protocols and Services
|
|
||||||
|
|
||||||
* Showmax.com
|
|
||||||
* Musical.ly
|
|
||||||
* RapidVideo
|
|
||||||
* VidTO streaming service
|
|
||||||
* Apache JServ Protocol
|
|
||||||
* Facebook Messenger
|
|
||||||
* FacebookZero protocol
|
|
||||||
|
|
||||||
## Improvements
|
|
||||||
|
|
||||||
* Improved YouTube support
|
|
||||||
* Improved Netflix support
|
|
||||||
* Updated Google Hangout detection
|
|
||||||
* Updated Twitter address range
|
|
||||||
* Updated Viber ports, subnet and domain
|
|
||||||
* Updated AmazonVideo detection
|
|
||||||
* Updated list of FaceBook sites
|
|
||||||
* Initial Skype in/out support
|
|
||||||
* Improved Tor detection
|
|
||||||
* Improved hyperscan support and category definition
|
|
||||||
* Custom categories loading, extended ndpiReader (`-c <file>`) for loading name-based categories
|
|
||||||
|
|
||||||
## Fixes
|
|
||||||
|
|
||||||
* Fixes for Instagram flows classified as Facebook
|
|
||||||
* Fixed Spotify detection
|
|
||||||
* Fixed minimum packet payload length for SSDP
|
|
||||||
* Fixed length check in MSN, x-steam-sid, Tor certificate name
|
|
||||||
* Increase client's maximum payload length for SSH
|
|
||||||
* Fixed end-of-line bounds handling
|
|
||||||
* Fixed substring matching
|
|
||||||
* Fix for handling IP address based custom categories
|
|
||||||
* Repaired wrong timestamp calculation
|
|
||||||
* Fixed memory leak
|
|
||||||
* Optimized memory usage
|
|
||||||
|
|
||||||
## Other/Changes
|
|
||||||
|
|
||||||
* New API calls:
|
|
||||||
* `ndpi_set_detection_preferences()`
|
|
||||||
* `ndpi_load_hostname_category()`
|
|
||||||
* `ndpi_enable_loaded_categories()`
|
|
||||||
* `ndpi_fill_protocol_category()`
|
|
||||||
* `ndpi_process_extra_packet()`
|
|
||||||
* Skype CallIn/CallOut are now set as Skype.SkypeCallOut Skype.SkypeCallIn
|
|
||||||
* Added support for SMTPS on port 587
|
|
||||||
* Changed RTP from VoIP to Media category
|
|
||||||
* Added site unavailable category
|
|
||||||
* Added custom categories CUSTOM_CATEGORY_MINING, CUSTOM_CATEGORY_MALWARE, CUSTOM_CATEGORY_ADVERTISEMENT, CUSTOM_CATEGORY_BANNED_SITE
|
|
||||||
* Implemented hash-based categories
|
|
||||||
* Converted some not popular protocols to NDPI_PROTOCOL_GENERIC with category detection
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#### nDPI 2.2.2 (April 2018)
|
|
||||||
|
|
||||||
## Main New Features
|
|
||||||
|
|
||||||
* Hyperscan support
|
|
||||||
* `ndpi_get_api_version` API call to be used in applications that are dynamically linking with nDPI
|
|
||||||
* `--enable-debug-messages` to enable debug information output
|
|
||||||
* Increased number of protocols to 512
|
|
||||||
|
|
||||||
## New Supported Protocols and Services
|
|
||||||
|
|
||||||
* GoogleDocs
|
|
||||||
* GoogleServices
|
|
||||||
* AmazonVideo
|
|
||||||
* ApplePush
|
|
||||||
* Diameter
|
|
||||||
* GooglePlus
|
|
||||||
* WhatsApp file exchage
|
|
||||||
|
|
||||||
## Improvements
|
|
||||||
|
|
||||||
* WhatsApp detection
|
|
||||||
* Amazon detection
|
|
||||||
* Improved Google Drive
|
|
||||||
* Improved Spotify support
|
|
||||||
* Improved SNI matching when using office365
|
|
||||||
* Improved HostShield VPN
|
|
||||||
|
|
||||||
## Fixes
|
|
||||||
|
|
||||||
* Fixed invalid RTP/Skype detection
|
|
||||||
* Fixed possible out-of-bounds due to malformed DHCP packets
|
|
||||||
* Fixed buffer overflow in function `ndpi_debug_printf`
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#### nDPI 2.2 (December 2017)
|
|
||||||
|
|
||||||
## Main New Features
|
|
||||||
|
|
||||||
* Custom protocol categories to allow personalization of protocols-categories mappings
|
|
||||||
* DHCP fingerprinting
|
|
||||||
* HTTP User Agent discovery
|
|
||||||
|
|
||||||
|
|
||||||
## New Supported Protocols and Services
|
|
||||||
|
|
||||||
* ICQ (instant messaging client)
|
|
||||||
* YouTube Upload
|
|
||||||
* LISP
|
|
||||||
* SoundCloud
|
|
||||||
* Sony PlayStation
|
|
||||||
* Nintendo (switch) gaming protocol
|
|
||||||
|
|
||||||
|
|
||||||
## Improvements
|
|
||||||
|
|
||||||
* Windows 10 detection from UA and indentation
|
|
||||||
* Determine STUN flows that turn into RTP
|
|
||||||
* Fixes for iQIYI and 1kxun
|
|
||||||
* Android fingerprint
|
|
||||||
* Added DHCP class identifier support
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#### nDPI 2.0 (May 2017)
|
#### nDPI 2.0 (May 2017)
|
||||||
|
|
||||||
## Main New Features
|
## Main New Features
|
||||||
@@ -209,7 +30,7 @@
|
|||||||
* Ubiquity AirControl 2
|
* Ubiquity AirControl 2
|
||||||
* HEP (Extensible Encapsulation Protocol)
|
* HEP (Extensible Encapsulation Protocol)
|
||||||
* WhatsApp Voice vs WhatsApp (chat, no voice)
|
* WhatsApp Voice vs WhatsApp (chat, no voice)
|
||||||
* Viber
|
* Viber
|
||||||
* Wechat
|
* Wechat
|
||||||
* Github
|
* Github
|
||||||
* Hotmail
|
* Hotmail
|
||||||
@@ -238,7 +59,7 @@
|
|||||||
* Improved HTTP subprotocol matching
|
* Improved HTTP subprotocol matching
|
||||||
* Implemented DHCP host name extraction
|
* Implemented DHCP host name extraction
|
||||||
* Updated Facebook detection by ip server ranges
|
* Updated Facebook detection by ip server ranges
|
||||||
* Updated Twitter networks
|
* Updated Twitter networks
|
||||||
* Improved Microsoft detection
|
* Improved Microsoft detection
|
||||||
* Enhanced Google detection
|
* Enhanced Google detection
|
||||||
* Improved BT-uTP protocol dissection
|
* Improved BT-uTP protocol dissection
|
||||||
|
|||||||
+3
-2
@@ -1,7 +1,8 @@
|
|||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = src/lib example tests
|
SUBDIRS = src/lib example tests
|
||||||
|
|
||||||
pkgconfigdir = $(prefix)/libdata/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libndpi.pc
|
pkgconfig_DATA = libndpi.pc
|
||||||
|
|
||||||
EXTRA_DIST = autogen.sh
|
EXTRA_DIST = libndpi.sym autogen.sh
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
# nDPI
|
# nDPI
|
||||||
|
|
||||||
[](https://travis-ci.org/ntop/nDPI)
|
[](https://travis-ci.org/ntop/nDPI)
|
||||||
[](https://lgtm.com/projects/g/ntop/nDPI/context:cpp)
|
|
||||||
[](https://lgtm.com/projects/g/ntop/nDPI/alerts)
|
|
||||||
|
|
||||||
## What is nDPI ?
|
## What is nDPI ?
|
||||||
|
|
||||||
@@ -31,18 +29,20 @@ The entire procedure of adding new protocols in detail:
|
|||||||
|
|
||||||
1. Add new protocol together with its unique ID to: src/include/ndpi_protocol_ids.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/
|
2. Create a new protocol in: src/lib/protocols/
|
||||||
3. Variables to be kept for the duration of the entire flow (as state variables) need to be placed in: src/include/ndpi_typedefs.h in ndpi_flow_tcp_struct (for TCP only), ndpi_flow_udp_struct (for UDP only), or ndpi_flow_struct (for both).
|
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
|
4. Add a new entry for the search function for the new protocol in: src/include/ndpi_protocols.h
|
||||||
5. Choose (do not change anything) a selection bitmask from: src/include/ndpi_define.h
|
5. Choose (do not change anything) a selection bitmask from: src/include/ndpi_define.h
|
||||||
6. Add a new entry in ndpi_set_protocol_detection_bitmask2 in: src/lib/ndpi_main.c
|
6. Add a new entry in ndpi_set_protocol_detection_bitmask2 in: src/lib/ndpi_main.c
|
||||||
7. Set protocol default ports in ndpi_init_protocol_defaults in: src/lib/ndpi_main.c
|
7. Set protocol default ports in ndpi_init_protocol_defaults in: src/lib/ndpi_main.c
|
||||||
8. ./autogen.sh
|
8. Add the new protocol file to: src/lib/Makefile.am
|
||||||
9. make
|
9. ./autogen.sh
|
||||||
10. make check
|
10. ./configure
|
||||||
|
11. make
|
||||||
|
12. make check
|
||||||
|
|
||||||
### How to use nDPI to Block Selected Traffic
|
### How to use nDPI to Block Selected Traffic
|
||||||
|
|
||||||
You can use nDPI to selectively block selected Internet traffic by embedding it onto an application (remember that nDPI is just a library). Both [ntopng](https://github.com/ntop/ntopng) and [nProbe cento](http://www.ntop.org/products/netflow/nprobe-cento/) can do this.
|
You can use nDPI to selectively block selected Internet traffic by embedding it onto an application (remember that nDPI us just a library). Both [ntopng](https://github.com/ntop/ntopng) and [nProbe cento](http://www.ntop.org/products/netflow/nprobe-cento/) can do this.
|
||||||
|
|
||||||
### DISCLAIMER
|
### 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.
|
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.
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ Prerequisites for Compilation
|
|||||||
Prerequisites
|
Prerequisites
|
||||||
- GNU autotools/libtool
|
- GNU autotools/libtool
|
||||||
- libpcap or PF_RING (optional but recommended)
|
- libpcap or PF_RING (optional but recommended)
|
||||||
- apt-get install libjson-c-dev (for JSON support)
|
|
||||||
|
|
||||||
On Ubuntu/Debian
|
On Ubuntu/Debian
|
||||||
- apt-get install build-essential
|
- apt-get install build-essential
|
||||||
|
|||||||
+6
-21
@@ -1,17 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
NDPI_MAJOR="2"
|
|
||||||
NDPI_MINOR="6"
|
|
||||||
NDPI_PATCH="0"
|
|
||||||
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
|
||||||
|
|
||||||
rm -f configure config.h config.h.in
|
/bin/rm -f configure config.h config.h.in src/lib/Makefile.in
|
||||||
|
|
||||||
AUTOCONF=$(command -v autoconf)
|
AUTOCONF=$(which autoconf)
|
||||||
AUTOMAKE=$(command -v automake)
|
AUTOMAKE=$(which automake)
|
||||||
LIBTOOL=$(command -v libtool)
|
LIBTOOL=$(which libtool)
|
||||||
LIBTOOLIZE=$(command -v libtoolize)
|
LIBTOOLIZE=$(which libtoolize)
|
||||||
AUTORECONF=$(command -v autoreconf)
|
AUTORECONF=$(which autoreconf)
|
||||||
|
|
||||||
if test -z $AUTOCONF; then
|
if test -z $AUTOCONF; then
|
||||||
echo "autoconf is missing: please install it and try again"
|
echo "autoconf is missing: please install it and try again"
|
||||||
@@ -33,16 +29,5 @@ if test -z $AUTORECONF; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat configure.seed | sed \
|
|
||||||
-e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \
|
|
||||||
-e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \
|
|
||||||
-e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \
|
|
||||||
-e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
|
|
||||||
> configure.ac
|
|
||||||
|
|
||||||
autoreconf -ivf
|
autoreconf -ivf
|
||||||
cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp
|
|
||||||
cat configure.tmp > configure
|
|
||||||
|
|
||||||
chmod +x configure
|
|
||||||
./configure $*
|
./configure $*
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
AC_INIT([libndpi], [@NDPI_VERSION_SHORT@])
|
AC_INIT([libndpi], [2.0.0])
|
||||||
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
@@ -10,15 +10,6 @@ AC_PROG_CC
|
|||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
AX_PTHREAD
|
AX_PTHREAD
|
||||||
|
|
||||||
NDPI_VERSION_SHORT="@NDPI_VERSION_SHORT@"
|
|
||||||
NDPI_MAJOR="@NDPI_MAJOR@"
|
|
||||||
NDPI_MINOR="@NDPI_MINOR@"
|
|
||||||
NDPI_PATCH="@NDPI_PATCH@"
|
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED(NDPI_MAJOR_RELEASE, "${NDPI_MAJOR}", [nDPI major release])
|
|
||||||
AC_DEFINE_UNQUOTED(NDPI_MINOR_RELEASE, "${NDPI_MINOR}", [nDPI minor release])
|
|
||||||
AC_DEFINE_UNQUOTED(NDPI_PATCH_LEVEL, "${NDPI_PATCH}", [nDPI patch level])
|
|
||||||
|
|
||||||
if test -d ".git"; then :
|
if test -d ".git"; then :
|
||||||
GIT_TAG=`git log -1 --format=%h`
|
GIT_TAG=`git log -1 --format=%h`
|
||||||
GIT_DATE=`git log -1 --format=%cd`
|
GIT_DATE=`git log -1 --format=%cd`
|
||||||
@@ -40,14 +31,6 @@ AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h])
|
|||||||
|
|
||||||
PCAP_HOME=$HOME/PF_RING/userland
|
PCAP_HOME=$HOME/PF_RING/userland
|
||||||
|
|
||||||
DPDK_TARGET=
|
|
||||||
if test -d $HOME/DPDK; then :
|
|
||||||
echo "Enabling DPDK support in ndpiReader"
|
|
||||||
DPDK_TARGET=dpdk
|
|
||||||
else
|
|
||||||
echo "DPDK support disabled (missing $HOME/DPDK)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -d $PCAP_HOME; then :
|
if test -d $PCAP_HOME; then :
|
||||||
echo -n ""
|
echo -n ""
|
||||||
else
|
else
|
||||||
@@ -57,41 +40,7 @@ SHORT_MACHINE=`uname -m | cut -b1-3`
|
|||||||
if test $SHORT_MACHINE = "arm"; then
|
if test $SHORT_MACHINE = "arm"; then
|
||||||
LIBNUMA=""
|
LIBNUMA=""
|
||||||
else
|
else
|
||||||
AC_CHECK_LIB([numa], [numa_available], [LIBNUMA="-lnuma"])
|
LIBNUMA="-lnuma"
|
||||||
fi
|
|
||||||
|
|
||||||
MACHINE=`uname -m`
|
|
||||||
SYSTEM=`uname -s`
|
|
||||||
if test $SYSTEM = "Darwin"; then
|
|
||||||
CC=clang
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $ax_cv_PTHREAD_CLANG = "yes"; then
|
|
||||||
CC=clang
|
|
||||||
fi
|
|
||||||
|
|
||||||
HS_LIB=
|
|
||||||
HS_INC=
|
|
||||||
|
|
||||||
AC_ARG_WITH(hyperscan, [ --with-hyperscan Enable nDPI build with Intel Hyperscan])
|
|
||||||
|
|
||||||
if test "${with_hyperscan+set}" = set; then
|
|
||||||
BKP=$LIBS
|
|
||||||
LIBS="$LIBS -lstdc++ -lm"
|
|
||||||
AC_CHECK_LIB([hs], [hs_compile_multi], AC_DEFINE_UNQUOTED(HAVE_HYPERSCAN, 1, [Intel Hyperscan is present]))
|
|
||||||
LIBS=$BKP
|
|
||||||
|
|
||||||
if test "x$ac_cv_lib_hs_hs_compile_multi" = xyes; then :
|
|
||||||
AC_CHECK_LIB([m], [pow])
|
|
||||||
AC_CHECK_LIB([stdc++], [main])
|
|
||||||
HS_INC=`pkg-config --cflags libhs`
|
|
||||||
HS_LIB=`pkg-config --libs libhs`
|
|
||||||
LDFLAGS="$LDFLAGS $HS_LIB"
|
|
||||||
AC_MSG_RESULT([compiling with Intel Hyperscan])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([Intel Hyperscan not found, exiting. See https://github.com/intel/hyperscan/blob/master/doc/dev-reference/getting_started.rst for install/build instructions])
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
||||||
@@ -130,38 +79,19 @@ AS_IF([test "x$enable_json_c" != "xno"], [
|
|||||||
LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)"
|
LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)"
|
||||||
AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present]))
|
AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present]))
|
||||||
],
|
],
|
||||||
[
|
[])
|
||||||
JSONC_HOME="$HOME/json-c"
|
|
||||||
if test -d "$JSONC_HOME"; then :
|
|
||||||
CFLAGS="$CFLAGS -I $JSONC_HOME"
|
|
||||||
LDFLAGS="$LDFLAGS $JSONC_HOME/.libs/libjson-c.a"
|
|
||||||
AC_MSG_RESULT([Found json-c in $JSONC_HOME])
|
|
||||||
AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_ARG_ENABLE([debug-messages],
|
|
||||||
AS_HELP_STRING([--enable-debug-messages], [Define NDPI_ENABLE_DEBUG_MESSAGES=1]), [
|
|
||||||
AC_DEFINE(NDPI_ENABLE_DEBUG_MESSAGES, 1, [Enable ndpi_debug_messages]) ])
|
|
||||||
|
|
||||||
AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np]))
|
AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np]))
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile example/Makefile example/Makefile.dpdk tests/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile])
|
AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile tests/Makefile libndpi.pc])
|
||||||
AC_CONFIG_HEADERS(src/include/ndpi_config.h)
|
AC_CONFIG_HEADERS(config.h)
|
||||||
AC_SUBST(GIT_RELEASE)
|
AC_SUBST(GIT_RELEASE)
|
||||||
AC_SUBST(NDPI_MAJOR)
|
|
||||||
AC_SUBST(NDPI_MINOR)
|
|
||||||
AC_SUBST(NDPI_PATCH)
|
|
||||||
AC_SUBST(NDPI_VERSION_SHORT)
|
|
||||||
AC_SUBST(SVN_DATE)
|
AC_SUBST(SVN_DATE)
|
||||||
AC_SUBST(JSON_C_LIB)
|
AC_SUBST(JSON_C_LIB)
|
||||||
AC_SUBST(PCAP_INC)
|
AC_SUBST(PCAP_INC)
|
||||||
AC_SUBST(PCAP_LIB)
|
AC_SUBST(PCAP_LIB)
|
||||||
AC_SUBST(DL_LIB)
|
AC_SUBST(DL_LIB)
|
||||||
AC_SUBST(HS_LIB)
|
|
||||||
AC_SUBST(HS_INC)
|
|
||||||
AC_SUBST(DPDK_TARGET)
|
|
||||||
AC_SUBST(HAVE_PTHREAD_SETAFFINITY_NP)
|
AC_SUBST(HAVE_PTHREAD_SETAFFINITY_NP)
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
# How to use?
|
|
||||||
|
|
||||||
You need to first compile the nDPI library as usual:
|
|
||||||
|
|
||||||
- ./autogen.sh
|
|
||||||
- ./configure
|
|
||||||
- make
|
|
||||||
|
|
||||||
Then open the Xcode project and you are ready to go. The default behavior is to analyze an embeded pcap file `capture.pcap`. You can change the behavior by changing command line input in `ViewController.m` file.
|
|
||||||
|
|
||||||
# What does the XCode project do?
|
|
||||||
|
|
||||||
It's a dummy Mac App project with a **Run** button. It doesn't modify any nDPI code except that it renamed the `main` function to `orginal_main` in `ndpiReader.c` (because the Mac App has it's own main function) and call the `orginal_main` with synthetic command line input from `ViewController.m` file when the **Run** button is clicked.
|
|
||||||
|
|
||||||
It also fixes some problems when compiling with Xcode. Some are listed below:
|
|
||||||
- Add missed `NDPI_LOG_DEBUG2` macro definition implementation (defined as `NDPI_LOG_DEBUG2_XCODE_PROJ` in `ViewController.m`)
|
|
||||||
- Add an empty ndpi_utils.h file to make `protocols/attic/ftp.c` and `protocols/attic/secondlife.c` can compile
|
|
||||||
- Specially treat `ndpi_patricia.c` by not adding it into compilation source, since it's directly included in `ndpi_main.c`
|
|
||||||
File diff suppressed because it is too large
Load Diff
Generated
-7
@@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Workspace
|
|
||||||
version = "1.0">
|
|
||||||
<FileRef
|
|
||||||
location = "self:ndpiExample.xcodeproj">
|
|
||||||
</FileRef>
|
|
||||||
</Workspace>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - 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/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
|
||||||
|
|
||||||
@interface AppDelegate : NSObject <NSApplicationDelegate>
|
|
||||||
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - 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/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import "AppDelegate.h"
|
|
||||||
|
|
||||||
@interface AppDelegate ()
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
@implementation AppDelegate
|
|
||||||
|
|
||||||
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
|
|
||||||
// Insert code here to initialize your application
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
- (void)applicationWillTerminate:(NSNotification *)aNotification {
|
|
||||||
// Insert code here to tear down your application
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@end
|
|
||||||
-58
@@ -1,58 +0,0 @@
|
|||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "16x16",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "16x16",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "32x32",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "32x32",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "128x128",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "128x128",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "256x256",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "256x256",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "512x512",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "mac",
|
|
||||||
"size" : "512x512",
|
|
||||||
"scale" : "2x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,732 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
|
|
||||||
<dependencies>
|
|
||||||
<deployment identifier="macosx"/>
|
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
|
|
||||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
|
||||||
</dependencies>
|
|
||||||
<scenes>
|
|
||||||
<!--Application-->
|
|
||||||
<scene sceneID="JPo-4y-FX3">
|
|
||||||
<objects>
|
|
||||||
<application id="hnw-xV-0zn" sceneMemberID="viewController">
|
|
||||||
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
|
|
||||||
<items>
|
|
||||||
<menuItem title="ndpiExample" id="1Xt-HY-uBw">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="ndpiExample" systemMenu="apple" id="uQy-DD-JDr">
|
|
||||||
<items>
|
|
||||||
<menuItem title="About ndpiExample" id="5kV-Vb-QxS">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
|
|
||||||
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
|
|
||||||
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
|
|
||||||
<menuItem title="Services" id="NMo-om-nkz">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
|
|
||||||
<menuItem title="Hide ndpiExample" keyEquivalent="h" id="Olw-nP-bQN">
|
|
||||||
<connections>
|
|
||||||
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Show All" id="Kd2-mp-pUS">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
|
|
||||||
<menuItem title="Quit ndpiExample" keyEquivalent="q" id="4sb-4s-VLi">
|
|
||||||
<connections>
|
|
||||||
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="File" id="dMs-cI-mzQ">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="File" id="bib-Uj-vzu">
|
|
||||||
<items>
|
|
||||||
<menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
|
|
||||||
<connections>
|
|
||||||
<action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
|
|
||||||
<connections>
|
|
||||||
<action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Open Recent" id="tXI-mr-wws">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Clear Menu" id="vNY-rz-j42">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
|
|
||||||
<menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
|
|
||||||
<connections>
|
|
||||||
<action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
|
|
||||||
<connections>
|
|
||||||
<action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
|
|
||||||
<connections>
|
|
||||||
<action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H">
|
|
||||||
<connections>
|
|
||||||
<action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
|
|
||||||
<menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
|
|
||||||
<connections>
|
|
||||||
<action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Edit" id="5QF-Oa-p0T">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Edit" id="W48-6f-4Dl">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
|
|
||||||
<connections>
|
|
||||||
<action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
|
|
||||||
<connections>
|
|
||||||
<action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
|
|
||||||
<menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
|
|
||||||
<connections>
|
|
||||||
<action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
|
|
||||||
<connections>
|
|
||||||
<action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
|
|
||||||
<connections>
|
|
||||||
<action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Delete" id="pa3-QI-u2k">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
|
|
||||||
<connections>
|
|
||||||
<action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
|
|
||||||
<menuItem title="Find" id="4EN-yA-p0u">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Find" id="1b7-l0-nxx">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
|
|
||||||
<connections>
|
|
||||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
|
|
||||||
<connections>
|
|
||||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
|
|
||||||
<connections>
|
|
||||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
|
|
||||||
<connections>
|
|
||||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
|
|
||||||
<connections>
|
|
||||||
<action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
|
|
||||||
<connections>
|
|
||||||
<action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
|
|
||||||
<connections>
|
|
||||||
<action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
|
|
||||||
<menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Substitutions" id="9ic-FL-obx">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Show Substitutions" id="z6F-FW-3nz">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
|
|
||||||
<menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Smart Quotes" id="hQb-2v-fYv">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Smart Dashes" id="rgM-f4-ycn">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Smart Links" id="cwL-P1-jid">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Data Detectors" id="tRr-pd-1PS">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Text Replacement" id="HFQ-gK-NFA">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Transformations" id="2oI-Rn-ZJC">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Transformations" id="c8a-y6-VQd">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Make Upper Case" id="vmV-6d-7jI">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Make Lower Case" id="d9M-CD-aMd">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Capitalize" id="UEZ-Bs-lqG">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Speech" id="xrE-MZ-jX0">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Speech" id="3rS-ZA-NoH">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Start Speaking" id="Ynk-f8-cLZ">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Stop Speaking" id="Oyz-dy-DGm">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Format" id="jxT-CU-nIS">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Format" id="GEO-Iw-cKr">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Font" id="Gi5-1S-RQB">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq">
|
|
||||||
<connections>
|
|
||||||
<action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27">
|
|
||||||
<connections>
|
|
||||||
<action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq">
|
|
||||||
<connections>
|
|
||||||
<action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
|
|
||||||
<connections>
|
|
||||||
<action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
|
|
||||||
<menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL">
|
|
||||||
<connections>
|
|
||||||
<action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST">
|
|
||||||
<connections>
|
|
||||||
<action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
|
|
||||||
<menuItem title="Kern" id="jBQ-r6-VK2">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Kern" id="tlD-Oa-oAM">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Use Default" id="GUa-eO-cwY">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Use None" id="cDB-IK-hbR">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Tighten" id="46P-cB-AYj">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Loosen" id="ogc-rX-tC1">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Ligatures" id="o6e-r0-MWq">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Use Default" id="agt-UL-0e3">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Use None" id="J7y-lM-qPV">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Use All" id="xQD-1f-W4t">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Baseline" id="OaQ-X3-Vso">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Baseline" id="ijk-EB-dga">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Use Default" id="3Om-Ey-2VK">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Superscript" id="Rqc-34-cIF">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Subscript" id="I0S-gh-46l">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Raise" id="2h7-ER-AoG">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Lower" id="1tx-W0-xDw">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
|
|
||||||
<menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
|
|
||||||
<connections>
|
|
||||||
<action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
|
|
||||||
<menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Text" id="Fal-I4-PZk">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Text" id="d9c-me-L2H">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
|
|
||||||
<connections>
|
|
||||||
<action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
|
|
||||||
<connections>
|
|
||||||
<action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Justify" id="J5U-5w-g23">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
|
|
||||||
<connections>
|
|
||||||
<action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
|
|
||||||
<menuItem title="Writing Direction" id="H1b-Si-o9J">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem id="YGs-j5-SAR">
|
|
||||||
<string key="title"> Default</string>
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem id="Lbh-J2-qVU">
|
|
||||||
<string key="title"> Left to Right</string>
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem id="jFq-tB-4Kx">
|
|
||||||
<string key="title"> Right to Left</string>
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
|
|
||||||
<menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem id="Nop-cj-93Q">
|
|
||||||
<string key="title"> Default</string>
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem id="BgM-ve-c93">
|
|
||||||
<string key="title"> Left to Right</string>
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem id="RB4-Sm-HuC">
|
|
||||||
<string key="title"> Right to Left</string>
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
|
|
||||||
<menuItem title="Show Ruler" id="vLm-3I-IUL">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="View" id="H8h-7b-M4v">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="View" id="HyV-fh-RgO">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="hB3-LF-h0Y"/>
|
|
||||||
<menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="toggleFullScreen:" target="Ady-hI-5gd" id="dU3-MA-1Rq"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Window" id="aUF-d1-5bR">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
|
|
||||||
<items>
|
|
||||||
<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
|
|
||||||
<connections>
|
|
||||||
<action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Zoom" id="R4o-n2-Eq4">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
|
|
||||||
<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
<menuItem title="Help" id="wpr-3q-Mcd">
|
|
||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
|
||||||
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
|
|
||||||
<items>
|
|
||||||
<menuItem title="ndpiExample Help" keyEquivalent="?" id="FKE-Sm-Kum">
|
|
||||||
<connections>
|
|
||||||
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
|
|
||||||
</connections>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</menuItem>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
<connections>
|
|
||||||
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
|
|
||||||
</connections>
|
|
||||||
</application>
|
|
||||||
<customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
|
|
||||||
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
|
|
||||||
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
|
||||||
</objects>
|
|
||||||
<point key="canvasLocation" x="75" y="0.0"/>
|
|
||||||
</scene>
|
|
||||||
<!--Window Controller-->
|
|
||||||
<scene sceneID="R2V-B0-nI4">
|
|
||||||
<objects>
|
|
||||||
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
|
|
||||||
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
|
|
||||||
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
|
||||||
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
|
||||||
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
|
|
||||||
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
|
|
||||||
<connections>
|
|
||||||
<outlet property="delegate" destination="B8D-0N-5wS" id="98r-iN-zZc"/>
|
|
||||||
</connections>
|
|
||||||
</window>
|
|
||||||
<connections>
|
|
||||||
<segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
|
|
||||||
</connections>
|
|
||||||
</windowController>
|
|
||||||
<customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
|
||||||
</objects>
|
|
||||||
<point key="canvasLocation" x="75" y="250"/>
|
|
||||||
</scene>
|
|
||||||
<!--View Controller-->
|
|
||||||
<scene sceneID="hIz-AP-VOD">
|
|
||||||
<objects>
|
|
||||||
<viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController">
|
|
||||||
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
|
|
||||||
<autoresizingMask key="autoresizingMask"/>
|
|
||||||
<subviews>
|
|
||||||
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jdf-YK-4JB">
|
|
||||||
<rect key="frame" x="23" y="173" width="64" height="32"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
|
||||||
<buttonCell key="cell" type="push" title="Run" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1eG-Fb-Ybk">
|
|
||||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
|
||||||
<font key="font" metaFont="system"/>
|
|
||||||
</buttonCell>
|
|
||||||
<connections>
|
|
||||||
<action selector="onRunButtonClicked:" target="XfG-lQ-9wD" id="zyK-t7-vwt"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
</subviews>
|
|
||||||
</view>
|
|
||||||
</viewController>
|
|
||||||
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
|
||||||
</objects>
|
|
||||||
<point key="canvasLocation" x="75" y="655"/>
|
|
||||||
</scene>
|
|
||||||
</scenes>
|
|
||||||
</document>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
|
||||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>$(EXECUTABLE_NAME)</string>
|
|
||||||
<key>CFBundleIconFile</key>
|
|
||||||
<string></string>
|
|
||||||
<key>CFBundleIdentifier</key>
|
|
||||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
|
||||||
<string>6.0</string>
|
|
||||||
<key>CFBundleName</key>
|
|
||||||
<string>$(PRODUCT_NAME)</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
|
||||||
<string>APPL</string>
|
|
||||||
<key>CFBundleShortVersionString</key>
|
|
||||||
<string>1.0</string>
|
|
||||||
<key>CFBundleVersion</key>
|
|
||||||
<string>1</string>
|
|
||||||
<key>LSMinimumSystemVersion</key>
|
|
||||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
|
||||||
<key>NSHumanReadableCopyright</key>
|
|
||||||
<string>Copyright © 2018年 ZengYingpei. All rights reserved.</string>
|
|
||||||
<key>NSMainStoryboardFile</key>
|
|
||||||
<string>Main</string>
|
|
||||||
<key>NSPrincipalClass</key>
|
|
||||||
<string>NSApplication</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - 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/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
|
||||||
|
|
||||||
@interface ViewController : NSViewController
|
|
||||||
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - 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/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import "ViewController.h"
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
// Declare the orginal_main defined in ndpiReader.c here
|
|
||||||
extern int orginal_main(int argc, char **argv);
|
|
||||||
|
|
||||||
@implementation ViewController
|
|
||||||
|
|
||||||
- (void)viewDidLoad {
|
|
||||||
[super viewDidLoad];
|
|
||||||
|
|
||||||
// Do any additional setup after loading the view.
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
- (void)setRepresentedObject:(id)representedObject {
|
|
||||||
[super setRepresentedObject:representedObject];
|
|
||||||
|
|
||||||
// Update the view, if already loaded.
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
- (IBAction)onRunButtonClicked:(id)sender
|
|
||||||
{
|
|
||||||
char* args[10];
|
|
||||||
|
|
||||||
extern int optind;
|
|
||||||
optind = 1; // reset the parse of getopt_long
|
|
||||||
|
|
||||||
// Check the "nDPI_QuickStartGuide.pdf" for comand option explanation.
|
|
||||||
|
|
||||||
/* Following code it to execute below command (remember to change args[2] to
|
|
||||||
* absolute path):
|
|
||||||
* ./ndpiReader -i capture.pcap
|
|
||||||
*/
|
|
||||||
args[0] = (char*)"ndpiReader";
|
|
||||||
args[1] = (char*)"-i";
|
|
||||||
NSString* pcap_file = [[NSBundle mainBundle]pathForResource:@"capture" ofType:@"pcap"];
|
|
||||||
args[2] = (char*)[pcap_file cStringUsingEncoding:NSUTF8StringEncoding];
|
|
||||||
// Change to you pcap file path if you want.
|
|
||||||
//args[2] = (char*)"/Users/zengyingpei/Documents/code/nDPI/example/MacOS/ndpiExample/ndpiExample/capture.pcap";
|
|
||||||
// Remember to change below number of args when you change to other command inputs.
|
|
||||||
orginal_main(3, args);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Following code it to execute below command:
|
|
||||||
* ./ndpiReader -i en1 -s 10 -p protos.txt
|
|
||||||
* The process seems to be not support re-entering. You may have to re-run the App.
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
args[0] = (char*)"ndpiReader";
|
|
||||||
args[1] = (char*)"-i";
|
|
||||||
args[2] = (char*)"en0";
|
|
||||||
args[3] = (char*)"-s";
|
|
||||||
args[4] = (char*)"10";
|
|
||||||
args[5] = (char*)"-p";
|
|
||||||
NSString* proto_file = [[NSBundle mainBundle]pathForResource:@"protos" ofType:@"txt"];
|
|
||||||
args[6] = (char*)[proto_file cStringUsingEncoding:NSUTF8StringEncoding];
|
|
||||||
//args[6] = (char*)"/Users/zengyingpei/Documents/code/nDPI/example/protos.txt";
|
|
||||||
orginal_main(7, args);
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// In order to fix the missing of NDPI_LOG_DEBUG2 (used in ndpi_main.c), we define
|
|
||||||
// NDPI_LOG_DEBUG2 as NDPI_LOG_DEBUG2_XCODE_PROJ.
|
|
||||||
|
|
||||||
void vNDPI_LOG_DEBUG2_XCODE_PROJ(struct ndpi_detection_module_struct * ndpi_struct,
|
|
||||||
const char *format, va_list ap)
|
|
||||||
{
|
|
||||||
vprintf(format, ap);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NDPI_LOG_DEBUG2_XCODE_PROJ(struct ndpi_detection_module_struct * ndpi_struct,
|
|
||||||
const char *format, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
va_start (ap, format);
|
|
||||||
vNDPI_LOG_DEBUG2_XCODE_PROJ(ndpi_struct, format, ap);
|
|
||||||
va_end (ap);
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
|
||||||
Binary file not shown.
@@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - 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/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
|
||||||
|
|
||||||
int main(int argc, const char * argv[]) {
|
|
||||||
return NSApplicationMain(argc, argv);
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict/>
|
|
||||||
</plist>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
|
||||||
*
|
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
|
||||||
*
|
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* nDPI is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ndpi_utils_h
|
|
||||||
#define ndpi_utils_h
|
|
||||||
|
|
||||||
// Empty placeholder head file. Just to make the compilations of protocols/attic/ftp.c and
|
|
||||||
// protocols/attic/secondlife.c don't break.
|
|
||||||
|
|
||||||
#endif /* ndpi_utils_h */
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
bin_PROGRAMS = ndpiReader
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -I$(top_srcdir)/src/include @PCAP_INC@
|
||||||
|
AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage
|
||||||
|
|
||||||
|
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 ndpi_util.h
|
||||||
|
|
||||||
|
ndpiReader.o: ndpiReader.c
|
||||||
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
#
|
|
||||||
# Run 'make -f Makefile.dpdk' to compile the DPDK examples
|
|
||||||
#
|
|
||||||
# See http://core.dpdk.org/doc/quick-start/ for DPDK installation and setup
|
|
||||||
#
|
|
||||||
ifeq ($(RTE_SDK),)
|
|
||||||
#$(error "Please define RTE_SDK environment variable")
|
|
||||||
RTE_SDK = $(HOME)/DPDK
|
|
||||||
RTE_TARGET = build
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Default target, can be overridden by command line or environment
|
|
||||||
RTE_TARGET ?= x86_64-native-linuxapp-gcc
|
|
||||||
|
|
||||||
include $(RTE_SDK)/mk/rte.vars.mk
|
|
||||||
|
|
||||||
APP = ndpiReader.dpdk
|
|
||||||
LIBNDPI = $(PWD)/../src/lib/libndpi.a
|
|
||||||
|
|
||||||
SRCS-y := ndpi_util.c ndpiReader.c
|
|
||||||
|
|
||||||
CFLAGS += -g
|
|
||||||
CFLAGS += -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-unused-parameter -I $(PWD)/../src/include @CFLAGS@ -DUSE_DPDK
|
|
||||||
LDLIBS = $(LIBNDPI) @PCAP_LIB@ -lpthread @LDFLAGS@
|
|
||||||
|
|
||||||
include $(RTE_SDK)/mk/rte.extapp.mk
|
|
||||||
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
CC=@CC@
|
|
||||||
CFLAGS=-g -I../src/include @CFLAGS@
|
|
||||||
LIBNDPI=../src/lib/libndpi.a
|
|
||||||
LDFLAGS=$(LIBNDPI) @PCAP_LIB@ -lpthread @LDFLAGS@
|
|
||||||
OBJS=ndpiReader.o ndpi_util.o
|
|
||||||
PREFIX?=/usr/local
|
|
||||||
|
|
||||||
all: ndpiReader @DPDK_TARGET@
|
|
||||||
|
|
||||||
ndpiReader: $(OBJS) $(LIBNDPI)
|
|
||||||
$(CXX) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
|
|
||||||
|
|
||||||
%.o: %.c $(HEADERS) Makefile
|
|
||||||
$(CC) $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
install:
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin/
|
|
||||||
cp ndpiReader $(DESTDIR)$(PREFIX)/bin/
|
|
||||||
[ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
|
||||||
[ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
|
||||||
|
|
||||||
dpdk:
|
|
||||||
make -f Makefile.dpdk
|
|
||||||
|
|
||||||
clean:
|
|
||||||
/bin/rm -f *.o ndpiReader ndpiReader.dpdk
|
|
||||||
/bin/rm -f .*.dpdk.cmd .*.o.cmd *.dpdk.map .*.o.d
|
|
||||||
/bin/rm -f _install _postbuild _postinstall _preinstall
|
|
||||||
/bin/rm -rf build
|
|
||||||
|
|
||||||
distclean: clean
|
|
||||||
/bin/rm -f Makefile.dpdk
|
|
||||||
/bin/rm -f Makefile
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
Prerequisites
|
|
||||||
-------------
|
|
||||||
|
|
||||||
You need to install and compile DPDK in your HOME directory as explained in
|
|
||||||
See http://core.dpdk.org/doc/quick-start/ for DPDK installation and setup
|
|
||||||
|
|
||||||
Once DPDK is built make sure to create a symbolic link
|
|
||||||
|
|
||||||
$ cd
|
|
||||||
$ ln -s dpdk-18.08 DPDK
|
|
||||||
|
|
||||||
so the build process will use the DPDK directory letting you have multiple
|
|
||||||
DPDK versions available on your system
|
|
||||||
|
|
||||||
|
|
||||||
Build
|
|
||||||
-----
|
|
||||||
Everything will happen automagically but if you want to do it by hand
|
|
||||||
do: make -f Makefile.dpdk
|
|
||||||
|
|
||||||
|
|
||||||
Run Application
|
|
||||||
---------------
|
|
||||||
Supposing to capture packets from device eno1 you can start the
|
|
||||||
application as follows:
|
|
||||||
|
|
||||||
sudo ./build/ndpiReader -c 1 --vdev=net_pcap0,iface=eno1 -- -v 1
|
|
||||||
|
|
||||||
NOTE:
|
|
||||||
- ndpiReader without DPDK support sits in this directory
|
|
||||||
- ndpiReader with DPDK support can be found inside the ./build directory
|
|
||||||
@@ -1,262 +0,0 @@
|
|||||||
# NoCoin Filter List
|
|
||||||
# Blocking Web Browser Bitcoin Mining
|
|
||||||
#
|
|
||||||
# Homepage: https://github.com/hoshsadiq/adblock-nocoin-list/
|
|
||||||
# Contribute: https://github.com/hoshsadiq/adblock-nocoin-list/issues
|
|
||||||
# Changelog: https://github.com/hoshsadiq/adblock-nocoin-list/commits/master/hosts.txt
|
|
||||||
# License: https://mit-license.org/
|
|
||||||
#
|
|
||||||
# Last modified: 24 April 2018
|
|
||||||
#
|
|
||||||
|
|
||||||
cnhv.co 99
|
|
||||||
coin-hive.com 99
|
|
||||||
coinhive.com 99
|
|
||||||
authedmine.com 99
|
|
||||||
gus.host 99
|
|
||||||
load.jsecoin.com 99
|
|
||||||
miner.pr0gramm.com 99
|
|
||||||
minemytraffic.com 99
|
|
||||||
ppoi.org 99
|
|
||||||
projectpoi.com 99
|
|
||||||
crypto-loot.com 99
|
|
||||||
coinerra.com 99
|
|
||||||
coin-have.com 99
|
|
||||||
minero.pw 99
|
|
||||||
minero-proxy-01.now.sh 99
|
|
||||||
minero-proxy-02.now.sh 99
|
|
||||||
minero-proxy-03.now.sh 99
|
|
||||||
api.inwemo.com 99
|
|
||||||
rocks.io 99
|
|
||||||
adminer.com 99
|
|
||||||
ad-miner.com 99
|
|
||||||
jsccnn.com 99
|
|
||||||
jscdndel.com 99
|
|
||||||
coinhiveproxy.com 99
|
|
||||||
coinblind.com 99
|
|
||||||
coinnebula.com 99
|
|
||||||
monerominer.rocks 99
|
|
||||||
cdn.cloudcoins.co 99
|
|
||||||
coinlab.biz 99
|
|
||||||
go.megabanners.cf 99
|
|
||||||
baiduccdn1.com 99
|
|
||||||
wsp.marketgid.com 99
|
|
||||||
papoto.com 99
|
|
||||||
flare-analytics.com 99
|
|
||||||
www.sparechange.io 99
|
|
||||||
static.sparechange.io 99
|
|
||||||
miner.nablabee.com 99
|
|
||||||
m.anyfiles.ovh 99
|
|
||||||
www.freecontent.bid 99
|
|
||||||
www.freecontent.loan 99
|
|
||||||
www.freecontent.win 99
|
|
||||||
www.cryptonoter.com 99
|
|
||||||
www.mutuza.win 99
|
|
||||||
cryweb.github.io 99
|
|
||||||
crywebber.github.io 99
|
|
||||||
crypto-webminer.com 99
|
|
||||||
cdn.adless.io 99
|
|
||||||
hegrinhar.com 99
|
|
||||||
verresof.com 99
|
|
||||||
hemnes.win 99
|
|
||||||
tidafors.xyz 99
|
|
||||||
moneone.ga 99
|
|
||||||
plexcoin.info 99
|
|
||||||
www.monkeyminer.net 99
|
|
||||||
go2.mercy.ga 99
|
|
||||||
coinpirate.cf 99
|
|
||||||
d.cpufan.club 99
|
|
||||||
krb.devphp.org.ua 99
|
|
||||||
nfwebminer.com 99
|
|
||||||
cfcdist.gdn 99
|
|
||||||
node.cfcdist.gdn 99
|
|
||||||
webxmr.com 99
|
|
||||||
xmr.mining.best 99
|
|
||||||
webminepool.com 99
|
|
||||||
webminepool.tk 99
|
|
||||||
hive.tubetitties.com 99
|
|
||||||
playerassets.info 99
|
|
||||||
tokyodrift.ga 99
|
|
||||||
webassembly.stream 99
|
|
||||||
okeyletsgo.ml 99
|
|
||||||
candid.zone 99
|
|
||||||
webmine.pro 99
|
|
||||||
andlache.com 99
|
|
||||||
bablace.com 99
|
|
||||||
bewaslac.com 99
|
|
||||||
biberukalap.com 99
|
|
||||||
bowithow.com 99
|
|
||||||
butcalve.com 99
|
|
||||||
evengparme.com 99
|
|
||||||
gridiogrid.com 99
|
|
||||||
hatcalter.com 99
|
|
||||||
kedtise.com 99
|
|
||||||
ledinund.com 99
|
|
||||||
nathetsof.com 99
|
|
||||||
renhertfo.com 99
|
|
||||||
rintindown.com 99
|
|
||||||
sparnove.com 99
|
|
||||||
witthethim.com 99
|
|
||||||
1q2w3.fun 99
|
|
||||||
1q2w3.me 99
|
|
||||||
cryptoloot.pro 99
|
|
||||||
bjorksta.men 99
|
|
||||||
crypto.csgocpu.com 99
|
|
||||||
noblock.pro 99
|
|
||||||
miner.cryptobara.com 99
|
|
||||||
digger.cryptobara.com 99
|
|
||||||
dev.cryptobara.com 99
|
|
||||||
reservedoffers.club 99
|
|
||||||
mine.torrent.pw 99
|
|
||||||
host.d-ns.ga 99
|
|
||||||
abc.pema.cl 99
|
|
||||||
mine.nahnoji.cz 99
|
|
||||||
webmine.cz 99
|
|
||||||
intactoffers.club 99
|
|
||||||
analytics.blue 99
|
|
||||||
smectapop12.pl 99
|
|
||||||
berserkpl.net.pl 99
|
|
||||||
hodlers.party 99
|
|
||||||
hodling.faith 99
|
|
||||||
chainblock.science 99
|
|
||||||
minescripts.info 99
|
|
||||||
cdn.minescripts.info 99
|
|
||||||
miner.nablabee.com 99
|
|
||||||
wss.nablabee.com 99
|
|
||||||
clickwith.bid 99
|
|
||||||
dronml.ml 99
|
|
||||||
niematego.tk 99
|
|
||||||
tulip18.com 99
|
|
||||||
p.estream.to 99
|
|
||||||
didnkinrab.com 99
|
|
||||||
ledhenone.com 99
|
|
||||||
losital.ru 99
|
|
||||||
mebablo.com 99
|
|
||||||
moonsade.com 99
|
|
||||||
nebabrop.com 99
|
|
||||||
pearno.com 99
|
|
||||||
rintinwa.com 99
|
|
||||||
willacrit.com 99
|
|
||||||
www2.adfreetv.ch 99
|
|
||||||
minr.pw 99
|
|
||||||
new.minr.pw 99
|
|
||||||
test.minr.pw 99
|
|
||||||
staticsfs.host 99
|
|
||||||
cdn-code.host 99
|
|
||||||
g-content.bid 99
|
|
||||||
ad.g-content.bid 99
|
|
||||||
cdn.static-cnt.bid 99
|
|
||||||
cnt.statistic.date 99
|
|
||||||
cdn.jquery-uim.download 99
|
|
||||||
cdn-jquery.host 99
|
|
||||||
p1.interestingz.pw 99
|
|
||||||
kippbeak.cf 99
|
|
||||||
pasoherb.gq 99
|
|
||||||
axoncoho.tk 99
|
|
||||||
depttake.ga 99
|
|
||||||
flophous.cf 99
|
|
||||||
pr0gram.org 99
|
|
||||||
authedmine.eu 99
|
|
||||||
www.monero-miner.com 99
|
|
||||||
www.datasecu.download 99
|
|
||||||
www.jquery-cdn.download 99
|
|
||||||
www.etzbnfuigipwvs.ru 99
|
|
||||||
www.terethat.ru 99
|
|
||||||
freshrefresher.com 99
|
|
||||||
api.pzoifaum.info 99
|
|
||||||
ws.pzoifaum.info 99
|
|
||||||
api.bhzejltg.info 99
|
|
||||||
ws.bhzejltg.info 99
|
|
||||||
d.cfcnet.top 99
|
|
||||||
vip.cfcnet.top 99
|
|
||||||
eu.cfcnet.top 99
|
|
||||||
as.cfcnet.top 99
|
|
||||||
us.cfcnet.top 99
|
|
||||||
eu.cfcdist.loan 99
|
|
||||||
as.cfcdist.loan 99
|
|
||||||
us.cfcdist.loan 99
|
|
||||||
gustaver.ddns.net 99
|
|
||||||
worker.salon.com 99
|
|
||||||
s2.appelamule.com 99
|
|
||||||
mepirtedic.com 99
|
|
||||||
cdn.streambeam.io 99
|
|
||||||
adzjzewsma.cf 99
|
|
||||||
ffinwwfpqi.gq 99
|
|
||||||
ininmacerad.pro 99
|
|
||||||
mhiobjnirs.gq 99
|
|
||||||
open-hive-server-1.pp.ua 99
|
|
||||||
pool.hws.ru 99
|
|
||||||
pool.etn.spacepools.org 99
|
|
||||||
api.aalbbh84.info 99
|
|
||||||
www.aymcsx.ru 99
|
|
||||||
aeros01.tk 99
|
|
||||||
aeros02.tk 99
|
|
||||||
aeros03.tk 99
|
|
||||||
aeros04.tk 99
|
|
||||||
aeros05.tk 99
|
|
||||||
aeros06.tk 99
|
|
||||||
aeros07.tk 99
|
|
||||||
aeros08.tk 99
|
|
||||||
aeros09.tk 99
|
|
||||||
aeros10.tk 99
|
|
||||||
aeros11.tk 99
|
|
||||||
aeros12.tk 99
|
|
||||||
npcdn1.now.sh 99
|
|
||||||
mxcdn2.now.sh 99
|
|
||||||
sxcdn6.now.sh 99
|
|
||||||
mxcdn1.now.sh 99
|
|
||||||
sxcdn02.now.sh 99
|
|
||||||
sxcdn4.now.sh 99
|
|
||||||
jqcdn2.herokuapp.com 99
|
|
||||||
sxcdn1.herokuapp.com 99
|
|
||||||
sxcdn5.herokuapp.com 99
|
|
||||||
wpcdn1.herokuapp.com 99
|
|
||||||
jqcdn01.herokuapp.com 99
|
|
||||||
jqcdn03.herokuapp.com 99
|
|
||||||
1q2w3.website 99
|
|
||||||
video.videos.vidto.me 99
|
|
||||||
video.streaming.estream.to 99
|
|
||||||
eth-pocket.de 99
|
|
||||||
xvideosharing.site 99
|
|
||||||
bestcoinsignals.com 99
|
|
||||||
eucsoft.com 99
|
|
||||||
traviilo.com 99
|
|
||||||
wasm24.ru 99
|
|
||||||
xmr.cool 99
|
|
||||||
api.netflare.info 99
|
|
||||||
cdnjs.cloudflane.com 99
|
|
||||||
www.cloudflane.com 99
|
|
||||||
hide.ovh 99
|
|
||||||
graftpool.ovh 99
|
|
||||||
encoding.ovh 99
|
|
||||||
altavista.ovh 99
|
|
||||||
scaleway.ovh 99
|
|
||||||
nexttime.ovh 99
|
|
||||||
never.ovh 99
|
|
||||||
2giga.download 99
|
|
||||||
support.2giga.link 99
|
|
||||||
webminerpool.com 99
|
|
||||||
minercry.pt 99
|
|
||||||
adplusplus.fr 99
|
|
||||||
|
|
||||||
# Does not seem to work anymore, but keeping it here just in case it gets revived
|
|
||||||
azvjudwr.info 99
|
|
||||||
jroqvbvw.info 99
|
|
||||||
jyhfuqoh.info 99
|
|
||||||
kdowqlpt.info 99
|
|
||||||
xbasfbno.info 99
|
|
||||||
|
|
||||||
# These were Obfuscated
|
|
||||||
1beb2a44.space 99
|
|
||||||
300ca0d0.space 99
|
|
||||||
310ca263.space 99
|
|
||||||
320ca3f6.space 99
|
|
||||||
330ca589.space 99
|
|
||||||
340ca71c.space 99
|
|
||||||
360caa42.space 99
|
|
||||||
370cabd5.space 99
|
|
||||||
3c0cb3b4.space 99
|
|
||||||
3d0cb547.space 99
|
|
||||||
|
|
||||||
imageshack.us 99
|
|
||||||
img265.imageshack.us 99
|
|
||||||
+473
-1715
File diff suppressed because it is too large
Load Diff
+94
-300
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* ndpi_util.c
|
* ndpi_util.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-17 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -21,10 +21,6 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "ndpi_config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@@ -74,8 +70,6 @@
|
|||||||
#include "ndpi_main.h"
|
#include "ndpi_main.h"
|
||||||
#include "ndpi_util.h"
|
#include "ndpi_util.h"
|
||||||
|
|
||||||
extern u_int8_t enable_protocol_guess;
|
|
||||||
|
|
||||||
/* ***************************************************** */
|
/* ***************************************************** */
|
||||||
|
|
||||||
void ndpi_free_flow_info_half(struct ndpi_flow_info *flow) {
|
void ndpi_free_flow_info_half(struct ndpi_flow_info *flow) {
|
||||||
@@ -111,69 +105,8 @@ static void free_wrapper(void *freeable) {
|
|||||||
|
|
||||||
/* ***************************************************** */
|
/* ***************************************************** */
|
||||||
|
|
||||||
static uint16_t ndpi_get_proto_id(struct ndpi_detection_module_struct *ndpi_mod, const char *name) {
|
struct ndpi_workflow * ndpi_workflow_init(const struct ndpi_workflow_prefs * prefs, pcap_t * pcap_handle) {
|
||||||
uint16_t proto_id;
|
|
||||||
char *e;
|
|
||||||
unsigned long p = strtol(name,&e,0);
|
|
||||||
ndpi_proto_defaults_t *proto_defaults = ndpi_get_proto_defaults(ndpi_mod);
|
|
||||||
|
|
||||||
if(e && !*e) {
|
|
||||||
if(p < NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS &&
|
|
||||||
proto_defaults[p].protoName) return (uint16_t)p;
|
|
||||||
return NDPI_PROTOCOL_UNKNOWN;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(proto_id=NDPI_PROTOCOL_UNKNOWN; proto_id < NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS; proto_id++) {
|
|
||||||
if(proto_defaults[proto_id].protoName &&
|
|
||||||
!strcasecmp(proto_defaults[proto_id].protoName,name))
|
|
||||||
return proto_id;
|
|
||||||
}
|
|
||||||
return NDPI_PROTOCOL_UNKNOWN;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ***************************************************** */
|
|
||||||
|
|
||||||
static NDPI_PROTOCOL_BITMASK debug_bitmask;
|
|
||||||
static char _proto_delim[] = " \t,:;";
|
|
||||||
static int parse_debug_proto(struct ndpi_detection_module_struct *ndpi_mod, char *str) {
|
|
||||||
char *n;
|
|
||||||
uint16_t proto;
|
|
||||||
char op=1;
|
|
||||||
for(n = strtok(str,_proto_delim); n && *n; n = strtok(NULL,_proto_delim)) {
|
|
||||||
if(*n == '-') {
|
|
||||||
op = 0;
|
|
||||||
n++;
|
|
||||||
} else if(*n == '+') {
|
|
||||||
op = 1;
|
|
||||||
n++;
|
|
||||||
}
|
|
||||||
if(!strcmp(n,"all")) {
|
|
||||||
if(op)
|
|
||||||
NDPI_BITMASK_SET_ALL(debug_bitmask);
|
|
||||||
else
|
|
||||||
NDPI_BITMASK_RESET(debug_bitmask);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
proto = ndpi_get_proto_id(ndpi_mod, n);
|
|
||||||
if(proto == NDPI_PROTOCOL_UNKNOWN && strcmp(n,"unknown") && strcmp(n,"0")) {
|
|
||||||
fprintf(stderr,"Invalid protocol %s\n",n);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if(op)
|
|
||||||
NDPI_BITMASK_ADD(debug_bitmask,proto);
|
|
||||||
else
|
|
||||||
NDPI_BITMASK_DEL(debug_bitmask,proto);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ***************************************************** */
|
|
||||||
|
|
||||||
extern char *_debug_protocols;
|
|
||||||
static int _debug_protocols_ok = 0;
|
|
||||||
|
|
||||||
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_malloc(malloc_wrapper), set_ndpi_free(free_wrapper);
|
||||||
set_ndpi_flow_malloc(NULL), set_ndpi_flow_free(NULL);
|
set_ndpi_flow_malloc(NULL), set_ndpi_flow_free(NULL);
|
||||||
/* TODO: just needed here to init ndpi malloc wrapper */
|
/* TODO: just needed here to init ndpi malloc wrapper */
|
||||||
@@ -182,7 +115,7 @@ struct ndpi_workflow* ndpi_workflow_init(const struct ndpi_workflow_prefs * pref
|
|||||||
struct ndpi_workflow * workflow = ndpi_calloc(1, sizeof(struct ndpi_workflow));
|
struct ndpi_workflow * workflow = ndpi_calloc(1, sizeof(struct ndpi_workflow));
|
||||||
|
|
||||||
workflow->pcap_handle = pcap_handle;
|
workflow->pcap_handle = pcap_handle;
|
||||||
workflow->prefs = *prefs;
|
workflow->prefs = *prefs;
|
||||||
workflow->ndpi_struct = module;
|
workflow->ndpi_struct = module;
|
||||||
|
|
||||||
if(workflow->ndpi_struct == NULL) {
|
if(workflow->ndpi_struct == NULL) {
|
||||||
@@ -190,22 +123,7 @@ struct ndpi_workflow* ndpi_workflow_init(const struct ndpi_workflow_prefs * pref
|
|||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
ndpi_set_log_level(module, nDPI_LogLevel);
|
|
||||||
|
|
||||||
if(_debug_protocols != NULL && ! _debug_protocols_ok) {
|
|
||||||
if(parse_debug_proto(module,_debug_protocols))
|
|
||||||
exit(-1);
|
|
||||||
_debug_protocols_ok = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
|
||||||
NDPI_BITMASK_RESET(module->debug_bitmask);
|
|
||||||
if(_debug_protocols_ok)
|
|
||||||
module->debug_bitmask = debug_bitmask;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
workflow->ndpi_flows_root = ndpi_calloc(workflow->prefs.num_roots, sizeof(void *));
|
workflow->ndpi_flows_root = ndpi_calloc(workflow->prefs.num_roots, sizeof(void *));
|
||||||
|
|
||||||
return workflow;
|
return workflow;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,7 +139,7 @@ void ndpi_flow_info_freer(void *node) {
|
|||||||
/* ***************************************************** */
|
/* ***************************************************** */
|
||||||
|
|
||||||
void ndpi_workflow_free(struct ndpi_workflow * workflow) {
|
void ndpi_workflow_free(struct ndpi_workflow * workflow) {
|
||||||
u_int i;
|
int i;
|
||||||
|
|
||||||
for(i=0; i<workflow->prefs.num_roots; i++)
|
for(i=0; i<workflow->prefs.num_roots; i++)
|
||||||
ndpi_tdestroy(workflow->ndpi_flows_root[i], ndpi_flow_info_freer);
|
ndpi_tdestroy(workflow->ndpi_flows_root[i], ndpi_flow_info_freer);
|
||||||
@@ -234,38 +152,38 @@ void ndpi_workflow_free(struct ndpi_workflow * workflow) {
|
|||||||
/* ***************************************************** */
|
/* ***************************************************** */
|
||||||
|
|
||||||
int ndpi_workflow_node_cmp(const void *a, const void *b) {
|
int ndpi_workflow_node_cmp(const void *a, const void *b) {
|
||||||
const struct ndpi_flow_info *fa = (const struct ndpi_flow_info*)a;
|
struct ndpi_flow_info *fa = (struct ndpi_flow_info*)a;
|
||||||
const struct ndpi_flow_info *fb = (const struct ndpi_flow_info*)b;
|
struct ndpi_flow_info *fb = (struct ndpi_flow_info*)b;
|
||||||
|
|
||||||
if(fa->hashval < fb->hashval) return(-1); else if(fa->hashval > fb->hashval) return(1);
|
if(fa->hashval < fb->hashval) return(-1); else if(fa->hashval > fb->hashval) return(1);
|
||||||
|
|
||||||
/* Flows have the same hash */
|
/* 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->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->protocol < fb->protocol ) return(-1); else { if(fa->protocol > fb->protocol ) return(1); }
|
||||||
|
|
||||||
if(
|
if(
|
||||||
(
|
(
|
||||||
(fa->src_ip == fb->src_ip )
|
(fa->lower_ip == fb->lower_ip )
|
||||||
&& (fa->src_port == fb->src_port)
|
&& (fa->lower_port == fb->lower_port)
|
||||||
&& (fa->dst_ip == fb->dst_ip )
|
&& (fa->upper_ip == fb->upper_ip )
|
||||||
&& (fa->dst_port == fb->dst_port)
|
&& (fa->upper_port == fb->upper_port)
|
||||||
)
|
)
|
||||||
||
|
||
|
||||||
(
|
(
|
||||||
(fa->src_ip == fb->dst_ip )
|
(fa->lower_ip == fb->upper_ip )
|
||||||
&& (fa->src_port == fb->dst_port)
|
&& (fa->lower_port == fb->upper_port)
|
||||||
&& (fa->dst_ip == fb->src_ip )
|
&& (fa->upper_ip == fb->lower_ip )
|
||||||
&& (fa->dst_port == fb->src_port)
|
&& (fa->upper_port == fb->lower_port)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return(0);
|
return(0);
|
||||||
|
|
||||||
if(fa->src_ip < fb->src_ip ) return(-1); else { if(fa->src_ip > fb->src_ip ) return(1); }
|
if(fa->lower_ip < fb->lower_ip ) return(-1); else { if(fa->lower_ip > fb->lower_ip ) return(1); }
|
||||||
if(fa->src_port < fb->src_port) return(-1); else { if(fa->src_port > fb->src_port) return(1); }
|
if(fa->lower_port < fb->lower_port) return(-1); else { if(fa->lower_port > fb->lower_port) return(1); }
|
||||||
if(fa->dst_ip < fb->dst_ip ) return(-1); else { if(fa->dst_ip > fb->dst_ip ) return(1); }
|
if(fa->upper_ip < fb->upper_ip ) return(-1); else { if(fa->upper_ip > fb->upper_ip ) return(1); }
|
||||||
if(fa->dst_port < fb->dst_port) return(-1); else { if(fa->dst_port > fb->dst_port) return(1); }
|
if(fa->upper_port < fb->upper_port) return(-1); else { if(fa->upper_port > fb->upper_port) return(1); }
|
||||||
|
|
||||||
return(0); /* notreached */
|
return(0); /* notreached */
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -309,7 +227,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
u_int32_t idx, l4_offset, hashval;
|
u_int32_t idx, l4_offset, hashval;
|
||||||
struct ndpi_flow_info flow;
|
struct ndpi_flow_info flow;
|
||||||
void *ret;
|
void *ret;
|
||||||
const u_int8_t *l3, *l4;
|
u_int8_t *l3, *l4;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Note: to keep things simple (ndpiReader is just a demo app)
|
Note: to keep things simple (ndpiReader is just a demo app)
|
||||||
@@ -324,10 +242,10 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
l4_offset = iph->ihl * 4;
|
l4_offset = iph->ihl * 4;
|
||||||
l3 = (const u_int8_t*)iph;
|
l3 = (u_int8_t*)iph;
|
||||||
} else {
|
} else {
|
||||||
l4_offset = sizeof(struct ndpi_ipv6hdr);
|
l4_offset = sizeof(struct ndpi_ipv6hdr);
|
||||||
l3 = (const u_int8_t*)iph6;
|
l3 = (u_int8_t*)iph6;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(l4_packet_len < 64)
|
if(l4_packet_len < 64)
|
||||||
@@ -347,7 +265,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
workflow->stats.max_packet_len = l4_packet_len;
|
workflow->stats.max_packet_len = l4_packet_len;
|
||||||
|
|
||||||
*proto = iph->protocol;
|
*proto = iph->protocol;
|
||||||
l4 = ((const u_int8_t *) l3 + l4_offset);
|
l4 = ((u_int8_t *) l3 + l4_offset);
|
||||||
|
|
||||||
if(iph->protocol == IPPROTO_TCP && l4_packet_len >= 20) {
|
if(iph->protocol == IPPROTO_TCP && l4_packet_len >= 20) {
|
||||||
u_int tcp_len;
|
u_int tcp_len;
|
||||||
@@ -357,7 +275,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
*tcph = (struct ndpi_tcphdr *)l4;
|
*tcph = (struct ndpi_tcphdr *)l4;
|
||||||
*sport = ntohs((*tcph)->source), *dport = ntohs((*tcph)->dest);
|
*sport = ntohs((*tcph)->source), *dport = ntohs((*tcph)->dest);
|
||||||
tcp_len = ndpi_min(4*(*tcph)->doff, l4_packet_len);
|
tcp_len = ndpi_min(4*(*tcph)->doff, l4_packet_len);
|
||||||
*payload = (u_int8_t*)&l4[tcp_len];
|
*payload = &l4[tcp_len];
|
||||||
*payload_len = ndpi_max(0, l4_packet_len-4*(*tcph)->doff);
|
*payload_len = ndpi_max(0, l4_packet_len-4*(*tcph)->doff);
|
||||||
} else if(iph->protocol == IPPROTO_UDP && l4_packet_len >= 8) {
|
} else if(iph->protocol == IPPROTO_UDP && l4_packet_len >= 8) {
|
||||||
// udp
|
// udp
|
||||||
@@ -365,39 +283,20 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
workflow->stats.udp_count++;
|
workflow->stats.udp_count++;
|
||||||
*udph = (struct ndpi_udphdr *)l4;
|
*udph = (struct ndpi_udphdr *)l4;
|
||||||
*sport = ntohs((*udph)->source), *dport = ntohs((*udph)->dest);
|
*sport = ntohs((*udph)->source), *dport = ntohs((*udph)->dest);
|
||||||
*payload = (u_int8_t*)&l4[sizeof(struct ndpi_udphdr)];
|
*payload = &l4[sizeof(struct ndpi_udphdr)];
|
||||||
*payload_len = (l4_packet_len > sizeof(struct ndpi_udphdr)) ? l4_packet_len-sizeof(struct ndpi_udphdr) : 0;
|
*payload_len = ndpi_max(0, l4_packet_len-sizeof(struct ndpi_udphdr));
|
||||||
} else {
|
} else {
|
||||||
// non tcp/udp protocols
|
// non tcp/udp protocols
|
||||||
*sport = *dport = 0;
|
*sport = *dport = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
flow.protocol = iph->protocol, flow.vlan_id = vlan_id;
|
flow.protocol = iph->protocol, flow.vlan_id = vlan_id;
|
||||||
flow.src_ip = iph->saddr, flow.dst_ip = iph->daddr;
|
flow.lower_ip = iph->saddr, flow.upper_ip = iph->daddr;
|
||||||
flow.src_port = htons(*sport), flow.dst_port = htons(*dport);
|
flow.lower_port = htons(*sport), flow.upper_port = htons(*dport);
|
||||||
flow.hashval = hashval = flow.protocol + flow.vlan_id + flow.src_ip + flow.dst_ip + flow.src_port + flow.dst_port;
|
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;
|
idx = hashval % workflow->prefs.num_roots;
|
||||||
ret = ndpi_tfind(&flow, &workflow->ndpi_flows_root[idx], ndpi_workflow_node_cmp);
|
ret = ndpi_tfind(&flow, &workflow->ndpi_flows_root[idx], ndpi_workflow_node_cmp);
|
||||||
|
|
||||||
|
|
||||||
/* to avoid two nodes in one binary tree for a flow */
|
|
||||||
int is_changed = 0;
|
|
||||||
if(ret == NULL) {
|
|
||||||
u_int32_t orig_src_ip = flow.src_ip;
|
|
||||||
u_int16_t orig_src_port = flow.src_port;
|
|
||||||
u_int32_t orig_dst_ip = flow.dst_ip;
|
|
||||||
u_int16_t orig_dst_port = flow.dst_port;
|
|
||||||
|
|
||||||
flow.src_ip = orig_dst_ip;
|
|
||||||
flow.src_port = orig_dst_port;
|
|
||||||
flow.dst_ip = orig_src_ip;
|
|
||||||
flow.dst_port = orig_src_port;
|
|
||||||
|
|
||||||
is_changed = 1;
|
|
||||||
|
|
||||||
ret = ndpi_tfind(&flow, &workflow->ndpi_flows_root[idx], ndpi_workflow_node_cmp);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(ret == NULL) {
|
if(ret == NULL) {
|
||||||
if(workflow->stats.ndpi_flow_count == workflow->prefs.max_ndpi_flows) {
|
if(workflow->stats.ndpi_flow_count == workflow->prefs.max_ndpi_flows) {
|
||||||
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR,
|
NDPI_LOG(0, workflow->ndpi_struct, NDPI_LOG_ERROR,
|
||||||
@@ -410,24 +309,23 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
if(newflow == NULL) {
|
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);
|
return(NULL);
|
||||||
} else
|
}
|
||||||
workflow->num_allocated_flows++;
|
|
||||||
|
|
||||||
memset(newflow, 0, sizeof(struct ndpi_flow_info));
|
memset(newflow, 0, sizeof(struct ndpi_flow_info));
|
||||||
newflow->hashval = hashval;
|
newflow->hashval = hashval;
|
||||||
newflow->protocol = iph->protocol, newflow->vlan_id = vlan_id;
|
newflow->protocol = iph->protocol, newflow->vlan_id = vlan_id;
|
||||||
newflow->src_ip = iph->saddr, newflow->dst_ip = iph->daddr;
|
newflow->lower_ip = iph->saddr, newflow->upper_ip = iph->daddr;
|
||||||
newflow->src_port = htons(*sport), newflow->dst_port = htons(*dport);
|
newflow->lower_port = htons(*sport), newflow->upper_port = htons(*dport);
|
||||||
newflow->ip_version = version;
|
newflow->ip_version = version;
|
||||||
|
|
||||||
if(version == IPVERSION) {
|
if(version == IPVERSION) {
|
||||||
inet_ntop(AF_INET, &newflow->src_ip, newflow->src_name, sizeof(newflow->src_name));
|
inet_ntop(AF_INET, &newflow->lower_ip, newflow->lower_name, sizeof(newflow->lower_name));
|
||||||
inet_ntop(AF_INET, &newflow->dst_ip, newflow->dst_name, sizeof(newflow->dst_name));
|
inet_ntop(AF_INET, &newflow->upper_ip, newflow->upper_name, sizeof(newflow->upper_name));
|
||||||
} else {
|
} else {
|
||||||
inet_ntop(AF_INET6, &iph6->ip6_src, newflow->src_name, sizeof(newflow->src_name));
|
inet_ntop(AF_INET6, &iph6->ip6_src, newflow->lower_name, sizeof(newflow->lower_name));
|
||||||
inet_ntop(AF_INET6, &iph6->ip6_dst, newflow->dst_name, sizeof(newflow->dst_name));
|
inet_ntop(AF_INET6, &iph6->ip6_dst, newflow->upper_name, sizeof(newflow->upper_name));
|
||||||
/* For consistency across platforms replace :0: with :: */
|
/* For consistency across platforms replace :0: with :: */
|
||||||
patchIPv6Address(newflow->src_name), patchIPv6Address(newflow->dst_name);
|
patchIPv6Address(newflow->lower_name), patchIPv6Address(newflow->upper_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
if((newflow->ndpi_flow = ndpi_flow_malloc(SIZEOF_FLOW_STRUCT)) == NULL) {
|
if((newflow->ndpi_flow = ndpi_flow_malloc(SIZEOF_FLOW_STRUCT)) == NULL) {
|
||||||
@@ -461,26 +359,15 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
} else {
|
} else {
|
||||||
struct ndpi_flow_info *flow = *(struct ndpi_flow_info**)ret;
|
struct ndpi_flow_info *flow = *(struct ndpi_flow_info**)ret;
|
||||||
|
|
||||||
if(is_changed) {
|
if(flow->lower_ip == iph->saddr
|
||||||
if(flow->src_ip == iph->saddr
|
&& flow->upper_ip == iph->daddr
|
||||||
&& flow->dst_ip == iph->daddr
|
&& flow->lower_port == htons(*sport)
|
||||||
&& flow->src_port == htons(*sport)
|
&& flow->upper_port == htons(*dport)
|
||||||
&& flow->dst_port == htons(*dport)
|
)
|
||||||
)
|
*src = flow->src_id, *dst = flow->dst_id, *src_to_dst_direction = 1;
|
||||||
*src = flow->dst_id, *dst = flow->src_id, *src_to_dst_direction = 0, flow->bidirectional = 1;
|
else
|
||||||
else
|
*src = flow->dst_id, *dst = flow->src_id, *src_to_dst_direction = 0, flow->bidirectional = 1;
|
||||||
*src = flow->src_id, *dst = flow->dst_id, *src_to_dst_direction = 1;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(flow->src_ip == iph->saddr
|
|
||||||
&& flow->dst_ip == iph->daddr
|
|
||||||
&& flow->src_port == htons(*sport)
|
|
||||||
&& flow->dst_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_to_dst_direction = 0, flow->bidirectional = 1;
|
|
||||||
}
|
|
||||||
return flow;
|
return flow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -506,20 +393,19 @@ static struct ndpi_flow_info *get_ndpi_flow_info6(struct ndpi_workflow * workflo
|
|||||||
iph.version = IPVERSION;
|
iph.version = IPVERSION;
|
||||||
iph.saddr = iph6->ip6_src.u6_addr.u6_addr32[2] + iph6->ip6_src.u6_addr.u6_addr32[3];
|
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.daddr = iph6->ip6_dst.u6_addr.u6_addr32[2] + iph6->ip6_dst.u6_addr.u6_addr32[3];
|
||||||
iph.protocol = iph6->ip6_hdr.ip6_un1_nxt;
|
iph.protocol = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt;
|
||||||
|
|
||||||
if(iph.protocol == IPPROTO_DSTOPTS /* IPv6 destination option */) {
|
if(iph.protocol == IPPROTO_DSTOPTS /* IPv6 destination option */) {
|
||||||
const u_int8_t *options = (const u_int8_t*)iph6 + sizeof(const struct ndpi_ipv6hdr);
|
u_int8_t *options = (u_int8_t*)iph6 + sizeof(const struct ndpi_ipv6hdr);
|
||||||
|
|
||||||
iph.protocol = options[0];
|
iph.protocol = options[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
return(get_ndpi_flow_info(workflow, 6, vlan_id, &iph, iph6, ip_offset,
|
return(get_ndpi_flow_info(workflow, 6, vlan_id, &iph, iph6, ip_offset,
|
||||||
sizeof(struct ndpi_ipv6hdr),
|
sizeof(struct ndpi_ipv6hdr),
|
||||||
ntohs(iph6->ip6_hdr.ip6_un1_plen),
|
ntohs(iph6->ip6_ctlun.ip6_un1.ip6_un1_plen),
|
||||||
tcph, udph, sport, dport,
|
tcph, udph, sport, dport,
|
||||||
src, dst, proto, payload,
|
src, dst, proto, payload, payload_len, src_to_dst_direction));
|
||||||
payload_len, src_to_dst_direction));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ****************************************************** */
|
/* ****************************************************** */
|
||||||
@@ -532,13 +418,11 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
|||||||
|
|
||||||
/* BITTORRENT */
|
/* BITTORRENT */
|
||||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_BITTORRENT) {
|
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_BITTORRENT) {
|
||||||
u_int i, j, n = 0;
|
int i, j, n = 0;
|
||||||
|
|
||||||
for(i=0, j = 0; j < sizeof(flow->bittorent_hash)-1; i++) {
|
for(i=0, j = 0; j < sizeof(flow->bittorent_hash)-1; i++) {
|
||||||
sprintf(&flow->bittorent_hash[j], "%02x",
|
sprintf(&flow->bittorent_hash[j], "%02x", flow->ndpi_flow->bittorent_hash[i]);
|
||||||
flow->ndpi_flow->protos.bittorrent.hash[i]);
|
j += 2, n += flow->ndpi_flow->bittorent_hash[i];
|
||||||
|
|
||||||
j += 2, n += flow->ndpi_flow->protos.bittorrent.hash[i];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(n == 0) flow->bittorent_hash[0] = '\0';
|
if(n == 0) flow->bittorent_hash[0] = '\0';
|
||||||
@@ -563,18 +447,18 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
|||||||
else if((flow->detected_protocol.app_protocol == NDPI_PROTOCOL_SSL)
|
else if((flow->detected_protocol.app_protocol == NDPI_PROTOCOL_SSL)
|
||||||
|| (flow->detected_protocol.master_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",
|
snprintf(flow->ssh_ssl.client_info, sizeof(flow->ssh_ssl.client_info), "%s",
|
||||||
flow->ndpi_flow->protos.stun_ssl.ssl.client_certificate);
|
flow->ndpi_flow->protos.ssl.client_certificate);
|
||||||
snprintf(flow->ssh_ssl.server_info, sizeof(flow->ssh_ssl.server_info), "%s",
|
snprintf(flow->ssh_ssl.server_info, sizeof(flow->ssh_ssl.server_info), "%s",
|
||||||
flow->ndpi_flow->protos.stun_ssl.ssl.server_certificate);
|
flow->ndpi_flow->protos.ssl.server_certificate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(flow->detection_completed && !flow->check_extra_packets) {
|
if(flow->detection_completed) {
|
||||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
|
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
|
||||||
if(workflow->__flow_giveup_callback != NULL)
|
if (workflow->__flow_giveup_callback != NULL)
|
||||||
workflow->__flow_giveup_callback(workflow, flow, workflow->__flow_giveup_udata);
|
workflow->__flow_giveup_callback(workflow, flow, workflow->__flow_giveup_udata);
|
||||||
} else {
|
} else {
|
||||||
if(workflow->__flow_detected_callback != NULL)
|
if (workflow->__flow_detected_callback != NULL)
|
||||||
workflow->__flow_detected_callback(workflow, flow, workflow->__flow_detected_udata);
|
workflow->__flow_detected_callback(workflow, flow, workflow->__flow_detected_udata);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -627,12 +511,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
|||||||
workflow->stats.total_wire_bytes += rawsize + 24 /* CRC etc */,
|
workflow->stats.total_wire_bytes += rawsize + 24 /* CRC etc */,
|
||||||
workflow->stats.total_ip_bytes += rawsize;
|
workflow->stats.total_ip_bytes += rawsize;
|
||||||
ndpi_flow = flow->ndpi_flow;
|
ndpi_flow = flow->ndpi_flow;
|
||||||
|
flow->packets++, flow->bytes += rawsize;
|
||||||
if(src_to_dst_direction)
|
|
||||||
flow->src2dst_packets++, flow->src2dst_bytes += rawsize;
|
|
||||||
else
|
|
||||||
flow->dst2src_packets++, flow->dst2src_bytes += rawsize;
|
|
||||||
|
|
||||||
flow->last_seen = time;
|
flow->last_seen = time;
|
||||||
} else { // flow is NULL
|
} else { // flow is NULL
|
||||||
workflow->stats.total_discarded_bytes++;
|
workflow->stats.total_discarded_bytes++;
|
||||||
@@ -640,50 +519,23 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Protocol already detected */
|
/* Protocol already detected */
|
||||||
if(flow->detection_completed) {
|
if(flow->detection_completed) return(flow->detected_protocol);
|
||||||
if(flow->check_extra_packets && ndpi_flow != NULL && ndpi_flow->check_extra_packets) {
|
|
||||||
if(ndpi_flow->num_extra_packets_checked == 0 && ndpi_flow->max_extra_packets_to_check == 0) {
|
|
||||||
/* Protocols can set this, but we set it here in case they didn't */
|
|
||||||
ndpi_flow->max_extra_packets_to_check = MAX_EXTRA_PACKETS_TO_CHECK;
|
|
||||||
}
|
|
||||||
if(ndpi_flow->num_extra_packets_checked < ndpi_flow->max_extra_packets_to_check) {
|
|
||||||
ndpi_process_extra_packet(workflow->ndpi_struct, ndpi_flow,
|
|
||||||
iph ? (uint8_t *)iph : (uint8_t *)iph6,
|
|
||||||
ipsize, time, src, dst);
|
|
||||||
if(ndpi_flow->check_extra_packets == 0) {
|
|
||||||
flow->check_extra_packets = 0;
|
|
||||||
process_ndpi_collected_info(workflow, flow);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if(ndpi_flow != NULL) {
|
|
||||||
/* If this wasn't NULL we should do the half free */
|
|
||||||
/* TODO: When half_free is deprecated, get rid of this */
|
|
||||||
ndpi_free_flow_info_half(flow);
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
||||||
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.app_protocol != NDPI_PROTOCOL_UNKNOWN)
|
if((flow->detected_protocol.app_protocol != NDPI_PROTOCOL_UNKNOWN)
|
||||||
|| ((proto == IPPROTO_UDP) && ((flow->src2dst_packets + flow->dst2src_packets) > 8))
|
|| ((proto == IPPROTO_UDP) && (flow->packets > 8))
|
||||||
|| ((proto == IPPROTO_TCP) && ((flow->src2dst_packets + flow->dst2src_packets) > 10))) {
|
|| ((proto == IPPROTO_TCP) && (flow->packets > 10))) {
|
||||||
/* New protocol detected or give up */
|
/* New protocol detected or give up */
|
||||||
flow->detection_completed = 1;
|
flow->detection_completed = 1;
|
||||||
/* Check if we should keep checking extra packets */
|
|
||||||
if(ndpi_flow->check_extra_packets)
|
|
||||||
flow->check_extra_packets = 1;
|
|
||||||
|
|
||||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
|
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
|
||||||
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow,
|
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct,
|
||||||
enable_protocol_guess);
|
flow->ndpi_flow);
|
||||||
|
|
||||||
process_ndpi_collected_info(workflow, flow);
|
process_ndpi_collected_info(workflow, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
return(flow->detected_protocol);
|
return(flow->detected_protocol);
|
||||||
}
|
}
|
||||||
@@ -710,10 +562,7 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
|||||||
const struct ndpi_wifi_header *wifi;
|
const struct ndpi_wifi_header *wifi;
|
||||||
|
|
||||||
/* --- MPLS header --- */
|
/* --- MPLS header --- */
|
||||||
union mpls {
|
struct ndpi_mpls_header *mpls;
|
||||||
uint32_t u32;
|
|
||||||
struct ndpi_mpls_header mpls;
|
|
||||||
} mpls;
|
|
||||||
|
|
||||||
/** --- IP header --- **/
|
/** --- IP header --- **/
|
||||||
struct ndpi_iphdr *iph;
|
struct ndpi_iphdr *iph;
|
||||||
@@ -754,15 +603,9 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
|||||||
workflow->last_time = time;
|
workflow->last_time = time;
|
||||||
|
|
||||||
/*** check Data Link type ***/
|
/*** check Data Link type ***/
|
||||||
int datalink_type;
|
const int datalink_type = pcap_datalink(workflow->pcap_handle);
|
||||||
|
|
||||||
#ifdef USE_DPDK
|
datalink_check:
|
||||||
datalink_type = DLT_EN10MB;
|
|
||||||
#else
|
|
||||||
datalink_type = (int)pcap_datalink(workflow->pcap_handle);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
datalink_check:
|
|
||||||
switch(datalink_type) {
|
switch(datalink_type) {
|
||||||
case DLT_NULL:
|
case DLT_NULL:
|
||||||
if(ntohl(*((u_int32_t*)&packet[eth_offset])) == 2)
|
if(ntohl(*((u_int32_t*)&packet[eth_offset])) == 2)
|
||||||
@@ -780,9 +623,8 @@ datalink_check:
|
|||||||
type = ntohs(chdlc->proto_code);
|
type = ntohs(chdlc->proto_code);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* Cisco PPP - 9 or 104 */
|
/* Cisco PPP with HDLC framing - 104 */
|
||||||
case DLT_C_HDLC:
|
case DLT_C_HDLC:
|
||||||
case DLT_PPP:
|
|
||||||
chdlc = (struct ndpi_chdlc *) &packet[eth_offset];
|
chdlc = (struct ndpi_chdlc *) &packet[eth_offset];
|
||||||
ip_offset = sizeof(struct ndpi_chdlc); /* CHDLC_OFF = 4 */
|
ip_offset = sizeof(struct ndpi_chdlc); /* CHDLC_OFF = 4 */
|
||||||
type = ntohs(chdlc->proto_code);
|
type = ntohs(chdlc->proto_code);
|
||||||
@@ -796,7 +638,7 @@ datalink_check:
|
|||||||
|
|
||||||
if(check <= 1500)
|
if(check <= 1500)
|
||||||
pyld_eth_len = check;
|
pyld_eth_len = check;
|
||||||
else if(check >= 1536)
|
else if (check >= 1536)
|
||||||
type = check;
|
type = check;
|
||||||
|
|
||||||
if(pyld_eth_len != 0) {
|
if(pyld_eth_len != 0) {
|
||||||
@@ -876,15 +718,15 @@ datalink_check:
|
|||||||
break;
|
break;
|
||||||
case MPLS_UNI:
|
case MPLS_UNI:
|
||||||
case MPLS_MULTI:
|
case MPLS_MULTI:
|
||||||
mpls.u32 = *((uint32_t *) &packet[ip_offset]);
|
mpls = (struct ndpi_mpls_header *) &packet[ip_offset];
|
||||||
mpls.u32 = ntohl(mpls.u32);
|
label = ntohl(mpls->label);
|
||||||
|
/* label = ntohl(*((u_int32_t*)&packet[ip_offset])); */
|
||||||
workflow->stats.mpls_count++;
|
workflow->stats.mpls_count++;
|
||||||
type = ETH_P_IP, ip_offset += 4;
|
type = ETH_P_IP, ip_offset += 4;
|
||||||
|
|
||||||
while(!mpls.mpls.s) {
|
while((label & 0x100) != 0x100) {
|
||||||
mpls.u32 = *((uint32_t *) &packet[ip_offset]);
|
|
||||||
mpls.u32 = ntohl(mpls.u32);
|
|
||||||
ip_offset += 4;
|
ip_offset += 4;
|
||||||
|
label = ntohl(mpls->label);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PPPoE:
|
case PPPoE:
|
||||||
@@ -898,7 +740,7 @@ datalink_check:
|
|||||||
|
|
||||||
workflow->stats.vlan_count += vlan_packet;
|
workflow->stats.vlan_count += vlan_packet;
|
||||||
|
|
||||||
iph_check:
|
iph_check:
|
||||||
/* Check and set IP header size and total packet length */
|
/* Check and set IP header size and total packet length */
|
||||||
iph = (struct ndpi_iphdr *) &packet[ip_offset];
|
iph = (struct ndpi_iphdr *) &packet[ip_offset];
|
||||||
|
|
||||||
@@ -942,7 +784,7 @@ iph_check:
|
|||||||
}
|
}
|
||||||
} else if(iph->version == 6) {
|
} else if(iph->version == 6) {
|
||||||
iph6 = (struct ndpi_ipv6hdr *)&packet[ip_offset];
|
iph6 = (struct ndpi_ipv6hdr *)&packet[ip_offset];
|
||||||
proto = iph6->ip6_hdr.ip6_un1_nxt;
|
proto = iph6->ip6_ctlun.ip6_un1.ip6_un1_nxt;
|
||||||
ip_len = sizeof(struct ndpi_ipv6hdr);
|
ip_len = sizeof(struct ndpi_ipv6hdr);
|
||||||
|
|
||||||
if(proto == IPPROTO_DSTOPTS /* IPv6 destination option */) {
|
if(proto == IPPROTO_DSTOPTS /* IPv6 destination option */) {
|
||||||
@@ -1043,8 +885,9 @@ iph_check:
|
|||||||
|
|
||||||
static uint32_t crc32_for_byte(uint32_t r) {
|
static uint32_t crc32_for_byte(uint32_t r) {
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
for(j = 0; j < 8; ++j)
|
for(j = 0; j < 8; ++j)
|
||||||
r = (r & 1? 0: (uint32_t)0xEDB88320L) ^ r >> 1;
|
r = ((r & 1) ? 0 : ((uint32_t)0xEDB88320L) ^ r >> 1);
|
||||||
return r ^ (uint32_t)0xFF000000L;
|
return r ^ (uint32_t)0xFF000000L;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1054,7 +897,8 @@ static uint32_t crc32_for_byte(uint32_t r) {
|
|||||||
typedef unsigned long accum_t;
|
typedef unsigned long accum_t;
|
||||||
|
|
||||||
static void init_tables(uint32_t* table, uint32_t* wtable) {
|
static void init_tables(uint32_t* table, uint32_t* wtable) {
|
||||||
size_t i, j, k, w;
|
size_t i, k, w, j;
|
||||||
|
|
||||||
for(i = 0; i < 0x100; ++i)
|
for(i = 0; i < 0x100; ++i)
|
||||||
table[i] = crc32_for_byte(i);
|
table[i] = crc32_for_byte(i);
|
||||||
for(k = 0; k < sizeof(accum_t); ++k)
|
for(k = 0; k < sizeof(accum_t); ++k)
|
||||||
@@ -1065,10 +909,11 @@ static void init_tables(uint32_t* table, uint32_t* wtable) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __crc32(const void* data, size_t n_bytes, uint32_t* crc) {
|
void ethernet_crc32(const void* data, size_t n_bytes, uint32_t* crc) {
|
||||||
static uint32_t table[0x100], wtable[0x100*sizeof(accum_t)];
|
static uint32_t table[0x100], wtable[0x100*sizeof(accum_t)];
|
||||||
size_t n_accum = n_bytes/sizeof(accum_t);
|
size_t n_accum = n_bytes/sizeof(accum_t);
|
||||||
size_t i, j;
|
size_t i, j;
|
||||||
|
|
||||||
if(!*table)
|
if(!*table)
|
||||||
init_tables(table, wtable);
|
init_tables(table, wtable);
|
||||||
for(i = 0; i < n_accum; ++i) {
|
for(i = 0; i < n_accum; ++i) {
|
||||||
@@ -1076,58 +921,7 @@ static void __crc32(const void* data, size_t n_bytes, uint32_t* crc) {
|
|||||||
for(j = *crc = 0; j < sizeof(accum_t); ++j)
|
for(j = *crc = 0; j < sizeof(accum_t); ++j)
|
||||||
*crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)];
|
*crc ^= wtable[(j << 8) + (uint8_t)(a >> 8*j)];
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
|
for(i = n_accum*sizeof(accum_t); i < n_bytes; ++i)
|
||||||
*crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8;
|
*crc = table[(uint8_t)*crc ^ ((uint8_t*)data)[i]] ^ *crc >> 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
u_int32_t ethernet_crc32(const void* data, size_t n_bytes) {
|
|
||||||
u_int32_t crc = 0;
|
|
||||||
__crc32(data, n_bytes, &crc);
|
|
||||||
return crc;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* *********************************************** */
|
|
||||||
|
|
||||||
#ifdef USE_DPDK
|
|
||||||
|
|
||||||
static const struct rte_eth_conf port_conf_default = {
|
|
||||||
.rxmode = { .max_rx_pkt_len = ETHER_MAX_LEN }
|
|
||||||
};
|
|
||||||
|
|
||||||
/* ************************************ */
|
|
||||||
|
|
||||||
int dpdk_port_init(int port, struct rte_mempool *mbuf_pool) {
|
|
||||||
struct rte_eth_conf port_conf = port_conf_default;
|
|
||||||
const u_int16_t rx_rings = 1, tx_rings = 1;
|
|
||||||
int retval;
|
|
||||||
u_int16_t q;
|
|
||||||
|
|
||||||
/* 1 RX queue */
|
|
||||||
retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);
|
|
||||||
|
|
||||||
if(retval != 0)
|
|
||||||
return retval;
|
|
||||||
|
|
||||||
for (q = 0; q < rx_rings; q++) {
|
|
||||||
retval = rte_eth_rx_queue_setup(port, q, RX_RING_SIZE, rte_eth_dev_socket_id(port), NULL, mbuf_pool);
|
|
||||||
if(retval < 0)
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (q = 0; q < tx_rings; q++) {
|
|
||||||
retval = rte_eth_tx_queue_setup(port, q, TX_RING_SIZE, rte_eth_dev_socket_id(port), NULL);
|
|
||||||
if(retval < 0)
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
retval = rte_eth_dev_start(port);
|
|
||||||
|
|
||||||
if(retval < 0)
|
|
||||||
return retval;
|
|
||||||
|
|
||||||
rte_eth_promiscuous_enable(port);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|||||||
+15
-48
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* ndpi_util.h
|
* ndpi_util.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-16 - ntop.org
|
||||||
*
|
*
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
@@ -24,37 +24,18 @@
|
|||||||
* If you concern about performance or have to integrate nDPI in your
|
* If you concern about performance or have to integrate nDPI in your
|
||||||
* application, you could need to reimplement them yourself.
|
* application, you could need to reimplement them yourself.
|
||||||
*
|
*
|
||||||
* WARNING: this API is just a demo od nDPI usage: Use it at your own risk!
|
* WARNING: this API is unstable! Use it at your own risk!
|
||||||
*/
|
*/
|
||||||
#ifndef __NDPI_UTIL_H__
|
#ifndef __NDPI_UTIL_H__
|
||||||
#define __NDPI_UTIL_H__
|
#define __NDPI_UTIL_H__
|
||||||
|
|
||||||
#include <pcap.h>
|
#include <pcap.h>
|
||||||
|
|
||||||
#ifdef USE_DPDK
|
|
||||||
#include <rte_eal.h>
|
|
||||||
#include <rte_ether.h>
|
|
||||||
#include <rte_ethdev.h>
|
|
||||||
#include <rte_cycles.h>
|
|
||||||
#include <rte_lcore.h>
|
|
||||||
#include <rte_mbuf.h>
|
|
||||||
|
|
||||||
#define RX_RING_SIZE 128
|
|
||||||
#define TX_RING_SIZE 512
|
|
||||||
#define NUM_MBUFS 8191
|
|
||||||
#define MBUF_CACHE_SIZE 250
|
|
||||||
#define BURST_SIZE 32
|
|
||||||
#define PREFETCH_OFFSET 3
|
|
||||||
|
|
||||||
extern int dpdk_port_init(int port, struct rte_mempool *mbuf_pool);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAX_NUM_READER_THREADS 16
|
#define MAX_NUM_READER_THREADS 16
|
||||||
#define IDLE_SCAN_PERIOD 10 /* msec (use TICK_RESOLUTION = 1000) */
|
#define IDLE_SCAN_PERIOD 10 /* msec (use TICK_RESOLUTION = 1000) */
|
||||||
#define MAX_IDLE_TIME 30000
|
#define MAX_IDLE_TIME 30000
|
||||||
#define IDLE_SCAN_BUDGET 1024
|
#define IDLE_SCAN_BUDGET 1024
|
||||||
#define NUM_ROOTS 512
|
#define NUM_ROOTS 512
|
||||||
#define MAX_EXTRA_PACKETS_TO_CHECK 7
|
|
||||||
#define MAX_NDPI_FLOWS 200000000
|
#define MAX_NDPI_FLOWS 200000000
|
||||||
#define TICK_RESOLUTION 1000
|
#define TICK_RESOLUTION 1000
|
||||||
#define MAX_NUM_IP_ADDRESS 5 /* len of ip address array */
|
#define MAX_NUM_IP_ADDRESS 5 /* len of ip address array */
|
||||||
@@ -62,42 +43,32 @@ extern int dpdk_port_init(int port, struct rte_mempool *mbuf_pool);
|
|||||||
#define AGGRESSIVE_PERCENT 95.00
|
#define AGGRESSIVE_PERCENT 95.00
|
||||||
#define DIR_SRC 10
|
#define DIR_SRC 10
|
||||||
#define DIR_DST 20
|
#define DIR_DST 20
|
||||||
#define PORT_ARRAY_SIZE 20
|
|
||||||
#define HOST_ARRAY_SIZE 20
|
|
||||||
#define FLOWS_PACKETS_THRESHOLD 0.9
|
|
||||||
#define FLOWS_PERCENT_THRESHOLD 1.0
|
|
||||||
#define FLOWS_PERCENT_THRESHOLD_2 0.2
|
|
||||||
#define FLOWS_THRESHOLD 1000
|
|
||||||
#define PKTS_PERCENT_THRESHOLD 0.1
|
|
||||||
#define MAX_TABLE_SIZE_1 4096
|
|
||||||
#define MAX_TABLE_SIZE_2 8192
|
|
||||||
#define INIT_VAL -1
|
|
||||||
|
|
||||||
// flow tracking
|
// flow tracking
|
||||||
typedef struct ndpi_flow_info {
|
typedef struct ndpi_flow_info {
|
||||||
u_int32_t hashval;
|
u_int32_t hashval;
|
||||||
u_int32_t src_ip;
|
u_int32_t lower_ip;
|
||||||
u_int32_t dst_ip;
|
u_int32_t upper_ip;
|
||||||
u_int16_t src_port;
|
u_int16_t lower_port;
|
||||||
u_int16_t dst_port;
|
u_int16_t upper_port;
|
||||||
u_int8_t detection_completed, protocol, bidirectional, check_extra_packets;
|
u_int8_t detection_completed, protocol, bidirectional;
|
||||||
u_int16_t vlan_id;
|
u_int16_t vlan_id;
|
||||||
struct ndpi_flow_struct *ndpi_flow;
|
struct ndpi_flow_struct *ndpi_flow;
|
||||||
char src_name[48], dst_name[48];
|
char lower_name[48], upper_name[48];
|
||||||
u_int8_t ip_version;
|
u_int8_t ip_version;
|
||||||
u_int64_t last_seen;
|
u_int64_t last_seen;
|
||||||
u_int64_t src2dst_bytes, dst2src_bytes;
|
u_int64_t bytes;
|
||||||
u_int32_t src2dst_packets, dst2src_packets;
|
u_int32_t packets;
|
||||||
|
|
||||||
// result only, not used for flow identification
|
// result only, not used for flow identification
|
||||||
ndpi_protocol detected_protocol;
|
ndpi_protocol detected_protocol;
|
||||||
|
|
||||||
char info[96];
|
char info[96];
|
||||||
char host_server_name[256];
|
char host_server_name[192];
|
||||||
char bittorent_hash[41];
|
char bittorent_hash[41];
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
char client_info[64], server_info[64];
|
char client_info[48], server_info[48];
|
||||||
} ssh_ssl;
|
} ssh_ssl;
|
||||||
|
|
||||||
void *src_id, *dst_id;
|
void *src_id, *dst_id;
|
||||||
@@ -153,7 +124,6 @@ typedef struct ndpi_workflow {
|
|||||||
/* allocated by prefs */
|
/* allocated by prefs */
|
||||||
void **ndpi_flows_root;
|
void **ndpi_flows_root;
|
||||||
struct ndpi_detection_module_struct *ndpi_struct;
|
struct ndpi_detection_module_struct *ndpi_struct;
|
||||||
u_int32_t num_allocated_flows;
|
|
||||||
} ndpi_workflow_t;
|
} ndpi_workflow_t;
|
||||||
|
|
||||||
|
|
||||||
@@ -195,9 +165,6 @@ static inline void ndpi_workflow_set_flow_giveup_callback(struct ndpi_workflow *
|
|||||||
/* compare two nodes in workflow */
|
/* compare two nodes in workflow */
|
||||||
int ndpi_workflow_node_cmp(const void *a, const void *b);
|
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);
|
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 ethernet_crc32(const void* data, size_t n_bytes, uint32_t* crc);
|
||||||
void ndpi_flow_info_freer(void *node);
|
void ndpi_flow_info_freer(void *node);
|
||||||
|
|
||||||
extern int nDPI_LogLevel;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+1
-1
@@ -7,4 +7,4 @@ Name: libndpi
|
|||||||
Description: deep packet inspection library
|
Description: deep packet inspection library
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -lndpi
|
Libs: -L${libdir} -lndpi
|
||||||
Cflags: -I${includedir}/ndpi
|
Cflags: -I${includedir}/libndpi-@VERSION@
|
||||||
|
|||||||
+54
@@ -0,0 +1,54 @@
|
|||||||
|
ndpi_dump_protocols
|
||||||
|
ndpi_strnstr
|
||||||
|
ndpi_detection_giveup
|
||||||
|
ndpi_get_proto_name
|
||||||
|
ndpi_free
|
||||||
|
ndpi_guess_undetected_protocol
|
||||||
|
ndpi_tfind
|
||||||
|
ndpi_tsearch
|
||||||
|
ndpi_set_protocol_detection_bitmask2
|
||||||
|
ndpi_detection_get_sizeof_ndpi_id_struct
|
||||||
|
ndpi_detection_get_sizeof_ndpi_flow_struct
|
||||||
|
ndpi_load_protocols_file
|
||||||
|
ndpi_tdestroy
|
||||||
|
ndpi_exit_detection_module
|
||||||
|
ndpi_l4_detection_process_packet
|
||||||
|
ndpi_detection_process_packet
|
||||||
|
ndpi_twalk
|
||||||
|
ndpi_tdelete
|
||||||
|
ndpi_revision
|
||||||
|
ndpi_init_detection_module
|
||||||
|
ndpi_get_num_supported_protocols
|
||||||
|
ndpi_set_proto_defaults
|
||||||
|
ndpi_get_protocol_id
|
||||||
|
ndpi_find_port_based_protocol
|
||||||
|
ndpi_get_http_method
|
||||||
|
ndpi_get_http_url
|
||||||
|
ndpi_get_http_content_type
|
||||||
|
ndpi_free_flow
|
||||||
|
ndpi_get_proto_breed
|
||||||
|
ndpi_get_proto_breed_name
|
||||||
|
ndpi_get_proto_by_id
|
||||||
|
ndpi_get_proto_by_name
|
||||||
|
ndpi_get_protocol_id_master_proto
|
||||||
|
ndpi_guess_protocol_id
|
||||||
|
ndpi_protocol2name
|
||||||
|
ndpi_get_lower_proto
|
||||||
|
ndpi_is_proto
|
||||||
|
ndpi_malloc
|
||||||
|
ndpi_calloc
|
||||||
|
ndpi_set_detected_protocol
|
||||||
|
ndpi_match_string_subprotocol
|
||||||
|
ndpi_init_automa
|
||||||
|
ndpi_free_automa
|
||||||
|
ndpi_add_string_value_to_automa
|
||||||
|
ndpi_add_string_to_automa
|
||||||
|
ndpi_finalize_automa
|
||||||
|
ndpi_match_string
|
||||||
|
ndpi_match_string_id
|
||||||
|
set_ndpi_malloc
|
||||||
|
set_ndpi_free
|
||||||
|
set_ndpi_debug_function
|
||||||
|
ndpi_category_str
|
||||||
|
ndpi_get_proto_category
|
||||||
|
ndpi_netbios_name_interpret
|
||||||
@@ -1 +0,0 @@
|
|||||||
ubuntu
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/usr/local/lib
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (C) 2018 - ntop.org
|
|
||||||
#
|
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
|
||||||
|
|
||||||
PKG_NAME:=libndpi
|
|
||||||
PKG_VERSION:=1333.ab2f3ce
|
|
||||||
PKG_RELEASE:=1
|
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
||||||
PKG_SOURCE_URL:=https://github.com/ntop/nDPI.git
|
|
||||||
PKG_SOURCE_VERSION:=ab2f3cefc89017d73e67faa4eb4011e7e3f2044d
|
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
PKG_SOURCE_PROTO:=git
|
|
||||||
|
|
||||||
PKG_MAINTAINER:=Emanuele Faranda <faranda@ntop.org>
|
|
||||||
PKG_LICENSE:=GPL3
|
|
||||||
PKG_BUILD_DEPENDS:=+libpcap
|
|
||||||
PKG_BUILD_PARALLEL:=1
|
|
||||||
|
|
||||||
# autogen fix
|
|
||||||
PKG_FIXUP:=autoreconf
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
|
||||||
|
|
||||||
define Package/libndpi
|
|
||||||
SECTION:=network
|
|
||||||
CATEGORY:=Network
|
|
||||||
#DEPENDS:=+libc +libjson-c +libpthread
|
|
||||||
TITLE:=nDPI Deep Packet Inspection Library
|
|
||||||
URL:=https://www.ntop.org
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/libndpi/description
|
|
||||||
Open and Extensible GPLv3 Deep Packet Inspection Library
|
|
||||||
endef
|
|
||||||
|
|
||||||
CONFIGURE_ARGS += \
|
|
||||||
--with-pic \
|
|
||||||
--disable-json-c \
|
|
||||||
|
|
||||||
define Build/Prepare
|
|
||||||
$(call Build/Prepare/Default)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Configure
|
|
||||||
( cd $(PKG_BUILD_DIR); ./autogen.sh )
|
|
||||||
$(call Build/Configure/Default)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/InstallDev
|
|
||||||
$(INSTALL_DIR) $(STAGING_DIR)/usr/local/include/libndpi
|
|
||||||
$(CP) $(PKG_BUILD_DIR)/src/include/* $(STAGING_DIR)/usr/local/include/libndpi
|
|
||||||
$(INSTALL_DIR) $(STAGING_DIR)/usr/local/lib
|
|
||||||
$(CP) $(PKG_BUILD_DIR)/src/lib/libndpi.* $(STAGING_DIR)/usr/local/lib
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,libndpi))
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#
|
|
||||||
# RPM Build Process
|
|
||||||
#
|
|
||||||
APPL=ndpi
|
|
||||||
PLATFORM=@PLATFORM@
|
|
||||||
GIT_REVISION=@GIT_REVISION@
|
|
||||||
PACKAGE_VERSION=@PACKAGE_VERSION@
|
|
||||||
PACKAGE=$(APPL)-$(PACKAGE_VERSION)-$(GIT_REVISION).$(PLATFORM).rpm
|
|
||||||
DEV_PACKAGE=$(APPL)-dev-$(PACKAGE_VERSION)-$(GIT_REVISION).$(PLATFORM).rpm
|
|
||||||
PACKAGE_PATH=$(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)
|
|
||||||
|
|
||||||
package: build-rpm
|
|
||||||
|
|
||||||
build-src:
|
|
||||||
cd ../..; ./autogen.sh; ./configure; make clean; make
|
|
||||||
|
|
||||||
cleanup-rpm:
|
|
||||||
rm -rf $(HOME)/rpmbuild/BUILD/ndpi* $(HOME)/rpmbuild/SOURCES/ndpi*
|
|
||||||
|
|
||||||
build-rpm: build-src cleanup-rpm
|
|
||||||
-rm -rf ndpi-@PACKAGE_VERSION@
|
|
||||||
mkdir -p ndpi-@PACKAGE_VERSION@/packages
|
|
||||||
cp ndpi.spec.in ndpi-@PACKAGE_VERSION@/packages
|
|
||||||
cp ../../Makefile.* ../../libtool ../../configure* ../../config.* ../../install-sh ../../autogen.sh ndpi-@PACKAGE_VERSION@
|
|
||||||
cp -rf ../../src ndpi-@PACKAGE_VERSION@
|
|
||||||
cp ../../CHANGELOG.md ../../COPYING ndpi-@PACKAGE_VERSION@
|
|
||||||
\rm -f ndpi-@PACKAGE_VERSION@/config.status
|
|
||||||
mkdir -p $(HOME)/rpmbuild/SOURCES
|
|
||||||
tar cvfz $(HOME)/rpmbuild/SOURCES/ndpi-@PACKAGE_VERSION@.tgz ndpi-@PACKAGE_VERSION@
|
|
||||||
@rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)
|
|
||||||
@rpmbuild -bb ./$(APPL).spec --define "buildnumber $(GIT_REVISION)"
|
|
||||||
@if [[ $EUID -ne 0 ]]; then ./rpm-sign.exp $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE); fi
|
|
||||||
@if [[ $EUID -ne 0 ]]; then ./rpm-sign.exp $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(DEV_PACKAGE); fi
|
|
||||||
@echo ""
|
|
||||||
@echo "Package contents:"
|
|
||||||
@rpm -qpl $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)
|
|
||||||
@echo "The package is now available in $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE)"
|
|
||||||
|
|
||||||
Vendored
-2869
File diff suppressed because it is too large
Load Diff
@@ -1,44 +0,0 @@
|
|||||||
AC_INIT([Makefile.in], 1.0)
|
|
||||||
|
|
||||||
DATE=`date -R`
|
|
||||||
KERNEL=`uname -r`
|
|
||||||
PLATFORM=`uname -p`
|
|
||||||
MACHINE=`uname -m`
|
|
||||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
|
||||||
|
|
||||||
EXTN=""
|
|
||||||
if test $MACHINE = "x86_64"; then
|
|
||||||
EXTN="amd64"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "aar"; then
|
|
||||||
EXTN="arm64"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "arm"; then
|
|
||||||
EXTN="armhf"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "mip"; then
|
|
||||||
EXTN="mips"
|
|
||||||
else
|
|
||||||
EXTN="i386"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
PACKAGE_VERSION=`../version.sh --release`
|
|
||||||
MAJOR_RELEASE=`../version.sh --major-release`
|
|
||||||
GIT_REVISION=`../version.sh --revision`
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile ndpi.spec])
|
|
||||||
|
|
||||||
AC_SUBST(PACKAGE_VERSION)
|
|
||||||
AC_SUBST(PLATFORM)
|
|
||||||
AC_SUBST(MACHINE)
|
|
||||||
AC_SUBST(EXTN)
|
|
||||||
AC_SUBST(DATE)
|
|
||||||
AC_SUBST(KERNEL)
|
|
||||||
AC_SUBST(GIT_REVISION)
|
|
||||||
AC_SUBST(MAJOR_RELEASE)
|
|
||||||
|
|
||||||
AC_OUTPUT
|
|
||||||
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
Summary: L7 DPI library
|
|
||||||
Name: ndpi
|
|
||||||
Version: @PACKAGE_VERSION@
|
|
||||||
Release: %{buildnumber}
|
|
||||||
License: LGPL
|
|
||||||
Group: Networking/Utilities
|
|
||||||
Conflicts: nprobe-dev
|
|
||||||
URL: http://www.ntop.org/products/deep-packet-inspection/ndpi/
|
|
||||||
Source: ndpi-%{version}.tgz
|
|
||||||
Packager: Luca Deri <deri@ntop.org>
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
||||||
%{?el7:Requires: glibc >= 2.3.4 numactl coreutils }
|
|
||||||
%{?el6:Requires: glibc >= 2.3.4 numactl coreutils }
|
|
||||||
AutoReqProv: no
|
|
||||||
|
|
||||||
%description
|
|
||||||
nDPI Open and Extensible LGPLv3 Deep Packet Inspection Library.
|
|
||||||
|
|
||||||
%package dev
|
|
||||||
Summary: Header files and development libraries for %{name}
|
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description dev
|
|
||||||
This package contains the header files and development libraries
|
|
||||||
for %{name}. If you like to develop programs using %{name},
|
|
||||||
you will need to install %{name}-dev.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
|
|
||||||
%setup -q
|
|
||||||
|
|
||||||
# Execution order:
|
|
||||||
# install: pre -> (copy) -> post
|
|
||||||
# upgrade: pre -> (copy) -> post -> preun (old) -> (delete old) -> postun (old)
|
|
||||||
# un-install: preun -> (delete) -> postun
|
|
||||||
|
|
||||||
%pre
|
|
||||||
|
|
||||||
%post
|
|
||||||
|
|
||||||
%build
|
|
||||||
PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
|
||||||
|
|
||||||
%define includedir /usr/local/include/ndpi
|
|
||||||
%define libdir /usr/local/lib
|
|
||||||
%define bindir /usr/local/bin
|
|
||||||
|
|
||||||
%install
|
|
||||||
PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
|
||||||
if [ -d $RPM_BUILD_ROOT ]; then
|
|
||||||
\rm -rf $RPM_BUILD_ROOT
|
|
||||||
fi
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{includedir}
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{libdir}
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{bindir}
|
|
||||||
cd $HOME/nDPI; make DESTDIR=$RPM_BUILD_ROOT install;
|
|
||||||
rm $RPM_BUILD_ROOT%{libdir}/libndpi.so
|
|
||||||
rm $RPM_BUILD_ROOT%{libdir}/libndpi.so.?
|
|
||||||
cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so.@MAJOR_RELEASE@; cd -
|
|
||||||
cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so; cd -
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
|
|
||||||
cp $HOME/nDPI/packages/etc/ld.so.conf.d/ndpi.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d
|
|
||||||
strip $RPM_BUILD_ROOT%{bindir}/*
|
|
||||||
rm -fr %{buildroot}%{includedir}/ndpi_win32.h
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -fr $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-, root, root)
|
|
||||||
|
|
||||||
/usr/local/lib/libndpi.so
|
|
||||||
/usr/local/lib/libndpi.so.@MAJOR_RELEASE@
|
|
||||||
/usr/local/lib/libndpi.so.@PACKAGE_VERSION@
|
|
||||||
/usr/local/bin/ndpiReader
|
|
||||||
/etc/ld.so.conf.d/ndpi.conf
|
|
||||||
/usr/local/libdata/pkgconfig/libndpi.pc
|
|
||||||
|
|
||||||
%preun
|
|
||||||
|
|
||||||
%files dev
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
|
|
||||||
%{includedir}
|
|
||||||
%{libdir}/libndpi.a
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Mon Nov 19 2018 Alfredo Cardigliano <cardigliano@ntop.org> 2.5
|
|
||||||
- Initial package version
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/usr/bin/expect -f
|
|
||||||
|
|
||||||
### rpm-sign.exp -- Sign RPMs by sending the passphrase.
|
|
||||||
|
|
||||||
spawn rpm --addsign {*}$argv
|
|
||||||
expect -exact "Enter pass phrase: "
|
|
||||||
send -- "\r"
|
|
||||||
expect eof
|
|
||||||
|
|
||||||
## end of rpm-sign.exp
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
#
|
||||||
|
# Change it according to your setup
|
||||||
|
#
|
||||||
|
NDPI_HOME=$(PWD)/../..
|
||||||
|
NDPI_BUILD=${NDPI_HOME}/packages/ubuntu
|
||||||
|
|
||||||
|
all: clean ndpi
|
||||||
|
|
||||||
|
ndpi:
|
||||||
|
\rm -rf ./usr ./debian/tmp ./debian/ndpi-dev
|
||||||
|
mkdir -p ./usr/local ./debian/ndpi-dev
|
||||||
|
mkdir -p ./usr/local/ndpi/lib ./usr/local/ndpi/bin ./ndpi-dev/usr/local/include/ndpi/
|
||||||
|
cd ${NDPI_HOME}; ./autogen.sh; ./configure; make
|
||||||
|
cp $(NDPI_HOME)/lib/libndpi.a $(NDPI_HOME)/lib/libndpi.so* ./usr/local/ndpi/lib/
|
||||||
|
cp $(NDPI_HOME)/example/ndpiReader ./usr/local/ndpi/bin/
|
||||||
|
cp $(NDPI_HOME)/src/include/*.h ndpi-dev/usr/local/include/ndpi/
|
||||||
|
-rm -fr ndpi-dev/usr/local/include/nprobe/ndpi/.svn ndpi-dev/usr/local/include/ndpi/Makefile* ndpi-dev/usr/local/include/ndpi/ndpi_win32.h* ndpi-dev/usr/local/include/ndpi/include
|
||||||
|
-find ./usr/local/lib -name "*.la" -exec /bin/rm {} ';'
|
||||||
|
@echo
|
||||||
|
@find . -name "*~" -exec /bin/rm {} ';'
|
||||||
|
dpkg-buildpackage -rfakeroot -d -us -uc
|
||||||
|
dpkg-sig --sign builder -k 7921DF34 ../ndpi*deb
|
||||||
|
@\rm -f ../ndpi*dsc ../ndpi*.gz ../ndpi*changes
|
||||||
|
@/bin/mv ../ndpi*deb .
|
||||||
|
@echo
|
||||||
|
@echo "Package built."
|
||||||
|
@/bin/ls ndpi*deb
|
||||||
|
@echo "-------------------------------"
|
||||||
|
-dpkg --contents ndpi*amd64.deb
|
||||||
|
@echo "-------------------------------"
|
||||||
|
@echo "-------------------------------"
|
||||||
|
-dpkg --contents ndpi*all.deb
|
||||||
|
@echo "-------------------------------"
|
||||||
|
|
||||||
|
distclean:
|
||||||
|
echo "dummy distclean"
|
||||||
|
|
||||||
|
install:
|
||||||
|
echo "dummy install"
|
||||||
|
|
||||||
|
clean:
|
||||||
|
-rm -rf *~ *deb debian/tmp ./usr
|
||||||
+13
-17
@@ -7,33 +7,29 @@ NDPI_BUILD=${NDPI_HOME}/packages/ubuntu
|
|||||||
all: clean ndpi
|
all: clean ndpi
|
||||||
|
|
||||||
ndpi:
|
ndpi:
|
||||||
\rm -rf ./debian/ndpi-tmp ./debian/ndpi-dev-tmp ./debian/ndpi ./debian/ndpi-dev
|
\rm -rf ./usr ./debian/tmp ./debian/ndpi-dev
|
||||||
mkdir -p ./debian/ndpi-tmp ./debian/ndpi-dev-tmp
|
mkdir -p ./usr/local ./debian/ndpi-dev
|
||||||
mkdir -p ./debian/ndpi-tmp/usr/local/lib ./debian/ndpi-tmp/usr/local/bin
|
mkdir -p ./usr/local/ndpi/lib ./usr/local/ndpi/bin ./ndpi-dev/usr/local/include/ndpi/
|
||||||
mkdir -p ./debian/ndpi-dev-tmp/usr/local/lib ./debian/ndpi-dev-tmp/usr/local/include/ndpi
|
|
||||||
cd ${NDPI_HOME}; ./autogen.sh; ./configure; make
|
cd ${NDPI_HOME}; ./autogen.sh; ./configure; make
|
||||||
cp $(NDPI_HOME)/src/lib/libndpi.so.@NDPI_VERS@ ./debian/ndpi-tmp/usr/local/lib/
|
cp $(NDPI_HOME)/lib/libndpi.a $(NDPI_HOME)/lib/libndpi.so* ./usr/local/ndpi/lib/
|
||||||
cd ./debian/ndpi-tmp/usr/local/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so; cd -
|
cp $(NDPI_HOME)/example/ndpiReader ./usr/local/ndpi/bin/
|
||||||
cd ./debian/ndpi-tmp/usr/local/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so.@MAJOR_RELEASE@; cd -
|
cp $(NDPI_HOME)/src/include/*.h ndpi-dev/usr/local/include/ndpi/
|
||||||
cp $(NDPI_HOME)/src/lib/libndpi.a ./debian/ndpi-dev-tmp/usr/local/lib/
|
-rm -fr ndpi-dev/usr/local/include/nprobe/ndpi/.svn ndpi-dev/usr/local/include/ndpi/Makefile* ndpi-dev/usr/local/include/ndpi/ndpi_win32.h* ndpi-dev/usr/local/include/ndpi/include
|
||||||
cp $(NDPI_HOME)/example/ndpiReader ./debian/ndpi-tmp/usr/local/bin/
|
-find ./usr/local/lib -name "*.la" -exec /bin/rm {} ';'
|
||||||
cp $(NDPI_HOME)/src/include/*.h ./debian/ndpi-dev-tmp/usr/local/include/ndpi/
|
|
||||||
-rm -fr ./debian/ndpi-dev-tmp/usr/local/include/ndpi/ndpi_win32.h*
|
|
||||||
@echo
|
@echo
|
||||||
@find ./debian/ndpi-tmp -name "*~" -exec /bin/rm {} ';'
|
@find . -name "*~" -exec /bin/rm {} ';'
|
||||||
@find ./debian/ndpi-dev-tmp -name "*~" -exec /bin/rm {} ';'
|
|
||||||
dpkg-buildpackage -rfakeroot -d -us -uc
|
dpkg-buildpackage -rfakeroot -d -us -uc
|
||||||
dpkg-sig --sign builder -k D1EB60BE ../ndpi*deb
|
dpkg-sig --sign builder -k 7921DF34 ../ndpi*deb
|
||||||
@\rm -f ../ndpi*dsc ../ndpi*.gz ../ndpi*changes
|
@\rm -f ../ndpi*dsc ../ndpi*.gz ../ndpi*changes
|
||||||
@/bin/mv ../ndpi*deb .
|
@/bin/mv ../ndpi*deb .
|
||||||
@echo
|
@echo
|
||||||
@echo "Package built."
|
@echo "Package built."
|
||||||
@/bin/ls ndpi*deb
|
@/bin/ls ndpi*deb
|
||||||
@echo "-------------------------------"
|
@echo "-------------------------------"
|
||||||
-dpkg --contents ndpi_*.deb
|
-dpkg --contents ndpi*amd64.deb
|
||||||
@echo "-------------------------------"
|
@echo "-------------------------------"
|
||||||
@echo "-------------------------------"
|
@echo "-------------------------------"
|
||||||
-dpkg --contents ndpi-dev_*.deb
|
-dpkg --contents ndpi*all.deb
|
||||||
@echo "-------------------------------"
|
@echo "-------------------------------"
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
@@ -43,4 +39,4 @@ install:
|
|||||||
echo "dummy install"
|
echo "dummy install"
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-rm -rf *~ *deb ./usr ./debian/ndpi ./debian/ndpi-dev ./debian/ndpi-tmp ./debian/ndpi-dev-tmp
|
-rm -rf *~ *deb debian/tmp ./usr
|
||||||
|
|||||||
Vendored
+21
-38
@@ -583,12 +583,13 @@ PACKAGE_URL=''
|
|||||||
|
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
MAJOR_RELEASE
|
PFRING_SVN_RELEASE
|
||||||
GIT_REVISION
|
SVN_RELEASE
|
||||||
KERNEL
|
KERNEL
|
||||||
DATE
|
DATE
|
||||||
EXTN
|
EXTN
|
||||||
MACHINE
|
MACHINE
|
||||||
|
PFRING_VERS
|
||||||
NDPI_VERS
|
NDPI_VERS
|
||||||
target_alias
|
target_alias
|
||||||
host_alias
|
host_alias
|
||||||
@@ -609,7 +610,6 @@ infodir
|
|||||||
docdir
|
docdir
|
||||||
oldincludedir
|
oldincludedir
|
||||||
includedir
|
includedir
|
||||||
runstatedir
|
|
||||||
localstatedir
|
localstatedir
|
||||||
sharedstatedir
|
sharedstatedir
|
||||||
sysconfdir
|
sysconfdir
|
||||||
@@ -674,7 +674,6 @@ datadir='${datarootdir}'
|
|||||||
sysconfdir='${prefix}/etc'
|
sysconfdir='${prefix}/etc'
|
||||||
sharedstatedir='${prefix}/com'
|
sharedstatedir='${prefix}/com'
|
||||||
localstatedir='${prefix}/var'
|
localstatedir='${prefix}/var'
|
||||||
runstatedir='${localstatedir}/run'
|
|
||||||
includedir='${prefix}/include'
|
includedir='${prefix}/include'
|
||||||
oldincludedir='/usr/include'
|
oldincludedir='/usr/include'
|
||||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||||
@@ -927,15 +926,6 @@ do
|
|||||||
| -silent | --silent | --silen | --sile | --sil)
|
| -silent | --silent | --silen | --sile | --sil)
|
||||||
silent=yes ;;
|
silent=yes ;;
|
||||||
|
|
||||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
||||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
|
||||||
| --run | --ru | --r)
|
|
||||||
ac_prev=runstatedir ;;
|
|
||||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
||||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
||||||
| --run=* | --ru=* | --r=*)
|
|
||||||
runstatedir=$ac_optarg ;;
|
|
||||||
|
|
||||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||||
ac_prev=sbindir ;;
|
ac_prev=sbindir ;;
|
||||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||||
@@ -1073,7 +1063,7 @@ fi
|
|||||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||||
libdir localedir mandir runstatedir
|
libdir localedir mandir
|
||||||
do
|
do
|
||||||
eval ac_val=\$$ac_var
|
eval ac_val=\$$ac_var
|
||||||
# Remove trailing slashes.
|
# Remove trailing slashes.
|
||||||
@@ -1226,7 +1216,6 @@ Fine tuning of the installation directories:
|
|||||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
||||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||||
--includedir=DIR C header files [PREFIX/include]
|
--includedir=DIR C header files [PREFIX/include]
|
||||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||||
@@ -1681,35 +1670,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
DATE=`date -R`
|
NDPI_VERS=`cat ../../config.h | grep -w VERSION | cut -d \" -f 2`
|
||||||
KERNEL=`uname -r`
|
PFRING_VERS=`cat $HOME/PF_RING/kernel/linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
|
||||||
|
SVN_RELEASE=`svn info ../.. | grep "^Revision"|cut -d " " -f 2`
|
||||||
|
PFRING_SVN_RELEASE=`svn info $HOME/PF_RING | grep "^Revision"|cut -d " " -f 2`
|
||||||
MACHINE=`uname -m`
|
MACHINE=`uname -m`
|
||||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
|
||||||
|
|
||||||
EXTN=""
|
|
||||||
if test $MACHINE = "x86_64"; then
|
if test $MACHINE = "x86_64"; then
|
||||||
EXTN="amd64"
|
EXTN="amd64"
|
||||||
else
|
else
|
||||||
if test $SHORT_MACHINE = "aar"; then
|
EXTN="i386"
|
||||||
EXTN="arm64"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "arm"; then
|
|
||||||
EXTN="armhf"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "mip"; then
|
|
||||||
EXTN="mips"
|
|
||||||
else
|
|
||||||
EXTN="i386"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
NDPI_VERS=`../version.sh --release`
|
DATE=`date -R`
|
||||||
MAJOR_RELEASE=`../version.sh --major-release`
|
KERNEL=`uname -r`
|
||||||
GIT_REVISION=`../version.sh --revision`
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile debian/changelog debian/files debian/control"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1720,6 +1694,15 @@ ac_config_files="$ac_config_files Makefile debian/changelog debian/files debian/
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files Makefile"
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files debian/changelog"
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files debian/files"
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files debian/control"
|
||||||
|
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
# This file is a shell script that caches the results of configure
|
# This file is a shell script that caches the results of configure
|
||||||
# tests run on this system so they can be shared between configure
|
# tests run on this system so they can be shared between configure
|
||||||
|
|||||||
@@ -1,41 +1,32 @@
|
|||||||
AC_INIT([Makefile.in], 1.0)
|
AC_INIT([Makefile.in], 1.0)
|
||||||
|
|
||||||
|
NDPI_VERS=`cat ../../config.h | grep -w VERSION | cut -d \" -f 2`
|
||||||
|
PFRING_VERS=`cat $HOME/PF_RING/kernel/linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
|
||||||
|
SVN_RELEASE=`svn info ../.. | grep "^Revision"|cut -d " " -f 2`
|
||||||
|
PFRING_SVN_RELEASE=`svn info $HOME/PF_RING | grep "^Revision"|cut -d " " -f 2`
|
||||||
|
MACHINE=`uname -m`
|
||||||
|
|
||||||
|
if test $MACHINE = "x86_64"; then
|
||||||
|
EXTN="amd64"
|
||||||
|
else
|
||||||
|
EXTN="i386"
|
||||||
|
fi
|
||||||
|
|
||||||
DATE=`date -R`
|
DATE=`date -R`
|
||||||
KERNEL=`uname -r`
|
KERNEL=`uname -r`
|
||||||
MACHINE=`uname -m`
|
|
||||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
|
||||||
|
|
||||||
EXTN=""
|
|
||||||
if test $MACHINE = "x86_64"; then
|
|
||||||
EXTN="amd64"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "aar"; then
|
|
||||||
EXTN="arm64"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "arm"; then
|
|
||||||
EXTN="armhf"
|
|
||||||
else
|
|
||||||
if test $SHORT_MACHINE = "mip"; then
|
|
||||||
EXTN="mips"
|
|
||||||
else
|
|
||||||
EXTN="i386"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
NDPI_VERS=`../version.sh --release`
|
|
||||||
MAJOR_RELEASE=`../version.sh --major-release`
|
|
||||||
GIT_REVISION=`../version.sh --revision`
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile debian/changelog debian/files debian/control])
|
|
||||||
|
|
||||||
AC_SUBST(NDPI_VERS)
|
AC_SUBST(NDPI_VERS)
|
||||||
|
AC_SUBST(PFRING_VERS)
|
||||||
AC_SUBST(MACHINE)
|
AC_SUBST(MACHINE)
|
||||||
AC_SUBST(EXTN)
|
AC_SUBST(EXTN)
|
||||||
AC_SUBST(DATE)
|
AC_SUBST(DATE)
|
||||||
AC_SUBST(KERNEL)
|
AC_SUBST(KERNEL)
|
||||||
AC_SUBST(GIT_REVISION)
|
AC_SUBST(SVN_RELEASE)
|
||||||
AC_SUBST(MAJOR_RELEASE)
|
AC_SUBST(PFRING_SVN_RELEASE)
|
||||||
|
|
||||||
|
AC_CONFIG_FILES(Makefile)
|
||||||
|
AC_CONFIG_FILES(debian/changelog)
|
||||||
|
AC_CONFIG_FILES(debian/files)
|
||||||
|
AC_CONFIG_FILES(debian/control)
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
This directory contains the files needed to build the package
|
This directory contains the files needed to build the package
|
||||||
named 'ndpi' for the Debian GNU/Linux distribution.
|
named 'nprobe' for the Debian GNU/Linux distribution.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ndpi (@NDPI_VERS@-@GIT_REVISION@) stable; urgency=high
|
ndpi (@NDPI_VERS@-@SVN_RELEASE@) stable; urgency=high
|
||||||
* Last packaged version
|
* Last packaged version
|
||||||
|
|
||||||
-- Luca Deri <deri@ntop.org> @DATE@
|
-- Luca Deri <deri@ntop.org> @DATE@
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
9
|
1
|
||||||
|
|||||||
@@ -2,25 +2,27 @@ Source: ndpi
|
|||||||
Section: free
|
Section: free
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Luca Deri <deri@ntop.org>
|
Maintainer: Luca Deri <deri@ntop.org>
|
||||||
Standards-Version: @NDPI_VERS@
|
Standards-Version: @NDPI_VERSION@
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
Build-Conflicts:
|
Build-Conflicts:
|
||||||
|
|
||||||
Package: ndpi
|
Package: ndpi
|
||||||
Architecture: @EXTN@
|
Architecture: @EXTN@
|
||||||
Depends: libnuma1
|
Depends: pfring (=@PFRING_VERS@-@PFRING_SVN_RELEASE@), libnuma
|
||||||
Recommends:
|
Recommends:
|
||||||
Suggests:
|
Suggests:
|
||||||
Pre-Depends:
|
Pre-Depends:
|
||||||
Conflicts:
|
Conflicts:
|
||||||
Provides:
|
Provides:
|
||||||
Replaces:
|
Replaces:
|
||||||
Description: A L7 DPI library.
|
Description: A network probe.
|
||||||
|
|
||||||
Package: ndpi-dev
|
Package: ndpi-dev
|
||||||
Section: libdevel
|
Section: libdevel
|
||||||
Architecture: @EXTN@
|
Architecture: all
|
||||||
Depends: ndpi (= ${binary:Version}), ${misc:Depends}
|
Depends: ndpi (= ${binary:Version}), ${misc:Depends}
|
||||||
Conflicts:
|
Conflicts:
|
||||||
Description: Development library and header files for ndpi
|
Description: development library and header files for ndpi
|
||||||
|
Headers, static libraries, and documentation for the ndpi library
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
usr/local/ndpi
|
||||||
|
|||||||
@@ -17,7 +17,18 @@ esac
|
|||||||
|
|
||||||
umask 022
|
umask 022
|
||||||
|
|
||||||
|
# Update shared libs
|
||||||
|
echo "/usr/local/lib\n" > /etc/ld.so.conf.d/nprobe.conf
|
||||||
echo "Rebuilding ld cache..."
|
echo "Rebuilding ld cache..."
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
echo "Adding the nprobe startup script"
|
||||||
|
update-rc.d nprobe defaults 93 >/dev/null
|
||||||
|
|
||||||
|
echo "Making the /etc/nprobe directory..."
|
||||||
|
mkdir -p /etc/nprobe/
|
||||||
|
|
||||||
|
echo "Making the /var/log/nprobe directory..."
|
||||||
|
mkdir -p /var/log/nprobe
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
#\/bin/rm /etc/ld.so.conf.d/nprobe.conf
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
# Not needed: upstart does it
|
||||||
|
if [ "$1" = "purge" ] ; then
|
||||||
|
update-rc.d nprobe remove >/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# preinst script
|
# preinst script for nbox
|
||||||
#
|
#
|
||||||
# see: dh_installdeb(1)
|
# see: dh_installdeb(1)
|
||||||
|
|
||||||
@@ -13,6 +13,9 @@ set -e
|
|||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
install|upgrade)
|
install|upgrade)
|
||||||
|
if test -f /usr/local/sbin/nprobe; then
|
||||||
|
rm /usr/local/sbin/nprobe
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
abort-upgrade)
|
abort-upgrade)
|
||||||
@@ -27,4 +30,6 @@ esac
|
|||||||
# dh_installdeb will replace this with shell code automatically
|
# dh_installdeb will replace this with shell code automatically
|
||||||
# generated by other debhelper scripts.
|
# generated by other debhelper scripts.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
# Only shut the daemon down if we're really removing the package. If this is
|
||||||
|
# an upgrade, we will instead do a restart in the postinst... this keeps nprobe
|
||||||
|
# from being left shut down for a long time, which could pose problems.
|
||||||
case "$1" in
|
case "$1" in
|
||||||
upgrade)
|
upgrade)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
/etc/init.d/nprobe stop
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
@@ -1,7 +1,16 @@
|
|||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
# Uncomment this to turn on verbose mode.
|
# Uncomment this to turn on verbose mode.
|
||||||
export DH_VERBOSE=1
|
# export DH_VERBOSE=1
|
||||||
|
|
||||||
|
#
|
||||||
|
# debian/compat
|
||||||
|
# We should use at least compatibility version 5
|
||||||
|
# but this requires the whole building process
|
||||||
|
# to be remade and this is something we leave
|
||||||
|
# to when we will have more time
|
||||||
|
# http://www.tin.org/bin/man.cgi?section=7&topic=debhelper
|
||||||
|
#
|
||||||
|
|
||||||
package=ndpi
|
package=ndpi
|
||||||
|
|
||||||
@@ -28,20 +37,20 @@ binary-indep: build install
|
|||||||
binary-arch: build install
|
binary-arch: build install
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
dh_prep
|
dh_clean -k
|
||||||
#dh_clean -k
|
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
dh_installinit
|
dh_installinit
|
||||||
dh_installman
|
dh_installman
|
||||||
|
# install the files into debian/tmp.
|
||||||
|
cp -r ./usr/ ./debian/tmp
|
||||||
|
cp -r ./ndpi-dev/* ./debian/ndpi-dev/
|
||||||
|
-find ./debian/tmp -name .svn -exec /bin/rm -rf {} ';'
|
||||||
|
-find ./debian/tmp -executable -type f |xargs strip
|
||||||
dh_link
|
dh_link
|
||||||
dh_strip
|
dh_strip
|
||||||
dh_compress
|
dh_compress
|
||||||
dh_fixperms
|
dh_fixperms
|
||||||
dh_installdeb
|
dh_installdeb
|
||||||
mkdir -p ./debian/ndpi ./debian/ndpi-dev
|
|
||||||
cp -r ./debian/ndpi-tmp/* ./debian/ndpi/
|
|
||||||
cp -r ./debian/ndpi-dev-tmp/* ./debian/ndpi-dev/
|
|
||||||
-find ./debian/ndpi -executable -type f | xargs strip
|
|
||||||
dh_gencontrol
|
dh_gencontrol
|
||||||
dh_md5sums
|
dh_md5sums
|
||||||
dh_builddeb
|
dh_builddeb
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
SCRIPTPATH="$(cd "$(dirname "$0")"; pwd -P)"
|
|
||||||
RELEASE="$(cd ${SCRIPTPATH}; cat ../configure.ac|grep C_INIT|cut -c 21-|rev|cut -c 3-|rev)"
|
|
||||||
MAJOR_RELEASE="$(cd ${SCRIPTPATH}; cat ../configure.ac|grep C_INIT|cut -c 21-|rev|cut -c 3-|rev|cut -d. -f1)"
|
|
||||||
REVISION="$(cd ${SCRIPTPATH}; git rev-list --all |wc -l | tr -d '[[:space:]]')"
|
|
||||||
|
|
||||||
get_release() {
|
|
||||||
echo "${RELEASE}"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
get_major_release() {
|
|
||||||
echo "${MAJOR_RELEASE}"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
get_revision() {
|
|
||||||
echo "${REVISION}"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
get_version() {
|
|
||||||
echo "${RELEASE}-${REVISION}"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
--release)
|
|
||||||
get_release;
|
|
||||||
;;
|
|
||||||
--major-release)
|
|
||||||
get_major_release;
|
|
||||||
;;
|
|
||||||
--revision)
|
|
||||||
get_revision;
|
|
||||||
;;
|
|
||||||
--version)
|
|
||||||
get_version;
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Usage: ${0} {--release|--major-release|--revision|--version}"
|
|
||||||
exit 1
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
+96
-260
@@ -31,13 +31,8 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The #define below is used for apps that dynamically link with nDPI to make
|
#define SIZEOF_ID_STRUCT (sizeof(struct ndpi_id_struct))
|
||||||
sure that datastructures and in sync across versions
|
#define SIZEOF_FLOW_STRUCT (sizeof(struct ndpi_flow_struct))
|
||||||
*/
|
|
||||||
#define NDPI_API_VERSION 1
|
|
||||||
|
|
||||||
#define SIZEOF_ID_STRUCT ( sizeof(struct ndpi_id_struct) )
|
|
||||||
#define SIZEOF_FLOW_STRUCT ( sizeof(struct ndpi_flow_struct) )
|
|
||||||
|
|
||||||
#define NDPI_DETECTION_ONLY_IPV4 ( 1 << 0 )
|
#define NDPI_DETECTION_ONLY_IPV4 ( 1 << 0 )
|
||||||
#define NDPI_DETECTION_ONLY_IPV6 ( 1 << 1 )
|
#define NDPI_DETECTION_ONLY_IPV6 ( 1 << 1 )
|
||||||
@@ -47,20 +42,20 @@ extern "C" {
|
|||||||
#define SAVE_DETECTION_BITMASK_AS_UNKNOWN 1
|
#define SAVE_DETECTION_BITMASK_AS_UNKNOWN 1
|
||||||
#define NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN 0
|
#define NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN 0
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a string is encoded with punycode
|
* Check if a string is encoded with punycode
|
||||||
* ( https://tools.ietf.org/html/rfc3492 )
|
* ( https://tools.ietf.org/html/rfc3492 )
|
||||||
*
|
*
|
||||||
* @par buff = pointer to the string to ckeck
|
* @par buff = pointer to the string to ckeck
|
||||||
* @par len = len of the string
|
* @par len = len of the string
|
||||||
* @return 1 if the string is punycoded;
|
* @return 1 if the string is punycoded;
|
||||||
* else 0
|
* else 0
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int check_punycode_string(char *buff, int len);
|
int check_punycode_string(char * buff , int len);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the size of the flow struct
|
* Get the size of the flow struct
|
||||||
*
|
*
|
||||||
@@ -69,15 +64,16 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
u_int32_t ndpi_detection_get_sizeof_ndpi_flow_struct(void);
|
u_int32_t ndpi_detection_get_sizeof_ndpi_flow_struct(void);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the size of the id struct
|
* Get the size of the id struct
|
||||||
*
|
*
|
||||||
* @return the size of the id struct
|
* @return the size of the id struct
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
u_int32_t ndpi_detection_get_sizeof_ndpi_id_struct(void);
|
u_int32_t ndpi_detection_get_sizeof_ndpi_id_struct(void);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* nDPI personal allocation and free functions
|
* nDPI personal allocation and free functions
|
||||||
**/
|
**/
|
||||||
@@ -102,18 +98,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
char* ndpi_strnstr(const char *s, const char *find, size_t slen);
|
char* ndpi_strnstr(const char *s, const char *find, size_t slen);
|
||||||
|
|
||||||
/**
|
|
||||||
* Same as ndpi_strnstr but case insensitive
|
|
||||||
*
|
|
||||||
* @par s = string to parse
|
|
||||||
* @par find = string to match with -s-
|
|
||||||
* @par slen = max length to match between -s- and -find-
|
|
||||||
* @return a pointer to the beginning of the located substring;
|
|
||||||
* NULL if the substring is not found
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
char* ndpi_strncasestr(const char *s, const char *find, size_t slen);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the nDPI protocol id for IP-based protocol detection
|
* Returns the nDPI protocol id for IP-based protocol detection
|
||||||
*
|
*
|
||||||
@@ -121,10 +106,10 @@ extern "C" {
|
|||||||
* @par pin = IP host address (MUST BE in network byte order):
|
* @par pin = IP host address (MUST BE in network byte order):
|
||||||
* See man(7) ip for details
|
* See man(7) ip for details
|
||||||
* @return the nDPI protocol ID
|
* @return the nDPI protocol ID
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
u_int16_t ndpi_network_ptree_match(struct ndpi_detection_module_struct *ndpi_struct,
|
u_int16_t ndpi_network_ptree_match(struct ndpi_detection_module_struct *ndpi_struct, struct in_addr *pin);
|
||||||
struct in_addr *pin);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Init single protocol match
|
* Init single protocol match
|
||||||
@@ -132,10 +117,9 @@ extern "C" {
|
|||||||
* @par ndpi_mod = the struct created for the protocol detection
|
* @par ndpi_mod = the struct created for the protocol detection
|
||||||
* @par match = the struct passed to match the protocol
|
* @par match = the struct passed to match the protocol
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ndpi_init_protocol_match(struct ndpi_detection_module_struct *ndpi_mod,
|
void ndpi_init_protocol_match(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol_match *match);
|
||||||
ndpi_protocol_match *match);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a new initialized detection module
|
* Returns a new initialized detection module
|
||||||
*
|
*
|
||||||
@@ -143,7 +127,7 @@ extern "C" {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
struct ndpi_detection_module_struct *ndpi_init_detection_module(void);
|
struct ndpi_detection_module_struct *ndpi_init_detection_module(void);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Frees the memory allocated in the specified flow
|
* Frees the memory allocated in the specified flow
|
||||||
*
|
*
|
||||||
@@ -152,6 +136,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
void ndpi_free_flow(struct ndpi_flow_struct *flow);
|
void ndpi_free_flow(struct ndpi_flow_struct *flow);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enables cache support.
|
* Enables cache support.
|
||||||
* In nDPI is used for some protocol (i.e. Skype)
|
* In nDPI is used for some protocol (i.e. Skype)
|
||||||
@@ -161,9 +146,9 @@ extern "C" {
|
|||||||
* @par port = unsigned int for the port number
|
* @par port = unsigned int for the port number
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ndpi_enable_cache(struct ndpi_detection_module_struct *ndpi_mod,
|
void ndpi_enable_cache(struct ndpi_detection_module_struct *ndpi_mod, char* host, u_int port);
|
||||||
char* host, u_int port);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destroys the detection module
|
* Destroys the detection module
|
||||||
*
|
*
|
||||||
@@ -172,6 +157,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_struct);
|
void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_struct);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets a single protocol bitmask
|
* Sets a single protocol bitmask
|
||||||
* This function does not increment the index of the callback_buffer
|
* This function does not increment the index of the callback_buffer
|
||||||
@@ -186,16 +172,15 @@ extern "C" {
|
|||||||
* @par b_add_detection_bitmask = if set as "true" add the protocol bitmask to the detection bitmask
|
* @par b_add_detection_bitmask = if set as "true" add the protocol bitmask to the detection bitmask
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ndpi_set_bitmask_protocol_detection(char *label,
|
void ndpi_set_bitmask_protocol_detection(char *label, struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
const NDPI_PROTOCOL_BITMASK *detection_bitmask,
|
const NDPI_PROTOCOL_BITMASK *detection_bitmask,
|
||||||
const u_int32_t idx,
|
const u_int32_t idx,
|
||||||
u_int16_t ndpi_protocol_id,
|
u_int16_t ndpi_protocol_id,
|
||||||
void (*func) (struct ndpi_detection_module_struct *,
|
void (*func) (struct ndpi_detection_module_struct *, struct ndpi_flow_struct *flow),
|
||||||
struct ndpi_flow_struct *flow),
|
|
||||||
const NDPI_SELECTION_BITMASK_PROTOCOL_SIZE ndpi_selection_bitmask,
|
const NDPI_SELECTION_BITMASK_PROTOCOL_SIZE ndpi_selection_bitmask,
|
||||||
u_int8_t b_save_bitmask_unknow,
|
u_int8_t b_save_bitmask_unknow,
|
||||||
u_int8_t b_add_detection_bitmask);
|
u_int8_t b_add_detection_bitmask);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the protocol bitmask2
|
* Sets the protocol bitmask2
|
||||||
@@ -207,43 +192,20 @@ extern "C" {
|
|||||||
void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *ndpi_struct,
|
void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
const NDPI_PROTOCOL_BITMASK * detection_bitmask);
|
const NDPI_PROTOCOL_BITMASK * detection_bitmask);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function to be called before we give up with detection for a given flow.
|
* Function to be called before we give up with detection for a given flow.
|
||||||
* This function reduces the NDPI_UNKNOWN_PROTOCOL detection
|
* This function reduces the NDPI_UNKNOWN_PROTOCOL detection
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par flow = the flow given for the detection module
|
* @par flow = the flow given for the detection module
|
||||||
* @par enable_guess = guess protocol if unknown
|
|
||||||
* @return the detected protocol even if the flow is not completed;
|
* @return the detected protocol even if the flow is not completed;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_struct,
|
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow);
|
||||||
u_int8_t enable_guess);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes an extra packet in order to get more information for a given protocol
|
|
||||||
* (like SSL getting both client and server certificate even if we already know after
|
|
||||||
* seeing the client certificate what the protocol is)
|
|
||||||
*
|
|
||||||
* @par ndpi_struct = the detection module
|
|
||||||
* @par flow = pointer to the connection state machine
|
|
||||||
* @par packet = unsigned char pointer to the Layer 3 (IP header)
|
|
||||||
* @par packetlen = the length of the packet
|
|
||||||
* @par current_tick = the current timestamp for the packet
|
|
||||||
* @par src = pointer to the source subscriber state machine
|
|
||||||
* @par dst = pointer to the destination subscriber state machine
|
|
||||||
* @return void
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ndpi_process_extra_packet(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
const unsigned char *packet,
|
|
||||||
const unsigned short packetlen,
|
|
||||||
const u_int64_t current_tick,
|
|
||||||
struct ndpi_id_struct *src,
|
|
||||||
struct ndpi_id_struct *dst);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processes one packet and returns the ID of the detected protocol.
|
* Processes one packet and returns the ID of the detected protocol.
|
||||||
* This is the MAIN PACKET PROCESSING FUNCTION.
|
* This is the MAIN PACKET PROCESSING FUNCTION.
|
||||||
@@ -265,6 +227,8 @@ extern "C" {
|
|||||||
const u_int64_t current_tick,
|
const u_int64_t current_tick,
|
||||||
struct ndpi_id_struct *src,
|
struct ndpi_id_struct *src,
|
||||||
struct ndpi_id_struct *dst);
|
struct ndpi_id_struct *dst);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the main protocol of the passed flows for the detected module
|
* Get the main protocol of the passed flows for the detected module
|
||||||
*
|
*
|
||||||
@@ -276,28 +240,14 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
u_int16_t ndpi_get_flow_masterprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
u_int16_t ndpi_get_flow_masterprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow);
|
struct ndpi_flow_struct *flow);
|
||||||
|
|
||||||
/**
|
|
||||||
* API call that is called internally by ndpi_detection_process_packet or by apps
|
|
||||||
* that want to avoid calling ndpi_detection_process_packet as they have already
|
|
||||||
* parsed the packet and thus want to avoid this.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* @par ndpi_struct = the detection module
|
|
||||||
* @par flow = the flow given for the detection module
|
|
||||||
* @par ndpi_selection_bitmask = the protocol selected bitmask
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ndpi_check_flow_func(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_SIZE *ndpi_selection_packet);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Query the pointer to the layer 4 packet
|
* Query the pointer to the layer 4 packet
|
||||||
*
|
*
|
||||||
* @par l3 = pointer to the layer 3 data
|
* @par l3 = pointer to the layer 3 data
|
||||||
* @par l3_len = length of the layer 3 data
|
* @par l3_len = length of the layer 3 data
|
||||||
* @par l4_return = address to the pointer of the layer 4 data if return value == 0, else undefined
|
* @par l4_return = address to the pointer of the layer 4 data if return value == 0, else undefined
|
||||||
* @par l4_len_return = length of the layer 4 data if return value == 0, else undefined
|
* @par l4_len_return = length of the layer 4 data if return value == 0, else undefined
|
||||||
* @par l4_protocol_return = protocol of the layer 4 data if return value == 0, undefined otherwise
|
* @par l4_protocol_return = protocol of the layer 4 data if return value == 0, undefined otherwise
|
||||||
* @par flags = limit operation on ipv4 or ipv6 packets. Possible values: NDPI_DETECTION_ONLY_IPV4 - NDPI_DETECTION_ONLY_IPV6 - 0 (any)
|
* @par flags = limit operation on ipv4 or ipv6 packets. Possible values: NDPI_DETECTION_ONLY_IPV4 - NDPI_DETECTION_ONLY_IPV6 - 0 (any)
|
||||||
@@ -308,15 +258,16 @@ extern "C" {
|
|||||||
u_int8_t ndpi_detection_get_l4(const u_int8_t *l3, u_int16_t l3_len, const u_int8_t **l4_return, u_int16_t *l4_len_return,
|
u_int8_t ndpi_detection_get_l4(const u_int8_t *l3, u_int16_t l3_len, const u_int8_t **l4_return, u_int16_t *l4_len_return,
|
||||||
u_int8_t *l4_protocol_return, u_int32_t flags);
|
u_int8_t *l4_protocol_return, u_int32_t flags);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search and return the protocol based on matched ports
|
* Search and return the protocol based on matched ports
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par shost = source address in host byte order
|
* @par shost = source address in host byte order
|
||||||
* @par sport = source port number
|
* @par sport = source port number
|
||||||
* @par dhost = destination address in host byte order
|
* @par dhost = destination address in host byte order
|
||||||
* @par dport = destination port number
|
* @par dport = destination port number
|
||||||
* @return the struct ndpi_protocol that match the port base protocol
|
* @return the struct ndpi_protocol that match the port base protocol
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
ndpi_protocol ndpi_find_port_based_protocol(struct ndpi_detection_module_struct *ndpi_struct/* , u_int8_t proto */,
|
ndpi_protocol ndpi_find_port_based_protocol(struct ndpi_detection_module_struct *ndpi_struct/* , u_int8_t proto */,
|
||||||
@@ -324,33 +275,34 @@ extern "C" {
|
|||||||
u_int16_t sport,
|
u_int16_t sport,
|
||||||
u_int32_t dhost,
|
u_int32_t dhost,
|
||||||
u_int16_t dport);
|
u_int16_t dport);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search and return the protocol guessed that is undetected
|
* Search and return the protocol guessed that is undetected
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par flow = the flow we're trying to guess, NULL if not available
|
|
||||||
* @par proto = the l4 protocol number
|
* @par proto = the l4 protocol number
|
||||||
* @par shost = source address in host byte order
|
* @par shost = source address in host byte order
|
||||||
* @par sport = source port number
|
* @par sport = source port number
|
||||||
* @par dhost = destination address in host byte order
|
* @par dhost = destination address in host byte order
|
||||||
* @par dport = destination port number
|
* @par dport = destination port number
|
||||||
* @return the struct ndpi_protocol that match the port base protocol
|
* @return the struct ndpi_protocol that match the port base protocol
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
u_int8_t proto,
|
u_int8_t proto,
|
||||||
u_int32_t shost,
|
u_int32_t shost,
|
||||||
u_int16_t sport,
|
u_int16_t sport,
|
||||||
u_int32_t dhost,
|
u_int32_t dhost,
|
||||||
u_int16_t dport);
|
u_int16_t dport);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the string passed match with a protocol
|
* Check if the string passed match with a protocol
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par string_to_match = the string to match
|
* @par string_to_match = the string to match
|
||||||
* @par string_to_match_len = the length of the string
|
* @par string_to_match_len = the length of the string
|
||||||
* @par ret_match = completed returned match information
|
|
||||||
* @par is_host_match = value of the second field of struct ndpi_automa
|
* @par is_host_match = value of the second field of struct ndpi_automa
|
||||||
* @return the ID of the matched subprotocol
|
* @return the ID of the matched subprotocol
|
||||||
*
|
*
|
||||||
@@ -358,16 +310,16 @@ extern "C" {
|
|||||||
int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
char *string_to_match,
|
char *string_to_match,
|
||||||
u_int string_to_match_len,
|
u_int string_to_match_len,
|
||||||
ndpi_protocol_match_result *ret_match,
|
|
||||||
u_int8_t is_host_match);
|
u_int8_t is_host_match);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the host passed match with a protocol
|
* Check if the host passed match with a protocol
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par flow = the flow where match the host
|
* @par flow = the flow where match the host
|
||||||
* @par string_to_match = the string to match
|
* @par string_to_match = the string to match
|
||||||
* @par string_to_match_len = the length of the string
|
* @par string_to_match_len = the length of the string
|
||||||
* @par ret_match = completed returned match information
|
|
||||||
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
||||||
* @return the ID of the matched subprotocol
|
* @return the ID of the matched subprotocol
|
||||||
*
|
*
|
||||||
@@ -376,18 +328,16 @@ extern "C" {
|
|||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow,
|
||||||
char *string_to_match,
|
char *string_to_match,
|
||||||
u_int string_to_match_len,
|
u_int string_to_match_len,
|
||||||
ndpi_protocol_match_result *ret_match,
|
|
||||||
u_int16_t master_protocol_id);
|
u_int16_t master_protocol_id);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the string content passed match with a protocol
|
* Check if the string content passed match with a protocol
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par flow = the flow where match the host
|
* @par flow = the flow where match the host
|
||||||
* @par string_to_match = the string to match
|
* @par string_to_match = the string to match
|
||||||
* @par string_to_match_len = the length of the string
|
* @par string_to_match_len = the length of the string
|
||||||
* @par ret_match = completed returned match information
|
|
||||||
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
||||||
* @return the ID of the matched subprotocol
|
* @return the ID of the matched subprotocol
|
||||||
*
|
*
|
||||||
@@ -396,33 +346,23 @@ extern "C" {
|
|||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow,
|
||||||
char *string_to_match,
|
char *string_to_match,
|
||||||
u_int string_to_match_len,
|
u_int string_to_match_len,
|
||||||
ndpi_protocol_match_result *ret_match,
|
|
||||||
u_int16_t master_protocol_id);
|
u_int16_t master_protocol_id);
|
||||||
/**
|
|
||||||
* Exclude protocol from search
|
|
||||||
*
|
|
||||||
* @par ndpi_struct = the detection module
|
|
||||||
* @par flow = the flow where match the host
|
|
||||||
* @par master_protocol_id = value of the ID associated to the master protocol detected
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ndpi_exclude_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
u_int16_t master_protocol_id,
|
|
||||||
const char *_file, const char *_func,int _line);
|
|
||||||
/**
|
/**
|
||||||
* Check if the string -bigram_to_match- match with a bigram of -automa-
|
* Check if the string -bigram_to_match- match with a bigram of -automa-
|
||||||
*
|
*
|
||||||
* @par ndpi_mod = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par automa = the struct ndpi_automa for the bigram
|
* @par automa = the struct ndpi_automa for the bigram
|
||||||
* @par bigram_to_match = the bigram string to match
|
* @par bigram_to_match = the bigram string to match
|
||||||
* @return 0
|
* @return 0
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_match_bigram(struct ndpi_detection_module_struct *ndpi_mod,
|
int ndpi_match_bigram(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
ndpi_automa *automa,
|
ndpi_automa *automa,
|
||||||
char *bigram_to_match);
|
char *bigram_to_match);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write the protocol name in the buffer -buf- as master_protocol.protocol
|
* Write the protocol name in the buffer -buf- as master_protocol.protocol
|
||||||
*
|
*
|
||||||
@@ -433,87 +373,16 @@ extern "C" {
|
|||||||
* @return the buffer contains the master_protocol and protocol name
|
* @return the buffer contains the master_protocol and protocol name
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
char* ndpi_protocol2name(struct ndpi_detection_module_struct *ndpi_mod,
|
char* ndpi_protocol2name(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol proto, char *buf, u_int buf_len);
|
||||||
ndpi_protocol proto, char *buf, u_int buf_len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Same as ndpi_protocol2name() with the difference that the numeric protocol
|
|
||||||
* name is returned
|
|
||||||
*
|
|
||||||
* @par ndpi_mod = the detection module
|
|
||||||
* @par proto = the struct ndpi_protocol contain the protocols name
|
|
||||||
* @par buf = the buffer to write the name of the protocols
|
|
||||||
* @par buf_len = the length of the buffer
|
|
||||||
* @return the buffer contains the master_protocol and protocol name
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
char* ndpi_protocol2id(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
ndpi_protocol proto, char *buf, u_int buf_len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find out if a given category is custom/user-defined
|
|
||||||
*
|
|
||||||
* @par category = the category associated to the protocol
|
|
||||||
* @return 1 if this is a custom user category, 0 otherwise
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
int ndpi_is_custom_category(ndpi_protocol_category_t category);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Overwrite a protocol category defined by nDPI with the custom category
|
|
||||||
*
|
|
||||||
* @par ndpi_mod = the detection module
|
|
||||||
* @par protoId = the protocol identifier to overwrite
|
|
||||||
* @par breed = the breed to be associated to the protocol
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ndpi_set_proto_breed(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
u_int16_t protoId, ndpi_protocol_breed_t breed);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Overwrite a protocol category defined by nDPI with the custom category
|
|
||||||
*
|
|
||||||
* @par ndpi_mod = the detection module
|
|
||||||
* @par protoId = the protocol identifier to overwrite
|
|
||||||
* @par category = the category associated to the protocol
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ndpi_set_proto_category(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
u_int16_t protoId, ndpi_protocol_category_t protoCategory);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if subprotocols of the specified master protocol are just
|
|
||||||
* informative (and not real)
|
|
||||||
*
|
|
||||||
* @par mod = the detection module
|
|
||||||
* @par protoId = the (master) protocol identifier to query
|
|
||||||
* @return 1 = the subprotocol is informative, 0 otherwise.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
u_int8_t ndpi_is_subprotocol_informative(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
u_int16_t protoId);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get protocol category as string
|
* Get protocol category as string
|
||||||
*
|
*
|
||||||
* @par mod = the detection module
|
|
||||||
* @par category = the category associated to the protocol
|
* @par category = the category associated to the protocol
|
||||||
* @return the string name of the category
|
* @return the string name of the category
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
const char* ndpi_category_get_name(struct ndpi_detection_module_struct *ndpi_mod,
|
const char* ndpi_category_str(ndpi_protocol_category_t category);
|
||||||
ndpi_protocol_category_t category);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set protocol category string
|
|
||||||
*
|
|
||||||
* @par mod = the detection module
|
|
||||||
* @par category = the category associated to the protocol
|
|
||||||
* @paw name = the string name of the category
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ndpi_category_set_name(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
ndpi_protocol_category_t category, char *name);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get protocol category
|
* Get protocol category
|
||||||
@@ -522,9 +391,8 @@ extern "C" {
|
|||||||
* @par proto = the struct ndpi_protocol contain the protocols name
|
* @par proto = the struct ndpi_protocol contain the protocols name
|
||||||
* @return the protocol category
|
* @return the protocol category
|
||||||
*/
|
*/
|
||||||
ndpi_protocol_category_t ndpi_get_proto_category(struct ndpi_detection_module_struct *ndpi_mod,
|
ndpi_protocol_category_t ndpi_get_proto_category(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol proto);
|
||||||
ndpi_protocol proto);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the protocol name associated to the ID
|
* Get the protocol name associated to the ID
|
||||||
*
|
*
|
||||||
@@ -544,39 +412,30 @@ extern "C" {
|
|||||||
* @return the breed ID associated to the protocol
|
* @return the breed ID associated to the protocol
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
ndpi_protocol_breed_t ndpi_get_proto_breed(struct ndpi_detection_module_struct *ndpi_struct,
|
ndpi_protocol_breed_t ndpi_get_proto_breed(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t proto);
|
||||||
u_int16_t proto);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the string name of the protocol breed
|
* Return the string name of the protocol breed
|
||||||
*
|
*
|
||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par breed_id = the breed ID associated to the protocol
|
* @par breed_id = the breed ID associated to the protocol
|
||||||
* @return the string name of the breed ID
|
* @return the string name of the breed ID
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
char* ndpi_get_proto_breed_name(struct ndpi_detection_module_struct *ndpi_struct,
|
char* ndpi_get_proto_breed_name(struct ndpi_detection_module_struct *ndpi_struct, ndpi_protocol_breed_t breed_id);
|
||||||
ndpi_protocol_breed_t breed_id);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the ID of the protocol
|
* Return the ID of the protocol
|
||||||
*
|
*
|
||||||
* @par ndpi_mod = the detection module
|
* @par ndpi_mod = the detection module
|
||||||
* @par proto = the protocol name
|
* @par proto = the ID of the protocol
|
||||||
* @return the ID of the protocol
|
* @return the string name of the breed ID
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_mod, char *proto);
|
int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_mod, char *proto);
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the ID of the category
|
|
||||||
*
|
|
||||||
* @par ndpi_mod = the detection module
|
|
||||||
* @par proto = the category name
|
|
||||||
* @return the ID of the category
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
int ndpi_get_category_id(struct ndpi_detection_module_struct *ndpi_mod, char *cat);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write the list of the supported protocols
|
* Write the list of the supported protocols
|
||||||
@@ -584,6 +443,7 @@ extern "C" {
|
|||||||
* @par ndpi_mod = the detection module
|
* @par ndpi_mod = the detection module
|
||||||
*/
|
*/
|
||||||
void ndpi_dump_protocols(struct ndpi_detection_module_struct *mod);
|
void ndpi_dump_protocols(struct ndpi_detection_module_struct *mod);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read a file and load the protocols
|
* Read a file and load the protocols
|
||||||
@@ -600,18 +460,19 @@ extern "C" {
|
|||||||
* -1 else
|
* -1 else
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod,
|
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod, char* path);
|
||||||
char* path);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the total number of the supported protocols
|
* Get the total number of the supported protocols
|
||||||
*
|
*
|
||||||
* @par ndpi_mod = the detection module
|
* @par ndpi_mod = the detection module
|
||||||
* @return the number of protocols
|
* @return the number of protocols
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
u_int ndpi_get_num_supported_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
u_int ndpi_get_num_supported_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the nDPI version release
|
* Get the nDPI version release
|
||||||
*
|
*
|
||||||
@@ -620,6 +481,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
char* ndpi_revision(void);
|
char* ndpi_revision(void);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the automa for the protocol search
|
* Set the automa for the protocol search
|
||||||
*
|
*
|
||||||
@@ -627,10 +489,10 @@ extern "C" {
|
|||||||
* @par automa = the automa to match
|
* @par automa = the automa to match
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ndpi_set_automa(struct ndpi_detection_module_struct *ndpi_struct,
|
void ndpi_set_automa(struct ndpi_detection_module_struct *ndpi_struct, void* automa);
|
||||||
void* automa);
|
|
||||||
|
|
||||||
/* NDPI_PROTOCOL_HTTP */
|
|
||||||
|
#ifdef NDPI_PROTOCOL_HTTP
|
||||||
/**
|
/**
|
||||||
* Retrieve information for HTTP flows
|
* Retrieve information for HTTP flows
|
||||||
*
|
*
|
||||||
@@ -639,9 +501,9 @@ extern "C" {
|
|||||||
* @return the HTTP method information about the flow
|
* @return the HTTP method information about the flow
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
ndpi_http_method ndpi_get_http_method(struct ndpi_detection_module_struct *ndpi_mod,
|
ndpi_http_method ndpi_get_http_method(struct ndpi_detection_module_struct *ndpi_mod, struct ndpi_flow_struct *flow);
|
||||||
struct ndpi_flow_struct *flow);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the HTTP url
|
* Get the HTTP url
|
||||||
*
|
*
|
||||||
@@ -650,8 +512,8 @@ extern "C" {
|
|||||||
* @return the HTTP method information about the flow
|
* @return the HTTP method information about the flow
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
char* ndpi_get_http_url(struct ndpi_detection_module_struct *ndpi_mod,
|
char* ndpi_get_http_url(struct ndpi_detection_module_struct *ndpi_mod, struct ndpi_flow_struct *flow);
|
||||||
struct ndpi_flow_struct *flow);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the HTTP content-type
|
* Get the HTTP content-type
|
||||||
@@ -661,10 +523,11 @@ extern "C" {
|
|||||||
* @return the HTTP method information about the flow
|
* @return the HTTP method information about the flow
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
char* ndpi_get_http_content_type(struct ndpi_detection_module_struct *ndpi_mod,
|
char* ndpi_get_http_content_type(struct ndpi_detection_module_struct *ndpi_mod, struct ndpi_flow_struct *flow);
|
||||||
struct ndpi_flow_struct *flow);
|
#endif
|
||||||
|
|
||||||
/* NDPI_PROTOCOL_TOR */
|
|
||||||
|
#ifdef NDPI_PROTOCOL_TOR
|
||||||
/**
|
/**
|
||||||
* Check if the flow could be detected as TOR protocol
|
* Check if the flow could be detected as TOR protocol
|
||||||
*
|
*
|
||||||
@@ -673,28 +536,31 @@ extern "C" {
|
|||||||
* @par certificate = the ssl certificate
|
* @par certificate = the ssl certificate
|
||||||
* @return 1 if the flow is TOR;
|
* @return 1 if the flow is TOR;
|
||||||
* 0 else
|
* 0 else
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow, char *certificate);
|
struct ndpi_flow_struct *flow, char *certificate);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Wrappers functions */
|
/* Wrappers functions */
|
||||||
/**
|
/**
|
||||||
* Init Aho-Corasick automata
|
* Init Aho-Corasick automata
|
||||||
*
|
*
|
||||||
* @return The requested automata, or NULL if an error occurred
|
* @return The requested automata, or NULL if an error occurred
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void* ndpi_init_automa(void);
|
void* ndpi_init_automa(void);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Free Aho-Corasick automata allocated with ndpi_init_automa();
|
* Free Aho-Corasick automata allocated with ndpi_init_automa();
|
||||||
*
|
*
|
||||||
* @par The automata initialized with ndpi_init_automa();
|
* @par The automata initialized with ndpi_init_automa();
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ndpi_free_automa(void *_automa);
|
void ndpi_free_automa(void *_automa);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a string to match to an automata
|
* Add a string to match to an automata
|
||||||
*
|
*
|
||||||
@@ -702,61 +568,42 @@ extern "C" {
|
|||||||
* @par The (sub)string to search
|
* @par The (sub)string to search
|
||||||
* @par The number associated with this string
|
* @par The number associated with this string
|
||||||
* @return 0 in case of no error, or -1 if an error occurred.
|
* @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);
|
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
|
* 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 automata initialized with ndpi_init_automa();
|
||||||
* @par The (sub)string to search
|
* @par The (sub)string to search
|
||||||
* @return 0 in case of no error, or -1 if an error occurred.
|
* @return 0 in case of no error, or -1 if an error occurred.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_add_string_to_automa(void *_automa, char *str);
|
int ndpi_add_string_to_automa(void *_automa, char *str);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finalize the automa (necessary before start searching)
|
* Finalize the automa (necessary before start searching)
|
||||||
*
|
*
|
||||||
* @par The automata initialized with ndpi_init_automa();
|
* @par The automata initialized with ndpi_init_automa();
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ndpi_finalize_automa(void *_automa);
|
void ndpi_finalize_automa(void *_automa);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a string to match to an automata
|
* Add a string to match to an automata
|
||||||
*
|
*
|
||||||
* @par The automata initialized with ndpi_init_automa();
|
* @par The automata initialized with ndpi_init_automa();
|
||||||
* @par The (sub)string to search
|
* @par The (sub)string to search
|
||||||
* @return 0 in case of match, or -1 if no match, or -2 if an error occurred.
|
* @return 0 in case of match, or -1 if no match, or -2 if an error occurred.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_match_string(void *_automa, char *string_to_match);
|
int ndpi_match_string(void *_automa, char *string_to_match);
|
||||||
|
|
||||||
void ndpi_load_ip_category(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
char *ip_address_and_mask, ndpi_protocol_category_t category);
|
|
||||||
int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
char *name, ndpi_protocol_category_t category);
|
|
||||||
int ndpi_enable_loaded_categories(struct ndpi_detection_module_struct *ndpi_struct);
|
|
||||||
int ndpi_fill_ip_protocol_category(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
const struct ndpi_iphdr *iph,
|
|
||||||
ndpi_protocol *ret);
|
|
||||||
void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
ndpi_protocol *ret);
|
|
||||||
int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
char *name_or_ip, unsigned long *id);
|
|
||||||
int ndpi_set_detection_preferences(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
ndpi_detection_preference pref,
|
|
||||||
int value);
|
|
||||||
|
|
||||||
ndpi_proto_defaults_t* ndpi_get_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod);
|
|
||||||
u_int ndpi_get_ndpi_num_supported_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
|
||||||
u_int ndpi_get_ndpi_num_custom_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
|
||||||
u_int ndpi_get_ndpi_detection_module_size();
|
|
||||||
void ndpi_set_log_level(struct ndpi_detection_module_struct *ndpi_mod, u_int l);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a string to match to an automata
|
* Add a string to match to an automata
|
||||||
*
|
*
|
||||||
@@ -764,29 +611,18 @@ extern "C" {
|
|||||||
* @par The (sub)string to search
|
* @par The (sub)string to search
|
||||||
* @par The id associated with the matched string or 0 id not found.
|
* @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.
|
* @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);
|
int ndpi_match_string_id(void *_automa, char *string_to_match, unsigned long *id);
|
||||||
|
|
||||||
|
|
||||||
/* Utility functions to set ndpi malloc/free/print wrappers */
|
/* Utility functions to set ndpi malloc/free/print wrappers */
|
||||||
void set_ndpi_malloc(void* (*__ndpi_malloc)(size_t size));
|
void set_ndpi_malloc(void* (*__ndpi_malloc)(size_t size));
|
||||||
void set_ndpi_free(void (*__ndpi_free)(void *ptr));
|
void set_ndpi_free(void (*__ndpi_free)(void *ptr));
|
||||||
void set_ndpi_flow_malloc(void* (*__ndpi_flow_malloc)(size_t size));
|
void set_ndpi_flow_malloc(void* (*__ndpi_flow_malloc)(size_t size));
|
||||||
void set_ndpi_flow_free(void (*__ndpi_flow_free)(void *ptr));
|
void set_ndpi_flow_free(void (*__ndpi_flow_free)(void *ptr));
|
||||||
void set_ndpi_debug_function(struct ndpi_detection_module_struct *ndpi_str,
|
void set_ndpi_debug_function(struct ndpi_detection_module_struct *ndpi_str, ndpi_debug_function_ptr ndpi_debug_printf);
|
||||||
ndpi_debug_function_ptr ndpi_debug_printf);
|
|
||||||
void * ndpi_malloc(size_t size);
|
|
||||||
void * ndpi_calloc(unsigned long count, size_t size);
|
|
||||||
void ndpi_free(void *ptr);
|
|
||||||
u_int8_t ndpi_get_api_version();
|
|
||||||
|
|
||||||
/* https://github.com/corelight/community-id-spec */
|
|
||||||
int ndpi_flowv4_flow_hash(u_int8_t l4_proto, u_int32_t src_ip, u_int32_t dst_ip, u_int16_t src_port, u_int16_t dst_port,
|
|
||||||
u_int8_t icmp_type, u_int8_t icmp_code, u_char *hash_buf, u_int8_t hash_buf_len);
|
|
||||||
int ndpi_flowv6_flow_hash(u_int8_t l4_proto, struct ndpi_in6_addr *src_ip, struct ndpi_in6_addr *dst_ip,
|
|
||||||
u_int16_t src_port, u_int16_t dst_port, u_int8_t icmp_type, u_int8_t icmp_code,
|
|
||||||
u_char *hash_buf, u_int8_t hash_buf_len);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-17 - ntop.org
|
* Copyright (C) 2011-16 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -180,67 +180,24 @@
|
|||||||
#define NDPI_SOULSEEK_CONNECTION_IP_TICK_TIMEOUT 600
|
#define NDPI_SOULSEEK_CONNECTION_IP_TICK_TIMEOUT 600
|
||||||
|
|
||||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||||
#define NDPI_LOG(proto, m, log_level, args...) \
|
#define NDPI_LOG(proto, m, log_level, args...) \
|
||||||
{ \
|
{ \
|
||||||
struct ndpi_detection_module_struct *mod = (struct ndpi_detection_module_struct*) m; \
|
struct ndpi_detection_module_struct *mod = (struct ndpi_detection_module_struct*) m; \
|
||||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
if(mod != NULL) { \
|
||||||
(*(mod->ndpi_debug_printf))(proto, mod, log_level, __FILE__, __FUNCTION__, __LINE__, args); \
|
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 */
|
||||||
/* We must define NDPI_CURRENT_PROTO before include ndpi_main.h !!!
|
#ifdef WIN32
|
||||||
*
|
#define NDPI_LOG(...) {}
|
||||||
* #include "ndpi_protocol_ids.h"
|
#else
|
||||||
* #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_XXXX
|
#define NDPI_LOG(proto, mod, log_level, args...) {}
|
||||||
* #include "ndpi_api.h"
|
#endif
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef NDPI_CURRENT_PROTO
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTO_UNKNOWN
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define NDPI_LOG_ERR(mod, args...) \
|
|
||||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_ERROR) { \
|
|
||||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
|
||||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_ERROR , __FILE__, __FUNCTION__, __LINE__, args); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define NDPI_LOG_INFO(mod, args...) \
|
|
||||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_TRACE) { \
|
|
||||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
|
||||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_TRACE , __FILE__, __FUNCTION__, __LINE__, args); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define NDPI_LOG_DBG(mod, args...) \
|
|
||||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_DEBUG) { \
|
|
||||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
|
||||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_DEBUG , __FILE__, __FUNCTION__, __LINE__, args); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define NDPI_LOG_DBG2(mod, args...) \
|
|
||||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_DEBUG_EXTRA) { \
|
|
||||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
|
||||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_DEBUG_EXTRA , __FILE__, __FUNCTION__, __LINE__, args); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* not defined NDPI_ENABLE_DEBUG_MESSAGES */
|
|
||||||
# ifdef WIN32
|
|
||||||
# define NDPI_LOG(...) {}
|
|
||||||
# define NDPI_LOG_ERR(...) {}
|
|
||||||
# define NDPI_LOG_INFO(...) {}
|
|
||||||
# define NDPI_LOG_DBG(...) {}
|
|
||||||
# define NDPI_LOG_DBG2(...) {}
|
|
||||||
# else
|
|
||||||
# define NDPI_LOG(proto, mod, log_level, args...) { /* printf(args); */ }
|
|
||||||
# define NDPI_LOG_ERR(mod, args...) { printf(args); }
|
|
||||||
# define NDPI_LOG_INFO(mod, args...) { /* printf(args); */ }
|
|
||||||
# define NDPI_LOG_DBG(mod, args...) { /* printf(args); */ }
|
|
||||||
# define NDPI_LOG_DBG2(mod, args...) { /* printf(args); */ }
|
|
||||||
# endif
|
|
||||||
#endif /* NDPI_ENABLE_DEBUG_MESSAGES */
|
#endif /* NDPI_ENABLE_DEBUG_MESSAGES */
|
||||||
|
|
||||||
#define NDPI_EXCLUDE_PROTO(mod,flow) ndpi_exclude_protocol(mod, flow, NDPI_CURRENT_PROTO, __FILE__, __FUNCTION__, __LINE__)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* macro for getting the string len of a static string
|
* macro for getting the string len of a static string
|
||||||
*
|
*
|
||||||
@@ -252,15 +209,15 @@
|
|||||||
#define NDPI_COMPARE_IPV6_ADDRESS_STRUCTS(x,y) \
|
#define NDPI_COMPARE_IPV6_ADDRESS_STRUCTS(x,y) \
|
||||||
((((u_int64_t *)(x))[0]) < (((u_int64_t *)(y))[0]) || ( (((u_int64_t *)(x))[0]) == (((u_int64_t *)(y))[0]) && (((u_int64_t *)(x))[1]) < (((u_int64_t *)(y))[1])) )
|
((((u_int64_t *)(x))[0]) < (((u_int64_t *)(y))[0]) || ( (((u_int64_t *)(x))[0]) == (((u_int64_t *)(y))[0]) && (((u_int64_t *)(x))[1]) < (((u_int64_t *)(y))[1])) )
|
||||||
|
|
||||||
#define NDPI_NUM_BITS 512
|
#define NDPI_NUM_BITS 256
|
||||||
|
|
||||||
#define NDPI_BITS /* 32 */ (sizeof(ndpi_ndpi_mask) * 8 /* number of bits in a byte */) /* bits per mask */
|
#define NDPI_BITS /* 32 */ (sizeof(ndpi_ndpi_mask) * 8 /* number of bits in a byte */) /* bits per mask */
|
||||||
#define howmanybits(x, y) (((x)+((y)-1))/(y))
|
#define howmanybits(x, y) (((x)+((y)-1))/(y))
|
||||||
|
|
||||||
|
|
||||||
#define NDPI_SET(p, n) ((p)->fds_bits[(n)/NDPI_BITS] |= (1ul << (((u_int32_t)n) % NDPI_BITS)))
|
#define NDPI_SET(p, n) ((p)->fds_bits[(n)/NDPI_BITS] |= (1 << (((u_int32_t)n) % NDPI_BITS)))
|
||||||
#define NDPI_CLR(p, n) ((p)->fds_bits[(n)/NDPI_BITS] &= ~(1ul << (((u_int32_t)n) % NDPI_BITS)))
|
#define NDPI_CLR(p, n) ((p)->fds_bits[(n)/NDPI_BITS] &= ~(1 << (((u_int32_t)n) % NDPI_BITS)))
|
||||||
#define NDPI_ISSET(p, n) ((p)->fds_bits[(n)/NDPI_BITS] & (1ul << (((u_int32_t)n) % NDPI_BITS)))
|
#define NDPI_ISSET(p, n) ((p)->fds_bits[(n)/NDPI_BITS] & (1 << (((u_int32_t)n) % NDPI_BITS)))
|
||||||
#define NDPI_ZERO(p) memset((char *)(p), 0, sizeof(*(p)))
|
#define NDPI_ZERO(p) memset((char *)(p), 0, sizeof(*(p)))
|
||||||
#define NDPI_ONE(p) memset((char *)(p), 0xFF, sizeof(*(p)))
|
#define NDPI_ONE(p) memset((char *)(p), 0xFF, sizeof(*(p)))
|
||||||
|
|
||||||
@@ -332,10 +289,5 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NDPI_MAX_DNS_REQUESTS 16
|
#define NDPI_MAX_DNS_REQUESTS 16
|
||||||
#define NDPI_MIN_NUM_STUN_DETECTION 8
|
|
||||||
|
|
||||||
#define NDPI_MAJOR @NDPI_MAJOR@
|
|
||||||
#define NDPI_MINOR @NDPI_MINOR@
|
|
||||||
#define NDPI_PATCH @NDPI_PATCH@
|
|
||||||
|
|
||||||
#endif /* __NDPI_DEFINE_INCLUDE_FILE__ */
|
#endif /* __NDPI_DEFINE_INCLUDE_FILE__ */
|
||||||
+22
-46
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* ndpi_main.h
|
* ndpi_main.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-16 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -28,8 +28,8 @@
|
|||||||
#include "ndpi_define.h"
|
#include "ndpi_define.h"
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocol_ids.h"
|
||||||
#include "ndpi_typedefs.h"
|
#include "ndpi_typedefs.h"
|
||||||
#include "ndpi_api.h"
|
|
||||||
#include "ndpi_protocols.h"
|
#include "ndpi_protocols.h"
|
||||||
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@@ -53,56 +53,35 @@ extern "C" {
|
|||||||
extern u_int8_t ndpi_ips_match(u_int32_t src, u_int32_t dst,
|
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_int32_t net, u_int32_t num_bits);
|
||||||
|
|
||||||
u_int16_t ntohs_ndpi_bytestream_to_number(const u_int8_t * str,
|
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 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,
|
void ndpi_set_detected_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow,
|
||||||
u_int16_t upper_detected_protocol,
|
u_int16_t upper_detected_protocol,
|
||||||
u_int16_t lower_detected_protocol);
|
u_int16_t lower_detected_protocol);
|
||||||
|
|
||||||
extern void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_struct,
|
extern void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
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_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,
|
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);
|
||||||
struct ndpi_flow_struct *flow, u_int16_t counter);
|
|
||||||
|
|
||||||
extern void ndpi_int_change_packet_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
extern void ndpi_int_change_packet_protocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow,
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
u_int16_t upper_detected_protocol,
|
u_int16_t upper_detected_protocol,
|
||||||
u_int16_t lower_detected_protocol);
|
u_int16_t lower_detected_protocol);
|
||||||
extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct,
|
extern void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow,
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
u_int16_t upper_detected_protocol,
|
u_int16_t upper_detected_protocol,
|
||||||
u_int16_t lower_detected_protocol);
|
u_int16_t lower_detected_protocol);
|
||||||
extern void ndpi_int_change_category(struct ndpi_detection_module_struct *ndpi_struct,
|
extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol_breed_t protoBreed, u_int16_t protoId,
|
||||||
struct ndpi_flow_struct *flow,
|
u_int16_t tcp_alias_protoId[2], u_int16_t udp_alias_protoId[2], char *protoName,
|
||||||
ndpi_protocol_category_t protocol_category);
|
|
||||||
|
|
||||||
extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod,
|
|
||||||
ndpi_protocol_breed_t protoBreed, u_int16_t protoId,
|
|
||||||
u_int8_t can_have_a_subprotocol,
|
|
||||||
u_int16_t tcp_alias_protoId[2],
|
|
||||||
u_int16_t udp_alias_protoId[2], char *protoName,
|
|
||||||
ndpi_protocol_category_t protoCategory,
|
ndpi_protocol_category_t protoCategory,
|
||||||
ndpi_port_range *tcpDefPorts,
|
ndpi_port_range *tcpDefPorts, ndpi_port_range *udpDefPorts);
|
||||||
ndpi_port_range *udpDefPorts);
|
|
||||||
|
|
||||||
extern void ndpi_int_reset_packet_protocol(struct ndpi_packet_struct *packet);
|
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_protocol(struct ndpi_flow_struct *flow);
|
||||||
@@ -112,27 +91,24 @@ extern "C" {
|
|||||||
extern void ndpi_packet_src_ip_get(const struct ndpi_packet_struct *packet, 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 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,
|
extern char *ndpi_get_ip_string(struct ndpi_detection_module_struct *ndpi_struct, const ndpi_ip_addr_t * ip);
|
||||||
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_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_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);
|
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,
|
extern u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
u_int8_t proto, u_int16_t sport, u_int16_t dport,
|
u_int8_t proto, u_int16_t sport, u_int16_t dport,
|
||||||
u_int8_t *user_defined_proto);
|
u_int8_t *user_defined_proto);
|
||||||
|
|
||||||
extern u_int8_t ndpi_is_proto(ndpi_protocol p, u_int16_t proto);
|
extern u_int8_t ndpi_is_proto(ndpi_protocol p, u_int16_t proto);
|
||||||
|
|
||||||
extern u_int16_t ndpi_get_lower_proto(ndpi_protocol p);
|
extern u_int16_t ndpi_get_lower_proto(ndpi_protocol p);
|
||||||
extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct,
|
extern int ndpi_get_protocol_id_master_proto(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t protocol_id,
|
||||||
u_int16_t protocol_id,
|
|
||||||
u_int16_t** tcp_master_proto,
|
u_int16_t** tcp_master_proto,
|
||||||
u_int16_t** udp_master_proto);
|
u_int16_t** udp_master_proto);
|
||||||
#/* NDPI_PROTOCOL_NETBIOS */
|
#ifdef NDPI_PROTOCOL_NETBIOS
|
||||||
int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
|
int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||||
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
|
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
|
|||||||
+250
-263
@@ -1,8 +1,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* ndpi_protocol_ids.h
|
* ndpi_protocol_ids.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-17 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -31,267 +30,255 @@
|
|||||||
#define __NDPI_PROTOCOLS_DEFAULT_H__
|
#define __NDPI_PROTOCOLS_DEFAULT_H__
|
||||||
|
|
||||||
#define NDPI_DETECTION_SUPPORT_IPV6
|
#define NDPI_DETECTION_SUPPORT_IPV6
|
||||||
#define NDPI_PROTOCOL_SIZE 2
|
#define NDPI_PROTOCOL_SIZE 2
|
||||||
|
|
||||||
typedef enum {
|
#define NDPI_PROTOCOL_UNKNOWN 0
|
||||||
NDPI_PROTOCOL_UNKNOWN = 0,
|
|
||||||
NDPI_PROTOCOL_FTP_CONTROL = 1, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_MAIL_POP = 2,
|
|
||||||
NDPI_PROTOCOL_MAIL_SMTP = 3,
|
|
||||||
NDPI_PROTOCOL_MAIL_IMAP = 4,
|
|
||||||
NDPI_PROTOCOL_DNS = 5,
|
|
||||||
NDPI_PROTOCOL_IPP = 6,
|
|
||||||
NDPI_PROTOCOL_HTTP = 7,
|
|
||||||
NDPI_PROTOCOL_MDNS = 8,
|
|
||||||
NDPI_PROTOCOL_NTP = 9,
|
|
||||||
NDPI_PROTOCOL_NETBIOS = 10,
|
|
||||||
NDPI_PROTOCOL_NFS = 11,
|
|
||||||
NDPI_PROTOCOL_SSDP = 12,
|
|
||||||
NDPI_PROTOCOL_BGP = 13,
|
|
||||||
NDPI_PROTOCOL_SNMP = 14,
|
|
||||||
NDPI_PROTOCOL_XDMCP = 15,
|
|
||||||
NDPI_PROTOCOL_SMBV1 = 16, /* SMB version 1 */
|
|
||||||
NDPI_PROTOCOL_SYSLOG = 17,
|
|
||||||
NDPI_PROTOCOL_DHCP = 18,
|
|
||||||
NDPI_PROTOCOL_POSTGRES = 19,
|
|
||||||
NDPI_PROTOCOL_MYSQL = 20,
|
|
||||||
NDPI_PROTOCOL_HOTMAIL = 21,
|
|
||||||
NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK = 22,
|
|
||||||
NDPI_PROTOCOL_MAIL_POPS = 23,
|
|
||||||
NDPI_PROTOCOL_APPLEJUICE = 24,
|
|
||||||
NDPI_PROTOCOL_DIRECTCONNECT = 25,
|
|
||||||
NDPI_PROTOCOL_NTOP = 26,
|
|
||||||
NDPI_PROTOCOL_COAP = 27,
|
|
||||||
NDPI_PROTOCOL_VMWARE = 28,
|
|
||||||
NDPI_PROTOCOL_MAIL_SMTPS = 29,
|
|
||||||
NDPI_PROTOCOL_FBZERO = 30,
|
|
||||||
NDPI_PROTOCOL_UBNTAC2 = 31, /* Ubiquity UBNT AirControl = 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
|
|
||||||
NDPI_PROTOCOL_KONTIKI = 32,
|
|
||||||
NDPI_PROTOCOL_OPENFT = 33,
|
|
||||||
NDPI_PROTOCOL_FASTTRACK = 34,
|
|
||||||
NDPI_PROTOCOL_GNUTELLA = 35,
|
|
||||||
NDPI_PROTOCOL_EDONKEY = 36, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_BITTORRENT = 37,
|
|
||||||
NDPI_PROTOCOL_SKYPE_CALL = 38, /* Skype call and videocalls */
|
|
||||||
NDPI_PROTOCOL_SIGNAL = 39,
|
|
||||||
NDPI_PROTOCOL_MEMCACHED = 40, /* Memcached - Darryl Sokoloski <darryl@egloo.ca> */
|
|
||||||
NDPI_PROTOCOL_SMBV23 = 41, /* SMB version 2/3 */
|
|
||||||
NDPI_PROTOCOL_MINING = 42, /* Bitcoin, Ethereum, ZCash, Monero */
|
|
||||||
NDPI_PROTOCOL_NEST_LOG_SINK = 43, /* Nest Log Sink (Nest Protect) - Darryl Sokoloski <darryl@egloo.ca> */
|
|
||||||
|
|
||||||
NDPI_PROTOCOL_FREE_44 = 44, /* Free */
|
|
||||||
NDPI_PROTOCOL_FREE_45 = 45, /* Free */
|
|
||||||
NDPI_PROTOCOL_FREE_46 = 46, /* Free */
|
|
||||||
|
|
||||||
NDPI_PROTOCOL_XBOX = 47,
|
|
||||||
NDPI_PROTOCOL_QQ = 48,
|
|
||||||
NDPI_PROTOCOL_FREE_49 = 49, /* Free */
|
|
||||||
NDPI_PROTOCOL_RTSP = 50,
|
|
||||||
NDPI_PROTOCOL_MAIL_IMAPS = 51,
|
|
||||||
NDPI_PROTOCOL_ICECAST = 52,
|
|
||||||
NDPI_PROTOCOL_PPLIVE = 53, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_PPSTREAM = 54,
|
|
||||||
NDPI_PROTOCOL_ZATTOO = 55,
|
|
||||||
NDPI_PROTOCOL_SHOUTCAST = 56,
|
|
||||||
NDPI_PROTOCOL_SOPCAST = 57,
|
|
||||||
NDPI_PROTOCOL_TVANTS = 58,
|
|
||||||
NDPI_PROTOCOL_TVUPLAYER = 59,
|
|
||||||
NDPI_PROTOCOL_HTTP_DOWNLOAD = 60,
|
|
||||||
NDPI_PROTOCOL_QQLIVE = 61,
|
|
||||||
NDPI_PROTOCOL_THUNDER = 62,
|
|
||||||
NDPI_PROTOCOL_SOULSEEK = 63,
|
|
||||||
NDPI_PROTOCOL_SSL_NO_CERT = 64,
|
|
||||||
NDPI_PROTOCOL_IRC = 65,
|
|
||||||
NDPI_PROTOCOL_AYIYA = 66,
|
|
||||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER = 67,
|
|
||||||
NDPI_PROTOCOL_MSN = 68,
|
|
||||||
NDPI_PROTOCOL_OSCAR = 69,
|
|
||||||
NDPI_PROTOCOL_YAHOO = 70,
|
|
||||||
NDPI_PROTOCOL_BATTLEFIELD = 71,
|
|
||||||
NDPI_PROTOCOL_GOOGLE_PLUS = 72,
|
|
||||||
NDPI_PROTOCOL_IP_VRRP = 73,
|
|
||||||
NDPI_PROTOCOL_STEAM = 74, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_HALFLIFE2 = 75,
|
|
||||||
NDPI_PROTOCOL_WORLDOFWARCRAFT = 76,
|
|
||||||
NDPI_PROTOCOL_TELNET = 77,
|
|
||||||
NDPI_PROTOCOL_STUN = 78,
|
|
||||||
NDPI_PROTOCOL_IP_IPSEC = 79,
|
|
||||||
NDPI_PROTOCOL_IP_GRE = 80,
|
|
||||||
NDPI_PROTOCOL_IP_ICMP = 81,
|
|
||||||
NDPI_PROTOCOL_IP_IGMP = 82,
|
|
||||||
NDPI_PROTOCOL_IP_EGP = 83,
|
|
||||||
NDPI_PROTOCOL_IP_SCTP = 84,
|
|
||||||
NDPI_PROTOCOL_IP_OSPF = 85,
|
|
||||||
NDPI_PROTOCOL_IP_IP_IN_IP = 86,
|
|
||||||
NDPI_PROTOCOL_RTP = 87,
|
|
||||||
NDPI_PROTOCOL_RDP = 88,
|
|
||||||
NDPI_PROTOCOL_VNC = 89,
|
|
||||||
NDPI_PROTOCOL_PCANYWHERE = 90,
|
|
||||||
NDPI_PROTOCOL_SSL = 91,
|
|
||||||
NDPI_PROTOCOL_SSH = 92,
|
|
||||||
NDPI_PROTOCOL_USENET = 93,
|
|
||||||
NDPI_PROTOCOL_MGCP = 94,
|
|
||||||
NDPI_PROTOCOL_IAX = 95,
|
|
||||||
NDPI_PROTOCOL_TFTP = 96,
|
|
||||||
NDPI_PROTOCOL_AFP = 97,
|
|
||||||
NDPI_PROTOCOL_STEALTHNET = 98,
|
|
||||||
NDPI_PROTOCOL_AIMINI = 99,
|
|
||||||
NDPI_PROTOCOL_SIP = 100,
|
|
||||||
NDPI_PROTOCOL_TRUPHONE = 101,
|
|
||||||
NDPI_PROTOCOL_IP_ICMPV6 = 102,
|
|
||||||
NDPI_PROTOCOL_DHCPV6 = 103,
|
|
||||||
NDPI_PROTOCOL_ARMAGETRON = 104,
|
|
||||||
NDPI_PROTOCOL_CROSSFIRE = 105,
|
|
||||||
NDPI_PROTOCOL_DOFUS = 106,
|
|
||||||
NDPI_PROTOCOL_FIESTA = 107,
|
|
||||||
NDPI_PROTOCOL_FLORENSIA = 108,
|
|
||||||
NDPI_PROTOCOL_GUILDWARS = 109,
|
|
||||||
NDPI_PROTOCOL_HTTP_ACTIVESYNC = 110,
|
|
||||||
NDPI_PROTOCOL_KERBEROS = 111,
|
|
||||||
NDPI_PROTOCOL_LDAP = 112,
|
|
||||||
NDPI_PROTOCOL_MAPLESTORY = 113,
|
|
||||||
NDPI_PROTOCOL_MSSQL_TDS = 114,
|
|
||||||
NDPI_PROTOCOL_PPTP = 115,
|
|
||||||
NDPI_PROTOCOL_WARCRAFT3 = 116,
|
|
||||||
NDPI_PROTOCOL_WORLD_OF_KUNG_FU = 117,
|
|
||||||
NDPI_PROTOCOL_SLACK = 118,
|
|
||||||
NDPI_PROTOCOL_FACEBOOK = 119,
|
|
||||||
NDPI_PROTOCOL_TWITTER = 120,
|
|
||||||
NDPI_PROTOCOL_DROPBOX = 121,
|
|
||||||
NDPI_PROTOCOL_GMAIL = 122,
|
|
||||||
NDPI_PROTOCOL_GOOGLE_MAPS = 123,
|
|
||||||
NDPI_PROTOCOL_YOUTUBE = 124,
|
|
||||||
NDPI_PROTOCOL_SKYPE = 125,
|
|
||||||
NDPI_PROTOCOL_GOOGLE = 126,
|
|
||||||
NDPI_PROTOCOL_DCERPC = 127,
|
|
||||||
NDPI_PROTOCOL_NETFLOW = 128,
|
|
||||||
NDPI_PROTOCOL_SFLOW = 129,
|
|
||||||
NDPI_PROTOCOL_HTTP_CONNECT = 130,
|
|
||||||
NDPI_PROTOCOL_HTTP_PROXY = 131,
|
|
||||||
NDPI_PROTOCOL_CITRIX = 132, /* It also includes the old NDPI_PROTOCOL_CITRIX_ONLINE */
|
|
||||||
NDPI_PROTOCOL_NETFLIX = 133,
|
|
||||||
NDPI_PROTOCOL_LASTFM = 134,
|
|
||||||
NDPI_PROTOCOL_WAZE = 135,
|
|
||||||
NDPI_PROTOCOL_YOUTUBE_UPLOAD = 136, /* Upload files to youtube */
|
|
||||||
NDPI_PROTOCOL_GENERIC = 137, /* Generic protocol used for category matching */
|
|
||||||
NDPI_PROTOCOL_CHECKMK = 138,
|
|
||||||
NDPI_PROTOCOL_AJP = 139, /* Leonn Paiva <leonn.paiva@gmail.com> */
|
|
||||||
NDPI_PROTOCOL_APPLE = 140,
|
|
||||||
NDPI_PROTOCOL_WEBEX = 141,
|
|
||||||
NDPI_PROTOCOL_WHATSAPP = 142,
|
|
||||||
NDPI_PROTOCOL_APPLE_ICLOUD = 143,
|
|
||||||
NDPI_PROTOCOL_VIBER = 144,
|
|
||||||
NDPI_PROTOCOL_APPLE_ITUNES = 145,
|
|
||||||
NDPI_PROTOCOL_RADIUS = 146,
|
|
||||||
NDPI_PROTOCOL_WINDOWS_UPDATE = 147,
|
|
||||||
NDPI_PROTOCOL_TEAMVIEWER = 148, /* xplico.org */
|
|
||||||
NDPI_PROTOCOL_TUENTI = 149,
|
|
||||||
NDPI_PROTOCOL_LOTUS_NOTES = 150,
|
|
||||||
NDPI_PROTOCOL_SAP = 151,
|
|
||||||
NDPI_PROTOCOL_GTP = 152,
|
|
||||||
NDPI_PROTOCOL_UPNP = 153,
|
|
||||||
NDPI_PROTOCOL_LLMNR = 154,
|
|
||||||
NDPI_PROTOCOL_REMOTE_SCAN = 155,
|
|
||||||
NDPI_PROTOCOL_SPOTIFY = 156,
|
|
||||||
NDPI_PROTOCOL_MESSENGER = 157,
|
|
||||||
NDPI_PROTOCOL_H323 = 158, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_OPENVPN = 159, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_NOE = 160, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_CISCOVPN = 161, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_TEAMSPEAK = 162, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_TOR = 163, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_SKINNY = 164, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_RTCP = 165, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_RSYNC = 166, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_ORACLE = 167, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_CORBA = 168, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_UBUNTUONE = 169, /* Remy Mudingay <mudingay@ill.fr> */
|
|
||||||
NDPI_PROTOCOL_WHOIS_DAS = 170,
|
|
||||||
NDPI_PROTOCOL_COLLECTD = 171,
|
|
||||||
NDPI_PROTOCOL_SOCKS = 172, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_NINTENDO = 173,
|
|
||||||
NDPI_PROTOCOL_RTMP = 174, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_FTP_DATA = 175, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_WIKIPEDIA = 176, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_ZMQ = 177,
|
|
||||||
NDPI_PROTOCOL_AMAZON = 178, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_EBAY = 179, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_CNN = 180, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_MEGACO = 181, /* Gianluca Costa <g.costa@xplico.org> */
|
|
||||||
NDPI_PROTOCOL_REDIS = 182,
|
|
||||||
NDPI_PROTOCOL_PANDO = 183, /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
|
||||||
NDPI_PROTOCOL_VHUA = 184,
|
|
||||||
NDPI_PROTOCOL_TELEGRAM = 185, /* Gianluca Costa <g.costa@xplico.org> */
|
|
||||||
NDPI_PROTOCOL_VEVO = 186,
|
|
||||||
NDPI_PROTOCOL_PANDORA = 187,
|
|
||||||
NDPI_PROTOCOL_QUIC = 188, /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
|
|
||||||
NDPI_PROTOCOL_WHATSAPP_VOICE = 189,
|
|
||||||
NDPI_PROTOCOL_EAQ = 190,
|
|
||||||
NDPI_PROTOCOL_OOKLA = 191,
|
|
||||||
NDPI_PROTOCOL_AMQP = 192,
|
|
||||||
NDPI_PROTOCOL_KAKAOTALK = 193, /* KakaoTalk Chat (no voice call) */
|
|
||||||
NDPI_PROTOCOL_KAKAOTALK_VOICE = 194, /* KakaoTalk Voice */
|
|
||||||
NDPI_PROTOCOL_TWITCH = 195, /* Edoardo Dominici <edoaramis@gmail.com> */
|
|
||||||
NDPI_PROTOCOL_FREE_196 = 196, /* Free */
|
|
||||||
NDPI_PROTOCOL_WECHAT = 197,
|
|
||||||
NDPI_PROTOCOL_MPEGTS = 198,
|
|
||||||
NDPI_PROTOCOL_SNAPCHAT = 199,
|
|
||||||
NDPI_PROTOCOL_SINA = 200,
|
|
||||||
NDPI_PROTOCOL_HANGOUT = 201,
|
|
||||||
NDPI_PROTOCOL_IFLIX = 202, /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
|
|
||||||
NDPI_PROTOCOL_GITHUB = 203,
|
|
||||||
NDPI_PROTOCOL_BJNP = 204,
|
|
||||||
NDPI_PROTOCOL_FREE_205 = 205, /* Free */
|
|
||||||
NDPI_PROTOCOL_VIDTO = 206,
|
|
||||||
NDPI_PROTOCOL_SMPP = 207, /* Damir Franusic <df@release14.org> */
|
|
||||||
NDPI_PROTOCOL_DNSCRYPT = 208,
|
|
||||||
NDPI_PROTOCOL_TINC = 209, /* William Guglielmo <william@deselmo.com> */
|
|
||||||
NDPI_PROTOCOL_DEEZER = 210,
|
|
||||||
NDPI_PROTOCOL_INSTAGRAM = 211, /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
|
|
||||||
NDPI_PROTOCOL_MICROSOFT = 212,
|
|
||||||
NDPI_PROTOCOL_STARCRAFT = 213, /* Matteo Bracci <matteobracci1@gmail.com> */
|
|
||||||
NDPI_PROTOCOL_TEREDO = 214,
|
|
||||||
NDPI_PROTOCOL_HOTSPOT_SHIELD = 215,
|
|
||||||
NDPI_PROTOCOL_HEP = 216, /* sipcapture.org QXIP BV */
|
|
||||||
NDPI_PROTOCOL_GOOGLE_DRIVE = 217,
|
|
||||||
NDPI_PROTOCOL_OCS = 218,
|
|
||||||
NDPI_PROTOCOL_OFFICE_365 = 219,
|
|
||||||
NDPI_PROTOCOL_CLOUDFLARE = 220,
|
|
||||||
NDPI_PROTOCOL_MS_ONE_DRIVE = 221,
|
|
||||||
NDPI_PROTOCOL_MQTT = 222,
|
|
||||||
NDPI_PROTOCOL_RX = 223,
|
|
||||||
NDPI_PROTOCOL_APPLESTORE = 224,
|
|
||||||
NDPI_PROTOCOL_OPENDNS = 225,
|
|
||||||
NDPI_PROTOCOL_GIT = 226,
|
|
||||||
NDPI_PROTOCOL_DRDA = 227,
|
|
||||||
NDPI_PROTOCOL_PLAYSTORE = 228,
|
|
||||||
NDPI_PROTOCOL_SOMEIP = 229,
|
|
||||||
NDPI_PROTOCOL_FIX = 230,
|
|
||||||
NDPI_PROTOCOL_PLAYSTATION = 231,
|
|
||||||
NDPI_PROTOCOL_PASTEBIN = 232, /* Paulo Angelo <pa@pauloangelo.com> */
|
|
||||||
NDPI_PROTOCOL_LINKEDIN = 233, /* Paulo Angelo <pa@pauloangelo.com> */
|
|
||||||
NDPI_PROTOCOL_SOUNDCLOUD = 234,
|
|
||||||
NDPI_PROTOCOL_CSGO = 235, /* Counter-Strike Global Offensive, Dota = 2 */
|
|
||||||
NDPI_PROTOCOL_LISP = 236,
|
|
||||||
NDPI_PROTOCOL_DIAMETER = 237,
|
|
||||||
NDPI_PROTOCOL_APPLE_PUSH = 238,
|
|
||||||
NDPI_PROTOCOL_GOOGLE_SERVICES = 239,
|
|
||||||
NDPI_PROTOCOL_AMAZON_VIDEO = 240,
|
|
||||||
NDPI_PROTOCOL_GOOGLE_DOCS = 241,
|
|
||||||
NDPI_PROTOCOL_WHATSAPP_FILES = 242, /* Videos, pictures, voice messages... */
|
|
||||||
/*
|
|
||||||
IMPORTANT
|
|
||||||
before allocating a new identifier please fill up
|
|
||||||
one of those named NDPI_PROTOCOL_FREE_XXX and not used
|
|
||||||
(placeholders to avoid protocol renumbering)
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/* IMPORTANT:NDPI_LAST_IMPLEMENTED_PROTOCOL MUST BE THE LAST ELEMENT */
|
|
||||||
NDPI_LAST_IMPLEMENTED_PROTOCOL
|
|
||||||
} ndpi_protocol_id_t;
|
|
||||||
|
|
||||||
#define NDPI_PROTOCOL_NO_MASTER_PROTO NDPI_PROTOCOL_UNKNOWN
|
#define NDPI_PROTOCOL_NO_MASTER_PROTO NDPI_PROTOCOL_UNKNOWN
|
||||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS NDPI_LAST_IMPLEMENTED_PROTOCOL
|
|
||||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
#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_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
|
||||||
|
|
||||||
|
/* 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_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
|
||||||
|
|
||||||
|
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||||
|
#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)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* ndpi_protocols.h
|
* ndpi_protocols.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-16 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -52,9 +52,7 @@ u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struc
|
|||||||
void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
|
|
||||||
/* Applications and other protocols. */
|
/* Applications and other protocols. */
|
||||||
void ndpi_search_diameter(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_lisp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_edonkey(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_edonkey(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
@@ -141,7 +139,6 @@ void ndpi_search_pptp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
void ndpi_search_stealthnet(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_dhcpv6_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_checkmk(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
@@ -193,20 +190,13 @@ void ndpi_search_starcraft(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_coap(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_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_mqtt (struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_someip (struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_rx(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
void ndpi_search_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_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_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_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);
|
void ndpi_search_smpp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||||
void ndpi_search_tinc(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_fix(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_csgo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_ajp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_memcached(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
void ndpi_search_nest_log_sink(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
|
||||||
/* --- INIT FUNCTIONS --- */
|
/* --- INIT FUNCTIONS --- */
|
||||||
void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_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_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_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
@@ -216,7 +206,6 @@ void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
|||||||
void init_battlefield_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_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_lisp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_teredo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_teredo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_ciscovpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_ciscovpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_citrix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_citrix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
@@ -234,6 +223,7 @@ void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
|||||||
void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
|
void init_filetopia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
@@ -261,7 +251,6 @@ void init_maplestory_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
void init_mdns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_mdns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_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_mgpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_mining_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_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_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_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
@@ -325,7 +314,6 @@ void init_tor_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
|||||||
void init_tvants_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_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_upnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
@@ -344,23 +332,11 @@ void init_stracraft_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_coap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
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_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct,u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_someip_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_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_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_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_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_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);
|
void init_smpp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||||
void init_tinc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_fix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_nintendo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_csgo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_checkmk_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_whatsapp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_fbzero_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_memcached_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_nest_log_sink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
void init_ookla_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
|
||||||
#endif /* __NDPI_PROTOCOLS_H__ */
|
#endif /* __NDPI_PROTOCOLS_H__ */
|
||||||
|
|||||||
+305
-475
File diff suppressed because it is too large
Load Diff
@@ -24,15 +24,7 @@
|
|||||||
#ifndef __NDPI_WIN32_H__
|
#ifndef __NDPI_WIN32_H__
|
||||||
#define __NDPI_WIN32_H__
|
#define __NDPI_WIN32_H__
|
||||||
|
|
||||||
// fix a MinGW build issue "error: multiple storage classes in declaration specifiers" due to MinGW
|
|
||||||
// defining extern for __forceinline types
|
|
||||||
#if (defined(__MINGW32__) || defined(__MINGW64__)) && defined(__GNUC__)
|
|
||||||
#define MINGW_GCC
|
|
||||||
#define __mingw_forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include <windows.h>
|
|
||||||
#include <ws2tcpip.h>
|
#include <ws2tcpip.h>
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
@@ -48,7 +40,7 @@
|
|||||||
|
|
||||||
#define IPVERSION 4 /* on *nix it is defined in netinet/ip.h */
|
#define IPVERSION 4 /* on *nix it is defined in netinet/ip.h */
|
||||||
|
|
||||||
extern char* strsep(char **sp, char *sep);
|
extern char* strsep(char **sp, const char *sep);
|
||||||
|
|
||||||
typedef unsigned char u_char;
|
typedef unsigned char u_char;
|
||||||
typedef unsigned short u_short;
|
typedef unsigned short u_short;
|
||||||
@@ -71,8 +63,6 @@ typedef unsigned __int64 u_int64_t;
|
|||||||
|
|
||||||
#define gmtime_r(a, b) memcpy(b, gmtime(a), sizeof(struct tm))
|
#define gmtime_r(a, b) memcpy(b, gmtime(a), sizeof(struct tm))
|
||||||
|
|
||||||
#define in_addr_t unsigned long
|
|
||||||
|
|
||||||
extern unsigned long waitForNextEvent(unsigned long ulDelay /* ms */);
|
extern unsigned long waitForNextEvent(unsigned long ulDelay /* ms */);
|
||||||
|
|
||||||
#define sleep(a /* sec */) waitForNextEvent(1000*a /* ms */)
|
#define sleep(a /* sec */) waitForNextEvent(1000*a /* ms */)
|
||||||
|
|||||||
@@ -0,0 +1,170 @@
|
|||||||
|
lib_LTLIBRARIES = libndpi.la
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
libndpi_la_includedir = $(includedir)/libndpi-@VERSION@/libndpi
|
||||||
|
|
||||||
|
libndpi_la_include_HEADERS = ../include/ndpi_api.h \
|
||||||
|
../include/ndpi_define.h \
|
||||||
|
../include/ndpi_main.h \
|
||||||
|
../include/ndpi_includes.h \
|
||||||
|
../include/ndpi_protocol_ids.h \
|
||||||
|
../include/ndpi_protocols.h \
|
||||||
|
../include/ndpi_typedefs.h
|
||||||
|
|
||||||
|
libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||||
|
ndpi_main.c \
|
||||||
|
protocols/afp.c \
|
||||||
|
protocols/aimini.c \
|
||||||
|
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 \
|
||||||
|
protocols/dcerpc.c \
|
||||||
|
protocols/dhcp.c \
|
||||||
|
protocols/dhcpv6.c \
|
||||||
|
protocols/directconnect.c \
|
||||||
|
protocols/directdownloadlink.c \
|
||||||
|
protocols/dns.c \
|
||||||
|
protocols/dofus.c \
|
||||||
|
protocols/drda.c \
|
||||||
|
protocols/dropbox.c \
|
||||||
|
protocols/eaq.c \
|
||||||
|
protocols/edonkey.c \
|
||||||
|
protocols/fasttrack.c \
|
||||||
|
protocols/fiesta.c \
|
||||||
|
protocols/filetopia.c \
|
||||||
|
protocols/florensia.c \
|
||||||
|
protocols/ftp_control.c \
|
||||||
|
protocols/ftp_data.c \
|
||||||
|
protocols/git.c \
|
||||||
|
protocols/gnutella.c \
|
||||||
|
protocols/gtp.c \
|
||||||
|
protocols/guildwars.c \
|
||||||
|
protocols/hangout.c \
|
||||||
|
protocols/h323.c \
|
||||||
|
protocols/halflife2_and_mods.c \
|
||||||
|
protocols/hep.c \
|
||||||
|
protocols/http_activesync.c \
|
||||||
|
protocols/http.c \
|
||||||
|
protocols/iax.c \
|
||||||
|
protocols/icecast.c \
|
||||||
|
protocols/ipp.c \
|
||||||
|
protocols/irc.c \
|
||||||
|
protocols/jabber.c \
|
||||||
|
protocols/kakaotalk_voice.c \
|
||||||
|
protocols/kerberos.c \
|
||||||
|
protocols/kontiki.c \
|
||||||
|
protocols/kxun.c \
|
||||||
|
protocols/ldap.c \
|
||||||
|
protocols/lotus_notes.c \
|
||||||
|
protocols/mail_imap.c \
|
||||||
|
protocols/mail_pop.c \
|
||||||
|
protocols/mail_smtp.c \
|
||||||
|
protocols/maplestory.c \
|
||||||
|
protocols/mdns.c \
|
||||||
|
protocols/megaco.c \
|
||||||
|
protocols/mgcp.c \
|
||||||
|
protocols/mms.c \
|
||||||
|
protocols/mpegts.c \
|
||||||
|
protocols/mqtt.c \
|
||||||
|
protocols/msn.c \
|
||||||
|
protocols/mssql_tds.c \
|
||||||
|
protocols/mysql.c \
|
||||||
|
protocols/netbios.c \
|
||||||
|
protocols/netflow.c \
|
||||||
|
protocols/nfs.c \
|
||||||
|
protocols/noe.c \
|
||||||
|
protocols/non_tcp_udp.c \
|
||||||
|
protocols/ntp.c \
|
||||||
|
protocols/openft.c \
|
||||||
|
protocols/openvpn.c \
|
||||||
|
protocols/oracle.c \
|
||||||
|
protocols/oscar.c \
|
||||||
|
protocols/pando.c \
|
||||||
|
protocols/pcanywhere.c \
|
||||||
|
protocols/postgres.c \
|
||||||
|
protocols/pplive.c \
|
||||||
|
protocols/ppstream.c \
|
||||||
|
protocols/pptp.c \
|
||||||
|
protocols/qq.c \
|
||||||
|
protocols/quake.c \
|
||||||
|
protocols/quic.c \
|
||||||
|
protocols/radius.c \
|
||||||
|
protocols/rdp.c \
|
||||||
|
protocols/redis_net.c \
|
||||||
|
protocols/rsync.c \
|
||||||
|
protocols/rtcp.c \
|
||||||
|
protocols/rtmp.c \
|
||||||
|
protocols/rtp.c \
|
||||||
|
protocols/rtsp.c \
|
||||||
|
protocols/rx.c \
|
||||||
|
protocols/sflow.c \
|
||||||
|
protocols/shoutcast.c \
|
||||||
|
protocols/sip.c \
|
||||||
|
protocols/skinny.c \
|
||||||
|
protocols/skype.c \
|
||||||
|
protocols/smb.c \
|
||||||
|
protocols/snmp.c \
|
||||||
|
protocols/socks45.c \
|
||||||
|
protocols/socrates.c \
|
||||||
|
protocols/sopcast.c \
|
||||||
|
protocols/soulseek.c \
|
||||||
|
protocols/spotify.c \
|
||||||
|
protocols/ssdp.c \
|
||||||
|
protocols/ssh.c \
|
||||||
|
protocols/ssl.c \
|
||||||
|
protocols/starcraft.c \
|
||||||
|
protocols/stealthnet.c \
|
||||||
|
protocols/steam.c \
|
||||||
|
protocols/stun.c \
|
||||||
|
protocols/syslog.c \
|
||||||
|
protocols/tcp_udp.c \
|
||||||
|
protocols/teamspeak.c \
|
||||||
|
protocols/teamviewer.c \
|
||||||
|
protocols/telegram.c \
|
||||||
|
protocols/telnet.c \
|
||||||
|
protocols/tftp.c \
|
||||||
|
protocols/thunder.c \
|
||||||
|
protocols/tor.c \
|
||||||
|
protocols/teredo.c \
|
||||||
|
protocols/tvants.c \
|
||||||
|
protocols/tvuplayer.c \
|
||||||
|
protocols/ubntac2.c \
|
||||||
|
protocols/usenet.c \
|
||||||
|
protocols/viber.c \
|
||||||
|
protocols/vhua.c \
|
||||||
|
protocols/vmware.c \
|
||||||
|
protocols/vnc.c \
|
||||||
|
protocols/warcraft3.c \
|
||||||
|
protocols/whoisdas.c \
|
||||||
|
protocols/world_of_kung_fu.c \
|
||||||
|
protocols/world_of_warcraft.c \
|
||||||
|
protocols/xbox.c \
|
||||||
|
protocols/xdmcp.c \
|
||||||
|
protocols/yahoo.c \
|
||||||
|
protocols/zattoo.c \
|
||||||
|
protocols/zeromq.c \
|
||||||
|
protocols/smpp.c \
|
||||||
|
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
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
#
|
|
||||||
# Simple non-autotools dependent makefile
|
|
||||||
#
|
|
||||||
# ./autogen.sh
|
|
||||||
# cd src/lib
|
|
||||||
# make Makefile
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Installation directories
|
|
||||||
#
|
|
||||||
prefix = /usr/local
|
|
||||||
libdir = ${prefix}/lib
|
|
||||||
includedir = ${prefix}/include/ndpi
|
|
||||||
CC = @CC@
|
|
||||||
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g
|
|
||||||
RANLIB = ranlib
|
|
||||||
|
|
||||||
OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o
|
|
||||||
HEADERS = $(wildcard ../include/*.h)
|
|
||||||
NDPI_VERSION_MAJOR = @NDPI_MAJOR@
|
|
||||||
NDPI_LIB_STATIC = libndpi.a
|
|
||||||
NDPI_LIB_SHARED_BASE = libndpi.so
|
|
||||||
NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@
|
|
||||||
NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
|
|
||||||
|
|
||||||
ifneq ($(OS),Windows_NT)
|
|
||||||
OS := $(shell uname)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS),Darwin)
|
|
||||||
CC=clang
|
|
||||||
SONAME_FLAG=
|
|
||||||
else
|
|
||||||
SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
all: $(NDPI_LIBS)
|
|
||||||
|
|
||||||
ndpi_main.c: ndpi_content_match.c.inc
|
|
||||||
|
|
||||||
$(NDPI_LIB_STATIC): $(OBJECTS)
|
|
||||||
ar rc $@ $(OBJECTS)
|
|
||||||
$(RANLIB) $@
|
|
||||||
|
|
||||||
$(NDPI_LIB_SHARED): $(OBJECTS)
|
|
||||||
$(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS)
|
|
||||||
ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
|
|
||||||
ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
|
|
||||||
|
|
||||||
%.o: %.c $(HEADERS) Makefile
|
|
||||||
$(CC) $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
clean:
|
|
||||||
/bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo $(NDPI_LIB_SHARED)
|
|
||||||
|
|
||||||
distclean: clean
|
|
||||||
/bin/rm -f Makefile
|
|
||||||
|
|
||||||
install: $(NDPI_LIBS)
|
|
||||||
mkdir -p $(DESTDIR)$(libdir)
|
|
||||||
cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
|
|
||||||
ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
|
|
||||||
ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
|
|
||||||
mkdir -p $(DESTDIR)$(includedir)
|
|
||||||
cp ../include/*.h $(DESTDIR)$(includedir)
|
|
||||||
+326
-545
File diff suppressed because it is too large
Load Diff
+828
-2226
File diff suppressed because it is too large
Load Diff
+10
-11
@@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* afp.c
|
* afp.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-11 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-16 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -23,11 +23,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AFP
|
#ifdef NDPI_PROTOCOL_AFP
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
struct afpHeader {
|
struct afpHeader {
|
||||||
u_int8_t flags, command;
|
u_int8_t flags, command;
|
||||||
@@ -45,8 +43,6 @@ void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search AFP\n");
|
|
||||||
|
|
||||||
if (packet->payload_packet_len >= sizeof(struct afpHeader)) {
|
if (packet->payload_packet_len >= sizeof(struct afpHeader)) {
|
||||||
struct afpHeader *h = (struct afpHeader*)packet->payload;
|
struct afpHeader *h = (struct afpHeader*)packet->payload;
|
||||||
|
|
||||||
@@ -68,7 +64,7 @@ void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
get_u_int32_t(packet->payload, 8) == htonl(packet->payload_packet_len - 16) &&
|
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)) {
|
get_u_int32_t(packet->payload, 12) == 0 && get_u_int16_t(packet->payload, 16) == htons(0x0104)) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found AFP: DSI OpenSession\n");
|
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP: DSI OpenSession detected.\n");
|
||||||
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -77,13 +73,14 @@ void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
&& ((h->command >= 1) && (h->command <= 8))
|
&& ((h->command >= 1) && (h->command <= 8))
|
||||||
&& (h->reserved == 0)
|
&& (h->reserved == 0)
|
||||||
&& (packet->payload_packet_len >= (sizeof(struct afpHeader)+ntohl(h->length)))) {
|
&& (packet->payload_packet_len >= (sizeof(struct afpHeader)+ntohl(h->length)))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found AFP: DSI\n");
|
NDPI_LOG(NDPI_PROTOCOL_AFP, ndpi_struct, NDPI_LOG_DEBUG, "AFP: DSI detected.\n");
|
||||||
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
ndpi_int_afp_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -98,3 +95,5 @@ void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
|||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+41
-37
@@ -2,7 +2,7 @@
|
|||||||
* aimini.c
|
* aimini.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -23,11 +23,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AIMINI
|
#ifdef NDPI_PROTOCOL_AIMINI
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_aimini_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow/* , */
|
static void ndpi_int_aimini_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow/* , */
|
||||||
@@ -52,40 +50,43 @@ static u_int8_t is_special_aimini_host(struct ndpi_int_one_line_struct host_line
|
|||||||
void ndpi_search_aimini(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)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
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_DBG(ndpi_struct, "search aimini\n");
|
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "search aimini.\n");
|
||||||
|
|
||||||
if (packet->udp != NULL) {
|
if (packet->udp != NULL) {
|
||||||
if (flow->l4.udp.aimini_stage == 0) {
|
if (flow->l4.udp.aimini_stage == 0) {
|
||||||
if (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b) {
|
if (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b) {
|
||||||
flow->l4.udp.aimini_stage = 1;
|
flow->l4.udp.aimini_stage = 1;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 1.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 136
|
if (packet->payload_packet_len == 136
|
||||||
&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) {
|
&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) {
|
||||||
flow->l4.udp.aimini_stage = 4;
|
flow->l4.udp.aimini_stage = 4;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 4\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 4.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) {
|
if (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) {
|
||||||
flow->l4.udp.aimini_stage = 7;
|
flow->l4.udp.aimini_stage = 7;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 7\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 7.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) {
|
if (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) {
|
||||||
flow->l4.udp.aimini_stage = 10;
|
flow->l4.udp.aimini_stage = 10;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 10\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 10.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) {
|
if (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) {
|
||||||
flow->l4.udp.aimini_stage = 13;
|
flow->l4.udp.aimini_stage = 13;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 13\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 13.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) {
|
if (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) {
|
||||||
flow->l4.udp.aimini_stage = 16;
|
flow->l4.udp.aimini_stage = 16;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 16\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 16.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -95,7 +96,7 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (flow->l4.udp.aimini_stage == 1 && packet->payload_packet_len > 100
|
if (flow->l4.udp.aimini_stage == 1 && packet->payload_packet_len > 100
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115) {
|
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115) {
|
||||||
flow->l4.udp.aimini_stage = 2;
|
flow->l4.udp.aimini_stage = 2;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 2\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 2.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 2 &&
|
if (flow->l4.udp.aimini_stage == 2 &&
|
||||||
@@ -103,14 +104,14 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
(packet->payload_packet_len == 64 && get_u_int16_t(packet->payload, 0) == htons(0x010b)) ||
|
(packet->payload_packet_len == 64 && get_u_int16_t(packet->payload, 0) == htons(0x010b)) ||
|
||||||
(packet->payload_packet_len == 88 && get_u_int16_t(packet->payload, 0) == ntohs(0x0115)))) {
|
(packet->payload_packet_len == 88 && get_u_int16_t(packet->payload, 0) == ntohs(0x0115)))) {
|
||||||
flow->l4.udp.aimini_stage = 3;
|
flow->l4.udp.aimini_stage = 3;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 3\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 3.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 3
|
if (flow->l4.udp.aimini_stage == 3
|
||||||
&& ((packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)
|
&& ((packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)
|
||||||
|| (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b)
|
|| (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b)
|
||||||
|| (packet->payload_packet_len > 100 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115))) {
|
|| (packet->payload_packet_len > 100 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found aimini (64, 0x010b), (>300, 0x0115), "
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "found aimini (64, 0x010b), (>300, 0x0115), "
|
||||||
"(16, 0x010c || 64, 0x010b), (16, 0x010c || 64, 0x010b || >100, 0x0115).\n");
|
"(16, 0x010c || 64, 0x010b), (16, 0x010c || 64, 0x010b || >100, 0x0115).\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -121,14 +122,14 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (flow->l4.udp.aimini_stage == 4 && packet->payload_packet_len == 136
|
if (flow->l4.udp.aimini_stage == 4 && packet->payload_packet_len == 136
|
||||||
&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) {
|
&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) {
|
||||||
flow->l4.udp.aimini_stage = 5;
|
flow->l4.udp.aimini_stage = 5;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 5\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 5.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 5 && (packet->payload_packet_len == 136
|
if (flow->l4.udp.aimini_stage == 5 && (packet->payload_packet_len == 136
|
||||||
&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9
|
&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165))) {
|
|| ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165))) {
|
||||||
flow->l4.udp.aimini_stage = 6;
|
flow->l4.udp.aimini_stage = 6;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 6\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 6.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 6 && ((packet->payload_packet_len == 136
|
if (flow->l4.udp.aimini_stage == 6 && ((packet->payload_packet_len == 136
|
||||||
@@ -136,7 +137,7 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
|| ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9))
|
|| ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9))
|
||||||
|| (packet->payload_packet_len == 32
|
|| (packet->payload_packet_len == 32
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
|
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found aimini (136, 0x01c9), (136, 0x01c9)," "(136, 0x01c9),(136, 0x01c9 || 32, 0x01ca).\n");
|
"found aimini (136, 0x01c9), (136, 0x01c9)," "(136, 0x01c9),(136, 0x01c9 || 32, 0x01ca).\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -147,18 +148,18 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (flow->l4.udp.aimini_stage == 7 && packet->payload_packet_len == 88
|
if (flow->l4.udp.aimini_stage == 7 && packet->payload_packet_len == 88
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) {
|
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) {
|
||||||
flow->l4.udp.aimini_stage = 8;
|
flow->l4.udp.aimini_stage = 8;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 8\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 8.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 8
|
if (flow->l4.udp.aimini_stage == 8
|
||||||
&& (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) {
|
&& (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) {
|
||||||
flow->l4.udp.aimini_stage = 9;
|
flow->l4.udp.aimini_stage = 9;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 9\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 9.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 9
|
if (flow->l4.udp.aimini_stage == 9
|
||||||
&& (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) {
|
&& (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found aimini (88, 0x0101), (88, 0x0101)," "(88, 0x0101),(88, 0x0101).\n");
|
"found aimini (88, 0x0101), (88, 0x0101)," "(88, 0x0101),(88, 0x0101).\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -169,19 +170,19 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (flow->l4.udp.aimini_stage == 10 && packet->payload_packet_len == 104
|
if (flow->l4.udp.aimini_stage == 10 && packet->payload_packet_len == 104
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) {
|
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) {
|
||||||
flow->l4.udp.aimini_stage = 11;
|
flow->l4.udp.aimini_stage = 11;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 11\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 11.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 11
|
if (flow->l4.udp.aimini_stage == 11
|
||||||
&& (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)) {
|
&& (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)) {
|
||||||
flow->l4.udp.aimini_stage = 12;
|
flow->l4.udp.aimini_stage = 12;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 12\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 12.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 12
|
if (flow->l4.udp.aimini_stage == 12
|
||||||
&& ((packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)
|
&& ((packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)
|
||||||
|| (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
|
|| (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found aimini (104, 0x0102), (104, 0x0102), " "(104, 0x0102), (104, 0x0102).\n");
|
"found aimini (104, 0x0102), (104, 0x0102), " "(104, 0x0102), (104, 0x0102).\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -192,20 +193,20 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (flow->l4.udp.aimini_stage == 13 && packet->payload_packet_len == 32
|
if (flow->l4.udp.aimini_stage == 13 && packet->payload_packet_len == 32
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) {
|
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) {
|
||||||
flow->l4.udp.aimini_stage = 14;
|
flow->l4.udp.aimini_stage = 14;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 14\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 14.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 14
|
if (flow->l4.udp.aimini_stage == 14
|
||||||
&& ((packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca)
|
&& ((packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca)
|
||||||
|| (packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166))) {
|
|| (packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166))) {
|
||||||
flow->l4.udp.aimini_stage = 15;
|
flow->l4.udp.aimini_stage = 15;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 15\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 15.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 15
|
if (flow->l4.udp.aimini_stage == 15
|
||||||
&& ((packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166)
|
&& ((packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166)
|
||||||
|| (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
|
|| (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found aimini (32,0x01ca), (32,0x01ca), (32,0x01ca), ((136, 0x0166)||(32,0x01ca)).\n");
|
"found aimini (32,0x01ca), (32,0x01ca), (32,0x01ca), ((136, 0x0166)||(32,0x01ca)).\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -216,18 +217,18 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (flow->l4.udp.aimini_stage == 16 && packet->payload_packet_len == 16
|
if (flow->l4.udp.aimini_stage == 16 && packet->payload_packet_len == 16
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) {
|
&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) {
|
||||||
flow->l4.udp.aimini_stage = 17;
|
flow->l4.udp.aimini_stage = 17;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 17\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 17.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 17
|
if (flow->l4.udp.aimini_stage == 17
|
||||||
&& (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) {
|
&& (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) {
|
||||||
flow->l4.udp.aimini_stage = 18;
|
flow->l4.udp.aimini_stage = 18;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage = 18\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 18.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.udp.aimini_stage == 18
|
if (flow->l4.udp.aimini_stage == 18
|
||||||
&& (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) {
|
&& (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found aimini (16, 0x010c), (16, 0x010c), (16, 0x010c), (16, 0x010c).\n");
|
"found aimini (16, 0x010c), (16, 0x010c), (16, 0x010c), (16, 0x010c).\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -237,11 +238,11 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
(memcmp(packet->payload, "GET /player/", NDPI_STATICSTRING_LEN("GET /player/")) == 0)) ||
|
(memcmp(packet->payload, "GET /player/", NDPI_STATICSTRING_LEN("GET /player/")) == 0)) ||
|
||||||
(packet->payload_packet_len > NDPI_STATICSTRING_LEN("GET /play/?fid=") &&
|
(packet->payload_packet_len > NDPI_STATICSTRING_LEN("GET /play/?fid=") &&
|
||||||
(memcmp(packet->payload, "GET /play/?fid=", NDPI_STATICSTRING_LEN("GET /play/?fid=")) == 0))) {
|
(memcmp(packet->payload, "GET /play/?fid=", NDPI_STATICSTRING_LEN("GET /play/?fid=")) == 0))) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "HTTP packet detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "HTTP packet detected.\n");
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
if (packet->host_line.ptr != NULL && packet->host_line.len > 11
|
if (packet->host_line.ptr != NULL && packet->host_line.len > 11
|
||||||
&& (memcmp(&packet->host_line.ptr[packet->host_line.len - 11], ".aimini.net", 11) == 0)) {
|
&& (memcmp(&packet->host_line.ptr[packet->host_line.len - 11], ".aimini.net", 11) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found AIMINI HTTP traffic\n");
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "AIMINI HTTP traffic detected.\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -254,8 +255,8 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
NDPI_STATICSTRING_LEN("download/")) == 0) {
|
NDPI_STATICSTRING_LEN("download/")) == 0) {
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
if (is_special_aimini_host(packet->host_line) == 1) {
|
if (is_special_aimini_host(packet->host_line) == 1) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found AIMINI HTTP traffic\n");
|
"AIMINI HTTP traffic detected.\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -265,8 +266,8 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
NDPI_STATICSTRING_LEN("upload/")) == 0) {
|
NDPI_STATICSTRING_LEN("upload/")) == 0) {
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
if (is_special_aimini_host(packet->host_line) == 1) {
|
if (is_special_aimini_host(packet->host_line) == 1) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"found AIMINI HTTP traffic detected.\n");
|
"AIMINI HTTP traffic detected.\n");
|
||||||
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
ndpi_int_aimini_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -275,7 +276,8 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "exclude aimini.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_AIMINI);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -291,3 +293,5 @@ void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,149 +0,0 @@
|
|||||||
/*
|
|
||||||
* ajp.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2018 by Leonn Paiva <leonn.paiva@gmail.com>
|
|
||||||
*
|
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
|
||||||
*
|
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* nDPI is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AJP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
enum ajp_direction {
|
|
||||||
AJP_SERVER_TO_CONTAINER = 0x1234,
|
|
||||||
AJP_CONTAINER_TO_SERVER = 0x4142
|
|
||||||
};
|
|
||||||
|
|
||||||
enum ajp_packet_type {
|
|
||||||
AJP_UNKNOWN = 0,
|
|
||||||
|
|
||||||
/* packet types */
|
|
||||||
AJP_FORWARD_REQUEST = 2,
|
|
||||||
AJP_SEND_BODY_CHUNK = 3,
|
|
||||||
AJP_SEND_HEADERS = 4,
|
|
||||||
AJP_END_RESPONSE = 5,
|
|
||||||
AJP_GET_BODY_CHUNK = 6,
|
|
||||||
AJP_SHUTDOWN = 7,
|
|
||||||
AJP_PING = 8,
|
|
||||||
AJP_CPONG = 9,
|
|
||||||
AJP_CPING = 10,
|
|
||||||
AJP_BODY = 11
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ajp_header {
|
|
||||||
uint16_t magic;
|
|
||||||
uint16_t len;
|
|
||||||
uint8_t code;
|
|
||||||
};
|
|
||||||
|
|
||||||
static void set_ajp_detected(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow) {
|
|
||||||
|
|
||||||
if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
|
|
||||||
ndpi_search_tcp_or_udp(ndpi_struct, flow);
|
|
||||||
|
|
||||||
/* If no custom protocol has been detected */
|
|
||||||
/* if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) */
|
|
||||||
ndpi_int_reset_protocol(flow);
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, NDPI_PROTOCOL_AJP);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************************************/
|
|
||||||
|
|
||||||
static void ndpi_check_ajp(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow)
|
|
||||||
{
|
|
||||||
struct ajp_header ajp_hdr;
|
|
||||||
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
|
||||||
|
|
||||||
if (packet->payload_packet_len < 5 /* ajp_header size*/) {
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ajp_hdr = *((struct ajp_header *) (packet->payload));
|
|
||||||
ajp_hdr.magic = ntohs(ajp_hdr.magic);
|
|
||||||
ajp_hdr.len = ntohs(ajp_hdr.len);
|
|
||||||
|
|
||||||
if (ajp_hdr.len > 0 && ajp_hdr.magic == AJP_SERVER_TO_CONTAINER) {
|
|
||||||
if (ajp_hdr.code == AJP_FORWARD_REQUEST || ajp_hdr.code == AJP_SHUTDOWN
|
|
||||||
|| ajp_hdr.code == AJP_PING || ajp_hdr.code == AJP_CPING) {
|
|
||||||
|
|
||||||
set_ajp_detected(ndpi_struct, flow);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "Invalid AJP request type");
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
|
||||||
} else if (ajp_hdr.len > 0 && ajp_hdr.magic == AJP_CONTAINER_TO_SERVER) {
|
|
||||||
if (ajp_hdr.code == AJP_SEND_BODY_CHUNK || ajp_hdr.code == AJP_SEND_HEADERS
|
|
||||||
|| ajp_hdr.code == AJP_END_RESPONSE || ajp_hdr.code == AJP_GET_BODY_CHUNK
|
|
||||||
|| ajp_hdr.code == AJP_CPONG) {
|
|
||||||
|
|
||||||
set_ajp_detected(ndpi_struct, flow);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "Invalid AJP response type");
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
NDPI_LOG_DBG(ndpi_struct,"Invalid AJP packet\n");
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ndpi_search_ajp(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow)
|
|
||||||
{
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
|
||||||
|
|
||||||
// Break after 20 packets.
|
|
||||||
if(flow->packet_counter > 20) {
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search AJP\n");
|
|
||||||
ndpi_check_ajp(ndpi_struct, flow);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ********************************* */
|
|
||||||
|
|
||||||
|
|
||||||
void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
|
||||||
{
|
|
||||||
ndpi_set_bitmask_protocol_detection("AJP", ndpi_struct, detection_bitmask,
|
|
||||||
*id, NDPI_PROTOCOL_AJP, ndpi_search_ajp,
|
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
|
|
||||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
|
||||||
ADD_TO_DETECTION_BITMASK);
|
|
||||||
|
|
||||||
*id += 1;
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* amqp.c
|
* amqp.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-17 - ntop.org
|
||||||
*
|
*
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
@@ -18,12 +18,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AMQP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_AMQP
|
||||||
|
|
||||||
PACK_ON
|
PACK_ON
|
||||||
struct amqp_header {
|
struct amqp_header {
|
||||||
@@ -42,7 +39,7 @@ static void ndpi_int_amqp_add_connection(struct ndpi_detection_module_struct *nd
|
|||||||
void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search amqp\n");
|
NDPI_LOG(NDPI_PROTOCOL_AMQP, ndpi_struct, NDPI_LOG_DEBUG, "search amqp. \n");
|
||||||
|
|
||||||
if (packet->tcp != NULL) {
|
if (packet->tcp != NULL) {
|
||||||
if(packet->payload_packet_len > sizeof(struct amqp_header)) {
|
if(packet->payload_packet_len > sizeof(struct amqp_header)) {
|
||||||
@@ -60,7 +57,7 @@ void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
u_int16_t method = htons(h->method);
|
u_int16_t method = htons(h->method);
|
||||||
|
|
||||||
if(method <= 120 /* Method basic NACK */) {
|
if(method <= 120 /* Method basic NACK */) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found amqp over tcp\n");
|
NDPI_LOG(NDPI_PROTOCOL_AMQP, ndpi_struct, NDPI_LOG_DEBUG, "found amqp over tcp. \n");
|
||||||
ndpi_int_amqp_add_connection(ndpi_struct, flow);
|
ndpi_int_amqp_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -68,8 +65,6 @@ void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,3 +80,4 @@ void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
|||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
/*
|
|
||||||
* apple_push.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2018 by ntop.org
|
|
||||||
*
|
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
|
||||||
*
|
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* nDPI is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_APPLE_PUSH
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
static void ndpi_check_apple_push(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow) {
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
|
||||||
|
|
||||||
/* https://support.apple.com/en-us/HT203609 */
|
|
||||||
if(((ntohl(packet->iph->saddr) & 0xFF000000 /* 255.0.0.0 */) == 0x11000000 /* 17.0.0.0/8 */)
|
|
||||||
|| ((ntohl(packet->iph->daddr) & 0xFF000000 /* 255.0.0.0 */) == 0x11000000 /* 17.0.0.0/8 */)) {
|
|
||||||
u_int16_t apple_push_port = ntohs(5223);
|
|
||||||
u_int16_t notification_apn_port = ntohs(2195);
|
|
||||||
u_int16_t apn_feedback_port = ntohs(2196);
|
|
||||||
|
|
||||||
if(((packet->tcp->source == apple_push_port) || (packet->tcp->dest == apple_push_port))
|
|
||||||
|| ((packet->tcp->source == notification_apn_port) || (packet->tcp->dest == notification_apn_port))
|
|
||||||
|| ((packet->tcp->source == apn_feedback_port) || (packet->tcp->dest == apn_feedback_port))
|
|
||||||
) {
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found apple_push\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_APPLE_PUSH, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ndpi_search_apple_push(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
|
||||||
{
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search apple_push\n");
|
|
||||||
|
|
||||||
/* skip marked packets */
|
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_APPLE_PUSH)
|
|
||||||
ndpi_check_apple_push(ndpi_struct, flow);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
|
||||||
{
|
|
||||||
ndpi_set_bitmask_protocol_detection("APPLE_PUSH", ndpi_struct, detection_bitmask, *id,
|
|
||||||
NDPI_PROTOCOL_APPLE_PUSH,
|
|
||||||
ndpi_search_apple_push,
|
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_TCP,
|
|
||||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
|
||||||
ADD_TO_DETECTION_BITMASK);
|
|
||||||
*id += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
* applejuice.c
|
* applejuice.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -22,11 +22,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_APPLEJUICE
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_APPLEJUICE
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_applejuice_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_applejuice_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
@@ -39,18 +37,21 @@ void ndpi_search_applejuice_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
struct ndpi_flow_struct *flow)
|
struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
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_DBG(ndpi_struct, "search applejuice\n");
|
NDPI_LOG(NDPI_PROTOCOL_APPLEJUICE, ndpi_struct, NDPI_LOG_DEBUG, "search applejuice.\n");
|
||||||
|
|
||||||
if ((packet->payload_packet_len > 7) && (packet->payload[6] == 0x0d)
|
if ((packet->payload_packet_len > 7) && (packet->payload[6] == 0x0d)
|
||||||
&& (packet->payload[7] == 0x0a)
|
&& (packet->payload[7] == 0x0a)
|
||||||
&& (memcmp(packet->payload, "ajprot", 6) == 0)) {
|
&& (memcmp(packet->payload, "ajprot", 6) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found applejuice\n");
|
NDPI_LOG(NDPI_PROTOCOL_APPLEJUICE, ndpi_struct, NDPI_LOG_DEBUG, "detected applejuice.\n");
|
||||||
ndpi_int_applejuice_add_connection(ndpi_struct, flow);
|
ndpi_int_applejuice_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_APPLEJUICE, ndpi_struct, NDPI_LOG_DEBUG, "exclude applejuice.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_APPLEJUICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -65,3 +66,5 @@ void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* armagetron.c
|
* armagetron.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -22,24 +22,27 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_ARMAGETRON
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#ifdef NDPI_PROTOCOL_ARMAGETRON
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_armagetron_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_armagetron_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow)
|
struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ARMAGETRON, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ARMAGETRON, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
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_ARMAGETRON, ndpi_struct, NDPI_LOG_DEBUG, "search armagetron.\n");
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search armagetron\n");
|
|
||||||
|
|
||||||
if (packet->payload_packet_len > 10) {
|
if (packet->payload_packet_len > 10) {
|
||||||
/* login request */
|
/* login request */
|
||||||
@@ -49,7 +52,7 @@ void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
goto exclude;
|
goto exclude;
|
||||||
if (get_u_int16_t(packet->payload, 6) == htons(0x0008)
|
if (get_u_int16_t(packet->payload, 6) == htons(0x0008)
|
||||||
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == 0) {
|
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found armagetron\n");
|
NDPI_LOG(NDPI_PROTOCOL_ARMAGETRON, ndpi_struct, NDPI_LOG_DEBUG, "detected armagetron.\n");
|
||||||
ndpi_int_armagetron_add_connection(ndpi_struct, flow);
|
ndpi_int_armagetron_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -62,7 +65,7 @@ void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
goto exclude;
|
goto exclude;
|
||||||
if (get_u_int32_t(packet->payload, 6) == htonl(0x00000500) && get_u_int32_t(packet->payload, 6 + 4) == htonl(0x00010000)
|
if (get_u_int32_t(packet->payload, 6) == htonl(0x00000500) && get_u_int32_t(packet->payload, 6 + 4) == htonl(0x00010000)
|
||||||
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == 0) {
|
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found armagetron\n");
|
NDPI_LOG(NDPI_PROTOCOL_ARMAGETRON, ndpi_struct, NDPI_LOG_DEBUG, "detected armagetron.\n");
|
||||||
ndpi_int_armagetron_add_connection(ndpi_struct, flow);
|
ndpi_int_armagetron_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -82,7 +85,7 @@ void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
&& (get_u_int32_t(packet->payload, 6 + 10 + val) == htonl(0x00010000)
|
&& (get_u_int32_t(packet->payload, 6 + 10 + val) == htonl(0x00010000)
|
||||||
|| get_u_int32_t(packet->payload, 6 + 10 + val) == htonl(0x00000001))
|
|| get_u_int32_t(packet->payload, 6 + 10 + val) == htonl(0x00000001))
|
||||||
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == 0) {
|
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found armagetron\n");
|
NDPI_LOG(NDPI_PROTOCOL_ARMAGETRON, ndpi_struct, NDPI_LOG_DEBUG, "detected armagetron.\n");
|
||||||
ndpi_int_armagetron_add_connection(ndpi_struct, flow);
|
ndpi_int_armagetron_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -91,7 +94,8 @@ void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
}
|
}
|
||||||
|
|
||||||
exclude:
|
exclude:
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_ARMAGETRON, ndpi_struct, NDPI_LOG_DEBUG, "exclude armagetron.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_ARMAGETRON);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -107,3 +111,6 @@ void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* flash.c
|
* flash.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* ftp.c
|
* ftp.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -43,8 +43,6 @@ static void ndpi_int_ftp_add_connection(struct ndpi_detection_module_struct *ndp
|
|||||||
*/
|
*/
|
||||||
#if !defined(WIN32)
|
#if !defined(WIN32)
|
||||||
static inline
|
static inline
|
||||||
#elif defined(MINGW_GCC)
|
|
||||||
__mingw_forceinline static
|
|
||||||
#else
|
#else
|
||||||
__forceinline static
|
__forceinline static
|
||||||
#endif
|
#endif
|
||||||
@@ -80,11 +78,8 @@ u_int8_t ndpi_int_check_possible_ftp_command(const struct ndpi_packet_struct *pa
|
|||||||
/**
|
/**
|
||||||
* ftp replies are are 3-digit number followed by space or hyphen
|
* ftp replies are are 3-digit number followed by space or hyphen
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(WIN32)
|
#if !defined(WIN32)
|
||||||
static inline
|
static inline
|
||||||
#elif defined(MINGW_GCC)
|
|
||||||
__mingw_forceinline static
|
|
||||||
#else
|
#else
|
||||||
__forceinline static
|
__forceinline static
|
||||||
#endif
|
#endif
|
||||||
@@ -113,8 +108,6 @@ u_int8_t ndpi_int_check_possible_ftp_reply(const struct ndpi_packet_struct *pack
|
|||||||
*/
|
*/
|
||||||
#if !defined(WIN32)
|
#if !defined(WIN32)
|
||||||
static inline
|
static inline
|
||||||
#elif defined(MINGW_GCC)
|
|
||||||
__mingw_forceinline static
|
|
||||||
#else
|
#else
|
||||||
__forceinline static
|
__forceinline static
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* manolito.c
|
* manolito.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* popo.c
|
* popo.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* secondlife.c
|
* secondlife.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* ayiya.c
|
* ayiya.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -26,11 +26,9 @@
|
|||||||
http://tools.ietf.org/html/rfc4891
|
http://tools.ietf.org/html/rfc4891
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AYIYA
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_AYIYA
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
struct ayiya {
|
struct ayiya {
|
||||||
u_int8_t flags[3];
|
u_int8_t flags[3];
|
||||||
@@ -44,8 +42,6 @@ void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search AYIYA\n");
|
|
||||||
|
|
||||||
if(packet->udp && (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN)) {
|
if(packet->udp && (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN)) {
|
||||||
/* Ayiya is udp based, port 5072 */
|
/* Ayiya is udp based, port 5072 */
|
||||||
if ((packet->udp->source == htons(5072) || packet->udp->dest == htons(5072))
|
if ((packet->udp->source == htons(5072) || packet->udp->dest == htons(5072))
|
||||||
@@ -59,15 +55,13 @@ void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
|
|
||||||
now = flow->packet.tick_timestamp;
|
now = flow->packet.tick_timestamp;
|
||||||
|
|
||||||
if((epoch >= (now - fiveyears)) && (epoch <= (now+86400 /* 1 day */))) {
|
if((epoch >= (now - fiveyears)) && (epoch <= (now+86400 /* 1 day */)))
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found AYIYA\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AYIYA, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AYIYA, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_AYIYA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,3 +77,5 @@ void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* battlefield.c
|
* battlefield.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -22,11 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_BATTLEFIELD
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_BATTLEFIELD
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
static void ndpi_int_battlefield_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_battlefield_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -54,12 +53,12 @@ void ndpi_search_battlefield(struct ndpi_detection_module_struct *ndpi_struct, s
|
|||||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_BATTLEFIELD) {
|
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_BATTLEFIELD) {
|
||||||
if (src != NULL && ((u_int32_t)
|
if (src != NULL && ((u_int32_t)
|
||||||
(packet->tick_timestamp - src->battlefield_ts) < ndpi_struct->battlefield_timeout)) {
|
(packet->tick_timestamp - src->battlefield_ts) < ndpi_struct->battlefield_timeout)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_BATTLEFIELD, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"battlefield : save src connection packet detected\n");
|
"battlefield : save src connection packet detected\n");
|
||||||
src->battlefield_ts = packet->tick_timestamp;
|
src->battlefield_ts = packet->tick_timestamp;
|
||||||
} else if (dst != NULL && ((u_int32_t)
|
} else if (dst != NULL && ((u_int32_t)
|
||||||
(packet->tick_timestamp - dst->battlefield_ts) < ndpi_struct->battlefield_timeout)) {
|
(packet->tick_timestamp - dst->battlefield_ts) < ndpi_struct->battlefield_timeout)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_BATTLEFIELD, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"battlefield : save dst connection packet detected\n");
|
"battlefield : save dst connection packet detected\n");
|
||||||
dst->battlefield_ts = packet->tick_timestamp;
|
dst->battlefield_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
@@ -75,7 +74,8 @@ void ndpi_search_battlefield(struct ndpi_detection_module_struct *ndpi_struct, s
|
|||||||
}
|
}
|
||||||
} else if (flow->l4.udp.battlefield_stage == 2 - packet->packet_direction) {
|
} else if (flow->l4.udp.battlefield_stage == 2 - packet->packet_direction) {
|
||||||
if (packet->payload_packet_len > 8 && get_u_int32_t(packet->payload, 0) == flow->l4.udp.battlefield_msg_id) {
|
if (packet->payload_packet_len > 8 && get_u_int32_t(packet->payload, 0) == flow->l4.udp.battlefield_msg_id) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Battlefield message and reply detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_BATTLEFIELD, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "Battlefield message and reply detected.\n");
|
||||||
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -91,26 +91,28 @@ void ndpi_search_battlefield(struct ndpi_detection_module_struct *ndpi_struct, s
|
|||||||
} else if (flow->l4.udp.battlefield_stage == 4 - packet->packet_direction) {
|
} else if (flow->l4.udp.battlefield_stage == 4 - packet->packet_direction) {
|
||||||
if (packet->payload_packet_len == 7
|
if (packet->payload_packet_len == 7
|
||||||
&& (packet->payload[0] == 0x02 || packet->payload[packet->payload_packet_len - 1] == 0xe0)) {
|
&& (packet->payload[0] == 0x02 || packet->payload[packet->payload_packet_len - 1] == 0xe0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Battlefield message and reply detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_BATTLEFIELD, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"Battlefield message and reply detected.\n");
|
||||||
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload_packet_len == 18 && memcmp(&packet->payload[5], "battlefield2\x00", 13) == 0) {
|
if (packet->payload_packet_len == 18 && memcmp(&packet->payload[5], "battlefield2\x00", 13) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Battlefield 2 hello packet detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_BATTLEFIELD, ndpi_struct, NDPI_LOG_DEBUG, "Battlefield 2 hello packet detected.\n");
|
||||||
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
} else if (packet->payload_packet_len > 10 &&
|
} else if (packet->payload_packet_len > 10 &&
|
||||||
(memcmp(packet->payload, "\x11\x20\x00\x01\x00\x00\x50\xb9\x10\x11", 10) == 0
|
(memcmp(packet->payload, "\x11\x20\x00\x01\x00\x00\x50\xb9\x10\x11", 10) == 0
|
||||||
|| memcmp(packet->payload, "\x11\x20\x00\x01\x00\x00\x30\xb9\x10\x11", 10) == 0
|
|| memcmp(packet->payload, "\x11\x20\x00\x01\x00\x00\x30\xb9\x10\x11", 10) == 0
|
||||||
|| memcmp(packet->payload, "\x11\x20\x00\x01\x00\x00\xa0\x98\x00\x11", 10) == 0)) {
|
|| memcmp(packet->payload, "\x11\x20\x00\x01\x00\x00\xa0\x98\x00\x11", 10) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Battlefield safe pattern detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_BATTLEFIELD, ndpi_struct, NDPI_LOG_DEBUG, "Battlefield safe pattern detected.\n");
|
||||||
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
ndpi_int_battlefield_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BATTLEFIELD);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -124,3 +126,5 @@ void init_battlefield_dissector(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+8
-12
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* bgp.c
|
* bgp.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2016-18 - ntop.org
|
* Copyright (C) 2016 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -20,13 +20,9 @@
|
|||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#ifdef NDPI_PROTOCOL_BGP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_BGP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* this detection also works asymmetrically */
|
/* this detection also works asymmetrically */
|
||||||
void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
@@ -34,8 +30,6 @@ void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
u_int16_t bgp_port = htons(179);
|
u_int16_t bgp_port = htons(179);
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search BGP\n");
|
|
||||||
|
|
||||||
if(packet->tcp) {
|
if(packet->tcp) {
|
||||||
if(packet->payload_packet_len > 18
|
if(packet->payload_packet_len > 18
|
||||||
&& packet->payload[18] < 5
|
&& packet->payload[18] < 5
|
||||||
@@ -44,13 +38,13 @@ void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
&& (get_u_int64_t(packet->payload, 8) == 0xffffffffffffffffULL)
|
&& (get_u_int64_t(packet->payload, 8) == 0xffffffffffffffffULL)
|
||||||
&& (ntohs(get_u_int16_t(packet->payload, 16)) <= packet->payload_packet_len)) {
|
&& (ntohs(get_u_int16_t(packet->payload, 16)) <= packet->payload_packet_len)) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BGP\n");
|
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);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BGP, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* exclude BGP */
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BGP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -65,3 +59,5 @@ void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
|||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* bittorrent.c
|
* bittorrent.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -23,12 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_BITTORRENT
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_BITTORRENT
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
#define NDPI_PROTOCOL_UNSAFE_DETECTION 0
|
#define NDPI_PROTOCOL_UNSAFE_DETECTION 0
|
||||||
#define NDPI_PROTOCOL_SAFE_DETECTION 1
|
#define NDPI_PROTOCOL_SAFE_DETECTION 1
|
||||||
|
|
||||||
@@ -55,8 +51,7 @@ static u_int8_t is_utp_pkt(const u_int8_t *payload, u_int payload_len) {
|
|||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ndpi_add_connection_as_bittorrent(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_add_connection_as_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow,
|
||||||
struct ndpi_flow_struct *flow,
|
|
||||||
int bt_offset, int check_hash,
|
int bt_offset, int check_hash,
|
||||||
const u_int8_t save_detection, const u_int8_t encrypted_connection)
|
const u_int8_t save_detection, const u_int8_t encrypted_connection)
|
||||||
{
|
{
|
||||||
@@ -64,17 +59,15 @@ static void ndpi_add_connection_as_bittorrent(struct ndpi_detection_module_struc
|
|||||||
const char *bt_hash = NULL; /* 20 bytes long */
|
const char *bt_hash = NULL; /* 20 bytes long */
|
||||||
|
|
||||||
if(bt_offset == -1) {
|
if(bt_offset == -1) {
|
||||||
const char *bt_magic = ndpi_strnstr((const char *)flow->packet.payload,
|
const char *bt_magic = ndpi_strnstr((const char *)flow->packet.payload,
|
||||||
"BitTorrent protocol", flow->packet.payload_packet_len);
|
"BitTorrent protocol", flow->packet.payload_packet_len);
|
||||||
|
|
||||||
if(bt_magic)
|
if(bt_magic)
|
||||||
bt_hash = &bt_magic[19];
|
bt_hash = &bt_magic[19];
|
||||||
} else
|
} else
|
||||||
bt_hash = (const char*)&flow->packet.payload[28];
|
bt_hash = (const char*)&flow->packet.payload[28];
|
||||||
|
|
||||||
if(!ndpi_struct->disable_metadata_export) {
|
if(bt_hash) memcpy(flow->bittorent_hash, bt_hash, 20);
|
||||||
if(bt_hash) memcpy(flow->protos.bittorrent.hash, bt_hash, 20);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -94,9 +87,10 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
|
|
||||||
if(flow->packet_counter == 2 && packet->payload_packet_len > 20) {
|
if(flow->packet_counter == 2 && packet->payload_packet_len > 20) {
|
||||||
if(memcmp(&packet->payload[0], "BitTorrent protocol", 19) == 0) {
|
if(memcmp(&packet->payload[0], "BitTorrent protocol", 19) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: plain\n");
|
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_add_connection_as_bittorrent(ndpi_struct, flow, 19, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -105,18 +99,19 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
/* test for match 0x13+"BitTorrent protocol" */
|
/* test for match 0x13+"BitTorrent protocol" */
|
||||||
if(packet->payload[0] == 0x13) {
|
if(packet->payload[0] == 0x13) {
|
||||||
if(memcmp(&packet->payload[1], "BitTorrent protocol", 19) == 0) {
|
if(memcmp(&packet->payload[1], "BitTorrent protocol", 19) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: plain\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct, NDPI_LOG_TRACE, "BT: plain BitTorrent protocol detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, 20, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, 20, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(packet->payload_packet_len > 23 && memcmp(packet->payload, "GET /webseed?info_hash=", 23) == 0) {
|
if(packet->payload_packet_len > 23 && memcmp(packet->payload, "GET /webseed?info_hash=", 23) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: plain webseed\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "BT: plain webseed BitTorrent protocol detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
/* seen Azureus as server for webseed, possibly other servers existing, to implement */
|
/* seen Azureus as server for webseed, possibly other servers existing, to implement */
|
||||||
@@ -124,9 +119,10 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
/* no asymmetric detection possible for answer of pattern "GET /data?fid=". */
|
/* no asymmetric detection possible for answer of pattern "GET /data?fid=". */
|
||||||
if(packet->payload_packet_len > 60
|
if(packet->payload_packet_len > 60
|
||||||
&& memcmp(packet->payload, "GET /data?fid=", 14) == 0 && memcmp(&packet->payload[54], "&size=", 6) == 0) {
|
&& memcmp(packet->payload, "GET /data?fid=", 14) == 0 && memcmp(&packet->payload[54], "&size=", 6) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: plain Bitcomet persistent seed\n");
|
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_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,9 +140,10 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
&& ((packet->user_agent_line.len > 8 && memcmp(packet->user_agent_line.ptr, "Azureus ", 8) == 0)
|
&& ((packet->user_agent_line.len > 8 && memcmp(packet->user_agent_line.ptr, "Azureus ", 8) == 0)
|
||||||
|| (packet->user_agent_line.len >= 10 && memcmp(packet->user_agent_line.ptr, "BitTorrent", 10) == 0)
|
|| (packet->user_agent_line.len >= 10 && memcmp(packet->user_agent_line.ptr, "BitTorrent", 10) == 0)
|
||||||
|| (packet->user_agent_line.len >= 11 && memcmp(packet->user_agent_line.ptr, "BTWebClient", 11) == 0))) {
|
|| (packet->user_agent_line.len >= 11 && memcmp(packet->user_agent_line.ptr, "BTWebClient", 11) == 0))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: Azureus /Bittorrent user agent\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "Azureus /Bittorrent user agent line detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,9 +151,10 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
&& (packet->user_agent_line.len >= 9 && memcmp(packet->user_agent_line.ptr, "Shareaza ", 9) == 0)
|
&& (packet->user_agent_line.len >= 9 && memcmp(packet->user_agent_line.ptr, "Shareaza ", 9) == 0)
|
||||||
&& (packet->parsed_lines > 8 && packet->line[8].ptr != 0
|
&& (packet->parsed_lines > 8 && packet->line[8].ptr != 0
|
||||||
&& packet->line[8].len >= 9 && memcmp(packet->line[8].ptr, "X-Queue: ", 9) == 0)) {
|
&& packet->line[8].len >= 9 && memcmp(packet->line[8].ptr, "X-Queue: ", 9) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: Shareaza detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "Bittorrent Shareaza detected.\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,9 +186,9 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
&& packet->line[8].ptr != NULL
|
&& packet->line[8].ptr != NULL
|
||||||
&& packet->line[8].len > 22 && memcmp(packet->line[8].ptr, "Cache-Control: no-cache", 23) == 0) {
|
&& packet->line[8].len > 22 && memcmp(packet->line[8].ptr, "Cache-Control: no-cache", 23) == 0) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: Bitcomet LTS\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct, NDPI_LOG_TRACE, "Bitcomet LTS detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_UNSAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_UNSAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -213,9 +211,9 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
&& packet->line[6].ptr != NULL
|
&& packet->line[6].ptr != NULL
|
||||||
&& packet->line[6].len > 21 && memcmp(packet->line[6].ptr, "Connection: Keep-Alive", 22) == 0) {
|
&& packet->line[6].len > 21 && memcmp(packet->line[6].ptr, "Connection: Keep-Alive", 22) == 0) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: FlashGet\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct, NDPI_LOG_TRACE, "FlashGet detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_UNSAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_UNSAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -234,9 +232,9 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
&& packet->line[5].ptr != NULL
|
&& packet->line[5].ptr != NULL
|
||||||
&& packet->line[5].len > 21 && memcmp(packet->line[5].ptr, "Connection: Keep-Alive", 22) == 0) {
|
&& packet->line[5].len > 21 && memcmp(packet->line[5].ptr, "Connection: Keep-Alive", 22) == 0) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: FlashGet\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct, NDPI_LOG_TRACE, "FlashGet detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_UNSAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_UNSAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,7 +250,8 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
ptr++;
|
ptr++;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, " BT stat: tracker info hash found\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, " BT stat: tracker info hash found\n");
|
||||||
|
|
||||||
/* len is > 50, so save operation here */
|
/* len is > 50, so save operation here */
|
||||||
len -= 10;
|
len -= 10;
|
||||||
@@ -301,9 +300,10 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: tracker info hash parsed\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, " BT stat: tracker info hash parsed\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -329,9 +329,10 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
/* did not see this pattern anywhere */
|
/* did not see this pattern anywhere */
|
||||||
if((memcmp(&packet->payload[0], pattern_20_bytes, 20) == 0)
|
if((memcmp(&packet->payload[0], pattern_20_bytes, 20) == 0)
|
||||||
&& (memcmp(&packet->payload[52], pattern_12_bytes, 12) == 0)) {
|
&& (memcmp(&packet->payload[52], pattern_12_bytes, 12) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: Warez - Plain\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "BT: Warez - Plain BitTorrent protocol detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -343,9 +344,11 @@ static u_int8_t ndpi_int_search_bittorrent_tcp_zero(struct ndpi_detection_module
|
|||||||
/* haven't fount this pattern anywhere */
|
/* haven't fount this pattern anywhere */
|
||||||
if(packet->host_line.ptr != NULL
|
if(packet->host_line.ptr != NULL
|
||||||
&& packet->host_line.len >= 9 && memcmp(packet->host_line.ptr, "ip2p.com:", 9) == 0) {
|
&& packet->host_line.len >= 9 && memcmp(packet->host_line.ptr, "ip2p.com:", 9) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: Warez - Plain Host: ip2p.com: pattern\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT,
|
||||||
|
ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"BT: Warez - Plain BitTorrent protocol detected due to Host: ip2p.com: pattern\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 1,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_WEBSEED_DETECTION);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -367,11 +370,13 @@ static void ndpi_int_search_bittorrent_tcp(struct ndpi_detection_module_struct *
|
|||||||
/* exclude stage 0 detection from next run */
|
/* exclude stage 0 detection from next run */
|
||||||
flow->bittorrent_stage = 1;
|
flow->bittorrent_stage = 1;
|
||||||
if(ndpi_int_search_bittorrent_tcp_zero(ndpi_struct, flow) != 0) {
|
if(ndpi_int_search_bittorrent_tcp_zero(ndpi_struct, flow) != 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage 0 has detected something, returning\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"stage 0 has detected something, returning\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "stage 0 has no direct detection, fall through\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"stage 0 has no direct detection, fall through\n");
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -382,15 +387,15 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
char *bt_proto = NULL;
|
char *bt_proto = NULL;
|
||||||
|
|
||||||
/* This is broadcast */
|
/* This is broadcast */
|
||||||
if(packet->iph
|
if(packet->iph
|
||||||
&& (((packet->iph->saddr == 0xFFFFFFFF) || (packet->iph->daddr == 0xFFFFFFFF))
|
&& (((packet->iph->saddr == 0xFFFFFFFF) || (packet->iph->daddr == 0xFFFFFFFF))
|
||||||
|| (packet->udp
|
|| (packet->udp
|
||||||
&& ((ntohs(packet->udp->source) == 3544) /* teredo.c */
|
&& ((ntohs(packet->udp->source) == 3544) /* teredo.c */
|
||||||
|| (ntohs(packet->udp->dest) == 3544))))) {
|
|| (ntohs(packet->udp->dest) == 3544))))) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BITTORRENT);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BITTORRENT) {
|
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BITTORRENT) {
|
||||||
/* check for tcp retransmission here */
|
/* check for tcp retransmission here */
|
||||||
|
|
||||||
@@ -436,8 +441,7 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
/* Heuristic */
|
/* Heuristic */
|
||||||
bt_proto = ndpi_strnstr((const char *)&packet->payload[20], "BitTorrent protocol", packet->payload_packet_len-20);
|
bt_proto = ndpi_strnstr((const char *)&packet->payload[20], "BitTorrent protocol", packet->payload_packet_len-20);
|
||||||
goto bittorrent_found;
|
goto bittorrent_found;
|
||||||
/* CSGO/DOTA conflict */
|
} else if(((v1_version & 0x0f) == 1)
|
||||||
} else if(flow->packet_counter > 8 && ((v1_version & 0x0f) == 1)
|
|
||||||
&& ((v1_version >> 4) < 5 /* ST_NUM_STATES */)
|
&& ((v1_version >> 4) < 5 /* ST_NUM_STATES */)
|
||||||
&& (v1_extension < 3 /* EXT_NUM_EXT */)
|
&& (v1_extension < 3 /* EXT_NUM_EXT */)
|
||||||
&& (v1_window_size < 32768 /* 32k */)
|
&& (v1_window_size < 32768 /* 32k */)
|
||||||
@@ -462,8 +466,8 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|
|
||||||
if(flow->bittorrent_stage < 10) {
|
if(flow->bittorrent_stage < 10) {
|
||||||
/* We have detected bittorrent but we need to wait until we get a hash */
|
/* We have detected bittorrent but we need to wait until we get a hash */
|
||||||
|
|
||||||
if(packet->payload_packet_len > 19 /* min size */) {
|
if(packet->payload_packet_len > 19 /* min size */) {
|
||||||
if(ndpi_strnstr((const char *)packet->payload, ":target20:", packet->payload_packet_len)
|
if(ndpi_strnstr((const char *)packet->payload, ":target20:", packet->payload_packet_len)
|
||||||
|| ndpi_strnstr((const char *)packet->payload, ":find_node1:", packet->payload_packet_len)
|
|| ndpi_strnstr((const char *)packet->payload, ":find_node1:", packet->payload_packet_len)
|
||||||
|| ndpi_strnstr((const char *)packet->payload, "d1:ad2:id20:", packet->payload_packet_len)
|
|| ndpi_strnstr((const char *)packet->payload, "d1:ad2:id20:", packet->payload_packet_len)
|
||||||
@@ -471,21 +475,23 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|| ndpi_strnstr((const char *)packet->payload, ":filter64", packet->payload_packet_len)
|
|| ndpi_strnstr((const char *)packet->payload, ":filter64", packet->payload_packet_len)
|
||||||
|| ndpi_strnstr((const char *)packet->payload, "d1:rd2:id20:", packet->payload_packet_len)
|
|| ndpi_strnstr((const char *)packet->payload, "d1:rd2:id20:", packet->payload_packet_len)
|
||||||
|| (bt_proto = ndpi_strnstr((const char *)packet->payload, "BitTorrent protocol", packet->payload_packet_len))
|
|| (bt_proto = ndpi_strnstr((const char *)packet->payload, "BitTorrent protocol", packet->payload_packet_len))
|
||||||
) {
|
) {
|
||||||
bittorrent_found:
|
bittorrent_found:
|
||||||
if(bt_proto && (packet->payload_packet_len > 47))
|
if(bt_proto && (packet->payload_packet_len > 47))
|
||||||
memcpy(flow->protos.bittorrent.hash, &bt_proto[27], 20);
|
memcpy(flow->bittorent_hash, &bt_proto[27], 20);
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found BT: plain\n");
|
NDPI_LOG(NDPI_PROTOCOL_BITTORRENT,
|
||||||
|
ndpi_struct, NDPI_LOG_TRACE, "BT: plain BitTorrent protocol detected\n");
|
||||||
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 0,
|
ndpi_add_connection_as_bittorrent(ndpi_struct, flow, -1, 0,
|
||||||
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
NDPI_PROTOCOL_SAFE_DETECTION, NDPI_PROTOCOL_PLAIN_DETECTION);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_BITTORRENT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -501,3 +507,5 @@ void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+14
-10
@@ -1,14 +1,13 @@
|
|||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_BJNP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_BJNP
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_bjnp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_bjnp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow,
|
||||||
u_int8_t due_to_correlation) {
|
u_int8_t due_to_correlation)
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow,
|
{
|
||||||
NDPI_PROTOCOL_BJNP, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_BJNP, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -24,21 +23,22 @@ static void ndpi_check_bjnp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|| (memcmp((const char *)packet->payload, "BJNB", 4) == 0)
|
|| (memcmp((const char *)packet->payload, "BJNB", 4) == 0)
|
||||||
|| (memcmp((const char *)packet->payload, "MFNP", 4) == 0)
|
|| (memcmp((const char *)packet->payload, "MFNP", 4) == 0)
|
||||||
) {
|
) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found bjnp\n");
|
NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "Found bjnp.\n");
|
||||||
ndpi_int_bjnp_add_connection(ndpi_struct, flow, 0);
|
ndpi_int_bjnp_add_connection(ndpi_struct, flow, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
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)
|
void ndpi_search_bjnp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search bjnp\n");
|
NDPI_LOG(NDPI_PROTOCOL_BJNP, ndpi_struct, NDPI_LOG_DEBUG, "bjnp detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BJNP) {
|
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BJNP) {
|
||||||
@@ -59,3 +59,7 @@ void init_bjnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* btlib.c
|
* btlib.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
* Contributed by Vitaly Lavrov <vel21ripn@gmail.com>
|
* Contributed by Vitaly Lavrov <vel21ripn@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
@@ -22,8 +22,6 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
#ifndef NDPI_NO_STD_INC
|
#ifndef NDPI_NO_STD_INC
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -31,17 +29,17 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
|
|
||||||
/*
|
|
||||||
typedef unsigned char u_int8_t;
|
typedef unsigned char u_int8_t;
|
||||||
typedef unsigned short int u_int16_t;
|
typedef unsigned short int u_int16_t;
|
||||||
typedef unsigned long long int u_int64_t;
|
typedef unsigned long long int u_int64_t;
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef signed long long int i_int64_t;
|
||||||
|
|
||||||
#include "btlib.h"
|
#include "btlib.h"
|
||||||
|
|
||||||
int bt_parse_debug = 0;
|
int bt_parse_debug = 0;
|
||||||
@@ -92,7 +90,6 @@ static char *print_id_ip6_p(char *s,const struct bt_nodes6_data *b) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
void dump_bt_proto_struct(struct bt_parse_protocol *p) {
|
void dump_bt_proto_struct(struct bt_parse_protocol *p) {
|
||||||
char b20h[128];
|
char b20h[128];
|
||||||
int i;
|
int i;
|
||||||
@@ -158,9 +155,7 @@ void dump_bt_proto_struct(struct bt_parse_protocol *p) {
|
|||||||
if(p->interval) printf("\tinterval\t%d\n",p->interval);
|
if(p->interval) printf("\tinterval\t%d\n",p->interval);
|
||||||
if(p->min_interval) printf("\tmin interval\t%d\n",p->min_interval);
|
if(p->min_interval) printf("\tmin interval\t%d\n",p->min_interval);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef BTLIB_DEBUG
|
|
||||||
static void _print_safe_str(char *msg,char *k,const u_int8_t *s,size_t l) {
|
static void _print_safe_str(char *msg,char *k,const u_int8_t *s,size_t l) {
|
||||||
static const char *th="0123456789abcdef?";
|
static const char *th="0123456789abcdef?";
|
||||||
char *buf = (char*)ndpi_malloc((size_t)(l*3+2));
|
char *buf = (char*)ndpi_malloc((size_t)(l*3+2));
|
||||||
@@ -186,13 +181,8 @@ static void _print_safe_str(char *msg,char *k,const u_int8_t *s,size_t l) {
|
|||||||
static void print_safe_str(char *msg,bt_parse_data_cb_t *cbd) {
|
static void print_safe_str(char *msg,bt_parse_data_cb_t *cbd) {
|
||||||
_print_safe_str(msg,cbd->buf,cbd->v.s.s,cbd->v.s.l);
|
_print_safe_str(msg,cbd->buf,cbd->v.s.s,cbd->v.s.l);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEBUG_TRACE(cmd) { if(bt_parse_debug) cmd; }
|
#define DEBUG_TRACE(cmd) { if(bt_parse_debug) cmd; }
|
||||||
|
|
||||||
#else
|
|
||||||
#define DEBUG_TRACE(cmd) ;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define STREQ(a,b) !strcmp(a,b)
|
#define STREQ(a,b) !strcmp(a,b)
|
||||||
|
|
||||||
|
|
||||||
@@ -418,8 +408,8 @@ void cb_data(bt_parse_data_cb_t *cbd,int *ret) {
|
|||||||
const u_int8_t *bt_decode(const u_int8_t *b, size_t *l, int *ret, bt_parse_data_cb_t *cbd) {
|
const u_int8_t *bt_decode(const u_int8_t *b, size_t *l, int *ret, bt_parse_data_cb_t *cbd) {
|
||||||
|
|
||||||
unsigned int n=0,neg=0;
|
unsigned int n=0,neg=0;
|
||||||
int64_t d = 0;
|
i_int64_t d = 0;
|
||||||
u_int8_t c;
|
register u_int8_t c;
|
||||||
|
|
||||||
if(*l == 0) return NULL;
|
if(*l == 0) return NULL;
|
||||||
if(cbd->level > BDEC_MAXDEPT) goto bad_data;
|
if(cbd->level > BDEC_MAXDEPT) goto bad_data;
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ typedef struct bt_parse_data_cb {
|
|||||||
int level;
|
int level;
|
||||||
int t;
|
int t;
|
||||||
union {
|
union {
|
||||||
int64_t i;
|
i_int64_t i;
|
||||||
b_elem_s_t s;
|
b_elem_s_t s;
|
||||||
} v;
|
} v;
|
||||||
} bt_parse_data_cb_t;
|
} bt_parse_data_cb_t;
|
||||||
|
|||||||
@@ -1,82 +0,0 @@
|
|||||||
/*
|
|
||||||
* checkmk.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
|
||||||
*
|
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
|
||||||
*
|
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* nDPI is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CHECKMK
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_checkmk_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow)
|
|
||||||
{
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CHECKMK, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ndpi_search_checkmk(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow)
|
|
||||||
{
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
|
||||||
|
|
||||||
if (packet->payload_packet_len >= 15) {
|
|
||||||
|
|
||||||
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 >= 15 && packet->payload_packet_len < 100
|
|
||||||
&& memcmp(packet->payload, "<<<check_mk>>>", 14) == 0) {
|
|
||||||
|
|
||||||
NDPI_LOG(NDPI_PROTOCOL_CHECKMK, ndpi_struct, NDPI_LOG_DEBUG, "Check_MK: Flow detected.\n");
|
|
||||||
ndpi_int_checkmk_add_connection(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NDPI_LOG(NDPI_PROTOCOL_CHECKMK, ndpi_struct, NDPI_LOG_DEBUG, "Check_MK excluded.\n");
|
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CHECKMK);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void init_checkmk_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
|
||||||
{
|
|
||||||
ndpi_set_bitmask_protocol_detection("CHECKMK", ndpi_struct, detection_bitmask, *id,
|
|
||||||
NDPI_PROTOCOL_CHECKMK,
|
|
||||||
ndpi_search_checkmk,
|
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
|
||||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
|
||||||
ADD_TO_DETECTION_BITMASK);
|
|
||||||
*id += 1;
|
|
||||||
}
|
|
||||||
@@ -4,12 +4,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CISCOVPN
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_CISCOVPN
|
||||||
|
|
||||||
static void ndpi_int_ciscovpn_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_ciscovpn_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -23,15 +20,15 @@ void ndpi_search_ciscovpn(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
u_int16_t tdport = 0, tsport = 0;
|
u_int16_t tdport = 0, tsport = 0;
|
||||||
|
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search CISCOVPN\n");
|
NDPI_LOG(NDPI_PROTOCOL_CISCOVPN, ndpi_struct, NDPI_LOG_DEBUG, "search CISCOVPN.\n");
|
||||||
|
|
||||||
if(packet->tcp != NULL) {
|
if(packet->tcp != NULL) {
|
||||||
tsport = ntohs(packet->tcp->source), tdport = ntohs(packet->tcp->dest);
|
tsport = ntohs(packet->tcp->source), tdport = ntohs(packet->tcp->dest);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculated CISCOVPN over tcp ports\n");
|
NDPI_LOG(NDPI_PROTOCOL_CISCOVPN, ndpi_struct, NDPI_LOG_DEBUG, "calculated CISCOVPN over tcp ports.\n");
|
||||||
}
|
}
|
||||||
if(packet->udp != NULL) {
|
if(packet->udp != NULL) {
|
||||||
usport = ntohs(packet->udp->source), udport = ntohs(packet->udp->dest);
|
usport = ntohs(packet->udp->source), udport = ntohs(packet->udp->dest);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculated CISCOVPN over udp ports\n");
|
NDPI_LOG(NDPI_PROTOCOL_CISCOVPN, ndpi_struct, NDPI_LOG_DEBUG, "calculated CISCOVPN over udp ports.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if((tdport == 10000 && tsport == 10000) ||
|
if((tdport == 10000 && tsport == 10000) ||
|
||||||
@@ -45,9 +42,8 @@ void ndpi_search_ciscovpn(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
|
|
||||||
{
|
{
|
||||||
/* This is a good query 17010000*/
|
/* This is a good query 17010000*/
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found CISCOVPN\n");
|
NDPI_LOG(NDPI_PROTOCOL_CISCOVPN, ndpi_struct, NDPI_LOG_DEBUG, "found CISCOVPN.\n");
|
||||||
ndpi_int_ciscovpn_add_connection(ndpi_struct, flow);
|
ndpi_int_ciscovpn_add_connection(ndpi_struct, flow);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
else if(
|
else if(
|
||||||
(
|
(
|
||||||
@@ -63,10 +59,11 @@ void ndpi_search_ciscovpn(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
|
|
||||||
|
|
||||||
/* This is a good query fe577e2b */
|
/* This is a good query fe577e2b */
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found CISCOVPN\n");
|
NDPI_LOG(NDPI_PROTOCOL_CISCOVPN, ndpi_struct, NDPI_LOG_DEBUG, "found CISCOVPN.\n");
|
||||||
ndpi_int_ciscovpn_add_connection(ndpi_struct, flow);
|
ndpi_int_ciscovpn_add_connection(ndpi_struct, flow);
|
||||||
} else {
|
} else {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_CISCOVPN, ndpi_struct, NDPI_LOG_DEBUG, "exclude CISCOVPN.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CISCOVPN);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -82,3 +79,5 @@ void init_ciscovpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+12
-11
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* citrix.c
|
* citrix.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012-18 - ntop.org
|
* Copyright (C) 2012-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -21,12 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CITRIX
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_CITRIX
|
||||||
|
|
||||||
/* ************************************ */
|
/* ************************************ */
|
||||||
|
|
||||||
@@ -47,25 +45,26 @@ static void ndpi_check_citrix(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
char citrix_header[] = { 0x07, 0x07, 0x49, 0x43, 0x41, 0x00 };
|
char citrix_header[] = { 0x07, 0x07, 0x49, 0x43, 0x41, 0x00 };
|
||||||
|
|
||||||
if(memcmp(packet->payload, citrix_header, sizeof(citrix_header)) == 0) {
|
if(memcmp(packet->payload, citrix_header, sizeof(citrix_header)) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found citrix\n");
|
NDPI_LOG(NDPI_PROTOCOL_CITRIX, ndpi_struct, NDPI_LOG_DEBUG, "Found citrix.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CITRIX, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CITRIX, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else if(payload_len > 4) {
|
} else if(payload_len > 4) {
|
||||||
char citrix_header[] = { 0x1a, 0x43, 0x47, 0x50, 0x2f, 0x30, 0x31 };
|
char citrix_header[] = { 0x1a, 0x43, 0x47, 0x50, 0x2f, 0x30, 0x31 };
|
||||||
|
|
||||||
if((memcmp(packet->payload, citrix_header, sizeof(citrix_header)) == 0)
|
if((memcmp(packet->payload, citrix_header, sizeof(citrix_header)) == 0)
|
||||||
|| (ndpi_strnstr((const char *)packet->payload, "Citrix.TcpProxyService", payload_len) != NULL)) {
|
|| (ndpi_strnstr((const char *)packet->payload, "Citrix.TcpProxyService", payload_len) != NULL)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found citrix\n");
|
NDPI_LOG(NDPI_PROTOCOL_CITRIX, ndpi_struct, NDPI_LOG_DEBUG, "Found citrix.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CITRIX, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CITRIX, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CITRIX);
|
||||||
} else if(flow->l4.tcp.citrix_packet_id > 3) {
|
} else if(flow->l4.tcp.citrix_packet_id > 3)
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CITRIX);
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -75,7 +74,7 @@ void ndpi_search_citrix(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search citrix\n");
|
NDPI_LOG(NDPI_PROTOCOL_CITRIX, ndpi_struct, NDPI_LOG_DEBUG, "citrix detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_CITRIX)
|
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_CITRIX)
|
||||||
@@ -93,3 +92,5 @@ void init_citrix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+12
-10
@@ -21,12 +21,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_COAP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_COAP
|
||||||
|
|
||||||
#define CON 0
|
#define CON 0
|
||||||
#define NO_CON 1
|
#define NO_CON 1
|
||||||
@@ -119,12 +116,14 @@ void ndpi_search_coap (struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
u_int16_t d_port = ntohs(flow->packet.udp->dest);
|
u_int16_t d_port = ntohs(flow->packet.udp->dest);
|
||||||
|
|
||||||
if((!isCoAPport(s_port) && !isCoAPport(d_port))
|
if((!isCoAPport(s_port) && !isCoAPport(d_port))
|
||||||
|| (packet->payload_packet_len < 4) ) { // header too short
|
|| (packet->payload_packet_len < 4) // header too short
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
) {
|
||||||
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculating coap over udp\n");
|
NDPI_LOG(NDPI_PROTOCOL_COAP, ndpi_struct, NDPI_LOG_DEBUG, "calculating coap over udp.\n");
|
||||||
|
|
||||||
// check values in header
|
// check values in header
|
||||||
if(h->version == 1) {
|
if(h->version == 1) {
|
||||||
@@ -134,7 +133,7 @@ void ndpi_search_coap (struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
(h->code >= 128 && h->code <= 134) || (h->code >= 140 && h->code <= 143) ||
|
(h->code >= 128 && h->code <= 134) || (h->code >= 140 && h->code <= 143) ||
|
||||||
(h->code >= 160 && h->code <= 165)) {
|
(h->code >= 160 && h->code <= 165)) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Coap\n");
|
NDPI_LOG(NDPI_PROTOCOL_COAP, ndpi_struct, NDPI_LOG_DEBUG, "Coap found...\n");
|
||||||
ndpi_int_coap_add_connection(ndpi_struct,flow);
|
ndpi_int_coap_add_connection(ndpi_struct,flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -143,7 +142,8 @@ void ndpi_search_coap (struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,3 +161,5 @@ void init_coap_dissector (struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
*id +=1;
|
*id +=1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif // NDPI_PROTOCOL_COAP
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* collectd.c
|
* collectd.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-18 - ntop.org
|
* Copyright (C) 2014 - ntop.org
|
||||||
*
|
*
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
@@ -19,19 +19,16 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_COLLECTD
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_COLLECTD
|
||||||
|
|
||||||
void ndpi_search_collectd(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_collectd(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
u_int len = 0;
|
u_int len = 0;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search collectd\n");
|
NDPI_LOG(NDPI_PROTOCOL_COLLECTD, ndpi_struct, NDPI_LOG_DEBUG, "search collectd.\n");
|
||||||
|
|
||||||
if (packet->udp == NULL) return;
|
if (packet->udp == NULL) return;
|
||||||
|
|
||||||
@@ -46,9 +43,12 @@ void ndpi_search_collectd(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(len == packet->payload_packet_len) {
|
if(len == packet->payload_packet_len) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found COLLECTD\n");
|
NDPI_LOG(NDPI_PROTOCOL_COLLECTD, ndpi_struct, NDPI_LOG_DEBUG, "found COLLECTD.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_COLLECTD, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_COLLECTD, NDPI_PROTOCOL_UNKNOWN);
|
||||||
} else {
|
} else {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_COLLECTD, ndpi_struct, NDPI_LOG_DEBUG, "exclude COLLECTD.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_COLLECTD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -18,12 +18,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CORBA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_CORBA
|
||||||
static void ndpi_int_corba_add_connection(struct ndpi_detection_module_struct
|
static void ndpi_int_corba_add_connection(struct ndpi_detection_module_struct
|
||||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -33,17 +31,18 @@ void ndpi_search_corba(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search for CORBA\n");
|
NDPI_LOG(NDPI_PROTOCOL_CORBA, ndpi_struct, NDPI_LOG_DEBUG, "search for CORBA.\n");
|
||||||
if(packet->tcp != NULL) {
|
if(packet->tcp != NULL) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculating CORBA over tcp\n");
|
NDPI_LOG(NDPI_PROTOCOL_CORBA, ndpi_struct, NDPI_LOG_DEBUG, "calculating CORBA over tcp.\n");
|
||||||
/* Corba General Inter-ORB Protocol -> GIOP */
|
/* Corba General Inter-ORB Protocol -> GIOP */
|
||||||
if ((packet->payload_packet_len >= 24 && packet->payload_packet_len <= 144) &&
|
if ((packet->payload_packet_len >= 24 && packet->payload_packet_len <= 144) &&
|
||||||
memcmp(packet->payload, "GIOP", 4) == 0) {
|
memcmp(packet->payload, "GIOP", 4) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found corba\n");
|
NDPI_LOG(NDPI_PROTOCOL_CORBA, ndpi_struct, NDPI_LOG_DEBUG, "found corba.\n");
|
||||||
ndpi_int_corba_add_connection(ndpi_struct, flow);
|
ndpi_int_corba_add_connection(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_CORBA, ndpi_struct, NDPI_LOG_DEBUG, "exclude CORBA.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CORBA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,3 +57,4 @@ void init_corba_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* crossfire.c
|
* crossfire.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012-18 - ntop.org
|
* Copyright (C) 2012-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -21,11 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CROSSFIRE
|
/* include files */
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#include "ndpi_api.h"
|
#ifdef NDPI_PROTOCOL_CROSSFIRE
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_crossfire_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_crossfire_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
@@ -38,17 +37,21 @@ static void ndpi_int_crossfire_add_connection(struct ndpi_detection_module_struc
|
|||||||
void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
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_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "search crossfire.\n");
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search crossfire\n");
|
|
||||||
|
|
||||||
if (packet->udp != 0) {
|
if (packet->udp != 0) {
|
||||||
if (packet->payload_packet_len == 25
|
if (packet->payload_packet_len == 25 && get_u_int32_t(packet->payload, 0) == ntohl(0xc7d91999)
|
||||||
&& get_u_int32_t(packet->payload, 0) == ntohl(0xc7d91999)
|
|
||||||
&& get_u_int16_t(packet->payload, 4) == ntohs(0x0200)
|
&& get_u_int16_t(packet->payload, 4) == ntohs(0x0200)
|
||||||
&& get_u_int16_t(packet->payload, 22) == ntohs(0x7d00)) {
|
&& get_u_int16_t(packet->payload, 22) == ntohs(0x7d00)
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Crossfire: udp packet\n");
|
) {
|
||||||
ndpi_int_crossfire_add_connection(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "Crossfire: found udp packet.\n");
|
||||||
return;
|
ndpi_int_crossfire_add_connection(ndpi_struct, flow);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (packet->tcp != 0) {
|
} else if (packet->tcp != 0) {
|
||||||
@@ -64,15 +67,16 @@ void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
&& (memcmp(packet->host_line.ptr, "crossfire", 9) == 0
|
&& (memcmp(packet->host_line.ptr, "crossfire", 9) == 0
|
||||||
|| memcmp(packet->host_line.ptr, "www.crossfire", 13) == 0))
|
|| memcmp(packet->host_line.ptr, "www.crossfire", 13) == 0))
|
||||||
) {
|
) {
|
||||||
NDPI_LOG_DBG(ndpi_struct, "found Crossfire: HTTP request\n");
|
NDPI_LOG(NDPI_PROTOCOL_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "Crossfire: found HTTP request.\n");
|
||||||
ndpi_int_crossfire_add_connection(ndpi_struct, flow);
|
ndpi_int_crossfire_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "exclude crossfire.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CROSSFIRE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -86,3 +90,5 @@ void init_crossfire_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,122 +0,0 @@
|
|||||||
/*
|
|
||||||
* csgo.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2016-2017 Vitaly Lavrov <vel21ripn@gmail.com>
|
|
||||||
*
|
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
|
||||||
*
|
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* nDPI is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CSGO
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
void ndpi_search_csgo(struct ndpi_detection_module_struct* ndpi_struct, struct ndpi_flow_struct* flow) {
|
|
||||||
struct ndpi_packet_struct* packet = &flow->packet;
|
|
||||||
|
|
||||||
if (packet->udp != NULL) {
|
|
||||||
uint32_t w = htonl(get_u_int32_t(packet->payload, 0));
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "CSGO: word %08x\n", w);
|
|
||||||
|
|
||||||
if (!flow->csgo_state && packet->payload_packet_len == 23 && w == 0xfffffffful) {
|
|
||||||
if (!memcmp(packet->payload + 5, "connect0x", 9)) {
|
|
||||||
flow->csgo_state++;
|
|
||||||
memcpy(flow->csgo_strid, packet->payload + 5, 18);
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Found csgo connect0x\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flow->csgo_state == 1 && packet->payload_packet_len >= 42 && w == 0xfffffffful) {
|
|
||||||
if (!memcmp(packet->payload + 24, flow->csgo_strid, 18)) {
|
|
||||||
flow->csgo_state++;
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo connect0x reply\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (packet->payload_packet_len == 8 && ( w == 0x3a180000 || w == 0x39180000) ) {
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp 8b\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (packet->payload_packet_len >= 36 && w == 0x56533031ul) {
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (packet->payload_packet_len >= 36 && w == 0x01007364) {
|
|
||||||
uint32_t w2 = htonl(get_u_int32_t(packet->payload, 4));
|
|
||||||
if (w2 == 0x70696e67) {
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp ping\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flow->csgo_s2 < 3 && (w & 0xffff0000ul) == 0x0d1d0000) {
|
|
||||||
uint32_t w2 = get_u_int32_t(packet->payload, 2);
|
|
||||||
if (packet->payload_packet_len == 13) {
|
|
||||||
if (!flow->csgo_s2) {
|
|
||||||
flow->csgo_id2 = w2;
|
|
||||||
flow->csgo_s2 = 1;
|
|
||||||
NDPI_LOG_DBG2( ndpi_struct, "Found csgo udp 0d1d step1\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (flow->csgo_s2 == 1 && flow->csgo_id2 == w2) {
|
|
||||||
NDPI_LOG_DBG2( ndpi_struct, "Found csgo udp 0d1d step1 DUP\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
flow->csgo_s2 = 3;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (packet->payload_packet_len == 15) {
|
|
||||||
if (flow->csgo_s2 == 1 && flow->csgo_id2 == w2) {
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp 0d1d\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
flow->csgo_s2 = 3;
|
|
||||||
}
|
|
||||||
if (packet->payload_packet_len >= 140 && (w == 0x02124c6c || w == 0x02125c6c) &&
|
|
||||||
!memcmp(&packet->payload[3], "lta\000mob\000tpc\000bhj\000bxd\000tae\000urg\000gkh\000", 32)) {
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo dictionary udp\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (packet->payload_packet_len >= 33 && packet->iph && packet->iph->daddr == 0xffffffff &&
|
|
||||||
!memcmp(&packet->payload[17], "LanSearch", 9)) {
|
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo LanSearch udp\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flow->packet_counter > 20)
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
|
||||||
|
|
||||||
void init_csgo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
|
||||||
{
|
|
||||||
ndpi_set_bitmask_protocol_detection("CSGO", ndpi_struct, detection_bitmask, *id,
|
|
||||||
NDPI_PROTOCOL_CSGO,
|
|
||||||
ndpi_search_csgo,
|
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
|
|
||||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
|
||||||
ADD_TO_DETECTION_BITMASK);
|
|
||||||
|
|
||||||
*id += 1;
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* dcerpc.c
|
* dcerpc.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-18 by ntop.org
|
* Copyright (C) 2011-13 by ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -21,12 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DCERPC
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_DCERPC
|
||||||
|
|
||||||
static void ndpi_int_dcerpc_add_connection(struct ndpi_detection_module_struct
|
static void ndpi_int_dcerpc_add_connection(struct ndpi_detection_module_struct
|
||||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
@@ -38,21 +36,20 @@ void ndpi_search_dcerpc(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search DCERPC\n");
|
|
||||||
|
|
||||||
if((packet->tcp != NULL)
|
if((packet->tcp != NULL)
|
||||||
&& (packet->payload_packet_len >= 64)
|
&& (packet->payload_packet_len >= 64)
|
||||||
&& (packet->payload[0] == 0x05) /* version 5 */
|
&& (packet->payload[0] == 0x05) /* version 5 */
|
||||||
&& (packet->payload[2] < 16) /* Packet type */
|
&& (packet->payload[2] < 16) /* Packet type */
|
||||||
&& (((packet->payload[9]<<8) | packet->payload[8]) == packet->payload_packet_len) /* Packet Length */
|
&& (((packet->payload[9]<<8) | packet->payload[8]) == packet->payload_packet_len) /* Packet Length */
|
||||||
) {
|
) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DCERPC\n");
|
NDPI_LOG(NDPI_PROTOCOL_DCERPC, ndpi_struct, NDPI_LOG_DEBUG, "DCERPC match\n");
|
||||||
ndpi_int_dcerpc_add_connection(ndpi_struct, flow);
|
ndpi_int_dcerpc_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(packet->payload_packet_len>1)
|
if(packet->payload_packet_len>1){
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DCERPC);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -67,3 +64,4 @@ void init_dcerpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
|||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+28
-57
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* dhcp.c
|
* dhcp.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2016-18 - ntop.org
|
* Copyright (C) 2016 - ntop.org
|
||||||
*
|
*
|
||||||
* nDPI is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
@@ -18,11 +18,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DHCP
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#ifdef NDPI_PROTOCOL_DHCP
|
||||||
|
|
||||||
/* freeradius/src/lib/dhcp.c */
|
/* freeradius/src/lib/dhcp.c */
|
||||||
#define DHCP_CHADDR_LEN 16
|
#define DHCP_CHADDR_LEN 16
|
||||||
@@ -62,7 +61,8 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search DHCP\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
/* this detection also works for asymmetric dhcp traffic */
|
/* this detection also works for asymmetric dhcp traffic */
|
||||||
|
|
||||||
@@ -70,72 +70,41 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
if(packet->udp) {
|
if(packet->udp) {
|
||||||
dhcp_packet_t *dhcp = (dhcp_packet_t*)packet->payload;
|
dhcp_packet_t *dhcp = (dhcp_packet_t*)packet->payload;
|
||||||
|
|
||||||
if((packet->payload_packet_len >= 244 /* 244 is the offset of options[0] in dhcp_packet_t */)
|
if((packet->payload_packet_len >= 244)
|
||||||
&& (packet->udp->source == htons(67) || packet->udp->source == htons(68))
|
&& (packet->udp->source == htons(67) || packet->udp->source == htons(68))
|
||||||
&& (packet->udp->dest == htons(67) || packet->udp->dest == htons(68))
|
&& (packet->udp->dest == htons(67) || packet->udp->dest == htons(68))
|
||||||
&& (dhcp->magic == htonl(DHCP_OPTION_MAGIC_NUMBER))) {
|
&& (dhcp->magic == htonl(DHCP_OPTION_MAGIC_NUMBER))) {
|
||||||
u_int i = 0, foundValidMsgType = 0;
|
int i = 0, foundValidMsgType = 0;
|
||||||
|
|
||||||
u_int dhcp_options_size = ndpi_min(DHCP_VEND_LEN /* maximum size of options in dhcp_packet_t */,
|
while(i < DHCP_VEND_LEN) {
|
||||||
packet->payload_packet_len - 244);
|
|
||||||
|
|
||||||
while(i + 1 /* for the len */ < dhcp_options_size) {
|
|
||||||
u_int8_t id = dhcp->options[i];
|
u_int8_t id = dhcp->options[i];
|
||||||
|
if(id == 0xFF) break;
|
||||||
if(id == 0xFF)
|
|
||||||
break;
|
|
||||||
else {
|
else {
|
||||||
/* Prevent malformed packets to cause out-of-bounds accesses */
|
u_int8_t len = dhcp->options[i+1];
|
||||||
u_int8_t len = ndpi_min(dhcp->options[i+1] /* len as found in the packet */,
|
|
||||||
dhcp_options_size - (i+2) /* 1 for the type and 1 for the value */);
|
|
||||||
|
|
||||||
if(len == 0) break;
|
if(len == 0) break;
|
||||||
|
|
||||||
#ifdef DHCP_DEBUG
|
#ifdef DHCP_DEBUG
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "[DHCP] Id=%d [len=%d]\n", id, len);
|
printf("[DHCP] Id=%d [len=%d]\n", id, len);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(id == 53 /* DHCP Message Type */) {
|
if(id == 53 /* DHCP Message Type */) {
|
||||||
u_int8_t msg_type = dhcp->options[i+2];
|
u_int8_t msg_type = dhcp->options[i+2];
|
||||||
|
|
||||||
if(msg_type <= 8) foundValidMsgType = 1;
|
if(msg_type <= 8) foundValidMsgType = 1;
|
||||||
} else if(id == 55 /* Parameter Request List / Fingerprint */) {
|
|
||||||
if(!ndpi_struct->disable_metadata_export) {
|
|
||||||
u_int idx, offset = 0;
|
|
||||||
|
|
||||||
for(idx = 0; idx < len && offset < sizeof(flow->protos.dhcp.fingerprint) - 2; idx++) {
|
|
||||||
snprintf((char*)&flow->protos.dhcp.fingerprint[offset],
|
|
||||||
sizeof(flow->protos.dhcp.fingerprint) - offset,
|
|
||||||
"%02X", dhcp->options[i+2+idx] & 0xFF);
|
|
||||||
offset += 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
flow->protos.dhcp.fingerprint[sizeof(flow->protos.dhcp.fingerprint) - 1] = '\0';
|
|
||||||
}
|
|
||||||
} else if(id == 60 /* Class Identifier */) {
|
|
||||||
if(!ndpi_struct->disable_metadata_export) {
|
|
||||||
char *name = (char*)&dhcp->options[i+2];
|
|
||||||
int j = 0;
|
|
||||||
|
|
||||||
j = ndpi_min(len, sizeof(flow->protos.dhcp.class_ident)-1);
|
|
||||||
strncpy((char*)flow->protos.dhcp.class_ident, name, j);
|
|
||||||
flow->protos.dhcp.class_ident[j] = '\0';
|
|
||||||
}
|
|
||||||
} else if(id == 12 /* Host Name */) {
|
} else if(id == 12 /* Host Name */) {
|
||||||
if(!ndpi_struct->disable_metadata_export) {
|
char *name = (char*)&dhcp->options[i+2];
|
||||||
char *name = (char*)&dhcp->options[i+2];
|
int j = 0;
|
||||||
int j = 0;
|
|
||||||
|
|
||||||
#ifdef DHCP_DEBUG
|
#ifdef DHCP_DEBUG
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "[DHCP] '%.*s'\n",name,len);
|
printf("[DHCP] ");
|
||||||
// while(j < len) { printf( "%c", name[j]); j++; }; printf("\n");
|
while(j < len) { printf("%c", name[j]); j++; }
|
||||||
|
printf("\n");
|
||||||
#endif
|
#endif
|
||||||
j = ndpi_min(len, sizeof(flow->host_server_name)-1);
|
j = ndpi_min(len, sizeof(flow->host_server_name)-1);
|
||||||
strncpy((char*)flow->host_server_name, name, j);
|
strncpy((char*)flow->host_server_name, name, j);
|
||||||
flow->host_server_name[j] = '\0';
|
flow->host_server_name[j] = '\0';
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
i += len + 2;
|
i += len + 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,14 +112,14 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
//get_u_int16_t(packet->payload, 240) == htons(0x3501)) {
|
//get_u_int16_t(packet->payload, 240) == htons(0x3501)) {
|
||||||
|
|
||||||
if(foundValidMsgType) {
|
if(foundValidMsgType) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DHCP\n");
|
NDPI_LOG(NDPI_PROTOCOL_DHCP, ndpi_struct, NDPI_LOG_DEBUG, "DHCP found\n");
|
||||||
ndpi_int_dhcp_add_connection(ndpi_struct, flow);
|
ndpi_int_dhcp_add_connection(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DHCP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -164,3 +133,5 @@ void init_dhcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* dhcpv6.c
|
* dhcpv6.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -22,12 +22,12 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DHCPV6
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
/* include files */
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_DHCPV6
|
||||||
|
|
||||||
static void ndpi_int_dhcpv6_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_dhcpv6_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow)
|
struct ndpi_flow_struct *flow)
|
||||||
@@ -40,19 +40,21 @@ void ndpi_search_dhcpv6_udp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search DHCPv6\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
if (packet->payload_packet_len >= 4 &&
|
if (packet->payload_packet_len >= 4 &&
|
||||||
(packet->udp->source == htons(546) || packet->udp->source == htons(547)) &&
|
(packet->udp->source == htons(546) || packet->udp->source == htons(547)) &&
|
||||||
(packet->udp->dest == htons(546) || packet->udp->dest == htons(547)) &&
|
(packet->udp->dest == htons(546) || packet->udp->dest == htons(547)) &&
|
||||||
packet->payload[0] >= 1 && packet->payload[0] <= 13) {
|
packet->payload[0] >= 1 && packet->payload[0] <= 13) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DHCPv6\n");
|
NDPI_LOG(NDPI_PROTOCOL_DHCPV6, ndpi_struct, NDPI_LOG_DEBUG, "DHCPv6 detected.\n");
|
||||||
ndpi_int_dhcpv6_add_connection(ndpi_struct, flow);
|
ndpi_int_dhcpv6_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_DHCPV6, ndpi_struct, NDPI_LOG_DEBUG, "DHCPv6 excluded.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DHCPV6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -66,3 +68,5 @@ void init_dhcpv6_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,129 +0,0 @@
|
|||||||
/*
|
|
||||||
* diameter.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2018 - 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/>.
|
|
||||||
*
|
|
||||||
* Based on code of:
|
|
||||||
* Michele Campus - <campus@ntop.org>
|
|
||||||
*/
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DIAMETER
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
// Header Flags possibile values
|
|
||||||
#define DIAMETER_REQUEST 0X80
|
|
||||||
#define DIAMETER_PROXYABLE 0X40
|
|
||||||
#define DIAMETER_ERROR 0X20
|
|
||||||
#define DIAMETER_RETRASM 0X10
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
AC = 271,
|
|
||||||
AS = 274,
|
|
||||||
CC = 272,
|
|
||||||
CE = 257,
|
|
||||||
DW = 280,
|
|
||||||
DP = 282,
|
|
||||||
RA = 258,
|
|
||||||
ST = 275
|
|
||||||
} com_type_t;
|
|
||||||
|
|
||||||
#define DIAM_HEADER_LEN 20
|
|
||||||
|
|
||||||
// DIAMETER header
|
|
||||||
struct diameter_header_t
|
|
||||||
{
|
|
||||||
u_int8_t version;
|
|
||||||
u_int8_t length[3];
|
|
||||||
u_int8_t flags;
|
|
||||||
u_int8_t com_code[3];
|
|
||||||
u_int32_t app_id;
|
|
||||||
u_int32_t hop_id;
|
|
||||||
u_int32_t end_id;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// Check packet
|
|
||||||
int is_diameter(struct ndpi_packet_struct *packet, int size_payload)
|
|
||||||
{
|
|
||||||
// check param
|
|
||||||
if(!packet || size_payload == 0) return -1;
|
|
||||||
|
|
||||||
// cast to diameter header
|
|
||||||
struct diameter_header_t *diameter = (struct diameter_header_t *) packet;
|
|
||||||
|
|
||||||
// check if the packet is diameter
|
|
||||||
if(diameter->version == 0x01 &&
|
|
||||||
(diameter->flags == DIAMETER_REQUEST ||
|
|
||||||
diameter->flags == DIAMETER_PROXYABLE ||
|
|
||||||
diameter->flags == DIAMETER_ERROR ||
|
|
||||||
diameter->flags == DIAMETER_RETRASM)) {
|
|
||||||
|
|
||||||
u_int16_t com_code = diameter->com_code[2] + (diameter->com_code[1] << 8) + (diameter->com_code[0] << 8);
|
|
||||||
|
|
||||||
if(com_code == AC || com_code == AS ||
|
|
||||||
com_code == CC || com_code == CE ||
|
|
||||||
com_code == DW || com_code == DP ||
|
|
||||||
com_code == RA || com_code == ST)
|
|
||||||
return 0; // OK
|
|
||||||
}
|
|
||||||
// wrong packet
|
|
||||||
return -2;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ndpi_search_diameter(struct ndpi_detection_module_struct *ndpi_struct,
|
|
||||||
struct ndpi_flow_struct *flow)
|
|
||||||
{
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
|
||||||
|
|
||||||
// Diameter is on TCP
|
|
||||||
if(packet->tcp) {
|
|
||||||
|
|
||||||
/* Check if it's diameter */
|
|
||||||
int ret = is_diameter(packet, packet->payload_packet_len);
|
|
||||||
if(ret != 0) {
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Diameter\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIAMETER, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else { // UDP
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
|
|
||||||
NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
|
||||||
{
|
|
||||||
ndpi_set_bitmask_protocol_detection("Diameter", ndpi_struct, detection_bitmask, *id,
|
|
||||||
NDPI_PROTOCOL_DIAMETER, ndpi_search_diameter,
|
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
|
|
||||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK);
|
|
||||||
|
|
||||||
*id += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
* directconnect.c
|
* directconnect.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-15 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -23,12 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_DIRECTCONNECT
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DIRECTCONNECT
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
//#define NDPI_DEBUG_DIRECTCONNECT
|
//#define NDPI_DEBUG_DIRECTCONNECT
|
||||||
//#define NDPI_DIRECTCONNECT_PORT_DEBUG
|
//#define NDPI_DIRECTCONNECT_PORT_DEBUG
|
||||||
@@ -62,7 +58,9 @@ static u_int16_t parse_binf_message(struct ndpi_detection_module_struct
|
|||||||
if (memcmp(&payload[i], "DCTM", 4) == 0) {
|
if (memcmp(&payload[i], "DCTM", 4) == 0) {
|
||||||
if (memcmp(&payload[i + 15], "ADCS", 4) == 0) {
|
if (memcmp(&payload[i + 15], "ADCS", 4) == 0) {
|
||||||
ssl_port = ntohs_ndpi_bytestream_to_number(&payload[i + 25], 5, &bytes_read);
|
ssl_port = ntohs_ndpi_bytestream_to_number(&payload[i + 25], 5, &bytes_read);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DC ssl port parsed %d\n", ssl_port);
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "directconnect ssl port parsed %d", ssl_port);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -78,7 +76,8 @@ static void ndpi_int_directconnect_add_connection(struct ndpi_detection_module_s
|
|||||||
const u_int8_t connection_type)
|
const u_int8_t connection_type)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
struct ndpi_id_struct *src = flow->src;
|
struct ndpi_id_struct *src = flow->src;
|
||||||
struct ndpi_id_struct *dst = flow->dst;
|
struct ndpi_id_struct *dst = flow->dst;
|
||||||
|
|
||||||
@@ -90,11 +89,13 @@ static void ndpi_int_directconnect_add_connection(struct ndpi_detection_module_s
|
|||||||
if (packet->tcp != NULL
|
if (packet->tcp != NULL
|
||||||
&& flow->setup_packet_direction != packet->packet_direction && src->detected_directconnect_port == 0) {
|
&& flow->setup_packet_direction != packet->packet_direction && src->detected_directconnect_port == 0) {
|
||||||
src->detected_directconnect_port = packet->tcp->source;
|
src->detected_directconnect_port = packet->tcp->source;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DC tcp PORT %u for src\n", ntohs(src->detected_directconnect_port));
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "directconnect tcp PORT %u for src\n", ntohs(src->detected_directconnect_port));
|
||||||
}
|
}
|
||||||
if (packet->udp != NULL && src->detected_directconnect_udp_port == 0) {
|
if (packet->udp != NULL && src->detected_directconnect_udp_port == 0) {
|
||||||
src->detected_directconnect_udp_port = packet->udp->source;
|
src->detected_directconnect_udp_port = packet->udp->source;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DC udp PORT %u for src\n", ntohs(src->detected_directconnect_port));
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "directconnect udp PORT %u for src\n", ntohs(src->detected_directconnect_port));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,9 +113,9 @@ static void ndpi_int_directconnect_add_connection(struct ndpi_detection_module_s
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
dst->detected_directconnect_port = packet->tcp->dest;
|
dst->detected_directconnect_port = packet->tcp->dest;
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG (NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
"DC tcp PORT %u for dst\n",
|
NDPI_LOG_DEBUG, "directconnect tcp PORT %u for dst\n",
|
||||||
ntohs (dst->detected_directconnect_port));
|
ntohs (dst->detected_directconnect_port));
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,12 +148,14 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if (dst != NULL) {
|
if (dst != NULL) {
|
||||||
dst->detected_directconnect_ssl_port =
|
dst->detected_directconnect_ssl_port =
|
||||||
ntohs_ndpi_bytestream_to_number(&packet->payload[25], 5, &bytes_read);
|
ntohs_ndpi_bytestream_to_number(&packet->payload[25], 5, &bytes_read);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DC ssl port parsed %d\n", ntohs(dst->detected_directconnect_ssl_port));
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "directconnect ssl port parsed %d", ntohs(dst->detected_directconnect_ssl_port));
|
||||||
}
|
}
|
||||||
if (src != NULL) {
|
if (src != NULL) {
|
||||||
src->detected_directconnect_ssl_port =
|
src->detected_directconnect_ssl_port =
|
||||||
ntohs_ndpi_bytestream_to_number(&packet->payload[25], 5, &bytes_read);
|
ntohs_ndpi_bytestream_to_number(&packet->payload[25], 5, &bytes_read);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DC ssl port parsed %d\n", ntohs(src->detected_directconnect_ssl_port));
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "directconnect ssl port parsed %d", ntohs(src->detected_directconnect_ssl_port));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -165,13 +168,15 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if ((u_int32_t)
|
if ((u_int32_t)
|
||||||
(packet->tick_timestamp -
|
(packet->tick_timestamp -
|
||||||
src->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
src->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
||||||
src->directconnect_last_safe_access_time = packet->tick_timestamp;
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC using port %d\n", ntohs(src->detected_directconnect_port));
|
|
||||||
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
src->directconnect_last_safe_access_time = packet->tick_timestamp;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "marking using dc port\n %d", ntohs(src->detected_directconnect_port));
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
src->detected_directconnect_port = 0;
|
src->detected_directconnect_port = 0;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "resetting src port due to timeout\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "resetting src port due to timeout");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -179,13 +184,15 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if ((u_int32_t)
|
if ((u_int32_t)
|
||||||
(packet->tick_timestamp -
|
(packet->tick_timestamp -
|
||||||
src->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
src->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
||||||
src->directconnect_last_safe_access_time = packet->tick_timestamp;
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC using port %d\n", ntohs(src->detected_directconnect_ssl_port));
|
|
||||||
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
src->directconnect_last_safe_access_time = packet->tick_timestamp;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "marking using dc port\n %d", ntohs(src->detected_directconnect_ssl_port));
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
src->detected_directconnect_ssl_port = 0;
|
src->detected_directconnect_ssl_port = 0;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "resetting src port due to timeout\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "resetting src port due to timeout");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -197,13 +204,15 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if ((u_int32_t)
|
if ((u_int32_t)
|
||||||
(packet->tick_timestamp -
|
(packet->tick_timestamp -
|
||||||
dst->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
dst->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
||||||
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC using port %d\n", ntohs(dst->detected_directconnect_port));
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "marking using dc port\n %d", ntohs(dst->detected_directconnect_port));
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
dst->detected_directconnect_port = 0;
|
dst->detected_directconnect_port = 0;
|
||||||
NDPI_LOG_DBG(ndpi_struct, "resetting dst port due to timeout\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "resetting dst port due to timeout");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -211,13 +220,16 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if ((u_int32_t)
|
if ((u_int32_t)
|
||||||
(packet->tick_timestamp -
|
(packet->tick_timestamp -
|
||||||
dst->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
dst->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
||||||
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "found DC using port %d\n", ntohs(dst->detected_directconnect_ssl_port));
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "marking using dc port\n %d", ntohs(dst->detected_directconnect_ssl_port));
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
dst->detected_directconnect_ssl_port = 0;
|
dst->detected_directconnect_ssl_port = 0;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "resetting dst port due to timeout\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "resetting dst port due to timeout");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,7 +242,8 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if (packet->payload[0] == '$'
|
if (packet->payload[0] == '$'
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == '|'
|
&& packet->payload[packet->payload_packet_len - 1] == '|'
|
||||||
&& (memcmp(&packet->payload[1], "Lock ", 5) == 0)) {
|
&& (memcmp(&packet->payload[1], "Lock ", 5) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe first dc connect to hub detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "maybe first dc connect to hub detected\n");
|
||||||
flow->directconnect_stage = 1;
|
flow->directconnect_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -238,7 +251,8 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
&& packet->payload[0] == '$'
|
&& packet->payload[0] == '$'
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == '|'
|
&& packet->payload[packet->payload_packet_len - 1] == '|'
|
||||||
&& (memcmp(&packet->payload[1], "MyNick ", 7) == 0)) {
|
&& (memcmp(&packet->payload[1], "MyNick ", 7) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe first dc connect between peers detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "maybe first dc connect between peers detected\n");
|
||||||
flow->directconnect_stage = 2;
|
flow->directconnect_stage = 2;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -248,13 +262,15 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
/* did not see this pattern in any trace */
|
/* did not see this pattern in any trace */
|
||||||
if (memcmp(&packet->payload[0], "HSUP ADBAS0", 11) == 0
|
if (memcmp(&packet->payload[0], "HSUP ADBAS0", 11) == 0
|
||||||
|| memcmp(&packet->payload[0], "HSUP ADBASE", 11) == 0) {
|
|| memcmp(&packet->payload[0], "HSUP ADBASE", 11) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC HSUP ADBAS0 E\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found directconnect HSUP ADBAS0 E\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB);
|
||||||
return;
|
return;
|
||||||
/* did not see this pattern in any trace */
|
/* did not see this pattern in any trace */
|
||||||
} else if (memcmp(&packet->payload[0], "CSUP ADBAS0", 11) == 0 ||
|
} else if (memcmp(&packet->payload[0], "CSUP ADBAS0", 11) == 0 ||
|
||||||
memcmp(&packet->payload[0], "CSUP ADBASE", 11) == 0) {
|
memcmp(&packet->payload[0], "CSUP ADBASE", 11) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC CSUP ADBAS0 E\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found directconnect CSUP ADBAS0 E\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_ADC_PEER);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_ADC_PEER);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -267,14 +283,19 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
/* did not see this pattern in any trace */
|
/* did not see this pattern in any trace */
|
||||||
if (memcmp(&packet->payload[0], "HSUP ADBAS0", 11) == 0
|
if (memcmp(&packet->payload[0], "HSUP ADBAS0", 11) == 0
|
||||||
|| memcmp(&packet->payload[0], "HSUP ADBASE", 11) == 0) {
|
|| memcmp(&packet->payload[0], "HSUP ADBASE", 11) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC HSUP ADBAS E in second packet\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found directconnect HSUP ADBAS E in second packet\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
/* did not see this pattern in any trace */
|
/* did not see this pattern in any trace */
|
||||||
} else if (memcmp(&packet->payload[0], "CSUP ADBAS0", 11) == 0 ||
|
} else if (memcmp(&packet->payload[0], "CSUP ADBAS0", 11) == 0 ||
|
||||||
memcmp(&packet->payload[0], "CSUP ADBASE", 11) == 0) {
|
memcmp(&packet->payload[0], "CSUP ADBASE", 11) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC HSUP ADBAS0 E in second packet\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found directconnect HSUP ADBAS0 E in second packet\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_ADC_PEER);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_ADC_PEER);
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -283,11 +304,12 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
if (packet->payload_packet_len > 6) {
|
if (packet->payload_packet_len > 6) {
|
||||||
if ((packet->payload[0] == '$' || packet->payload[0] == '<')
|
if ((packet->payload[0] == '$' || packet->payload[0] == '<')
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == '|') {
|
&& packet->payload[packet->payload_packet_len - 1] == '|') {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC second\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct, NDPI_LOG_DEBUG, "second dc detected\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "second dc not detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct, NDPI_LOG_DEBUG, "second dc not detected\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -295,17 +317,23 @@ static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *n
|
|||||||
/* get client hello answer or server message */
|
/* get client hello answer or server message */
|
||||||
if (packet->payload_packet_len > 6) {
|
if (packet->payload_packet_len > 6) {
|
||||||
if (packet->payload[0] == '$' && packet->payload[packet->payload_packet_len - 1] == '|') {
|
if (packet->payload[0] == '$' && packet->payload[packet->payload_packet_len - 1] == '|') {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC between peers\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "second dc between peers detected\n");
|
||||||
|
|
||||||
|
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "second dc between peers not detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "second dc between peers not detected\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DIRECTCONNECT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -324,13 +352,15 @@ static void ndpi_search_directconnect_udp(struct ndpi_detection_module_struct
|
|||||||
(packet->tick_timestamp -
|
(packet->tick_timestamp -
|
||||||
dst->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
dst->directconnect_last_safe_access_time) < ndpi_struct->directconnect_connection_ip_tick_timeout) {
|
||||||
|
|
||||||
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC using udp port %d\n", ntohs(dst->detected_directconnect_udp_port));
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "marking using dc udp port\n %d", ntohs(dst->detected_directconnect_udp_port));
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
dst->detected_directconnect_udp_port = 0;
|
dst->detected_directconnect_udp_port = 0;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "resetting dst udp port due to timeout\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "resetting dst udp port due to timeout");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -350,15 +380,20 @@ static void ndpi_search_directconnect_udp(struct ndpi_detection_module_struct
|
|||||||
if (packet->payload[pos] == '(') {
|
if (packet->payload[pos] == '(') {
|
||||||
pos = pos - 44;
|
pos = pos - 44;
|
||||||
if (pos > 2 && memcmp(&packet->payload[pos], "TTH:", 4) == 0) {
|
if (pos > 2 && memcmp(&packet->payload[pos], "TTH:", 4) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC udp\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct, NDPI_LOG_DEBUG, "dc udp detected\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
flow->directconnect_stage++;
|
flow->directconnect_stage++;
|
||||||
if (flow->directconnect_stage < 3)
|
|
||||||
|
if (flow->directconnect_stage < 3) {
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -376,7 +411,7 @@ static void ndpi_search_directconnect_udp(struct ndpi_detection_module_struct
|
|||||||
if (packet->payload[pos] == '(') {
|
if (packet->payload[pos] == '(') {
|
||||||
pos = pos - 44;
|
pos = pos - 44;
|
||||||
if (pos > 2 && memcmp(&packet->payload[pos], "TTH:", 4) == 0) {
|
if (pos > 2 && memcmp(&packet->payload[pos], "TTH:", 4) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DC udp\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct, NDPI_LOG_DEBUG, "dc udp detected\n");
|
||||||
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER);
|
ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -385,11 +420,15 @@ static void ndpi_search_directconnect_udp(struct ndpi_detection_module_struct
|
|||||||
flow->directconnect_stage++;
|
flow->directconnect_stage++;
|
||||||
if (flow->directconnect_stage < 3)
|
if (flow->directconnect_stage < 3)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
NDPI_LOG_DBG(ndpi_struct, "excluded DC at stage %d \n", flow->directconnect_stage);
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"excluded at stage %d \n", flow->directconnect_stage);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DIRECTCONNECT);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DIRECTCONNECT);
|
||||||
|
|
||||||
@@ -403,7 +442,7 @@ void ndpi_search_directconnect(struct ndpi_detection_module_struct
|
|||||||
struct ndpi_id_struct *src = flow->src;
|
struct ndpi_id_struct *src = flow->src;
|
||||||
struct ndpi_id_struct *dst = flow->dst;
|
struct ndpi_id_struct *dst = flow->dst;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search DC\n");
|
|
||||||
|
|
||||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_DIRECTCONNECT) {
|
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_DIRECTCONNECT) {
|
||||||
if (src != NULL && ((u_int32_t)
|
if (src != NULL && ((u_int32_t)
|
||||||
@@ -419,7 +458,8 @@ void ndpi_search_directconnect(struct ndpi_detection_module_struct
|
|||||||
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
dst->directconnect_last_safe_access_time = packet->tick_timestamp;
|
||||||
} else {
|
} else {
|
||||||
packet->detected_protocol_stack[0] = NDPI_PROTOCOL_UNKNOWN;
|
packet->detected_protocol_stack[0] = NDPI_PROTOCOL_UNKNOWN;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "skipping as unknown due to timeout\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECTCONNECT, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "directconnect: skipping as unknown due to timeout\n");
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -443,3 +483,5 @@ void init_directconnect_dissector(struct ndpi_detection_module_struct *ndpi_stru
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* directdownloadlink.c
|
* directdownloadlink.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||||
* Copyright (C) 2011-18 - ntop.org
|
* Copyright (C) 2011-14svn - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -23,11 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef NDPI_DEBUG_DIRECT_DOWNLOAD_LINK
|
#ifdef NDPI_DEBUG_DIRECT_DOWNLOAD_LINK
|
||||||
@@ -55,12 +52,15 @@ static void ndpi_int_direct_download_link_add_connection(struct ndpi_detection_m
|
|||||||
u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
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 = 0;
|
u_int16_t filename_start = 0;
|
||||||
u_int8_t i = 1;
|
u_int8_t i = 1;
|
||||||
u_int16_t host_line_len_without_port;
|
u_int16_t host_line_len_without_port;
|
||||||
|
|
||||||
if (packet->payload_packet_len < 100) {
|
if (packet->payload_packet_len < 100) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: Packet too small\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: Packet too small.\n");
|
||||||
goto end_ddl_nothing_found;
|
goto end_ddl_nothing_found;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,10 +68,10 @@ u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|
|
||||||
if (memcmp(packet->payload, "POST ", 5) == 0) {
|
if (memcmp(packet->payload, "POST ", 5) == 0) {
|
||||||
filename_start = 5; // POST
|
filename_start = 5; // POST
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: POST FOUND\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: POST FOUND\n");
|
||||||
} else if (memcmp(packet->payload, "GET ", 4) == 0) {
|
} else if (memcmp(packet->payload, "GET ", 4) == 0) {
|
||||||
filename_start = 4; // GET
|
filename_start = 4; // GET
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: GET FOUND\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: GET FOUND\n");
|
||||||
} else {
|
} else {
|
||||||
goto end_ddl_nothing_found;
|
goto end_ddl_nothing_found;
|
||||||
}
|
}
|
||||||
@@ -79,15 +79,16 @@ u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
|
|
||||||
if (packet->host_line.ptr == NULL) {
|
if (packet->host_line.ptr == NULL) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: NO HOST FOUND\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: NO HOST FOUND\n");
|
||||||
goto end_ddl_nothing_found;
|
goto end_ddl_nothing_found;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: Host: found\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: Host: found\n");
|
||||||
|
|
||||||
if (packet->line[0].len < 9 + filename_start
|
if (packet->line[0].len < 9 + filename_start
|
||||||
|| memcmp(&packet->line[0].ptr[packet->line[0].len - 9], " HTTP/1.", 8) != 0) {
|
|| memcmp(&packet->line[0].ptr[packet->line[0].len - 9], " HTTP/1.", 8) != 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: PACKET NOT HTTP CONFORM.\nXXX%.*sXXX\n",
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "DDL: PACKET NOT HTTP CONFORM.\nXXX%.*sXXX\n",
|
||||||
8, &packet->line[0].ptr[packet->line[0].len - 9]);
|
8, &packet->line[0].ptr[packet->line[0].len - 9]);
|
||||||
goto end_ddl_nothing_found;
|
goto end_ddl_nothing_found;
|
||||||
}
|
}
|
||||||
@@ -99,11 +100,11 @@ u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
i = 2;
|
i = 2;
|
||||||
while (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] >= '0'
|
while (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] >= '0'
|
||||||
&& packet->host_line.ptr[host_line_len_without_port - i] <= '9') {
|
&& packet->host_line.ptr[host_line_len_without_port - i] <= '9') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: number found\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: number found\n");
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] == ':') {
|
if (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] == ':') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "DDL: ':' found\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: ':' found\n");
|
||||||
host_line_len_without_port = host_line_len_without_port - i;
|
host_line_len_without_port = host_line_len_without_port - i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -693,12 +694,12 @@ u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
end_ddl_nothing_found:
|
end_ddl_nothing_found:
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"Nothing Found\n");
|
"Nothing Found\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
end_ddl_found:
|
end_ddl_found:
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DIRECT DOWNLOAD LINK\n");
|
NDPI_LOG(NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_struct, NDPI_LOG_DEBUG, "DDL: DIRECT DOWNLOAD LINK FOUND\n");
|
||||||
ndpi_int_direct_download_link_add_connection(ndpi_struct, flow);
|
ndpi_int_direct_download_link_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -708,12 +709,15 @@ void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *n
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
|
/* struct ndpi_id_struct *src=ndpi_struct->src; */
|
||||||
|
/* struct ndpi_id_struct *dst=ndpi_struct->dst; */
|
||||||
|
|
||||||
/* do not detect again if it is already ddl */
|
/* do not detect again if it is already ddl */
|
||||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK) {
|
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK) {
|
||||||
if (search_ddl_domains(ndpi_struct, flow) != 0) {
|
if (search_ddl_domains(ndpi_struct, flow) != 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -729,4 +733,4 @@ void init_directdownloadlink_dissector(struct ndpi_detection_module_struct *ndpi
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
+22
-24
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* dns.c
|
* dns.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012-18 - ntop.org
|
* Copyright (C) 2012-16 - ntop.org
|
||||||
*
|
*
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
* This file is part of nDPI, an open source deep packet inspection
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||||
@@ -21,12 +21,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DNS
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_DNS
|
||||||
|
|
||||||
#define FLAGS_MASK 0x8000
|
#define FLAGS_MASK 0x8000
|
||||||
|
|
||||||
@@ -67,7 +64,7 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
u_int8_t is_query;
|
u_int8_t is_query;
|
||||||
u_int16_t s_port = 0, d_port = 0;
|
u_int16_t s_port = 0, d_port = 0;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search DNS\n");
|
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);
|
s_port = ntohs(flow->packet.udp->source);
|
||||||
@@ -78,8 +75,8 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
d_port = ntohs(flow->packet.tcp->dest);
|
d_port = ntohs(flow->packet.tcp->dest);
|
||||||
x = 2;
|
x = 2;
|
||||||
} else {
|
} else {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n");
|
||||||
return;
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS);
|
||||||
}
|
}
|
||||||
|
|
||||||
if((s_port == 53 || d_port == 53 || d_port == 5355)
|
if((s_port == 53 || d_port == 53 || d_port == 5355)
|
||||||
@@ -119,7 +116,7 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
x++;
|
x++;
|
||||||
flow->protos.dns.query_type = get16(&x, flow->packet.payload);
|
flow->protos.dns.query_type = get16(&x, flow->packet.payload);
|
||||||
#ifdef DNS_DEBUG
|
#ifdef DNS_DEBUG
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "query_type=%2d\n", flow->protos.dns.query_type);
|
printf("[%s:%d] query_type=%2d\n", __FILE__, __LINE__, flow->protos.dns.query_type);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
} else
|
} else
|
||||||
@@ -180,7 +177,8 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(invalid) {
|
if(invalid) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,40 +197,38 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
off++;
|
off++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_query && ndpi_struct->dns_dissect_response)
|
|
||||||
return; /* The response will set the verdict */
|
|
||||||
|
|
||||||
flow->host_server_name[j] = '\0';
|
flow->host_server_name[j] = '\0';
|
||||||
|
|
||||||
flow->protos.dns.num_queries = (u_int8_t)dns_header.num_queries,
|
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);
|
flow->protos.dns.num_answers = (u_int8_t) (dns_header.num_answers + dns_header.authority_rrs + dns_header.additional_rrs);
|
||||||
|
|
||||||
if(j > 0) {
|
if(j > 0)
|
||||||
ndpi_protocol_match_result ret_match;
|
|
||||||
|
|
||||||
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
ndpi_match_host_subprotocol(ndpi_struct, flow,
|
||||||
(char *)flow->host_server_name,
|
(char *)flow->host_server_name,
|
||||||
strlen((const char*)flow->host_server_name),
|
strlen((const char*)flow->host_server_name),
|
||||||
&ret_match,
|
|
||||||
NDPI_PROTOCOL_DNS);
|
NDPI_PROTOCOL_DNS);
|
||||||
}
|
|
||||||
|
#ifdef DNS_DEBUG
|
||||||
#ifdef DNS_DEBUG
|
printf("[%s:%d] [num_queries=%d][num_answers=%d][reply_code=%u][rsp_type=%u][host_server_name=%s]\n",
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "[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.num_queries, flow->protos.dns.num_answers,
|
||||||
flow->protos.dns.reply_code, flow->protos.dns.rsp_type, flow->host_server_name
|
flow->protos.dns.reply_code, flow->protos.dns.rsp_type, flow->host_server_name
|
||||||
);
|
);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(flow->packet.detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
|
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
|
Do not set the protocol with DNS if ndpi_match_host_subprotocol() has
|
||||||
matched a subprotocol
|
matched a subprotocol
|
||||||
**/
|
**/
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DNS\n");
|
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);
|
ndpi_set_detected_protocol(ndpi_struct, flow, (d_port == 5355) ? NDPI_PROTOCOL_LLMNR : NDPI_PROTOCOL_DNS, NDPI_PROTOCOL_UNKNOWN);
|
||||||
} else {
|
} else {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -249,3 +245,5 @@ void init_dns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
|||||||
|
|
||||||
*id += 1;
|
*id += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user