Compare commits
1
Commits
2.2.2-stable
..
2.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f561e14271 |
@@ -1,40 +1,5 @@
|
|||||||
# CHANGELOG
|
# CHANGELOG
|
||||||
|
|
||||||
#### 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)
|
#### nDPI 2.2 (December 2017)
|
||||||
|
|
||||||
|
|||||||
+8
-18
@@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
NDPI_MAJOR="2"
|
NDPI_MAJOR="2"
|
||||||
NDPI_MINOR="2"
|
NDPI_MINOR="2"
|
||||||
NDPI_PATCH="2"
|
NDPI_PATCH="0"
|
||||||
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
||||||
|
|
||||||
rm -f configure config.h config.h.in src/lib/Makefile.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 +33,6 @@ if test -z $AUTORECONF; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat configure.seed | sed \
|
cat configure.seed | sed "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" | sed "s/@NDPI_MINOR@/$NDPI_MINOR/g" | sed "s/@NDPI_PATCH@/$NDPI_PATCH/g" | sed "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" > configure.ac
|
||||||
-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
-18
@@ -51,17 +51,6 @@ else
|
|||||||
AC_CHECK_LIB([numa], [numa_available], [LIBNUMA="-lnuma"])
|
AC_CHECK_LIB([numa], [numa_available], [LIBNUMA="-lnuma"])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
HS_LIB=
|
|
||||||
HS_INC=
|
|
||||||
AC_ARG_WITH(hyperscan, [ --with-hyperscan Enable Intel Hyperscan (if available)])
|
|
||||||
|
|
||||||
if test "${with_hyperscan}" == "yes"; then :
|
|
||||||
AC_CHECK_LIB([hs], [hs_compile_multi], AC_DEFINE_UNQUOTED(HAVE_HYPERSCAN, 1, [Intel Hyperscan is present]))
|
|
||||||
HS_INC=`pkg-config --cflags libhs`
|
|
||||||
HS_LIB=`pkg-config --libs libhs`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
if test -f $PCAP_HOME/libpcap/libpcap.a; then :
|
||||||
echo "Using libpcap from $PCAP_HOME"
|
echo "Using libpcap from $PCAP_HOME"
|
||||||
PCAP_INC="-I $PCAP_HOME/libpcap"
|
PCAP_INC="-I $PCAP_HOME/libpcap"
|
||||||
@@ -109,14 +98,10 @@ AS_IF([test "x$enable_json_c" != "xno"], [
|
|||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
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 src/lib/Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h])
|
AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h])
|
||||||
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_MAJOR)
|
||||||
AC_SUBST(NDPI_MINOR)
|
AC_SUBST(NDPI_MINOR)
|
||||||
@@ -126,8 +111,6 @@ 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(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 */
|
|
||||||
+3
-3
@@ -1,10 +1,10 @@
|
|||||||
bin_PROGRAMS = ndpiReader
|
bin_PROGRAMS = ndpiReader
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/lib/third_party/include @PCAP_INC@ @HS_INC@
|
AM_CPPFLAGS = -I$(top_srcdir)/src/include @PCAP_INC@
|
||||||
AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage
|
AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage
|
||||||
|
|
||||||
LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ @DL_LIB@ @HS_LIB@ -lm
|
LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ @DL_LIB@ -lm
|
||||||
AM_LDFLAGS = -static @DL_LIB@ @HS_LIB@
|
AM_LDFLAGS = -static @DL_LIB@
|
||||||
|
|
||||||
ndpiReader_SOURCES = ndpiReader.c ndpi_util.c ndpi_util.h uthash.h
|
ndpiReader_SOURCES = ndpiReader.c ndpi_util.c ndpi_util.h uthash.h
|
||||||
|
|
||||||
|
|||||||
+11
-36
@@ -43,6 +43,7 @@
|
|||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include "../config.h"
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
#include "uthash.h"
|
#include "uthash.h"
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
@@ -76,9 +77,7 @@ static json_object *jArray_topStats;
|
|||||||
static u_int8_t live_capture = 0;
|
static u_int8_t live_capture = 0;
|
||||||
static u_int8_t undetected_flows_deleted = 0;
|
static u_int8_t undetected_flows_deleted = 0;
|
||||||
/** User preferences **/
|
/** User preferences **/
|
||||||
static u_int8_t enable_protocol_guess = 1, verbose = 0, json_flag = 0;
|
static u_int8_t enable_protocol_guess = 1, verbose = 0, nDPI_traceLevel = 0, json_flag = 0;
|
||||||
int nDPI_LogLevel = 0;
|
|
||||||
char *_debug_protocols = NULL;
|
|
||||||
static u_int8_t stats_flag = 0, bpf_filter_flag = 0;
|
static u_int8_t stats_flag = 0, bpf_filter_flag = 0;
|
||||||
#ifdef HAVE_JSON_C
|
#ifdef HAVE_JSON_C
|
||||||
static u_int8_t file_first_time = 1;
|
static u_int8_t file_first_time = 1;
|
||||||
@@ -252,12 +251,9 @@ static void help(u_int long_help) {
|
|||||||
" | 1 = verbose\n"
|
" | 1 = verbose\n"
|
||||||
" | 2 = very verbose\n"
|
" | 2 = very verbose\n"
|
||||||
" | 3 = port stats\n"
|
" | 3 = port stats\n"
|
||||||
" -V <1-4> | nDPI logging level\n"
|
" -b <file.json> | Specify a file to write port based diagnose statistics\n"
|
||||||
" | 1 - trace, 2 - debug, 3 - full debug\n"
|
" -x <file.json> | Produce bpf filters for specified diagnose file. Use\n"
|
||||||
" | >3 - full debug + dbg_proto = all\n"
|
" | this option only for .json files generated with -b flag.\n");
|
||||||
" -b <file.json> | Specify a file to write port based diagnose statistics\n"
|
|
||||||
" -x <file.json> | Produce bpf filters for specified diagnose file. Use\n"
|
|
||||||
" | this option only for .json files generated with -b flag.\n");
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
@@ -271,7 +267,6 @@ static void help(u_int long_help) {
|
|||||||
" --extcap-capture-filter\n"
|
" --extcap-capture-filter\n"
|
||||||
" --fifo <path to file or pipe>\n"
|
" --fifo <path to file or pipe>\n"
|
||||||
" --debug\n"
|
" --debug\n"
|
||||||
" --dbg-proto proto|num[,...]\n"
|
|
||||||
);
|
);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -294,8 +289,7 @@ static struct option longopts[] = {
|
|||||||
{ "capture", no_argument, NULL, '5'},
|
{ "capture", no_argument, NULL, '5'},
|
||||||
{ "extcap-capture-filter", required_argument, NULL, '6'},
|
{ "extcap-capture-filter", required_argument, NULL, '6'},
|
||||||
{ "fifo", required_argument, NULL, '7'},
|
{ "fifo", required_argument, NULL, '7'},
|
||||||
{ "debug", no_argument, NULL, '8'},
|
{ "debug", optional_argument, NULL, '8'},
|
||||||
{ "dbg-proto", required_argument, NULL, 257},
|
|
||||||
{ "ndpi-proto-filter", required_argument, NULL, '9'},
|
{ "ndpi-proto-filter", required_argument, NULL, '9'},
|
||||||
|
|
||||||
/* ndpiReader options */
|
/* ndpiReader options */
|
||||||
@@ -521,12 +515,8 @@ static void parseOptions(int argc, char **argv) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'V':
|
case 'V':
|
||||||
nDPI_LogLevel = atoi(optarg);
|
printf("%d\n",atoi(optarg) );
|
||||||
if(nDPI_LogLevel < 0) nDPI_LogLevel = 0;
|
nDPI_traceLevel = atoi(optarg);
|
||||||
if(nDPI_LogLevel > 3) {
|
|
||||||
nDPI_LogLevel = 3;
|
|
||||||
_debug_protocols = strdup("all");
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'h':
|
case 'h':
|
||||||
@@ -552,7 +542,6 @@ static void parseOptions(int argc, char **argv) {
|
|||||||
|
|
||||||
case 'q':
|
case 'q':
|
||||||
quiet_mode = 1;
|
quiet_mode = 1;
|
||||||
nDPI_LogLevel = 0;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* Extcap */
|
/* Extcap */
|
||||||
@@ -581,18 +570,13 @@ static void parseOptions(int argc, char **argv) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case '8':
|
case '8':
|
||||||
nDPI_LogLevel = NDPI_LOG_DEBUG_EXTRA;
|
nDPI_traceLevel = 9;
|
||||||
_debug_protocols = strdup("all");
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case '9':
|
case '9':
|
||||||
extcap_packet_filter = ndpi_get_proto_by_name(ndpi_info_mod, optarg);
|
extcap_packet_filter = ndpi_get_proto_by_name(ndpi_info_mod, optarg);
|
||||||
if (extcap_packet_filter == NDPI_PROTOCOL_UNKNOWN) extcap_packet_filter = atoi(optarg);
|
if (extcap_packet_filter == NDPI_PROTOCOL_UNKNOWN) extcap_packet_filter = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 257:
|
|
||||||
_debug_protocols = strdup(optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
help(0);
|
help(0);
|
||||||
@@ -998,6 +982,7 @@ void updateTopIpAddress(u_int32_t addr, u_int8_t version, const char *proto,
|
|||||||
int min = count;
|
int min = count;
|
||||||
int update = 0;
|
int update = 0;
|
||||||
int min_i = 0;
|
int min_i = 0;
|
||||||
|
int r;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if(count == 0) return;
|
if(count == 0) return;
|
||||||
@@ -1131,7 +1116,6 @@ static struct receiver *cutBackTo(struct receiver **receivers, u_int32_t size, u
|
|||||||
}
|
}
|
||||||
|
|
||||||
return(NULL);
|
return(NULL);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* *********************************************** */
|
/* *********************************************** */
|
||||||
@@ -1396,7 +1380,7 @@ static void debug_printf(u_int32_t protocol, void *id_struct,
|
|||||||
struct tm result;
|
struct tm result;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(log_level <= nDPI_LogLevel) {
|
if(log_level <= nDPI_traceLevel) {
|
||||||
char buf[8192], out_buf[8192];
|
char buf[8192], out_buf[8192];
|
||||||
char theDate[32];
|
char theDate[32];
|
||||||
const char *extra_msg = "";
|
const char *extra_msg = "";
|
||||||
@@ -3135,18 +3119,9 @@ static void produceBpfFilter(char *filePath) {
|
|||||||
/**
|
/**
|
||||||
@brief MAIN FUNCTION
|
@brief MAIN FUNCTION
|
||||||
**/
|
**/
|
||||||
#ifdef APP_HAS_OWN_MAIN
|
|
||||||
int orginal_main(int argc, char **argv) {
|
|
||||||
#else
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
#endif
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if(ndpi_get_api_version() != NDPI_API_VERSION) {
|
|
||||||
printf("nDPI Library version mismatch: please make sure this code and the nDPI library are in sync\n");
|
|
||||||
return(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
automataUnitTest();
|
automataUnitTest();
|
||||||
|
|
||||||
ndpi_info_mod = ndpi_init_detection_module();
|
ndpi_info_mod = ndpi_init_detection_module();
|
||||||
|
|||||||
+18
-118
@@ -105,61 +105,6 @@ static void free_wrapper(void *freeable) {
|
|||||||
|
|
||||||
/* ***************************************************** */
|
/* ***************************************************** */
|
||||||
|
|
||||||
static uint16_t ndpi_get_proto_id(struct ndpi_detection_module_struct *ndpi_mod, const char *name) {
|
|
||||||
uint16_t proto_id;
|
|
||||||
char *e;
|
|
||||||
unsigned long p = strtol(name,&e,0);
|
|
||||||
if(e && !*e) {
|
|
||||||
if(p < NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS &&
|
|
||||||
ndpi_mod->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(ndpi_mod->proto_defaults[proto_id].protoName &&
|
|
||||||
!strcasecmp(ndpi_mod->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) {
|
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);
|
||||||
@@ -176,18 +121,7 @@ struct ndpi_workflow * ndpi_workflow_init(const struct ndpi_workflow_prefs * pre
|
|||||||
NDPI_LOG(0, NULL, NDPI_LOG_ERROR, "global structure initialization failed\n");
|
NDPI_LOG(0, NULL, NDPI_LOG_ERROR, "global structure initialization failed\n");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
module->ndpi_log_level = 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;
|
||||||
}
|
}
|
||||||
@@ -362,26 +296,6 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
|
|||||||
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,
|
||||||
@@ -445,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->src_ip == iph->saddr
|
||||||
if(flow->src_ip == iph->saddr
|
&& flow->dst_ip == iph->daddr
|
||||||
&& flow->dst_ip == iph->daddr
|
&& flow->src_port == htons(*sport)
|
||||||
&& flow->src_port == htons(*sport)
|
&& flow->dst_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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -490,7 +393,7 @@ 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 */) {
|
||||||
u_int8_t *options = (u_int8_t*)iph6 + sizeof(const struct ndpi_ipv6hdr);
|
u_int8_t *options = (u_int8_t*)iph6 + sizeof(const struct ndpi_ipv6hdr);
|
||||||
@@ -500,7 +403,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info6(struct ndpi_workflow * workflo
|
|||||||
|
|
||||||
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, payload_len, src_to_dst_direction));
|
src, dst, proto, payload, payload_len, src_to_dst_direction));
|
||||||
}
|
}
|
||||||
@@ -689,10 +592,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;
|
||||||
@@ -849,15 +749,15 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
|||||||
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:
|
||||||
@@ -915,7 +815,7 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
|
|||||||
}
|
}
|
||||||
} 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 */) {
|
||||||
|
|||||||
@@ -179,7 +179,4 @@ 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);
|
u_int32_t ethernet_crc32(const void* data, size_t n_bytes);
|
||||||
void ndpi_flow_info_freer(void *node);
|
void ndpi_flow_info_freer(void *node);
|
||||||
|
|
||||||
extern int nDPI_LogLevel;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+1
-6
@@ -22,7 +22,6 @@ ndpi_init_detection_module
|
|||||||
ndpi_get_num_supported_protocols
|
ndpi_get_num_supported_protocols
|
||||||
ndpi_set_proto_defaults
|
ndpi_set_proto_defaults
|
||||||
ndpi_get_protocol_id
|
ndpi_get_protocol_id
|
||||||
ndpi_get_category_id
|
|
||||||
ndpi_find_port_based_protocol
|
ndpi_find_port_based_protocol
|
||||||
ndpi_get_http_method
|
ndpi_get_http_method
|
||||||
ndpi_get_http_url
|
ndpi_get_http_url
|
||||||
@@ -59,8 +58,4 @@ ndpi_netbios_name_interpret
|
|||||||
ndpi_category_set_name
|
ndpi_category_set_name
|
||||||
ndpi_category_get_name
|
ndpi_category_get_name
|
||||||
ndpi_is_custom_category
|
ndpi_is_custom_category
|
||||||
ndpi_is_subprotocol_informative
|
ndpi_is_subprotocol_informative
|
||||||
ndpi_set_proto_category
|
|
||||||
ndpi_get_api_version
|
|
||||||
ndpi_network_ptree_match
|
|
||||||
ndpi_check_flow_func
|
|
||||||
+3
-51
@@ -31,11 +31,6 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The #define below is used for apps that dynamically link with nDPI to make
|
|
||||||
sure that datastructures and in sync across versions
|
|
||||||
*/
|
|
||||||
#define NDPI_API_VERSION 1
|
|
||||||
|
|
||||||
#define SIZEOF_ID_STRUCT (sizeof(struct ndpi_id_struct))
|
#define SIZEOF_ID_STRUCT (sizeof(struct ndpi_id_struct))
|
||||||
#define SIZEOF_FLOW_STRUCT (sizeof(struct ndpi_flow_struct))
|
#define SIZEOF_FLOW_STRUCT (sizeof(struct ndpi_flow_struct))
|
||||||
|
|
||||||
@@ -281,21 +276,6 @@ extern "C" {
|
|||||||
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
|
||||||
*
|
*
|
||||||
@@ -403,20 +383,6 @@ extern "C" {
|
|||||||
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-
|
||||||
*
|
*
|
||||||
@@ -553,24 +519,13 @@ extern "C" {
|
|||||||
* 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
|
||||||
*
|
*
|
||||||
@@ -756,10 +711,7 @@ extern "C" {
|
|||||||
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, ndpi_debug_function_ptr ndpi_debug_printf);
|
void set_ndpi_debug_function(struct ndpi_detection_module_struct *ndpi_str, ndpi_debug_function_ptr ndpi_debug_printf);
|
||||||
void * ndpi_malloc(size_t size);
|
|
||||||
void * ndpi_calloc(unsigned long count, size_t size);
|
|
||||||
void ndpi_free(void *ptr);
|
|
||||||
u_int8_t ndpi_get_api_version();
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -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...) {}
|
|
||||||
# define NDPI_LOG_ERR(mod, args...) {}
|
|
||||||
# define NDPI_LOG_INFO(mod, args...) {}
|
|
||||||
# define NDPI_LOG_DBG(mod, args...) {}
|
|
||||||
# define NDPI_LOG_DBG2(mod, 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,7 +209,7 @@
|
|||||||
#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))
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
#ifndef __NDPI_MAIN_H__
|
#ifndef __NDPI_MAIN_H__
|
||||||
#define __NDPI_MAIN_H__
|
#define __NDPI_MAIN_H__
|
||||||
|
|
||||||
#include "ndpi_config.h"
|
|
||||||
#include "ndpi_includes.h"
|
#include "ndpi_includes.h"
|
||||||
#include "ndpi_define.h"
|
#include "ndpi_define.h"
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocol_ids.h"
|
||||||
|
|||||||
@@ -2,7 +2,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
|
||||||
@@ -86,10 +86,7 @@
|
|||||||
#define NDPI_CONTENT_MMS 46
|
#define NDPI_CONTENT_MMS 46
|
||||||
#define NDPI_PROTOCOL_XBOX 47
|
#define NDPI_PROTOCOL_XBOX 47
|
||||||
#define NDPI_PROTOCOL_QQ 48
|
#define NDPI_PROTOCOL_QQ 48
|
||||||
|
#define NDPI_PROTOCOL_MOVE 49
|
||||||
/* Free to use */
|
|
||||||
#define NDPI_PROTOCOL_FREE_A 49
|
|
||||||
|
|
||||||
#define NDPI_PROTOCOL_RTSP 50
|
#define NDPI_PROTOCOL_RTSP 50
|
||||||
#define NDPI_PROTOCOL_MAIL_IMAPS 51
|
#define NDPI_PROTOCOL_MAIL_IMAPS 51
|
||||||
#define NDPI_PROTOCOL_ICECAST 52
|
#define NDPI_PROTOCOL_ICECAST 52
|
||||||
@@ -112,7 +109,7 @@
|
|||||||
#define NDPI_PROTOCOL_OSCAR 69
|
#define NDPI_PROTOCOL_OSCAR 69
|
||||||
#define NDPI_PROTOCOL_YAHOO 70
|
#define NDPI_PROTOCOL_YAHOO 70
|
||||||
#define NDPI_PROTOCOL_BATTLEFIELD 71
|
#define NDPI_PROTOCOL_BATTLEFIELD 71
|
||||||
#define NDPI_PROTOCOL_GOOGLE_PLUS 72
|
#define NDPI_PROTOCOL_QUAKE 72
|
||||||
#define NDPI_PROTOCOL_IP_VRRP 73
|
#define NDPI_PROTOCOL_IP_VRRP 73
|
||||||
#define NDPI_PROTOCOL_STEAM 74 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
#define NDPI_PROTOCOL_STEAM 74 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||||
#define NDPI_PROTOCOL_HALFLIFE2 75
|
#define NDPI_PROTOCOL_HALFLIFE2 75
|
||||||
@@ -172,17 +169,14 @@
|
|||||||
#define NDPI_PROTOCOL_SFLOW 129
|
#define NDPI_PROTOCOL_SFLOW 129
|
||||||
#define NDPI_PROTOCOL_HTTP_CONNECT 130
|
#define NDPI_PROTOCOL_HTTP_CONNECT 130
|
||||||
#define NDPI_PROTOCOL_HTTP_PROXY 131
|
#define NDPI_PROTOCOL_HTTP_PROXY 131
|
||||||
#define NDPI_PROTOCOL_CITRIX 132 /* It includes also the old NDPI_PROTOCOL_CITRIX_ONLINE */
|
#define NDPI_PROTOCOL_CITRIX 132
|
||||||
#define NDPI_PROTOCOL_NETFLIX 133
|
#define NDPI_PROTOCOL_NETFLIX 133
|
||||||
#define NDPI_PROTOCOL_LASTFM 134
|
#define NDPI_PROTOCOL_LASTFM 134
|
||||||
#define NDPI_PROTOCOL_WAZE 135
|
#define NDPI_PROTOCOL_WAZE 135
|
||||||
#define NDPI_PROTOCOL_YOUTUBE_UPLOAD 136 /* Upload files to youtube */
|
#define NDPI_PROTOCOL_YOUTUBE_UPLOAD 136 /* Upload files to youtube */
|
||||||
#define NDPI_PROTOCOL_ICQ 137
|
#define NDPI_PROTOCOL_ICQ 137
|
||||||
#define NDPI_PROTOCOL_CHECKMK 138
|
#define NDPI_PROTOCOL_CHECKMK 138
|
||||||
|
#define NDPI_PROTOCOL_CITRIX_ONLINE 139
|
||||||
/* Free to use */
|
|
||||||
#define NDPI_PROTOCOL_FREE_B 139
|
|
||||||
|
|
||||||
#define NDPI_PROTOCOL_APPLE 140
|
#define NDPI_PROTOCOL_APPLE 140
|
||||||
#define NDPI_PROTOCOL_WEBEX 141
|
#define NDPI_PROTOCOL_WEBEX 141
|
||||||
#define NDPI_PROTOCOL_WHATSAPP 142
|
#define NDPI_PROTOCOL_WHATSAPP 142
|
||||||
@@ -216,6 +210,7 @@
|
|||||||
#define NDPI_PROTOCOL_WHOIS_DAS 170
|
#define NDPI_PROTOCOL_WHOIS_DAS 170
|
||||||
#define NDPI_PROTOCOL_COLLECTD 171
|
#define NDPI_PROTOCOL_COLLECTD 171
|
||||||
#define NDPI_PROTOCOL_SOCKS 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
#define NDPI_PROTOCOL_SOCKS 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||||
|
/* The Lync protocol is now skype for business and this the old id 173 can now be recycled */
|
||||||
#define NDPI_PROTOCOL_NINTENDO 173
|
#define NDPI_PROTOCOL_NINTENDO 173
|
||||||
#define NDPI_PROTOCOL_RTMP 174 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
#define NDPI_PROTOCOL_RTMP 174 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||||
#define NDPI_PROTOCOL_FTP_DATA 175 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
#define NDPI_PROTOCOL_FTP_DATA 175 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||||
@@ -280,15 +275,9 @@
|
|||||||
#define NDPI_PROTOCOL_SOUNDCLOUD 234
|
#define NDPI_PROTOCOL_SOUNDCLOUD 234
|
||||||
#define NDPI_PROTOCOL_CSGO 235 /* Counter-Strike Global Offensive, Dota 2 */
|
#define NDPI_PROTOCOL_CSGO 235 /* Counter-Strike Global Offensive, Dota 2 */
|
||||||
#define NDPI_PROTOCOL_LISP 236
|
#define NDPI_PROTOCOL_LISP 236
|
||||||
#define NDPI_PROTOCOL_DIAMETER 237
|
|
||||||
#define NDPI_PROTOCOL_APPLE_PUSH 238
|
|
||||||
#define NDPI_PROTOCOL_GOOGLE_SERVICES 239
|
|
||||||
#define NDPI_PROTOCOL_AMAZON_VIDEO 240
|
|
||||||
#define NDPI_PROTOCOL_GOOGLE_DOCS 241
|
|
||||||
#define NDPI_PROTOCOL_WHATSAPP_FILES 242 /* Videos, pictures, voice messages... */
|
|
||||||
|
|
||||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_WHATSAPP_FILES
|
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_LISP
|
||||||
|
|
||||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||||
|
|||||||
@@ -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,7 +52,6 @@ u_int ndpi_search_tcp_or_udp_raw(struct ndpi_detection_module_struct *ndpi_struc
|
|||||||
void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
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_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);
|
||||||
@@ -203,7 +202,6 @@ void ndpi_search_tinc(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
void ndpi_search_fix(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_csgo(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);
|
||||||
@@ -352,6 +350,5 @@ void init_fix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
|||||||
void init_nintendo_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_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_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);
|
|
||||||
#endif /* __NDPI_PROTOCOLS_H__ */
|
#endif /* __NDPI_PROTOCOLS_H__ */
|
||||||
|
|||||||
+59
-61
@@ -25,28 +25,32 @@
|
|||||||
#define __NDPI_TYPEDEFS_H__
|
#define __NDPI_TYPEDEFS_H__
|
||||||
|
|
||||||
#include "ndpi_define.h"
|
#include "ndpi_define.h"
|
||||||
|
#include "../lib/third_party/include/libcache.h"
|
||||||
|
|
||||||
#define BT_ANNOUNCE
|
#define BT_ANNOUNCE
|
||||||
#define SNAP_EXT
|
#define SNAP_EXT
|
||||||
|
|
||||||
|
|
||||||
/* NDPI_LOG_LEVEL */
|
/* NDPI_LOG_LEVEL */
|
||||||
typedef enum {
|
typedef enum
|
||||||
NDPI_LOG_ERROR,
|
{
|
||||||
NDPI_LOG_TRACE,
|
NDPI_LOG_ERROR,
|
||||||
NDPI_LOG_DEBUG,
|
NDPI_LOG_TRACE,
|
||||||
NDPI_LOG_DEBUG_EXTRA
|
NDPI_LOG_DEBUG
|
||||||
} ndpi_log_level_t;
|
} ndpi_log_level_t;
|
||||||
|
|
||||||
/* NDPI_VISIT */
|
/* NDPI_VISIT */
|
||||||
typedef enum {
|
typedef enum
|
||||||
ndpi_preorder,
|
{
|
||||||
ndpi_postorder,
|
ndpi_preorder,
|
||||||
ndpi_endorder,
|
ndpi_postorder,
|
||||||
ndpi_leaf
|
ndpi_endorder,
|
||||||
} ndpi_VISIT;
|
ndpi_leaf
|
||||||
|
} ndpi_VISIT;
|
||||||
|
|
||||||
/* NDPI_NODE */
|
/* NDPI_NODE */
|
||||||
typedef struct node_t {
|
typedef struct node_t
|
||||||
|
{
|
||||||
char *key;
|
char *key;
|
||||||
struct node_t *left, *right;
|
struct node_t *left, *right;
|
||||||
} ndpi_node;
|
} ndpi_node;
|
||||||
@@ -55,7 +59,8 @@ typedef struct node_t {
|
|||||||
typedef u_int32_t ndpi_ndpi_mask;
|
typedef u_int32_t ndpi_ndpi_mask;
|
||||||
|
|
||||||
/* NDPI_PROTO_BITMASK_STRUCT */
|
/* NDPI_PROTO_BITMASK_STRUCT */
|
||||||
typedef struct ndpi_protocol_bitmask_struct {
|
typedef struct ndpi_protocol_bitmask_struct
|
||||||
|
{
|
||||||
ndpi_ndpi_mask fds_bits[NDPI_NUM_FDS_BITS];
|
ndpi_ndpi_mask fds_bits[NDPI_NUM_FDS_BITS];
|
||||||
} ndpi_protocol_bitmask_struct_t;
|
} ndpi_protocol_bitmask_struct_t;
|
||||||
|
|
||||||
@@ -172,15 +177,7 @@ struct ndpi_wifi_header
|
|||||||
PACK_ON
|
PACK_ON
|
||||||
struct ndpi_mpls_header
|
struct ndpi_mpls_header
|
||||||
{
|
{
|
||||||
/* Before using this strcut to parse an MPLS header, you will need to convert
|
|
||||||
* the 4-byte data to the correct endianess with ntohl(). */
|
|
||||||
#if defined(__LITTLE_ENDIAN__)
|
|
||||||
u_int32_t ttl:8, s:1, exp:3, label:20;
|
|
||||||
#elif defined(__BIG_ENDIAN__)
|
|
||||||
u_int32_t label:20, exp:3, s:1, ttl:8;
|
u_int32_t label:20, exp:3, s:1, ttl:8;
|
||||||
#else
|
|
||||||
# error "Byte order must be defined"
|
|
||||||
#endif
|
|
||||||
} PACK_OFF;
|
} PACK_OFF;
|
||||||
|
|
||||||
/* ++++++++++++++++++++++++ IP header ++++++++++++++++++++++++ */
|
/* ++++++++++++++++++++++++ IP header ++++++++++++++++++++++++ */
|
||||||
@@ -208,27 +205,34 @@ struct ndpi_iphdr {
|
|||||||
/* +++++++++++++++++++++++ IPv6 header +++++++++++++++++++++++ */
|
/* +++++++++++++++++++++++ IPv6 header +++++++++++++++++++++++ */
|
||||||
/* rfc3542 */
|
/* rfc3542 */
|
||||||
|
|
||||||
struct ndpi_in6_addr {
|
struct ndpi_in6_addr
|
||||||
union {
|
{
|
||||||
|
union
|
||||||
|
{
|
||||||
u_int8_t u6_addr8[16];
|
u_int8_t u6_addr8[16];
|
||||||
u_int16_t u6_addr16[8];
|
u_int16_t u6_addr16[8];
|
||||||
u_int32_t u6_addr32[4];
|
u_int32_t u6_addr32[4];
|
||||||
} u6_addr; /* 128-bit IP6 address */
|
} u6_addr; /* 128-bit IP6 address */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ndpi_ip6_hdrctl {
|
PACK_ON
|
||||||
u_int32_t ip6_un1_flow;
|
struct ndpi_ipv6hdr
|
||||||
u_int16_t ip6_un1_plen;
|
{
|
||||||
u_int8_t ip6_un1_nxt;
|
union
|
||||||
u_int8_t ip6_un1_hlim;
|
{
|
||||||
};
|
struct ndpi_ip6_hdrctl
|
||||||
|
{
|
||||||
|
u_int32_t ip6_un1_flow;
|
||||||
|
u_int16_t ip6_un1_plen;
|
||||||
|
u_int8_t ip6_un1_nxt;
|
||||||
|
u_int8_t ip6_un1_hlim;
|
||||||
|
} ip6_un1;
|
||||||
|
u_int8_t ip6_un2_vfc;
|
||||||
|
} ip6_ctlun;
|
||||||
|
|
||||||
/* PACK_ON */
|
|
||||||
struct ndpi_ipv6hdr {
|
|
||||||
struct ndpi_ip6_hdrctl ip6_hdr;
|
|
||||||
struct ndpi_in6_addr ip6_src;
|
struct ndpi_in6_addr ip6_src;
|
||||||
struct ndpi_in6_addr ip6_dst;
|
struct ndpi_in6_addr ip6_dst;
|
||||||
} /* PACK_OFF */;
|
} PACK_OFF;
|
||||||
|
|
||||||
/* +++++++++++++++++++++++ TCP header +++++++++++++++++++++++ */
|
/* +++++++++++++++++++++++ TCP header +++++++++++++++++++++++ */
|
||||||
|
|
||||||
@@ -750,12 +754,11 @@ typedef struct {
|
|||||||
} ndpi_port_range;
|
} ndpi_port_range;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
NDPI_PROTOCOL_SAFE = 0, /* Surely doesn't provide risks for the network. (e.g., a news site) */
|
NDPI_PROTOCOL_SAFE = 0, /* Surely doesn’t provide risks for the network. (e.g., a news site) */
|
||||||
NDPI_PROTOCOL_ACCEPTABLE, /* Probably doesn't provide risks, but could be malicious (e.g., Dropbox) */
|
NDPI_PROTOCOL_ACCEPTABLE, /* Probably doesn’t provide risks, but could be malicious (e.g., Dropbox) */
|
||||||
NDPI_PROTOCOL_FUN, /* Pure fun protocol, which may be prohibited by the user policy (e.g., Netflix) */
|
NDPI_PROTOCOL_FUN, /* Pure fun protocol, which may be prohibited by the user policy (e.g., Netflix) */
|
||||||
NDPI_PROTOCOL_UNSAFE, /* Probably provides risks, but could be a normal traffic. Unencrypted protocols with clear pass should be here (e.g., telnet) */
|
NDPI_PROTOCOL_UNSAFE, /* Probably provides risks, but could be a normal traffic. Unencrypted protocols with clear pass should be here (e.g., telnet) */
|
||||||
NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, /* Surely is dangerous (ex. Tor). Be prepared to troubles */
|
NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, /* Surely is dangerous (ex. Tor). Be prepared to troubles */
|
||||||
NDPI_PROTOCOL_TRACKER_ADS, /* Trackers, Advertisements... */
|
|
||||||
NDPI_PROTOCOL_UNRATED /* No idea, not implemented or impossible to classify */
|
NDPI_PROTOCOL_UNRATED /* No idea, not implemented or impossible to classify */
|
||||||
} ndpi_protocol_breed_t;
|
} ndpi_protocol_breed_t;
|
||||||
|
|
||||||
@@ -768,7 +771,7 @@ typedef enum {
|
|||||||
NDPI_PROTOCOL_CATEGORY_VPN, /* Virtual Private Networks */
|
NDPI_PROTOCOL_CATEGORY_VPN, /* Virtual Private Networks */
|
||||||
NDPI_PROTOCOL_CATEGORY_MAIL, /* Protocols to send/receive/sync emails */
|
NDPI_PROTOCOL_CATEGORY_MAIL, /* Protocols to send/receive/sync emails */
|
||||||
NDPI_PROTOCOL_CATEGORY_DATA_TRANSFER, /* AFS/NFS and similar protocols */
|
NDPI_PROTOCOL_CATEGORY_DATA_TRANSFER, /* AFS/NFS and similar protocols */
|
||||||
NDPI_PROTOCOL_CATEGORY_WEB, /* Web/mobile protocols and services */
|
NDPI_PROTOCOL_CATEGORY_WEB, /* Web protocols and services */
|
||||||
NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, /* Social networks */
|
NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, /* Social networks */
|
||||||
NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, /* Download, FTP, file transfer/sharing */
|
NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, /* Download, FTP, file transfer/sharing */
|
||||||
NDPI_PROTOCOL_CATEGORY_GAME, /* Online games */
|
NDPI_PROTOCOL_CATEGORY_GAME, /* Online games */
|
||||||
@@ -780,7 +783,7 @@ typedef enum {
|
|||||||
NDPI_PROTOCOL_CATEGORY_NETWORK, /* Network infrastructure protocols */
|
NDPI_PROTOCOL_CATEGORY_NETWORK, /* Network infrastructure protocols */
|
||||||
NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, /* Software for collaborative development, including Webmail */
|
NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, /* Software for collaborative development, including Webmail */
|
||||||
NDPI_PROTOCOL_CATEGORY_RPC, /* High level network communication protocols */
|
NDPI_PROTOCOL_CATEGORY_RPC, /* High level network communication protocols */
|
||||||
NDPI_PROTOCOL_CATEGORY_STREAMING, /* Streaming protocols */
|
NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, /* Network administration and monitor protocols */
|
||||||
NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, /* System/Operating System level applications */
|
NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, /* System/Operating System level applications */
|
||||||
NDPI_PROTOCOL_CATEGORY_SW_UPDATE, /* Software update */
|
NDPI_PROTOCOL_CATEGORY_SW_UPDATE, /* Software update */
|
||||||
/* See #define NUM_CUSTOM_CATEGORIES */
|
/* See #define NUM_CUSTOM_CATEGORIES */
|
||||||
@@ -791,9 +794,9 @@ typedef enum {
|
|||||||
NDPI_PROTOCOL_CATEGORY_CUSTOM_5, /* User custom category 5 */
|
NDPI_PROTOCOL_CATEGORY_CUSTOM_5, /* User custom category 5 */
|
||||||
|
|
||||||
NDPI_PROTOCOL_NUM_CATEGORIES /*
|
NDPI_PROTOCOL_NUM_CATEGORIES /*
|
||||||
NOTE: Keep this as last member
|
NOTE: Keep this as last member
|
||||||
Unused as value but useful to getting the number of elements
|
Unused as value but useful to getting the number of elements
|
||||||
in this datastructure
|
in this datastructure
|
||||||
*/
|
*/
|
||||||
} ndpi_protocol_category_t;
|
} ndpi_protocol_category_t;
|
||||||
|
|
||||||
@@ -856,15 +859,12 @@ struct ndpi_detection_module_struct {
|
|||||||
|
|
||||||
ndpi_default_ports_tree_node_t *tcpRoot, *udpRoot;
|
ndpi_default_ports_tree_node_t *tcpRoot, *udpRoot;
|
||||||
|
|
||||||
ndpi_log_level_t ndpi_log_level; /* default error */
|
|
||||||
|
|
||||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||||
/* debug callback, only set when debug is used */
|
/* debug callback, only set when debug is used */
|
||||||
ndpi_debug_function_ptr ndpi_debug_printf;
|
ndpi_debug_function_ptr ndpi_debug_printf;
|
||||||
const char *ndpi_debug_print_file;
|
const char *ndpi_debug_print_file;
|
||||||
const char *ndpi_debug_print_function;
|
const char *ndpi_debug_print_function;
|
||||||
u_int32_t ndpi_debug_print_line;
|
u_int32_t ndpi_debug_print_line;
|
||||||
NDPI_PROTOCOL_BITMASK debug_bitmask;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* misc parameters */
|
/* misc parameters */
|
||||||
@@ -925,15 +925,13 @@ struct ndpi_detection_module_struct {
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef NDPI_PROTOCOL_TINC
|
#ifdef NDPI_PROTOCOL_TINC
|
||||||
struct cache *tinc_cache;
|
cache_t tinc_cache;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ndpi_proto_defaults_t proto_defaults[NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS];
|
ndpi_proto_defaults_t proto_defaults[NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS];
|
||||||
|
|
||||||
u_int8_t http_dont_dissect_response:1, dns_dissect_response:1,
|
u_int8_t http_dont_dissect_response:1, dns_dissect_response:1,
|
||||||
direction_detect_disable:1; /* disable internal detection of packet direction */
|
direction_detect_disable:1; /* disable internal detection of packet direction */
|
||||||
|
|
||||||
void *hyperscan; /* Intel Hyperscan */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ndpi_flow_struct {
|
struct ndpi_flow_struct {
|
||||||
@@ -949,8 +947,8 @@ struct ndpi_flow_struct {
|
|||||||
u_int8_t protocol_id_already_guessed:1, host_already_guessed:1, init_finished:1, setup_packet_direction:1, packet_direction:1, check_extra_packets:1;
|
u_int8_t protocol_id_already_guessed:1, host_already_guessed:1, init_finished:1, setup_packet_direction:1, packet_direction:1, check_extra_packets:1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if ndpi_struct->direction_detect_disable == 1
|
if ndpi_struct->direction_detect_disable == 1
|
||||||
tcp sequence number connection tracking
|
tcp sequence number connection tracking
|
||||||
*/
|
*/
|
||||||
u_int32_t next_tcp_seq_nr[2];
|
u_int32_t next_tcp_seq_nr[2];
|
||||||
|
|
||||||
@@ -959,8 +957,8 @@ struct ndpi_flow_struct {
|
|||||||
int (*extra_packets_func) (struct ndpi_detection_module_struct *, struct ndpi_flow_struct *flow);
|
int (*extra_packets_func) (struct ndpi_detection_module_struct *, struct ndpi_flow_struct *flow);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
the tcp / udp / other l4 value union
|
the tcp / udp / other l4 value union
|
||||||
used to reduce the number of bytes for tcp or udp protocol states
|
used to reduce the number of bytes for tcp or udp protocol states
|
||||||
*/
|
*/
|
||||||
union {
|
union {
|
||||||
struct ndpi_flow_tcp_struct tcp;
|
struct ndpi_flow_tcp_struct tcp;
|
||||||
@@ -968,20 +966,20 @@ struct ndpi_flow_struct {
|
|||||||
} l4;
|
} l4;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Pointer to src or dst
|
Pointer to src or dst
|
||||||
that identifies the
|
that identifies the
|
||||||
server of this connection
|
server of this connection
|
||||||
*/
|
*/
|
||||||
struct ndpi_id_struct *server_id;
|
struct ndpi_id_struct *server_id;
|
||||||
/* HTTP host or DNS query */
|
/* HTTP host or DNS query */
|
||||||
u_char host_server_name[256];
|
u_char host_server_name[256];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
This structure below will not not stay inside the protos
|
This structure below will not not stay inside the protos
|
||||||
structure below as HTTP is used by many subprotocols
|
structure below as HTTP is used by many subprotocols
|
||||||
such as FaceBook, Google... so it is hard to know
|
such as FaceBook, Google... so it is hard to know
|
||||||
when to use it or not. Thus we leave it outside for the
|
when to use it or not. Thus we leave it outside for the
|
||||||
time being.
|
time being.
|
||||||
*/
|
*/
|
||||||
struct {
|
struct {
|
||||||
ndpi_http_method method;
|
ndpi_http_method method;
|
||||||
@@ -1142,7 +1140,7 @@ struct ndpi_flow_struct {
|
|||||||
};
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char *string_to_match, *string2_to_match, *pattern_to_match, *proto_name;
|
char *string_to_match, *proto_name;
|
||||||
int protocol_id;
|
int protocol_id;
|
||||||
ndpi_protocol_category_t proto_category;
|
ndpi_protocol_category_t proto_category;
|
||||||
ndpi_protocol_breed_t protocol_breed;
|
ndpi_protocol_breed_t protocol_breed;
|
||||||
|
|||||||
+8
-12
@@ -1,27 +1,24 @@
|
|||||||
lib_LTLIBRARIES = libndpi.la
|
lib_LTLIBRARIES = libndpi.la
|
||||||
|
|
||||||
CFLAGS += -fPIC -DPIC # --coverage
|
CFLAGS += -fPIC -DPIC # --coverage
|
||||||
libndpi_la_CPPFLAGS = -I$(top_srcdir)/src/include/ -I$(top_srcdir)/src/lib/third_party/include/ @HS_INC@
|
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_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/libndpi.sym
|
||||||
|
|
||||||
libndpi_la_includedir = $(includedir)/libndpi-@VERSION@/libndpi
|
libndpi_la_includedir = $(includedir)/libndpi-@VERSION@/libndpi
|
||||||
|
|
||||||
libndpi_la_include_HEADERS = ../include/ndpi_api.h \
|
libndpi_la_include_HEADERS = ../include/ndpi_api.h \
|
||||||
../include/ndpi_define.h \
|
../include/ndpi_define.h \
|
||||||
../include/ndpi_main.h \
|
../include/ndpi_main.h \
|
||||||
../include/ndpi_includes.h \
|
../include/ndpi_includes.h \
|
||||||
../include/ndpi_config.h \
|
|
||||||
../include/ndpi_protocol_ids.h \
|
../include/ndpi_protocol_ids.h \
|
||||||
../include/ndpi_protocols.h \
|
../include/ndpi_protocols.h \
|
||||||
../include/ndpi_typedefs.h \
|
../include/ndpi_typedefs.h
|
||||||
third_party/include/libcache.h
|
|
||||||
|
|
||||||
libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||||
ndpi_main.c \
|
ndpi_main.c \
|
||||||
protocols/afp.c \
|
protocols/afp.c \
|
||||||
protocols/aimini.c \
|
protocols/aimini.c \
|
||||||
protocols/applejuice.c \
|
protocols/applejuice.c \
|
||||||
protocols/apple_push.c \
|
|
||||||
protocols/armagetron.c \
|
protocols/armagetron.c \
|
||||||
protocols/ayiya.c \
|
protocols/ayiya.c \
|
||||||
protocols/amqp.c \
|
protocols/amqp.c \
|
||||||
@@ -40,7 +37,6 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
|||||||
protocols/dcerpc.c \
|
protocols/dcerpc.c \
|
||||||
protocols/dhcp.c \
|
protocols/dhcp.c \
|
||||||
protocols/dhcpv6.c \
|
protocols/dhcpv6.c \
|
||||||
protocols/diameter.c \
|
|
||||||
protocols/directconnect.c \
|
protocols/directconnect.c \
|
||||||
protocols/directdownloadlink.c \
|
protocols/directdownloadlink.c \
|
||||||
protocols/dns.c \
|
protocols/dns.c \
|
||||||
@@ -108,6 +104,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
|||||||
protocols/ppstream.c \
|
protocols/ppstream.c \
|
||||||
protocols/pptp.c \
|
protocols/pptp.c \
|
||||||
protocols/qq.c \
|
protocols/qq.c \
|
||||||
|
protocols/quake.c \
|
||||||
protocols/quic.c \
|
protocols/quic.c \
|
||||||
protocols/radius.c \
|
protocols/radius.c \
|
||||||
protocols/rdp.c \
|
protocols/rdp.c \
|
||||||
@@ -167,7 +164,6 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
|||||||
protocols/smpp.c \
|
protocols/smpp.c \
|
||||||
protocols/tinc.c \
|
protocols/tinc.c \
|
||||||
protocols/someip.c \
|
protocols/someip.c \
|
||||||
protocols/whatsapp.c \
|
|
||||||
third_party/include/actypes.h \
|
third_party/include/actypes.h \
|
||||||
third_party/include/ahocorasick.h \
|
third_party/include/ahocorasick.h \
|
||||||
third_party/include/ndpi_patricia.h \
|
third_party/include/ndpi_patricia.h \
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
#
|
|
||||||
# Simple non-autotools dependent makefile
|
|
||||||
#
|
|
||||||
# ./autogen.sh
|
|
||||||
# cd src/lib
|
|
||||||
# make -f Makefile.simple
|
|
||||||
#
|
|
||||||
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include
|
|
||||||
RANLIB=ranlib
|
|
||||||
|
|
||||||
OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o
|
|
||||||
HEADERS = $(wildcard ../include/*.h)
|
|
||||||
|
|
||||||
libndpi.a: $(OBJECTS)
|
|
||||||
ar rc $@ $(OBJECTS)
|
|
||||||
$(RANLIB) $@
|
|
||||||
|
|
||||||
%.o: %.c $(HEADERS) Makefile
|
|
||||||
$(CC) $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
clean:
|
|
||||||
/bin/rm -f libndpi.a $(OBJECTS)
|
|
||||||
+384
-391
@@ -82,46 +82,38 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
/*
|
/*
|
||||||
WhatsApp Inc.
|
WhatsApp Inc.
|
||||||
*/
|
*/
|
||||||
{ 0x3216C6CC /* 50.22.198.204/30 */, 30, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0x4B7E2720 /* 75.126.39.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0x3216C6CC /* 50.22.198.204/30 */, 30, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0x6CA8B460 /* 108.168.180.96/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0x4B7E2720 /* 75.126.39.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0x9E553A00 /* 158.85.58.0/25 */, 25, NDPI_PROTOCOL_WHATSAPP },
|
{ 0x6CA8B460 /* 108.168.180.96/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0x9E55FE40 /* 158.85.254.64/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0x9E553A00 /* 158.85.58.0/25 */, 25, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA92C5360 /* 169.44.82.96/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0x9E55FE40 /* 158.85.254.64/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA92DD6E0 /* 169.45.214.224/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xA92F2320 /* 169.47.35.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA92DDBE0 /* 169.45.219.224/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xA93743E0 /* 169.55.67.224/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA92DF860 /* 169.45.248.96/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xA93764A0 /* 169.55.100.160/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA92F05C0 /* 169.47.5.192/26 */, 26, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xA937EBA0 /* 169.55.235.160/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA92F2320 /* 169.47.35.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xADC0A220 /* 173.192.162.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA9373CAA /* 169.55.60.170/32 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xB8AD8840 /* 184.173.136.64/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA93C4F00 /* 169.60.79.0/24 */, 24, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xB93CDA35 /* 185.60.218.53/32 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA93F4C11 /* 169.63.76.0/25 */, 25, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xC60BFB20 /* 198.11.251.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA93F4940 /* 169.63.73.64/25 */, 25, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xD02B73C0 /* 208.43.115.192/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA93764A0 /* 169.55.100.160/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
{ 0xD02B7A80 /* 208.43.122.128/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
||||||
{ 0xA937EBA0 /* 169.55.235.160/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0xADC0A220 /* 173.192.162.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0xB8AD8840 /* 184.173.136.64/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0xB93CDA35 /* 185.60.218.53/32 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0xC60BFB20 /* 198.11.251.32/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0xD02B73C0 /* 208.43.115.192/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
{ 0xD02B7A80 /* 208.43.122.128/27 */, 27, NDPI_PROTOCOL_WHATSAPP },
|
|
||||||
/* Files */
|
|
||||||
{ 0xB93CD835 /* 185.60.216.53/32 */, 32, NDPI_PROTOCOL_WHATSAPP_FILES },
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
WeChat
|
WeChat
|
||||||
origin AS132203, AS132591, AS45090
|
origin AS132203, AS132591, AS45090
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{ 0xCBCD93AB /* 203.205.147.171/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
{ 0xCBCD93AB /* 203.205.147.171/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
||||||
{ 0xCBCD93AD /* 203.205.147.173/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
{ 0xCBCD93AD /* 203.205.147.173/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
||||||
{ 0xCBCD97A2 /* 203.205.151.162/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
{ 0xCBCD97A2 /* 203.205.151.162/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
||||||
{ 0x67071E25 /* 103.7.30.37/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
{ 0x67071E25 /* 103.7.30.37/32 */, 32, NDPI_PROTOCOL_WECHAT },
|
||||||
|
|
||||||
/*
|
/*
|
||||||
OpenDNS, LLC
|
OpenDNS, LLC
|
||||||
origin AS36692, AS30607
|
origin AS36692, AS30607
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{ 0x26631400 /* 38.99.20.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
{ 0x26631400 /* 38.99.20.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||||
{ 0x3F504FC0 /* 63.80.79.192/26 */, 26, NDPI_PROTOCOL_OPENDNS },
|
{ 0x3F504FC0 /* 63.80.79.192/26 */, 26, NDPI_PROTOCOL_OPENDNS },
|
||||||
@@ -224,9 +216,59 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
{ 0x344D0000 /* 52.77.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
{ 0x344D0000 /* 52.77.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x344E0000 /* 52.78.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
{ 0x344E0000 /* 52.78.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x344F0000 /* 52.79.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
{ 0x344F0000 /* 52.79.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x34520000 /* 52.82.0.0/14 */, 14, NDPI_PROTOCOL_AMAZON },
|
{ 0x3452BB00 /* 52.82.187.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x34580000 /* 52.88.0.0/13 */, 13, NDPI_PROTOCOL_AMAZON },
|
{ 0x34530000 /* 52.83.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x34540000 /* 52.84.0.0/15 */, 15, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x34560000 /* 52.86.0.0/15 */, 15, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x34580000 /* 52.88.0.0/15 */, 15, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x345A0000 /* 52.90.0.0/15 */, 15, NDPI_PROTOCOL_AMAZON },
|
{ 0x345A0000 /* 52.90.0.0/15 */, 15, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C0000 /* 52.92.0.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C1000 /* 52.92.16.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C2000 /* 52.92.32.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C2800 /* 52.92.40.0/21 */, 21, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C3000 /* 52.92.48.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C3400 /* 52.92.52.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C3800 /* 52.92.56.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C3C00 /* 52.92.60.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C4000 /* 52.92.64.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C4400 /* 52.92.68.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C4800 /* 52.92.72.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C4C00 /* 52.92.76.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C5400 /* 52.92.84.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345C5800 /* 52.92.88.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345CF800 /* 52.92.248.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345CFC00 /* 52.92.252.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345D0000 /* 52.93.0.0/16 */, 16, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0000 /* 52.94.0.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0400 /* 52.94.4.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0500 /* 52.94.5.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0600 /* 52.94.6.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0700 /* 52.94.7.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0800 /* 52.94.8.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0900 /* 52.94.9.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0A00 /* 52.94.10.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0B00 /* 52.94.11.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0C00 /* 52.94.12.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0D00 /* 52.94.13.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0E00 /* 52.94.14.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E0F00 /* 52.94.15.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E1100 /* 52.94.17.0/24 */, 24, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E1800 /* 52.94.24.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E1C00 /* 52.94.28.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E2000 /* 52.94.32.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E3000 /* 52.94.48.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E4000 /* 52.94.64.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E5000 /* 52.94.80.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E6000 /* 52.94.96.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345E7000 /* 52.94.112.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345ECC00 /* 52.94.204.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345ECE00 /* 52.94.206.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345ED000 /* 52.94.208.0/21 */, 21, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345ED800 /* 52.94.216.0/21 */, 21, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345EE000 /* 52.94.224.0/20 */, 20, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345EF000 /* 52.94.240.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345EFC00 /* 52.94.252.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
|
{ 0x345EFE00 /* 52.94.254.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x345F0000 /* 52.95.0.0/21 */, 21, NDPI_PROTOCOL_AMAZON },
|
{ 0x345F0000 /* 52.95.0.0/21 */, 21, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x345F0A00 /* 52.95.10.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
{ 0x345F0A00 /* 52.95.10.0/23 */, 23, NDPI_PROTOCOL_AMAZON },
|
||||||
{ 0x345F0C00 /* 52.95.12.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
{ 0x345F0C00 /* 52.95.12.0/22 */, 22, NDPI_PROTOCOL_AMAZON },
|
||||||
@@ -594,9 +636,9 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
|
|
||||||
/* Teamviewer 159.122.189.32-63 */
|
/* Teamviewer 159.122.189.32-63 */
|
||||||
{ 0x9F7ABD30 /* 159.122.189.32 */, 21, NDPI_PROTOCOL_TEAMVIEWER },
|
{ 0x9F7ABD30 /* 159.122.189.32 */, 21, NDPI_PROTOCOL_TEAMVIEWER },
|
||||||
|
|
||||||
/*
|
/*
|
||||||
IFLIX services -by www.vizuamatix.com R&D team
|
IFLIX services -by www.vizuamatix.com R&D team
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{ 0x344D0000 /* 52.77.0.0 */, 16, NDPI_PROTOCOL_IFLIX },
|
{ 0x344D0000 /* 52.77.0.0 */, 16, NDPI_PROTOCOL_IFLIX },
|
||||||
@@ -613,8 +655,8 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
Citrix GotoMeeting (AS16815, AS21866)
|
Citrix GotoMeeting (AS16815, AS21866)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{ 0xD873D000 /* 216.115.208.0 */, 20, NDPI_PROTOCOL_CITRIX },
|
{ 0xD873D000 /* 216.115.208.0 */, 20, NDPI_PROTOCOL_CITRIX_ONLINE },
|
||||||
{ 0xD8DB7000 /* 216.219.112.0 */, 20, NDPI_PROTOCOL_CITRIX },
|
{ 0xD8DB7000 /* 216.219.112.0 */, 20, NDPI_PROTOCOL_CITRIX_ONLINE },
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Cisco Webex LLC
|
Cisco Webex LLC
|
||||||
@@ -789,7 +831,7 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
{ 0xD8EF2000 /* 216.239.32.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
{ 0xD8EF2000 /* 216.239.32.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||||
{ 0xD8FCDC00 /* 216.252.220.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
|
{ 0xD8FCDC00 /* 216.252.220.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Canonical Ltd (Ubuntu)
|
Canonical Ltd (Ubuntu)
|
||||||
origin AS41231
|
origin AS41231
|
||||||
*/
|
*/
|
||||||
@@ -810,7 +852,7 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
{ 0x5B6C1400 /* 91.108.20.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM },
|
{ 0x5B6C1400 /* 91.108.20.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM },
|
||||||
{ 0x5B6C3800 /* 91.108.56.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM },
|
{ 0x5B6C3800 /* 91.108.56.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM },
|
||||||
{ 0x959AA000 /* 149.154.160.0/20 */, 20, NDPI_PROTOCOL_TELEGRAM },
|
{ 0x959AA000 /* 149.154.160.0/20 */, 20, NDPI_PROTOCOL_TELEGRAM },
|
||||||
|
|
||||||
/*
|
/*
|
||||||
BitTorrent
|
BitTorrent
|
||||||
*/
|
*/
|
||||||
@@ -7940,391 +7982,342 @@ static ndpi_network host_protocol_list[] = {
|
|||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
NDPI_PROTOCOL_SAFE
|
NDPI_PROTOCOL_SAFE
|
||||||
- Web sites (and CDNs) which are not commonly used to host malicious activities.
|
- Web sites (and CDNs) which are not commonly used to host malicious activities.
|
||||||
- OS update hosts.
|
- OS update hosts.
|
||||||
- App stores.
|
- App stores.
|
||||||
- Commonly used services with passwords in encrypted channels (SMTPS, POPS, etc)
|
- Commonly used services with passwords in encrypted channels (SMTPS, POPS, etc)
|
||||||
|
|
||||||
NDPI_PROTOCOL_ACCEPTABLE
|
NDPI_PROTOCOL_ACCEPTABLE
|
||||||
- Cloud services may be used to host malware (e.g., https://www.fireeye.com/blog/threat-research/2015/11/china-based-threat.html),
|
- Cloud services may be used to host malware (e.g., https://www.fireeye.com/blog/threat-research/2015/11/china-based-threat.html),
|
||||||
but it is mostly used for normal purposes.
|
but it is mostly used for normal purposes.
|
||||||
- Webmail sites, which can be used to phising.
|
- Webmail sites, which can be used to phising.
|
||||||
- Encrypted administrative protocols, such as SSH.
|
- Encrypted administrative protocols, such as SSH.
|
||||||
- Text, voice or video communication (e.g., Skype, Slack, Whatsapp).
|
- Text, voice or video communication (e.g., Skype, Slack, Whatsapp).
|
||||||
- Ads services are commonly used to spread malware
|
- Ads services are commonly used to spread malware
|
||||||
(https://www.tripwire.com/state-of-security/security-data-protection/crypto-ransomware-spreads-via-poisoned-ads-on-major-websites/)
|
(https://www.tripwire.com/state-of-security/security-data-protection/crypto-ransomware-spreads-via-poisoned-ads-on-major-websites/)
|
||||||
|
|
||||||
NDPI_PROTOCOL_FUN
|
NDPI_PROTOCOL_FUN
|
||||||
- Social media sites and services.
|
- Social media sites and services.
|
||||||
- Communication used for fun purposes, like Snapchat, Tinder, etc.
|
- Communication used for fun purposes, like Snapchat, Tinder, etc.
|
||||||
- Audio and videostreamming services (e.g., Netflix).
|
- Audio and videostreamming services (e.g., Netflix).
|
||||||
- Game services.
|
- Game services.
|
||||||
|
|
||||||
NDPI_PROTOCOL_UNSAFE
|
NDPI_PROTOCOL_UNSAFE
|
||||||
- Unencrypted administrative protocols, such as Telnet.
|
- Unencrypted administrative protocols, such as Telnet.
|
||||||
- Cloud hosted servers when accessed by default domains, such as *.amazonaws.com.
|
- Cloud hosted servers when accessed by default domains, such as *.amazonaws.com.
|
||||||
- "AWS Supports 41% of Malware Hosting Sites, More than Any Other Web Host or ISP"
|
- "AWS Supports 41% of Malware Hosting Sites, More than Any Other Web Host or ISP"
|
||||||
http://www.thewhir.com/web-hosting-news/aws-supports-41-malware-hosting-sites-web-host-isp
|
http://www.thewhir.com/web-hosting-news/aws-supports-41-malware-hosting-sites-web-host-isp
|
||||||
- https://www.scmagazine.com/600-plus-cloud-repositories-spotted-hosting-malware-and-malicious-files/article/572205/
|
- https://www.scmagazine.com/600-plus-cloud-repositories-spotted-hosting-malware-and-malicious-files/article/572205/
|
||||||
- https://howtoremove.guide/remove-s3-amazonaws-virus/
|
- https://howtoremove.guide/remove-s3-amazonaws-virus/
|
||||||
- Torrents.
|
- Torrents.
|
||||||
- Commonly used services with passwords in unencrypted channels (SMTP, POP, etc)
|
- Commonly used services with passwords in unencrypted channels (SMTP, POP, etc)
|
||||||
|
|
||||||
NDPI_PROTOCOL_POTENTIALLY_DANGEROUS
|
NDPI_PROTOCOL_POTENTIALLY_DANGEROUS
|
||||||
- Tor and other anonymization access.
|
- Tor and other anonymization access.
|
||||||
- Sites commonly used to host malware and not as commonly used by "normal" users. (e.g., pastebin.com)
|
- Sites commonly used to host malware and not as commonly used by "normal" users. (e.g., pastebin.com)
|
||||||
https://isc.sans.edu/forums/diary/Many+Malware+Samples+Found+on+Pastebin/22036/
|
https://isc.sans.edu/forums/diary/Many+Malware+Samples+Found+on+Pastebin/22036/
|
||||||
|
|
||||||
NDPI_PROTOCOL_UNRATED
|
NDPI_PROTOCOL_UNRATED
|
||||||
- Avoid this class.
|
- Avoid this class.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ndpi_protocol_match host_match[] = {
|
ndpi_protocol_match host_match[] = {
|
||||||
{ "s3.ll.dash.row.aiv-cdn.net", NULL, "s3\\.ll\\.dash\\.row\\.aiv-cdn\\.net", "AmazonVideo", NDPI_PROTOCOL_AMAZON_VIDEO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "amazon.", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ "d25xi40x97liuc.cloudfront.net", NULL, "d25xi40x97liuc\\.cloudfront\\.net", "AmazonVideo", NDPI_PROTOCOL_AMAZON_VIDEO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "amazon.com", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".aiv-delivery.net", NULL, "\\.aiv-delivery\\.net", "AmazonVideo", NDPI_PROTOCOL_AMAZON_VIDEO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "images-amazon.com", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "amazon.", NULL, NULL, "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "amazonaws.com", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_UNSAFE },
|
||||||
{ "amazon.com", NULL, "amazon\\.com$", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "amazon-adsystem.com", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "images-amazon.com", NULL, "images-amazon\\.com$", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".cloudfront.net", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "amazonaws.com", NULL, "amazonaws\\.com$", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "amazon-adsystem.com", NULL, "amazon-adsystem\\.com$", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".cloudfront.net", NULL, "\\.cloudfront\\.net$", "Amazon", NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ ".push.apple.com", NULL, NULL, "ApplePush", NDPI_PROTOCOL_APPLE_PUSH, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE },
|
{ ".apple.com", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".apple-dns.net", NULL, NULL, "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".apple-dns.net", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".mzstatic.com", NULL, NULL, "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".mzstatic.com", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".aaplimg.com", NULL, NULL, "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".aaplimg.com", "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ "iosapps.itunes.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE }, /* iOS */
|
{ ".icloud.com", "AppleiCloud", NDPI_PROTOCOL_APPLE_ICLOUD, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "osxapps.itunes.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE }, /* MacOS */
|
{ "iosapps.itunes.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE }, /* iOS */
|
||||||
{ "buy.itunes.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "osxapps.itunes.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE }, /* MacOS */
|
||||||
{ "su.itunes.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "buy.itunes.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "se.itunes.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "su.itunes.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "myapp.itunes.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "se.itunes.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "swscan.apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "myapp.itunes.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "itunes-apple.com", NULL, NULL, "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "swscan.apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "itunes.apple.com", NULL, NULL, "AppleiTunes", NDPI_PROTOCOL_APPLE_ITUNES, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "itunes-apple.com", "AppleStore", NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "aaplimg.com", NULL, NULL, "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "itunes.apple.com", "AppleiTunes", NDPI_PROTOCOL_APPLE_ITUNES, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_FUN },
|
||||||
{ ".apple.com", NULL, NULL, "Apple", NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
{ ".icloud.com", NULL, NULL, "AppleiCloud", NDPI_PROTOCOL_APPLE_ICLOUD, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ ".cnn.c", NULL, NULL, "CNN", NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".cnn.c", "CNN", NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".cnn.net", NULL, NULL, "CNN", NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".cnn.net", "CNN", NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
{ ".dropbox.com", NULL, NULL, "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".dropbox.com", "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".dropboxstatic.com", NULL, NULL, "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".dropbox-dns.com", "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".dropbox-dns.com", NULL, NULL, "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "log.getdropbox.com", "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "log.getdropbox.com", NULL, NULL, "DropBox", NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ ".ebay.", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /* or FUN */
|
{ ".ebay.", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /* or FUN */
|
||||||
{ ".ebay.com", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".ebay.com", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".ebaystatic.com", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".ebaystatic.com", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".ebaydesc.com", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".ebaydesc.com", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".ebayrtm.com", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".ebayrtm.com", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".ebaystratus.com", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".ebaystratus.com", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".ebayimg.com", NULL, NULL, "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".ebayimg.com", "eBay", NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
{ "facebook.com", NULL, NULL, "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "facebook.com", "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "fbstatic-a.akamaihd.net", NULL, NULL, "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "fbstatic-a.akamaihd.net", "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".fbcdn.net", NULL, NULL, "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".fbcdn.net", "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "fbcdn-", NULL, NULL, "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "fbcdn-", "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".facebook.net", NULL, NULL, "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".facebook.net", "Facebook", NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".speedtest.net", NULL, NULL, "Ookla", NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_SAFE },
|
{ ".speedtest.net", "Ookla", NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
{ "docs.googleusercontent.com", NULL, NULL, "GoogleDocs", NDPI_PROTOCOL_GOOGLE_DOCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "drive-thirdparty.", "GoogleDrive", NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "docs.", "GoogleDrive", NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".docs.", "GoogleDrive", NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "drive.", "GoogleDrive", NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "drive-thirdparty.googleusercontent.com", NULL, NULL, "GoogleDrive", NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "android.clients.google.com", "PlayStore", NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "drive.google.com", NULL, NULL, "GoogleDrive", NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "ggpht.com", "PlayStore", NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
{ "android.clients.google.com", NULL, NULL, "PlayStore", NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "google.", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ "ggpht.com", NULL, NULL, "PlayStore", NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ ".google.", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ ".gstatic.com", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ ".googlesyndication.com", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ ".googletagservices.com", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".2mdn.net", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".doubleclick.net", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE }, /* Ads */
|
||||||
|
{ "googleads.", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "google-analytics.", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ "googleusercontent.", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "googleadservices.", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "googleapis.com", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "1e100.net", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
/*
|
{ "maps.google.", "GoogleMaps", NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
See https://better.fyi/trackers/
|
{ "maps.gstatic.com", "GoogleMaps", NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
DoubleClick by Google (2mdn.net)
|
{ ".gmail.", "GMail", NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_MAIL, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
DoubleClick by Google (doubleclick.net)
|
{ "mail.google.", "GMail", NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_MAIL, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
DoubleClick by Google, Inc. (dmtry.com)
|
|
||||||
Google AdSense by Google (google.com)
|
|
||||||
Google AdSense by Google (google.se)
|
|
||||||
Google AdSense by Google (googleadservices.com)
|
|
||||||
Google Analytics by Google (google-analytics.com)
|
|
||||||
Google APIs by Google (ajax.googleapis.com)
|
|
||||||
Google Fonts by Google (fonts.googleapis.com)
|
|
||||||
Google Interactive Media Ads (imasdk.googleapis.com)
|
|
||||||
Google Syndication (googlesyndication.com)
|
|
||||||
Google Tag Manager by Google (googletagmanager.com)
|
|
||||||
Google Tag Manager by Google (googletagservices.com)
|
|
||||||
Gstatic by Google (gstatic.com)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Google Advertisements */
|
{ "mail.outlook.com", "Hotmail", NDPI_PROTOCOL_HOTMAIL, NDPI_PROTOCOL_CATEGORY_MAIL, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".googlesyndication.com", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
{ "googleads.", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
{ ".doubleclick.net", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
{ "googleadservices.", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
{ ".2mdn.net", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
{ ".dmtry.com", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
{ "google-analytics.", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_TRACKER_ADS },
|
|
||||||
|
|
||||||
/* Google Services */
|
{ ".last.fm", "LastFM", NDPI_PROTOCOL_LASTFM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "googleapis.com", NULL, NULL, "GoogleServices", NDPI_PROTOCOL_GOOGLE_SERVICES, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".googletagservices.com", NULL, NULL, "GoogleServices", NDPI_PROTOCOL_GOOGLE_SERVICES, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "mtalk.google.com", NULL, NULL, "GoogleServices", NDPI_PROTOCOL_GOOGLE_SERVICES, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ "plus.google.com", NULL, NULL, "GooglePlus", NDPI_PROTOCOL_GOOGLE_PLUS, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "msn.com", "MSN", NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /*News site*/
|
||||||
{ "plus.url.google.com", NULL, NULL, "GooglePlus", NDPI_PROTOCOL_GOOGLE_PLUS, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
|
||||||
|
|
||||||
/* http://check.googlezip.net/connect [check browser connectivity] */
|
{ "netflix.com", "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".googlezip.net", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "nflxext.com", "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "nflximg.com", "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "nflximg.net", "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "nflxvideo.net", "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ "docs.googleusercontent.com", NULL, NULL, "GoogleDocs", NDPI_PROTOCOL_GOOGLE_DOCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".skype.", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "docs.google.com", NULL, NULL, "GoogleDocs", NDPI_PROTOCOL_GOOGLE_DOCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".skypeassets.", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".skypedata.", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".skypeecs-", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".skypeforbusiness.", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ ".lync.com", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "e7768.b.akamaiedge.net", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "e4593.dspg.akamaiedge.net","Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
{ "e4593.g.akamaiedge.net", "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "googleusercontent.com", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".tuenti.com", "Tuenti", NDPI_PROTOCOL_TUENTI, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "1e100.net", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ "maps.google.", NULL, NULL, "GoogleMaps", NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".twttr.com", "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "maps.gstatic.com", NULL, NULL, "GoogleMaps", NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "twitter.", "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "twimg.com", "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".gmail.", NULL, NULL, "GMail", NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_MAIL, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".viber.com", "Viber", NDPI_PROTOCOL_VIBER, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "mail.google.", NULL, NULL, "GMail", NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_MAIL, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".cdn.viber.com", "Viber", NDPI_PROTOCOL_VIBER, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "google.", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "wikipedia.", "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".google.", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "wikimedia.", "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".gstatic.com", NULL, NULL, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "mediawiki.", "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ "wikimediafoundation.", "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
{ "mail.outlook.com", NULL, NULL, "Hotmail", NDPI_PROTOCOL_HOTMAIL, NDPI_PROTOCOL_CATEGORY_MAIL, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".whatsapp.", "WhatsApp", NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ ".last.fm", NULL, NULL, "LastFM", NDPI_PROTOCOL_LASTFM, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".yahoo.", "Yahoo", NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ ".yimg.com", "Yahoo", NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
|
{ "yahooapis.", "Yahoo", NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "msn.com", NULL, NULL, "MSN", NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /* News site */
|
{ "upload.youtube.com", "YouTubeUpload", NDPI_PROTOCOL_YOUTUBE_UPLOAD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "upload.video.google.com", "YouTubeUpload", NDPI_PROTOCOL_YOUTUBE_UPLOAD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "youtube.", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "youtu.be.", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "yt3.ggpht.com", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ ".googlevideo.com", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ ".ytimg.com", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "youtube-nocookie.", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "ggpht.com", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
{ "googleusercontent.com", "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ "netflix.com", NULL, NULL, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".vevo.com", "Vevo", NDPI_PROTOCOL_VEVO, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "nflxext.com", NULL, NULL, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "nflximg.com", NULL, NULL, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "nflximg.net", NULL, NULL, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "nflxvideo.net", NULL, NULL, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
|
||||||
|
|
||||||
{ ".skype.", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".spotify.", "Spotify", NDPI_PROTOCOL_SPOTIFY, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".skypeassets.", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "audio-fa.scdn.co", "Spotify", NDPI_PROTOCOL_SPOTIFY, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".skypedata.", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".skypeecs-", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".skypeforbusiness.", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".lync.com", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "e7768.b.akamaiedge.net", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "e4593.dspg.akamaiedge.net", NULL, NULL,"Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "e4593.g.akamaiedge.net", NULL, NULL, "Skype", NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ ".tuenti.com", NULL, NULL, "Tuenti", NDPI_PROTOCOL_TUENTI, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ ".twttr.com", NULL, NULL, "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "twitter.", NULL, NULL, "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "twimg.com", NULL, NULL, "Twitter", NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
|
||||||
|
|
||||||
{ ".viber.com", NULL, NULL, "Viber", NDPI_PROTOCOL_VIBER, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".cdn.viber.com", NULL, NULL, "Viber", NDPI_PROTOCOL_VIBER, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ "wikipedia.", NULL, NULL, "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
{ "wikimedia.", NULL, NULL, "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
{ "mediawiki.", NULL, NULL, "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
{ "wikimediafoundation.", NULL, NULL, "Wikipedia", NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
|
|
||||||
{ "mmg-fna.whatsapp.net", NULL, NULL, "WhatsAppFiles", NDPI_PROTOCOL_WHATSAPP_FILES, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".whatsapp.", NULL, NULL, "WhatsApp", NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ ".yahoo.", NULL, NULL, "Yahoo", NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
{ ".yimg.com", NULL, NULL, "Yahoo", NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
{ "yahooapis.", NULL, NULL, "Yahoo", NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ "upload.youtube.com", NULL, NULL, "YouTubeUpload", NDPI_PROTOCOL_YOUTUBE_UPLOAD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "upload.video.google.com", NULL, NULL, "YouTubeUpload", NDPI_PROTOCOL_YOUTUBE_UPLOAD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "youtube.", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "youtu.be.", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "yt3.ggpht.com", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ ".googlevideo.com", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ ".ytimg.com", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "youtube-nocookie.", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "ggpht.com", NULL, NULL, "YouTube", NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
|
|
||||||
{ ".vevo.com", NULL, NULL, "Vevo", NDPI_PROTOCOL_VEVO, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
|
|
||||||
{ ".spotify.", NULL, NULL, "Spotify", NDPI_PROTOCOL_SPOTIFY, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
{ "audio-fa.scdn.co", NULL, NULL, "Spotify", NDPI_PROTOCOL_SPOTIFY, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
|
||||||
|
|
||||||
|
|
||||||
{ ".pandora.com", NULL, NULL, "Pandora", NDPI_PROTOCOL_PANDORA, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".pandora.com", "Pandora", NDPI_PROTOCOL_PANDORA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".torproject.org", NULL, NULL, "Tor", NDPI_PROTOCOL_TOR, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
{ ".torproject.org", "Tor", NDPI_PROTOCOL_TOR, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
||||||
|
|
||||||
{ ".kakao.com", NULL, NULL, "KakaoTalk", NDPI_PROTOCOL_KAKAOTALK, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".kakao.com", "KakaoTalk", NDPI_PROTOCOL_KAKAOTALK, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "ttvnw.net", NULL, NULL, "Twitch", NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "ttvnw.net", "Twitch", NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "static-cdn.jtvnw.net", NULL, NULL, "Twitch", NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "static-cdn.jtvnw.net", "Twitch", NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "www-cdn.jtvnw.net", NULL, NULL, "Twitch", NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "www-cdn.jtvnw.net", "Twitch", NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ "quickplay.com", NULL, NULL, "QuickPlay", NDPI_PROTOCOL_QUICKPLAY, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "quickplay.com", "QuickPlay", NDPI_PROTOCOL_QUICKPLAY, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".qq.com", NULL, NULL, "QQ", NDPI_PROTOCOL_QQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".qq.com", "QQ", NDPI_PROTOCOL_QQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".gtimg.com", NULL, NULL, "QQ", NDPI_PROTOCOL_QQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".gtimg.com", "QQ", NDPI_PROTOCOL_QQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".weibo.com", NULL, NULL, "Sina(Weibo)", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".weibo.com", "Sina(Weibo)", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".sinaimg.cn", NULL, NULL, "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".sinaimg.cn", "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".sinajs.cn", NULL, NULL, "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".sinajs.cn", "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".sina.cn", NULL, NULL, "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".sina.cn", "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".sina.com.cn", NULL, NULL, "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".sina.com.cn", "Sina", NDPI_PROTOCOL_SINA, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
/* https://support.cipafilter.com/index.php?/Knowledgebase/Article/View/117/0/snapchat---how-to-block */
|
/* https://support.cipafilter.com/index.php?/Knowledgebase/Article/View/117/0/snapchat---how-to-block */
|
||||||
{ "feelinsonice.appspot.com", NULL, "\\.appspot\\.com$", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ "feelinsonice.appspot.com", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ "feelinsonice-hrd.appspot.com", NULL, NULL, "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ "feelinsonice-hrd.appspot.com", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ "feelinsonice.com", NULL, "\\.feelsonice\\.com$", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ "feelinsonice.com", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".snapchat.", NULL, "\\.snapchat\\.com$", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".snapchat.", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".snapads.", NULL, "\\.snapads\\.com$", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".snapads.", "Snapchat", NDPI_PROTOCOL_SNAPCHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
/* Detected "instagram.c10r.facebook.com". Omitted "*amazonaws.com" and "*facebook.com" CDNs e.g. "ig-telegraph-shv-04-frc3.facebook.com" */
|
/* Detected "instagram.c10r.facebook.com". Omitted "*amazonaws.com" and "*facebook.com" CDNs e.g. "ig-telegraph-shv-04-frc3.facebook.com" */
|
||||||
{ ".cdninstagram.com", NULL, NULL, "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".cdninstagram.com", "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "instagram.", NULL, NULL, "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "instagram.", "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".instagram.", NULL, NULL, "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".instagram.", "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "igcdn-photos-", NULL, NULL, "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "igcdn-photos-", "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "instagramimages-", NULL, NULL, "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "instagramimages-", "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ "instagramstatic-", NULL, NULL, "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ "instagramstatic-", "Instagram", NDPI_PROTOCOL_INSTAGRAM, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".waze.com", NULL, NULL, "Waze", NDPI_PROTOCOL_WAZE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".waze.com", "Waze", NDPI_PROTOCOL_WAZE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ ".deezer.com", NULL, NULL, "Deezer", NDPI_PROTOCOL_DEEZER, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".deezer.com", "Deezer", NDPI_PROTOCOL_DEEZER, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".microsoft.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ ".microsoft.com", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ "i-msdn.sec.s-msft.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "i-msdn.sec.s-msft.com", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "i2-msdn.sec.s-msft.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "i2-msdn.sec.s-msft.com", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".webtrends.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".webtrends.com", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".msecnd.net", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".msecnd.net", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "bing.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
{ "bing.com", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".visualstudio.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE },
|
{ ".visualstudio.com", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE },
|
||||||
{ "login.live.com", NULL, NULL, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
|
|
||||||
|
|
||||||
{ "bn1301.storage.live.com", NULL, NULL, "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE,NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "bn1301.storage.live.com", "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE,NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "*.gateway.messenger.live.com", NULL, NULL, "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "*.gateway.messenger.live.com", "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "skyapi.live.net", NULL, NULL, "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "skyapi.live.net", "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "d.docs.live.net", NULL, NULL, "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "d.docs.live.net", "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "onedrive.live.com", NULL, NULL, "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
{ "update.microsoft.com", NULL, NULL, "WindowsUpdate", NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ "update.microsoft.com", "WindowsUpdate", NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
{ ".windowsupdate.com", NULL, NULL, "WindowsUpdate", NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
{ ".windowsupdate.com", "WindowsUpdate", NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
|
||||||
|
|
||||||
{ "worldofwarcraft.com", NULL, NULL, "WorldOfWarcraft", NDPI_PROTOCOL_WORLDOFWARCRAFT, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ "worldofwarcraft.com", "WorldOfWarcraft", NDPI_PROTOCOL_WORLDOFWARCRAFT, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".anchorfree.", NULL, NULL, "HotspotShield", NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
{ ".anchorfree.", "HotspotShield", NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
||||||
{ "hotspotshield.com", NULL, NULL, "HotspotShield", NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
{ "hotspotshield.com", "HotspotShield", NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
||||||
{ ".northghost.com", NULL, NULL, "HotspotShield", NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
|
||||||
|
|
||||||
{ ".webex.com", NULL, NULL, "Webex", NDPI_PROTOCOL_WEBEX, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".webex.com", "Webex", NDPI_PROTOCOL_WEBEX, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ ".ocsdomain.com", NULL, NULL, "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".ocsdomain.com", "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "ocs.fr", NULL, NULL, "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "ocs.fr", "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".ocs.fr", NULL, NULL, "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".ocs.fr", "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".labgency.ws", NULL, NULL, "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".labgency.ws", "OCS", NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".iflix.com", NULL, NULL, "IFLIX", NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".iflix.com", "IFLIX", NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".app.iflixcorp.com", NULL, NULL, "IFLIX", NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".app.iflixcorp.com", "IFLIX", NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".images.iflixassets.com", NULL, NULL, "IFLIX", NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".images.iflixassets.com", "IFLIX", NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ "crl.microsoft.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "crl.microsoft.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "evsecure-ocsp.verisign.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "evsecure-ocsp.verisign.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "evsecure-aia.verisign.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "evsecure-aia.verisign.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "evsecure-crl.verisign.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "evsecure-crl.verisign.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".omniroot.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".omniroot.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".microsoftonline.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".microsoftonline.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".office365.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".office365.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".office.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".office.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".msocsp.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".msocsp.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".msocdn.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".msocdn.com", "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "officeapps.live.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "outlook.live.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "office.live.com", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ ".onenote.", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
{ "office.net", NULL, NULL, "Office365", NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
|
||||||
|
|
||||||
/* http://www.urlquery.net/report.php?id=1453233646161 */
|
/* http://www.urlquery.net/report.php?id=1453233646161 */
|
||||||
{ "lifedom.top", NULL, NULL, "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "lifedom.top", "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "coby.ns.cloudflare.com", NULL, NULL, "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "coby.ns.cloudflare.com", "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "amanda.ns.cloudflare.com", NULL, NULL, "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "amanda.ns.cloudflare.com", "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "d295hzzivaok4k.cloudfront.net", NULL, NULL,"OpenDNS", NDPI_PROTOCOL_OPENDNS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "d295hzzivaok4k.cloudfront.net","OpenDNS", NDPI_PROTOCOL_OPENDNS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".opendns.com", NULL, NULL, "OpenDNS", NDPI_PROTOCOL_OPENDNS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".opendns.com", "OpenDNS", NDPI_PROTOCOL_OPENDNS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
/* https://get.slack.help/hc/en-us/articles/205138367-Troubleshooting-Slack-connection-issues */
|
/* https://get.slack.help/hc/en-us/articles/205138367-Troubleshooting-Slack-connection-issues */
|
||||||
{ "slack.com", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "slack.com", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".slack-msgs.com", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".slack-msgs.com", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "slack-files.com", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "slack-files.com", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "slack-imgs.com", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "slack-imgs.com", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".slack-edge.com", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".slack-edge.com", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".slack-core.com", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".slack-core.com", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "slack-redir.net", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "slack-redir.net", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
/* Detected "slack-assets2.s3-us-west-2.amazonaws.com.". Omitted "*amazonaws.com" CDN, but no generic pattern to use on first part */
|
/* Detected "slack-assets2.s3-us-west-2.amazonaws.com.". Omitted "*amazonaws.com" CDN, but no generic pattern to use on first part */
|
||||||
{ "slack-assets2.s3-", NULL, NULL, "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "slack-assets2.s3-", "Slack", NDPI_PROTOCOL_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "github.com", NULL, NULL, "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "github.com", "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".github.com", NULL, NULL, "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".github.com", "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "github.io", NULL, NULL, "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "github.io", "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".github.io", NULL, NULL, "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".github.io", "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "githubusercontent.com", NULL, NULL, "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "githubusercontent.com", "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ ".githubusercontent.com", NULL, NULL, "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".githubusercontent.com", "Github", NDPI_PROTOCOL_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ ".iqiyi.com", NULL, NULL, "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".iqiyi.com", "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".qiyi.com", NULL, NULL, "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".qiyi.com", "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".71.am", NULL, NULL, "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".71.am", "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".qiyipic.com", NULL, NULL, "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".qiyipic.com", "iQIYI", NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".ppstream.com", NULL, NULL, "PPStream", NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".ppstream.com", "PPStream", NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".pps.tv", NULL, NULL, "PPStream", NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".pps.tv", "PPStream", NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".1kxun.", NULL, NULL, "1kxun", NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".1kxun.", "1kxun", NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "tcad.wedolook.com", NULL, NULL, "1kxun", NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "tcad.wedolook.com", "1kxun", NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".steampowered.com", NULL, NULL, "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".steampowered.com", "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ "steamcommunity.com", NULL, NULL, "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ "steamcommunity.com", "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ ".steamcontent.com", NULL, NULL, "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".steamcontent.com", "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ ".steamstatic.com", NULL, NULL, "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".steamstatic.com", "Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ "steamcommunity-a.akamaihd.net", NULL, NULL,"Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ "steamcommunity-a.akamaihd.net","Steam", NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".wechat.com", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".wechat.com", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".wechat.org", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".wechat.org", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".wechatapp.com", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".wechatapp.com", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".we.chat", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".we.chat", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".wx.", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".wx.", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".weixin.", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".weixin.", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
{ ".mmsns.qpic.cn", NULL, NULL, "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
{ ".mmsns.qpic.cn", "WeChat", NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ "dnscrypt.org", NULL, NULL, "DNScrypt", NDPI_PROTOCOL_DNSCRYPT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "dnscrypt.org", "DNScrypt", NDPI_PROTOCOL_DNSCRYPT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ "torrent.", NULL, NULL, "BitTorrent", NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_UNSAFE },
|
{ "torrent.", "BitTorrent", NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_UNSAFE },
|
||||||
{ "torrents.", NULL, NULL, "BitTorrent", NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_UNSAFE },
|
{ "torrents.", "BitTorrent", NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_UNSAFE },
|
||||||
{ "torrentz.", NULL, NULL, "BitTorrent", NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_UNSAFE },
|
{ "torrentz.", "BitTorrent", NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_UNSAFE },
|
||||||
|
|
||||||
{ ".nintendo.net", NULL, NULL, "Nintendo", NDPI_PROTOCOL_NINTENDO, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".nintendo.net", "Nintendo", NDPI_PROTOCOL_NINTENDO, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ ".nintendo.com", NULL, NULL, "Nintendo", NDPI_PROTOCOL_NINTENDO, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".nintendo.com", "Nintendo", NDPI_PROTOCOL_NINTENDO, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ ".playstation.net", NULL, NULL, "Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".playstation.net", "Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ ".playstation.com", NULL, NULL, "Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".playstation.com", "Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
{ ".sonyentertainmentnetwork.com", NULL, NULL,"Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
{ ".sonyentertainmentnetwork.com","Playstation", NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".pastebin.com", NULL, NULL, "Pastebin", NDPI_PROTOCOL_PASTEBIN, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
{ ".pastebin.com", "Pastebin", NDPI_PROTOCOL_PASTEBIN, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
|
||||||
|
|
||||||
{ ".linkedin.com", NULL, NULL, "LinkedIn", NDPI_PROTOCOL_LINKEDIN, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".linkedin.com", "LinkedIn", NDPI_PROTOCOL_LINKEDIN, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
{ ".licdn.com", NULL, NULL, "LinkedIn", NDPI_PROTOCOL_LINKEDIN, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
{ ".licdn.com", "LinkedIn", NDPI_PROTOCOL_LINKEDIN, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ ".sndcdn.com", NULL, NULL, "SoundCloud", NDPI_PROTOCOL_SOUNDCLOUD, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".sndcdn.com", "SoundCloud", NDPI_PROTOCOL_SOUNDCLOUD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".soundcloud.com", NULL, NULL, "SoundCloud", NDPI_PROTOCOL_SOUNDCLOUD, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ ".soundcloud.com", "SoundCloud", NDPI_PROTOCOL_SOUNDCLOUD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "getrockerbox.com", NULL, NULL, "SoundCloud", NDPI_PROTOCOL_SOUNDCLOUD, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN },
|
{ "getrockerbox.com", "SoundCloud", NDPI_PROTOCOL_SOUNDCLOUD, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
|
|
||||||
{ "web.telegram.org", NULL, NULL, "Telegram", NDPI_PROTOCOL_TELEGRAM, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "web.telegram.org", "Telegram", NDPI_PROTOCOL_TELEGRAM, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "tdesktop.com", NULL, NULL, "Telegram", NDPI_PROTOCOL_TELEGRAM, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "tdesktop.com", "Telegram", NDPI_PROTOCOL_TELEGRAM, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "tupdate.com", NULL, NULL, "Telegram", NDPI_PROTOCOL_TELEGRAM, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "tupdate.com", "Telegram", NDPI_PROTOCOL_TELEGRAM, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ ".icq.", NULL, NULL, "ICQ", NDPI_PROTOCOL_ICQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ ".icq.", "ICQ", NDPI_PROTOCOL_ICQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "icq.", NULL, NULL, "ICQ", NDPI_PROTOCOL_ICQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "icq.", "ICQ", NDPI_PROTOCOL_ICQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ NULL, NULL, NULL, 0 }
|
{ NULL, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -8332,57 +8325,57 @@ ndpi_protocol_match host_match[] = {
|
|||||||
Mime-type content match match
|
Mime-type content match match
|
||||||
*/
|
*/
|
||||||
ndpi_protocol_match content_match[] = {
|
ndpi_protocol_match content_match[] = {
|
||||||
{ "audio/mpeg", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/mpeg", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "audio/x-mpeg", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/x-mpeg", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "audio/mpeg3", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/mpeg3", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "audio/mp4a", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/mp4a", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/mpeg", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/mpeg", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/nsv", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/nsv", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "misc/ultravox", NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "misc/ultravox", NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "audio/ogg", NULL, NULL, NULL, NDPI_CONTENT_OGG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/ogg", NULL, NDPI_CONTENT_OGG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/ogg", NULL, NULL, NULL, NDPI_CONTENT_OGG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/ogg", NULL, NDPI_CONTENT_OGG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/ogg", NULL, NULL, NULL, NDPI_CONTENT_OGG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/ogg", NULL, NDPI_CONTENT_OGG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ ".adobe.", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ ".adobe.", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/flv", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/flv", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/x-flv", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/x-flv", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/x-fcs", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/x-fcs", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/x-shockwave-flash",NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "application/x-shockwave-flash",NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "video/flash", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/flash", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/flv", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/flv", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "flv-application/octet-stream", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "flv-application/octet-stream", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/futuresplash", NULL, NULL, NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/futuresplash", NULL, NDPI_CONTENT_FLASH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/quicktime", NULL, NULL, NULL, NDPI_CONTENT_QUICKTIME, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/quicktime", NULL, NDPI_CONTENT_QUICKTIME, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/mp4", NULL, NULL, NULL, NDPI_CONTENT_QUICKTIME, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/mp4", NULL, NDPI_CONTENT_QUICKTIME, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/x-m4v", NULL, NULL, NULL, NDPI_CONTENT_QUICKTIME, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/x-m4v", NULL, NDPI_CONTENT_QUICKTIME, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "audio/x-pn-realaudio", NULL, NULL, NULL, NDPI_CONTENT_REALMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/x-pn-realaudio", NULL, NDPI_CONTENT_REALMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/vnd.rn-realmedia", NULL, NULL, NULL, NDPI_CONTENT_REALMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/vnd.rn-realmedia", NULL, NDPI_CONTENT_REALMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/x-ms-", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/x-ms-", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "asf", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "asf", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "asx", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "asx", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/x-msvideo", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/x-msvideo", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "audio/x-wav", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/x-wav", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/vnd.ms.wms-hdr.asfv1", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/vnd.ms.wms-hdr.asfv1", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "NSPlayer/", NULL, NULL, NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "NSPlayer/", NULL, NDPI_CONTENT_WINDOWSMEDIA, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/x-mms-framed", NULL, NULL, NULL, NDPI_CONTENT_MMS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/x-mms-framed", NULL, NDPI_CONTENT_MMS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "Xbox Live Client/", NULL, NULL, NULL, NDPI_PROTOCOL_XBOX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "Xbox Live Client/", NULL, NDPI_PROTOCOL_XBOX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "Windows-Update-Agent", NULL, NULL, NULL, NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "Windows-Update-Agent", NULL, NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "audio/webm", NULL, NULL, NULL, NDPI_CONTENT_WEBM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "audio/webm", NULL, NDPI_CONTENT_WEBM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "video/webm", NULL, NULL, NULL, NDPI_CONTENT_WEBM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "video/webm", NULL, NDPI_CONTENT_WEBM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/x-rtsp-tunnelled", NULL, NULL, NULL, NDPI_PROTOCOL_RTSP, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/x-rtsp-tunnelled", NULL, NDPI_PROTOCOL_RTSP, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/vnd.apple.mpegurl",NULL, NULL, NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
{ "application/vnd.apple.mpegurl",NULL, NDPI_CONTENT_MPEG, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
|
||||||
{ "application/x-tar", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "application/x-tar", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "application/octet-stream", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "application/octet-stream", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "application/mac-binary", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "application/mac-binary", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "/x-bzip", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "/x-bzip", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "/x-gzip", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "/x-gzip", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "/x-zip", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "/x-zip", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "/zip", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "/zip", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "binhex", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "binhex", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "/base64", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "/base64", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "application/gnutar", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "application/gnutar", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
{ "application/x-compressed", NULL, NULL, NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
{ "application/x-compressed", NULL, NDPI_PROTOCOL_HTTP_DOWNLOAD, NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, NDPI_PROTOCOL_ACCEPTABLE },
|
||||||
|
|
||||||
{ NULL, NULL, NULL, 0 }
|
{ NULL, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ****************************************************** */
|
/* ****************************************************** */
|
||||||
|
|||||||
+124
-352
File diff suppressed because it is too large
Load Diff
+5
-10
@@ -23,14 +23,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_AFP
|
#ifdef NDPI_PROTOCOL_AFP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AFP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
struct afpHeader {
|
struct afpHeader {
|
||||||
u_int8_t flags, command;
|
u_int8_t flags, command;
|
||||||
u_int16_t requestId;
|
u_int16_t requestId;
|
||||||
@@ -47,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;
|
||||||
|
|
||||||
@@ -70,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;
|
||||||
}
|
}
|
||||||
@@ -79,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+37
-37
@@ -23,14 +23,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_AIMINI
|
#ifdef NDPI_PROTOCOL_AIMINI
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO 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/* , */
|
||||||
/* ndpi_protocol_type_t protocol_type */)
|
/* ndpi_protocol_type_t protocol_type */)
|
||||||
@@ -54,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -97,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 &&
|
||||||
@@ -105,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;
|
||||||
@@ -123,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
|
||||||
@@ -138,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;
|
||||||
@@ -149,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;
|
||||||
@@ -171,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;
|
||||||
@@ -194,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;
|
||||||
@@ -218,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;
|
||||||
@@ -239,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;
|
||||||
}
|
}
|
||||||
@@ -256,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;
|
||||||
}
|
}
|
||||||
@@ -267,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;
|
||||||
}
|
}
|
||||||
@@ -277,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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,15 +18,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_AMQP
|
#ifdef NDPI_PROTOCOL_AMQP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AMQP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
PACK_ON
|
PACK_ON
|
||||||
struct amqp_header {
|
struct amqp_header {
|
||||||
u_int8_t ptype;
|
u_int8_t ptype;
|
||||||
@@ -44,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)) {
|
||||||
@@ -62,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;
|
||||||
}
|
}
|
||||||
@@ -70,8 +65,6 @@ void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,81 +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"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_APPLE_PUSH
|
|
||||||
|
|
||||||
#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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -22,14 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_APPLEJUICE
|
#ifdef NDPI_PROTOCOL_APPLEJUICE
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO 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,
|
||||||
struct ndpi_flow_struct *flow)
|
struct ndpi_flow_struct *flow)
|
||||||
@@ -41,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,26 +22,27 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_ARMAGETRON
|
#ifdef NDPI_PROTOCOL_ARMAGETRON
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_ARMAGETRON
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
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 */
|
||||||
@@ -51,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;
|
||||||
}
|
}
|
||||||
@@ -64,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;
|
||||||
}
|
}
|
||||||
@@ -84,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;
|
||||||
}
|
}
|
||||||
@@ -93,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -26,14 +26,10 @@
|
|||||||
http://tools.ietf.org/html/rfc4891
|
http://tools.ietf.org/html/rfc4891
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_AYIYA
|
#ifdef NDPI_PROTOCOL_AYIYA
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AYIYA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
struct ayiya {
|
struct ayiya {
|
||||||
u_int8_t flags[3];
|
u_int8_t flags[3];
|
||||||
u_int8_t next_header;
|
u_int8_t next_header;
|
||||||
@@ -46,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))
|
||||||
@@ -61,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,13 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_BATTLEFIELD
|
#ifdef NDPI_PROTOCOL_BATTLEFIELD
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO 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)
|
||||||
{
|
{
|
||||||
@@ -56,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;
|
||||||
}
|
}
|
||||||
@@ -77,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;
|
||||||
}
|
}
|
||||||
@@ -93,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+4
-12
@@ -20,24 +20,16 @@
|
|||||||
* 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
|
#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)
|
||||||
{
|
{
|
||||||
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
|
||||||
@@ -46,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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,14 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_BITTORRENT
|
#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
|
||||||
|
|
||||||
@@ -93,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -104,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 */
|
||||||
@@ -123,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -251,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;
|
||||||
@@ -300,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -342,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -366,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;
|
||||||
}
|
}
|
||||||
@@ -386,7 +392,7 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|| (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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -475,16 +481,18 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
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->protos.bittorrent.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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_BJNP
|
#ifdef NDPI_PROTOCOL_BJNP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_BJNP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
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,
|
||||||
@@ -26,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) {
|
||||||
|
|||||||
@@ -29,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;
|
||||||
@@ -90,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;
|
||||||
@@ -156,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));
|
||||||
@@ -184,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)
|
||||||
|
|
||||||
|
|
||||||
@@ -416,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;
|
||||||
|
|||||||
Regular → Executable
+2
-6
@@ -21,15 +21,11 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_CHECKMK
|
#ifdef NDPI_PROTOCOL_CHECKMK
|
||||||
|
|
||||||
#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,
|
static void ndpi_int_checkmk_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow)
|
struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,15 +4,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_CISCOVPN
|
#ifdef NDPI_PROTOCOL_CISCOVPN
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CISCOVPN
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CISCOVPN, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CISCOVPN, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -25,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) ||
|
||||||
@@ -47,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(
|
||||||
(
|
(
|
||||||
@@ -65,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_CITRIX
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CITRIX
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_CITRIX
|
||||||
|
|
||||||
/* ************************************ */
|
/* ************************************ */
|
||||||
|
|
||||||
@@ -49,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;
|
||||||
}
|
}
|
||||||
@@ -77,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)
|
||||||
|
|||||||
@@ -21,15 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_COAP
|
#ifdef NDPI_PROTOCOL_COAP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_COAP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define CON 0
|
#define CON 0
|
||||||
#define NO_CON 1
|
#define NO_CON 1
|
||||||
#define ACK 2
|
#define ACK 2
|
||||||
@@ -121,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) {
|
||||||
@@ -136,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;
|
||||||
}
|
}
|
||||||
@@ -145,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,21 +19,16 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_COLLECTD
|
#ifdef NDPI_PROTOCOL_COLLECTD
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_COLLECTD
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
@@ -48,10 +43,11 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,14 +18,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_CORBA
|
|
||||||
|
|
||||||
#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)
|
||||||
{
|
{
|
||||||
@@ -35,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,14 +21,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
/* include files */
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_CROSSFIRE
|
#ifdef NDPI_PROTOCOL_CROSSFIRE
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CROSSFIRE
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
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,
|
||||||
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
|
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
|
||||||
@@ -40,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) {
|
||||||
@@ -66,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+16
-18
@@ -20,51 +20,49 @@
|
|||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_CSGO
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CSGO
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_CSGO
|
||||||
|
|
||||||
void ndpi_search_csgo(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) {
|
||||||
struct ndpi_packet_struct* packet = &flow->packet;
|
struct ndpi_packet_struct* packet = &flow->packet;
|
||||||
|
|
||||||
if (packet->udp != NULL) {
|
if (packet->udp != NULL) {
|
||||||
uint32_t w = htonl(get_u_int32_t(packet->payload, 0));
|
uint32_t w = htonl(get_u_int32_t(packet->payload, 0));
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "CSGO: word %08x\n", w);
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "CSGO: word %08x\n", w);
|
||||||
|
|
||||||
if (!flow->csgo_state && packet->payload_packet_len == 23 && w == 0xfffffffful) {
|
if (!flow->csgo_state && packet->payload_packet_len == 23 && w == 0xfffffffful) {
|
||||||
if (!memcmp(packet->payload + 5, "connect0x", 9)) {
|
if (!memcmp(packet->payload + 5, "connect0x", 9)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo connect0x.\n");
|
||||||
flow->csgo_state++;
|
flow->csgo_state++;
|
||||||
memcpy(flow->csgo_strid, packet->payload + 5, 18);
|
memcpy(flow->csgo_strid, packet->payload + 5, 18);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Found csgo connect0x\n");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (flow->csgo_state == 1 && packet->payload_packet_len >= 42 && w == 0xfffffffful) {
|
if (flow->csgo_state == 1 && packet->payload_packet_len >= 42 && w == 0xfffffffful) {
|
||||||
if (!memcmp(packet->payload + 24, flow->csgo_strid, 18)) {
|
if (!memcmp(packet->payload + 24, flow->csgo_strid, 18)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo connect0x reply.\n");
|
||||||
flow->csgo_state++;
|
flow->csgo_state++;
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo connect0x reply\n");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 8 && ( w == 0x3a180000 || w == 0x39180000) ) {
|
if (packet->payload_packet_len == 8 && ( w == 0x3a180000 || w == 0x39180000) ) {
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp 8b\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo udp 8b.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len >= 36 && w == 0x56533031ul) {
|
if (packet->payload_packet_len >= 36 && w == 0x56533031ul) {
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo udp.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len >= 36 && w == 0x01007364) {
|
if (packet->payload_packet_len >= 36 && w == 0x01007364) {
|
||||||
uint32_t w2 = htonl(get_u_int32_t(packet->payload, 4));
|
uint32_t w2 = htonl(get_u_int32_t(packet->payload, 4));
|
||||||
if (w2 == 0x70696e67) {
|
if (w2 == 0x70696e67) {
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp ping\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo udp ping.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -75,11 +73,11 @@ void ndpi_search_csgo(struct ndpi_detection_module_struct* ndpi_struct, struct n
|
|||||||
if (!flow->csgo_s2) {
|
if (!flow->csgo_s2) {
|
||||||
flow->csgo_id2 = w2;
|
flow->csgo_id2 = w2;
|
||||||
flow->csgo_s2 = 1;
|
flow->csgo_s2 = 1;
|
||||||
NDPI_LOG_DBG2( ndpi_struct, "Found csgo udp 0d1d step1\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo udp 0d1d step1.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->csgo_s2 == 1 && flow->csgo_id2 == w2) {
|
if (flow->csgo_s2 == 1 && flow->csgo_id2 == w2) {
|
||||||
NDPI_LOG_DBG2( ndpi_struct, "Found csgo udp 0d1d step1 DUP\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo udp 0d1d step1 DUP.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
flow->csgo_s2 = 3;
|
flow->csgo_s2 = 3;
|
||||||
@@ -87,7 +85,7 @@ void ndpi_search_csgo(struct ndpi_detection_module_struct* ndpi_struct, struct n
|
|||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 15) {
|
if (packet->payload_packet_len == 15) {
|
||||||
if (flow->csgo_s2 == 1 && flow->csgo_id2 == w2) {
|
if (flow->csgo_s2 == 1 && flow->csgo_id2 == w2) {
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo udp 0d1d\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo udp 0d1d.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -96,23 +94,23 @@ void ndpi_search_csgo(struct ndpi_detection_module_struct* ndpi_struct, struct n
|
|||||||
}
|
}
|
||||||
if (packet->payload_packet_len >= 140 && (w == 0x02124c6c || w == 0x02125c6c) &&
|
if (packet->payload_packet_len >= 140 && (w == 0x02124c6c || w == 0x02125c6c) &&
|
||||||
!memcmp(&packet->payload[3], "lta\000mob\000tpc\000bhj\000bxd\000tae\000urg\000gkh\000", 32)) {
|
!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_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo dictionary udp.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len >= 33 && packet->iph && packet->iph->daddr == 0xffffffff &&
|
if (packet->payload_packet_len >= 33 && packet->iph && packet->iph->daddr == 0xffffffff &&
|
||||||
!memcmp(&packet->payload[17], "LanSearch", 9)) {
|
!memcmp(&packet->payload[17], "LanSearch", 9)) {
|
||||||
NDPI_LOG_INFO( ndpi_struct, "found csgo LanSearch udp\n");
|
NDPI_LOG(NDPI_PROTOCOL_CSGO, ndpi_struct, NDPI_LOG_DEBUG, "Found csgo LanSearch udp.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CSGO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (flow->packet_counter > 20)
|
if (flow->packet_counter > 20)
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CSGO);
|
||||||
}
|
}
|
||||||
|
|
||||||
void init_csgo_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) {
|
||||||
ndpi_set_bitmask_protocol_detection("CSGO", ndpi_struct, detection_bitmask, *id,
|
ndpi_set_bitmask_protocol_detection("CSGO", ndpi_struct, detection_bitmask, *id,
|
||||||
NDPI_PROTOCOL_CSGO,
|
NDPI_PROTOCOL_CSGO,
|
||||||
ndpi_search_csgo,
|
ndpi_search_csgo,
|
||||||
|
|||||||
@@ -21,14 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DCERPC
|
|
||||||
|
|
||||||
#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)
|
||||||
@@ -40,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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+19
-26
@@ -18,14 +18,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DHCP
|
#ifdef NDPI_PROTOCOL_DHCP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DHCP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
/* freeradius/src/lib/dhcp.c */
|
/* freeradius/src/lib/dhcp.c */
|
||||||
#define DHCP_CHADDR_LEN 16
|
#define DHCP_CHADDR_LEN 16
|
||||||
#define DHCP_SNAME_LEN 64
|
#define DHCP_SNAME_LEN 64
|
||||||
@@ -64,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 */
|
||||||
|
|
||||||
@@ -72,29 +70,24 @@ 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)
|
if(id == 0xFF)
|
||||||
break;
|
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 */) {
|
||||||
@@ -102,16 +95,15 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
|
|
||||||
if(msg_type <= 8) foundValidMsgType = 1;
|
if(msg_type <= 8) foundValidMsgType = 1;
|
||||||
} else if(id == 55 /* Parameter Request List / Fingerprint */) {
|
} else if(id == 55 /* Parameter Request List / Fingerprint */) {
|
||||||
u_int idx, offset = 0;
|
u_int idx, offset = 0,
|
||||||
|
hex_len = ndpi_min(len * 2, sizeof(flow->protos.dhcp.fingerprint));
|
||||||
|
|
||||||
for(idx = 0; idx < len && offset < sizeof(flow->protos.dhcp.fingerprint) - 2; idx++) {
|
for(idx=0; idx<len; idx++) {
|
||||||
snprintf((char*)&flow->protos.dhcp.fingerprint[offset],
|
snprintf((char*)&flow->protos.dhcp.fingerprint[offset],
|
||||||
sizeof(flow->protos.dhcp.fingerprint) - offset,
|
sizeof(flow->protos.dhcp.fingerprint)-offset-1,
|
||||||
"%02X", dhcp->options[i+2+idx] & 0xFF);
|
"%02X", dhcp->options[i+2+idx] & 0xFF);
|
||||||
offset += 2;
|
offset += 2;
|
||||||
}
|
}
|
||||||
flow->protos.dhcp.fingerprint[sizeof(flow->protos.dhcp.fingerprint) - 1] = '\0';
|
|
||||||
|
|
||||||
} else if(id == 60 /* Class Identifier */) {
|
} else if(id == 60 /* Class Identifier */) {
|
||||||
char *name = (char*)&dhcp->options[i+2];
|
char *name = (char*)&dhcp->options[i+2];
|
||||||
int j = 0;
|
int j = 0;
|
||||||
@@ -124,8 +116,9 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
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);
|
||||||
@@ -139,14 +132,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,15 +22,13 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
/* include files */
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_DHCPV6
|
#ifdef NDPI_PROTOCOL_DHCPV6
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DHCPV6
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
@@ -42,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,132 +0,0 @@
|
|||||||
/*
|
|
||||||
* aimini.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2018 - ntop.org
|
|
||||||
* Written by Michele Campus - <campus@ntop.org>
|
|
||||||
*
|
|
||||||
* This file is part of nDPI, an open source deep packet inspection
|
|
||||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
|
||||||
*
|
|
||||||
* 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"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DIAMETER
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DIAMETER
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
// Header Flags possibile values
|
|
||||||
#define REQUEST 0X80
|
|
||||||
#define PROXYABLE 0X40
|
|
||||||
#define ERROR 0X20
|
|
||||||
#define 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 == REQUEST ||
|
|
||||||
diameter->flags == PROXYABLE ||
|
|
||||||
diameter->flags == ERROR ||
|
|
||||||
diameter->flags == 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* NDPI_PROTOCOL_DIAMETER */
|
|
||||||
|
|
||||||
@@ -23,15 +23,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DIRECTCONNECT
|
#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
|
||||||
//#define NDPI_DEBUG_DIRECTCONNECT_CONN
|
//#define NDPI_DEBUG_DIRECTCONNECT_CONN
|
||||||
@@ -64,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 {
|
||||||
@@ -93,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));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,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));
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -150,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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -168,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -182,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -200,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -214,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -233,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;
|
||||||
}
|
}
|
||||||
@@ -241,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;
|
||||||
}
|
}
|
||||||
@@ -251,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;
|
||||||
|
|
||||||
@@ -270,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;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -286,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");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -298,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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -353,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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -379,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;
|
||||||
}
|
}
|
||||||
@@ -388,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);
|
||||||
|
|
||||||
@@ -406,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)
|
||||||
@@ -422,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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,14 +23,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK
|
#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
|
||||||
//#define NDPI_DEBUG_DIRECT_DOWNLOAD_LINK_NOTHING_FOUND
|
//#define NDPI_DEBUG_DIRECT_DOWNLOAD_LINK_NOTHING_FOUND
|
||||||
@@ -57,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,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;
|
||||||
}
|
}
|
||||||
@@ -81,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;
|
||||||
}
|
}
|
||||||
@@ -101,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -695,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;
|
||||||
}
|
}
|
||||||
@@ -710,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-15
@@ -21,15 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DNS
|
#ifdef NDPI_PROTOCOL_DNS
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DNS
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define FLAGS_MASK 0x8000
|
#define FLAGS_MASK 0x8000
|
||||||
|
|
||||||
/* #define DNS_DEBUG 1 */
|
/* #define DNS_DEBUG 1 */
|
||||||
@@ -69,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);
|
||||||
@@ -80,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)
|
||||||
@@ -121,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
|
||||||
@@ -182,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,8 +211,9 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
strlen((const char*)flow->host_server_name),
|
strlen((const char*)flow->host_server_name),
|
||||||
NDPI_PROTOCOL_DNS);
|
NDPI_PROTOCOL_DNS);
|
||||||
|
|
||||||
#ifdef DNS_DEBUG
|
#ifdef DNS_DEBUG
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "[num_queries=%d][num_answers=%d][reply_code=%u][rsp_type=%u][host_server_name=%s]\n",
|
printf("[%s:%d] [num_queries=%d][num_answers=%d][reply_code=%u][rsp_type=%u][host_server_name=%s]\n",
|
||||||
|
__FILE__, __LINE__,
|
||||||
flow->protos.dns.num_queries, flow->protos.dns.num_answers,
|
flow->protos.dns.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
|
||||||
);
|
);
|
||||||
@@ -227,10 +224,11 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+53
-47
@@ -22,69 +22,77 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DOFUS
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DOFUS
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_DOFUS
|
||||||
|
|
||||||
static void ndpi_dofus_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_dofus_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DOFUS, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DOFUS, NDPI_PROTOCOL_UNKNOWN);
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found dofus\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
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 dofus\n");
|
|
||||||
|
|
||||||
/* Dofus v 1.x.x */
|
/* Dofus v 1.x.x */
|
||||||
if (packet->payload_packet_len == 13 && get_u_int16_t(packet->payload, 1) == ntohs(0x0508)
|
if (packet->payload_packet_len == 13 && get_u_int16_t(packet->payload, 1) == ntohs(0x0508)
|
||||||
&& get_u_int16_t(packet->payload, 5) == ntohs(0x04a0)
|
&& get_u_int16_t(packet->payload, 5) == ntohs(0x04a0)
|
||||||
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == ntohs(0x0194)) {
|
&& get_u_int16_t(packet->payload, packet->payload_packet_len - 2) == ntohs(0x0194)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "found dofus.\n");
|
||||||
ndpi_dofus_add_connection(ndpi_struct, flow);
|
ndpi_dofus_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->l4.tcp.dofus_stage == 0) {
|
if (flow->l4.tcp.dofus_stage == 0 && packet->payload_packet_len == 3 && memcmp(packet->payload, "HG", 2) == 0
|
||||||
if (packet->payload_packet_len == 3 && memcmp(packet->payload, "HG", 2) == 0
|
&& packet->payload[packet->payload_packet_len - 1] == 0) {
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == 0)
|
flow->l4.tcp.dofus_stage = 1;
|
||||||
goto maybe_dofus;
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "maybe dofus.\n");
|
||||||
|
return;
|
||||||
if (packet->payload_packet_len == 12 && memcmp(packet->payload, "Af", 2) == 0
|
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == 0)
|
|
||||||
goto maybe_dofus;
|
|
||||||
|
|
||||||
if (packet->payload_packet_len == 35 && memcmp(packet->payload, "HC", 2) == 0
|
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == 0)
|
|
||||||
goto maybe_dofus;
|
|
||||||
|
|
||||||
if (packet->payload_packet_len > 2 && packet->payload[0] == 'A'
|
|
||||||
&& (packet->payload[1] == 'x' || packet->payload[1] == 'X')
|
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == 0)
|
|
||||||
goto maybe_dofus;
|
|
||||||
|
|
||||||
if (packet->payload_packet_len > 2 && memcmp(packet->payload, "Ad", 2)
|
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == 0)
|
|
||||||
goto maybe_dofus;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
if (flow->l4.tcp.dofus_stage == 1) {
|
if (flow->l4.tcp.dofus_stage == 0 && packet->payload_packet_len == 35 && memcmp(packet->payload, "HC", 2) == 0
|
||||||
if (packet->payload_packet_len == 11 && memcmp(packet->payload, "AT", 2) == 0
|
&& packet->payload[packet->payload_packet_len - 1] == 0) {
|
||||||
&& packet->payload[10] == 0x00) {
|
flow->l4.tcp.dofus_stage = 1;
|
||||||
ndpi_dofus_add_connection(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "maybe dofus.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 5
|
if (flow->l4.tcp.dofus_stage == 0 && packet->payload_packet_len > 2 && packet->payload[0] == 'A'
|
||||||
&& packet->payload[0] == 'A' && packet->payload[4] == 0x00
|
&& (packet->payload[1] == 'x' || packet->payload[1] == 'X')
|
||||||
&& (packet->payload[1] == 'T' || packet->payload[1] == 'k')) {
|
&& packet->payload[packet->payload_packet_len - 1] == 0) {
|
||||||
|
flow->l4.tcp.dofus_stage = 1;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "maybe dofus.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (flow->l4.tcp.dofus_stage == 0 && packet->payload_packet_len == 12 && memcmp(packet->payload, "Af", 2) == 0
|
||||||
|
&& packet->payload[packet->payload_packet_len - 1] == 0) {
|
||||||
|
flow->l4.tcp.dofus_stage = 1;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "maybe dofus.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (flow->l4.tcp.dofus_stage == 0 && packet->payload_packet_len > 2 && memcmp(packet->payload, "Ad", 2)
|
||||||
|
&& packet->payload[packet->payload_packet_len - 1] == 0) {
|
||||||
|
flow->l4.tcp.dofus_stage = 1;
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "maybe dofus.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (packet->payload_packet_len == 11 && memcmp(packet->payload, "AT", 2) == 0 && packet->payload[10] == 0x00) {
|
||||||
|
if (flow->l4.tcp.dofus_stage == 1) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "found dofus.\n");
|
||||||
ndpi_dofus_add_connection(ndpi_struct, flow);
|
ndpi_dofus_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (flow->l4.tcp.dofus_stage == 1 && packet->payload_packet_len == 5
|
||||||
|
&& packet->payload[0] == 'A' && packet->payload[4] == 0x00 && (packet->payload[1] == 'T'
|
||||||
|
|| packet->payload[1] == 'k')) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "found dofus asym.\n");
|
||||||
|
ndpi_dofus_add_connection(ndpi_struct, flow);
|
||||||
|
return;
|
||||||
|
}
|
||||||
/* end Dofus 1.x.x */
|
/* end Dofus 1.x.x */
|
||||||
|
|
||||||
|
|
||||||
@@ -101,6 +109,7 @@ void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if (packet->payload_packet_len == 49 && ntohs(get_u_int16_t(packet->payload, 15)) + 17 != packet->payload_packet_len) {
|
if (packet->payload_packet_len == 49 && ntohs(get_u_int16_t(packet->payload, 15)) + 17 != packet->payload_packet_len) {
|
||||||
goto exclude;
|
goto exclude;
|
||||||
}
|
}
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "found dofus.\n");
|
||||||
ndpi_dofus_add_connection(ndpi_struct, flow);
|
ndpi_dofus_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -111,6 +120,7 @@ void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
goto exclude;
|
goto exclude;
|
||||||
len2 = ntohs(get_u_int16_t(packet->payload, 5 + len));
|
len2 = ntohs(get_u_int16_t(packet->payload, 5 + len));
|
||||||
if (5 + len + 2 + len2 == packet->payload_packet_len) {
|
if (5 + len + 2 + len2 == packet->payload_packet_len) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "found dofus.\n");
|
||||||
ndpi_dofus_add_connection(ndpi_struct, flow);
|
ndpi_dofus_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -125,21 +135,17 @@ void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
if ((12 + len + 2 + len2 + 1) > packet->payload_packet_len)
|
if ((12 + len + 2 + len2 + 1) > packet->payload_packet_len)
|
||||||
goto exclude;
|
goto exclude;
|
||||||
if (12 + len + 2 + len2 + 1 == packet->payload_packet_len && packet->payload[12 + len + 2 + len2] == 0x01) {
|
if (12 + len + 2 + len2 + 1 == packet->payload_packet_len && packet->payload[12 + len + 2 + len2] == 0x01) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "found dofus.\n");
|
||||||
ndpi_dofus_add_connection(ndpi_struct, flow);
|
ndpi_dofus_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
exclude:
|
exclude:
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_DOFUS, ndpi_struct, NDPI_LOG_DEBUG, "exclude dofus.\n");
|
||||||
return;
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DOFUS);
|
||||||
|
|
||||||
maybe_dofus:
|
|
||||||
flow->l4.tcp.dofus_stage = 1;
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe dofus\n");
|
|
||||||
return;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void init_dofus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
void init_dofus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||||
{
|
{
|
||||||
ndpi_set_bitmask_protocol_detection("Dofus", ndpi_struct, detection_bitmask, *id,
|
ndpi_set_bitmask_protocol_detection("Dofus", ndpi_struct, detection_bitmask, *id,
|
||||||
|
|||||||
@@ -17,14 +17,10 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DRDA
|
#ifdef NDPI_PROTOCOL_DRDA
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DRDA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
struct ndpi_drda_hdr {
|
struct ndpi_drda_hdr {
|
||||||
u_int16_t length;
|
u_int16_t length;
|
||||||
u_int8_t magic;
|
u_int8_t magic;
|
||||||
@@ -41,8 +37,6 @@ void ndpi_search_drda(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
struct ndpi_packet_struct * packet = &flow->packet;
|
struct ndpi_packet_struct * packet = &flow->packet;
|
||||||
u_int16_t payload_len = packet->payload_packet_len;
|
u_int16_t payload_len = packet->payload_packet_len;
|
||||||
u_int count = 0; // prevent integer overflow
|
u_int count = 0; // prevent integer overflow
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search DRDA\n");
|
|
||||||
|
|
||||||
if(packet->tcp != NULL) {
|
if(packet->tcp != NULL) {
|
||||||
|
|
||||||
@@ -77,14 +71,15 @@ void ndpi_search_drda(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
if(count != payload_len) goto no_drda;
|
if(count != payload_len) goto no_drda;
|
||||||
}
|
}
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found DRDA\n");
|
NDPI_LOG(NDPI_PROTOCOL_DRDA, ndpi_struct, NDPI_LOG_DEBUG, "found DRDA.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DRDA, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DRDA, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
no_drda:
|
no_drda:
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_DRDA, ndpi_struct, NDPI_LOG_DEBUG, "exclude DRDA.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DRDA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -21,14 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_DROPBOX
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DROPBOX
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_DROPBOX
|
||||||
|
|
||||||
#define DB_LSP_PORT 17500
|
#define DB_LSP_PORT 17500
|
||||||
|
|
||||||
@@ -55,7 +51,7 @@ static void ndpi_check_dropbox(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
if(payload_len > 2) {
|
if(payload_len > 2) {
|
||||||
if(strncmp((const char *)packet->payload, "{\"host_int\"", 11) == 0) {
|
if(strncmp((const char *)packet->payload, "{\"host_int\"", 11) == 0) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found dropbox\n");
|
NDPI_LOG(NDPI_PROTOCOL_DROPBOX, ndpi_struct, NDPI_LOG_DEBUG, "Found dropbox.\n");
|
||||||
ndpi_int_dropbox_add_connection(ndpi_struct, flow, 0);
|
ndpi_int_dropbox_add_connection(ndpi_struct, flow, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -63,14 +59,15 @@ static void ndpi_check_dropbox(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_DROPBOX, ndpi_struct, NDPI_LOG_DEBUG, "exclude dropbox.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DROPBOX);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_dropbox(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_dropbox(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search dropbox\n");
|
NDPI_LOG(NDPI_PROTOCOL_DROPBOX, ndpi_struct, NDPI_LOG_DEBUG, "dropbox detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_DROPBOX) {
|
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_DROPBOX) {
|
||||||
|
|||||||
+25
-32
@@ -24,18 +24,12 @@
|
|||||||
|
|
||||||
http://www.brasilbandalarga.com.br
|
http://www.brasilbandalarga.com.br
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_EAQ
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_EAQ
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
#define EAQ_DEFAULT_PORT 6000
|
#define EAQ_DEFAULT_PORT 6000
|
||||||
#define EAQ_DEFAULT_SIZE 16
|
#define EAQ_DEFAULT_SIZE 16
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_EAQ
|
||||||
static void ndpi_int_eaq_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_eaq_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_EAQ, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_EAQ, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -46,34 +40,33 @@ void ndpi_search_eaq(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 sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
|
u_int16_t sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search eaq\n");
|
if((packet->payload_packet_len != EAQ_DEFAULT_SIZE)
|
||||||
|
|| ((sport != EAQ_DEFAULT_PORT) && (dport != EAQ_DEFAULT_PORT))) {
|
||||||
|
exclude_eaq:
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_EAQ, ndpi_struct, NDPI_LOG_DEBUG, "Exclude eaq.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_EAQ);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
do {
|
if(packet->udp != NULL) {
|
||||||
if( (packet->payload_packet_len != EAQ_DEFAULT_SIZE) ||
|
u_int32_t seq = (packet->payload[0] * 1000) + (packet->payload[1] * 100) + (packet->payload[2] * 10) + packet->payload[3];
|
||||||
((sport != EAQ_DEFAULT_PORT) && (dport != EAQ_DEFAULT_PORT)) )
|
|
||||||
break;
|
if(flow->l4.udp.eaq_pkt_id == 0)
|
||||||
|
flow->l4.udp.eaq_sequence = seq;
|
||||||
if(packet->udp != NULL) {
|
else {
|
||||||
u_int32_t seq = (packet->payload[0] * 1000) + (packet->payload[1] * 100) + (packet->payload[2] * 10) + packet->payload[3];
|
if((flow->l4.udp.eaq_sequence == seq) || ((flow->l4.udp.eaq_sequence+1) == seq)) {
|
||||||
|
; /* Looks good */
|
||||||
if(flow->l4.udp.eaq_pkt_id == 0)
|
} else
|
||||||
flow->l4.udp.eaq_sequence = seq;
|
goto exclude_eaq;
|
||||||
else {
|
|
||||||
if( (flow->l4.udp.eaq_sequence != seq) &&
|
|
||||||
((flow->l4.udp.eaq_sequence+1) != seq)) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(++flow->l4.udp.eaq_pkt_id == 4) {
|
|
||||||
/* We have collected enough packets so we assume it's EAQ */
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found eaq\n");
|
|
||||||
ndpi_int_eaq_add_connection(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} while(0);
|
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
|
|
||||||
|
if(++flow->l4.udp.eaq_pkt_id == 4) {
|
||||||
|
/* We have collected enough packets so we assume it's EAQ */
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_EAQ, ndpi_struct, NDPI_LOG_DEBUG, "found eaq.\n");
|
||||||
|
ndpi_int_eaq_add_connection(ndpi_struct, flow);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
goto exclude_eaq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,15 +23,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_EDONKEY
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_EDONKEY
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_EDONKEY
|
||||||
static void ndpi_int_edonkey_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
static void ndpi_int_edonkey_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_EDONKEY, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_EDONKEY, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
@@ -164,23 +159,24 @@ static void ndpi_check_edonkey(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
|
|
||||||
/* Break after 20 packets. */
|
/* Break after 20 packets. */
|
||||||
if (flow->packet_counter > 20) {
|
if (flow->packet_counter > 20) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "Exclude EDONKEY.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_EDONKEY);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check if we so far detected the protocol in the request or not. */
|
/* Check if we so far detected the protocol in the request or not. */
|
||||||
if (flow->edonkey_stage == 0) {
|
if (flow->edonkey_stage == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "EDONKEY stage 0: \n");
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "EDONKEY stage 0: \n");
|
||||||
|
|
||||||
if (ndpi_edonkey_payload_check(packet->payload, payload_len)) {
|
if (ndpi_edonkey_payload_check(packet->payload, payload_len)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Possible EDONKEY request detected, we will look further for the response\n");
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "Possible EDONKEY request detected, we will look further for the response...\n");
|
||||||
|
|
||||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||||
flow->edonkey_stage = packet->packet_direction + 1;
|
flow->edonkey_stage = packet->packet_direction + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "EDONKEY stage %u: \n", flow->edonkey_stage);
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "EDONKEY stage %u: \n", flow->edonkey_stage);
|
||||||
|
|
||||||
/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
|
/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
|
||||||
if ((flow->edonkey_stage - packet->packet_direction) == 1) {
|
if ((flow->edonkey_stage - packet->packet_direction) == 1) {
|
||||||
@@ -189,10 +185,10 @@ static void ndpi_check_edonkey(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
|
|
||||||
/* This is a packet in another direction. Check if we find the proper response. */
|
/* This is a packet in another direction. Check if we find the proper response. */
|
||||||
if ((payload_len == 0) || (ndpi_edonkey_payload_check(packet->payload, payload_len))) {
|
if ((payload_len == 0) || (ndpi_edonkey_payload_check(packet->payload, payload_len))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found EDONKEY\n");
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "Found EDONKEY.\n");
|
||||||
ndpi_int_edonkey_add_connection(ndpi_struct, flow);
|
ndpi_int_edonkey_add_connection(ndpi_struct, flow);
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to EDONKEY, resetting the stage to 0\n");
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "The reply did not seem to belong to EDONKEY, resetting the stage to 0...\n");
|
||||||
flow->edonkey_stage = 0;
|
flow->edonkey_stage = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,7 +198,7 @@ static void ndpi_check_edonkey(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
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) {
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search EDONKEY\n");
|
NDPI_LOG(NDPI_PROTOCOL_EDONKEY, ndpi_struct, NDPI_LOG_DEBUG, "EDONKEY detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_EDONKEY) {
|
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_EDONKEY) {
|
||||||
|
|||||||
@@ -22,13 +22,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_FASTTRACK
|
#ifdef NDPI_PROTOCOL_FASTTRACK
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FASTTRACK
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_fasttrack_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_fasttrack_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
@@ -41,12 +39,13 @@ void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search FASTTRACK\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
if ( (packet->payload != NULL)
|
if ( (packet->payload != NULL)
|
||||||
&& (packet->payload_packet_len > 6)
|
&& (packet->payload_packet_len > 6)
|
||||||
&& (ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)) {
|
&& (ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected 0d0a at the end of the packet\n");
|
NDPI_LOG(NDPI_PROTOCOL_FASTTRACK, ndpi_struct, NDPI_LOG_TRACE, "detected 0d0a at the end of the packet.\n");
|
||||||
|
|
||||||
if (memcmp(packet->payload, "GIVE ", 5) == 0 && packet->payload_packet_len >= 8) {
|
if (memcmp(packet->payload, "GIVE ", 5) == 0 && packet->payload_packet_len >= 8) {
|
||||||
u_int16_t i;
|
u_int16_t i;
|
||||||
@@ -57,20 +56,20 @@ void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found FASTTRACK\n");
|
NDPI_LOG(NDPI_PROTOCOL_FASTTRACK, ndpi_struct, NDPI_LOG_TRACE, "FASTTRACK GIVE DETECTED\n");
|
||||||
ndpi_int_fasttrack_add_connection(ndpi_struct, flow);
|
ndpi_int_fasttrack_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /", 5) == 0) {
|
if (packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /", 5) == 0) {
|
||||||
u_int8_t a = 0;
|
u_int8_t a = 0;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected GET /. \n");
|
NDPI_LOG(NDPI_PROTOCOL_FASTTRACK, ndpi_struct, NDPI_LOG_TRACE, "detected GET /. \n");
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
for (a = 0; a < packet->parsed_lines; a++) {
|
for (a = 0; a < packet->parsed_lines; a++) {
|
||||||
if ((packet->line[a].len > 17 && memcmp(packet->line[a].ptr, "X-Kazaa-Username: ", 18) == 0)
|
if ((packet->line[a].len > 17 && memcmp(packet->line[a].ptr, "X-Kazaa-Username: ", 18) == 0)
|
||||||
|| (packet->line[a].len > 23 && memcmp(packet->line[a].ptr, "User-Agent: PeerEnabler/", 24) == 0)) {
|
|| (packet->line[a].len > 23 && memcmp(packet->line[a].ptr, "User-Agent: PeerEnabler/", 24) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_FASTTRACK, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"found FASTTRACK X-Kazaa-Username: || User-Agent: PeerEnabler/\n");
|
"detected X-Kazaa-Username: || User-Agent: PeerEnabler/\n");
|
||||||
ndpi_int_fasttrack_add_connection(ndpi_struct, flow);
|
ndpi_int_fasttrack_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -79,7 +78,8 @@ void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
|
|
||||||
exclude_fasttrack:
|
exclude_fasttrack:
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_FASTTRACK, ndpi_struct, NDPI_LOG_TRACE, "fasttrack/kazaa excluded.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FASTTRACK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+12
-12
@@ -22,14 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
/* include files */
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_FIESTA
|
#ifdef NDPI_PROTOCOL_FIESTA
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FIESTA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_fiesta_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_fiesta_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -39,15 +35,18 @@ static void ndpi_int_fiesta_add_connection(struct ndpi_detection_module_struct *
|
|||||||
void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
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 fiesta\n");
|
NDPI_LOG(NDPI_PROTOCOL_FIESTA, ndpi_struct, NDPI_LOG_DEBUG, "search fiesta.\n");
|
||||||
|
|
||||||
if (flow->l4.tcp.fiesta_stage == 0 && packet->payload_packet_len == 5
|
if (flow->l4.tcp.fiesta_stage == 0 && packet->payload_packet_len == 5
|
||||||
&& get_u_int16_t(packet->payload, 0) == ntohs(0x0407)
|
&& get_u_int16_t(packet->payload, 0) == ntohs(0x0407)
|
||||||
&& (packet->payload[2] == 0x08)
|
&& (packet->payload[2] == 0x08)
|
||||||
&& (packet->payload[4] == 0x00 || packet->payload[4] == 0x01)) {
|
&& (packet->payload[4] == 0x00 || packet->payload[4] == 0x01)) {
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe fiesta symmetric, first packet\n");
|
NDPI_LOG(NDPI_PROTOCOL_FIESTA, ndpi_struct, NDPI_LOG_DEBUG, "maybe fiesta symmetric, first packet.\n");
|
||||||
flow->l4.tcp.fiesta_stage = 1 + packet->packet_direction;
|
flow->l4.tcp.fiesta_stage = 1 + packet->packet_direction;
|
||||||
goto maybe_fiesta;
|
goto maybe_fiesta;
|
||||||
}
|
}
|
||||||
@@ -55,7 +54,7 @@ void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
&& ((packet->payload_packet_len > 1 && packet->payload_packet_len - 1 == packet->payload[0])
|
&& ((packet->payload_packet_len > 1 && packet->payload_packet_len - 1 == packet->payload[0])
|
||||||
|| (packet->payload_packet_len > 3 && packet->payload[0] == 0
|
|| (packet->payload_packet_len > 3 && packet->payload[0] == 0
|
||||||
&& get_l16(packet->payload, 1) == packet->payload_packet_len - 3))) {
|
&& get_l16(packet->payload, 1) == packet->payload_packet_len - 3))) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Maybe fiesta\n");
|
NDPI_LOG(NDPI_PROTOCOL_FIESTA, ndpi_struct, NDPI_LOG_DEBUG, "Maybe fiesta.\n");
|
||||||
goto maybe_fiesta;
|
goto maybe_fiesta;
|
||||||
}
|
}
|
||||||
if (flow->l4.tcp.fiesta_stage == (1 + packet->packet_direction)) {
|
if (flow->l4.tcp.fiesta_stage == (1 + packet->packet_direction)) {
|
||||||
@@ -80,15 +79,16 @@ void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_FIESTA, ndpi_struct, NDPI_LOG_DEBUG, "exclude fiesta.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FIESTA);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
maybe_fiesta:
|
maybe_fiesta:
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Stage is set to %d\n", flow->l4.tcp.fiesta_stage);
|
NDPI_LOG(NDPI_PROTOCOL_FIESTA, ndpi_struct, NDPI_LOG_DEBUG, "Stage is set to %d.\n", flow->l4.tcp.fiesta_stage);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
add_fiesta:
|
add_fiesta:
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found fiesta\n");
|
NDPI_LOG(NDPI_PROTOCOL_FIESTA, ndpi_struct, NDPI_LOG_DEBUG, "detected fiesta.\n");
|
||||||
ndpi_int_fiesta_add_connection(ndpi_struct, flow);
|
ndpi_int_fiesta_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,14 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_FILETOPIA
|
#ifdef NDPI_PROTOCOL_FILETOPIA
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FILETOPIA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_filetopia_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_filetopia_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -40,13 +36,14 @@ void ndpi_search_filetopia_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search Filetopia\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
if (flow->l4.tcp.filetopia_stage == 0) {
|
if (flow->l4.tcp.filetopia_stage == 0) {
|
||||||
if (packet->payload_packet_len >= 50 && packet->payload_packet_len <= 70
|
if (packet->payload_packet_len >= 50 && packet->payload_packet_len <= 70
|
||||||
&& packet->payload[0] == 0x03 && packet->payload[1] == 0x9a
|
&& packet->payload[0] == 0x03 && packet->payload[1] == 0x9a
|
||||||
&& packet->payload[3] == 0x22 && packet->payload[packet->payload_packet_len - 1] == 0x2b) {
|
&& packet->payload[3] == 0x22 && packet->payload[packet->payload_packet_len - 1] == 0x2b) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Filetopia stage 1 detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_FILETOPIA, ndpi_struct, NDPI_LOG_DEBUG, "Filetopia stage 1 detected\n");
|
||||||
flow->l4.tcp.filetopia_stage = 1;
|
flow->l4.tcp.filetopia_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -62,7 +59,7 @@ void ndpi_search_filetopia_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Filetopia stage 2 detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_FILETOPIA, ndpi_struct, NDPI_LOG_DEBUG, "Filetopia stage 2 detected\n");
|
||||||
flow->l4.tcp.filetopia_stage = 2;
|
flow->l4.tcp.filetopia_stage = 2;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -72,7 +69,7 @@ void ndpi_search_filetopia_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
if (packet->payload_packet_len >= 4 && packet->payload_packet_len <= 100
|
if (packet->payload_packet_len >= 4 && packet->payload_packet_len <= 100
|
||||||
&& packet->payload[0] == 0x03 && packet->payload[1] == 0x9a
|
&& packet->payload[0] == 0x03 && packet->payload[1] == 0x9a
|
||||||
&& (packet->payload[3] == 0x22 || packet->payload[3] == 0x23)) {
|
&& (packet->payload[3] == 0x22 || packet->payload[3] == 0x23)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Filetopia\n");
|
NDPI_LOG(NDPI_PROTOCOL_FILETOPIA, ndpi_struct, NDPI_LOG_DEBUG, "Filetopia detected\n");
|
||||||
ndpi_int_filetopia_add_connection(ndpi_struct, flow);
|
ndpi_int_filetopia_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -80,7 +77,7 @@ void ndpi_search_filetopia_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
|
|
||||||
end_filetopia_nothing_found:
|
end_filetopia_nothing_found:
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FILETOPIA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+5
-12
@@ -20,21 +20,14 @@
|
|||||||
* 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_FIX
|
#ifdef NDPI_PROTOCOL_FIX
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FIX
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
void ndpi_search_fix(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)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search FIX\n");
|
|
||||||
if(packet->tcp) {
|
if(packet->tcp) {
|
||||||
// 8=
|
// 8=
|
||||||
if(packet->payload[0] == 0x38 && packet->payload[1] == 0x3d) {
|
if(packet->payload[0] == 0x38 && packet->payload[1] == 0x3d) {
|
||||||
@@ -44,7 +37,7 @@ void ndpi_search_fix(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
packet->payload[4] == 0x58 &&
|
packet->payload[4] == 0x58 &&
|
||||||
packet->payload[5] == 0x2e) {
|
packet->payload[5] == 0x2e) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found FIX\n");
|
NDPI_LOG(NDPI_PROTOCOL_FIX, ndpi_struct, NDPI_LOG_DEBUG, "FIX detected.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FIX, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FIX, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -54,14 +47,14 @@ void ndpi_search_fix(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
packet->payload[4] == 0x39 &&
|
packet->payload[4] == 0x39 &&
|
||||||
packet->payload[5] == 0x3d) {
|
packet->payload[5] == 0x3d) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found FIX\n");
|
NDPI_LOG(NDPI_PROTOCOL_FIX, ndpi_struct, NDPI_LOG_DEBUG, "FIX detected.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FIX, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FIX, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* exclude FIX */
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FIX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,14 +22,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_FLORENSIA
|
#ifdef NDPI_PROTOCOL_FLORENSIA
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FLORENSIA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_florensia_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_florensia_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -40,40 +37,44 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search florensia\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
|
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "search florensia.\n");
|
||||||
|
|
||||||
if (packet->tcp != NULL) {
|
if (packet->tcp != NULL) {
|
||||||
if (packet->payload_packet_len == 5 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
if (packet->payload_packet_len == 5 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
||||||
&& packet->payload[2] == 0x65 && packet->payload[4] == 0xff) {
|
&& packet->payload[2] == 0x65 && packet->payload[4] == 0xff) {
|
||||||
if (flow->florensia_stage == 1) {
|
if (flow->florensia_stage == 1) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
|
||||||
ndpi_florensia_add_connection(ndpi_struct, flow);
|
ndpi_florensia_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
|
||||||
flow->florensia_stage = 1;
|
flow->florensia_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len > 8 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
if (packet->payload_packet_len > 8 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
||||||
&& get_u_int16_t(packet->payload, 2) == htons(0x0201) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) {
|
&& get_u_int16_t(packet->payload, 2) == htons(0x0201) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
|
||||||
flow->florensia_stage = 1;
|
flow->florensia_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 406 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
if (packet->payload_packet_len == 406 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
||||||
&& packet->payload[2] == 0x63) {
|
&& packet->payload[2] == 0x63) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
|
||||||
flow->florensia_stage = 1;
|
flow->florensia_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 12 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
if (packet->payload_packet_len == 12 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
||||||
&& get_u_int16_t(packet->payload, 2) == htons(0x0301)) {
|
&& get_u_int16_t(packet->payload, 2) == htons(0x0301)) {
|
||||||
if (flow->florensia_stage == 1) {
|
if (flow->florensia_stage == 1) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
|
||||||
ndpi_florensia_add_connection(ndpi_struct, flow);
|
ndpi_florensia_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
|
||||||
flow->florensia_stage = 1;
|
flow->florensia_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -81,19 +82,19 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
if (flow->florensia_stage == 1) {
|
if (flow->florensia_stage == 1) {
|
||||||
if (packet->payload_packet_len == 8 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
if (packet->payload_packet_len == 8 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
||||||
&& get_u_int16_t(packet->payload, 2) == htons(0x0302) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) {
|
&& get_u_int16_t(packet->payload, 2) == htons(0x0302) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found florensia asymmetrically\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia asymmetrically.\n");
|
||||||
ndpi_florensia_add_connection(ndpi_struct, flow);
|
ndpi_florensia_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 24 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
if (packet->payload_packet_len == 24 && get_l16(packet->payload, 0) == packet->payload_packet_len
|
||||||
&& get_u_int16_t(packet->payload, 2) == htons(0x0202)
|
&& get_u_int16_t(packet->payload, 2) == htons(0x0202)
|
||||||
&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0xFFFFFFFF)) {
|
&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0xFFFFFFFF)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
|
||||||
ndpi_florensia_add_connection(ndpi_struct, flow);
|
ndpi_florensia_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->packet_counter < 10 && get_l16(packet->payload, 0) == packet->payload_packet_len) {
|
if (flow->packet_counter < 10 && get_l16(packet->payload, 0) == packet->payload_packet_len) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe florensia\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -102,19 +103,20 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
if (packet->udp != NULL) {
|
if (packet->udp != NULL) {
|
||||||
if (flow->florensia_stage == 0 && packet->payload_packet_len == 6
|
if (flow->florensia_stage == 0 && packet->payload_packet_len == 6
|
||||||
&& get_u_int16_t(packet->payload, 0) == ntohs(0x0503) && get_u_int32_t(packet->payload, 2) == htonl(0xFFFF0000)) {
|
&& get_u_int16_t(packet->payload, 0) == ntohs(0x0503) && get_u_int32_t(packet->payload, 2) == htonl(0xFFFF0000)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
|
||||||
flow->florensia_stage = 1;
|
flow->florensia_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->florensia_stage == 1 && packet->payload_packet_len == 8
|
if (flow->florensia_stage == 1 && packet->payload_packet_len == 8
|
||||||
&& get_u_int16_t(packet->payload, 0) == ntohs(0x0500) && get_u_int16_t(packet->payload, 4) == htons(0x4191)) {
|
&& get_u_int16_t(packet->payload, 0) == ntohs(0x0500) && get_u_int16_t(packet->payload, 4) == htons(0x4191)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
|
||||||
ndpi_florensia_add_connection(ndpi_struct, flow);
|
ndpi_florensia_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "exclude florensia.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FLORENSIA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -21,14 +21,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_FTP_CONTROL
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FTP_CONTROL
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_FTP_CONTROL
|
||||||
|
|
||||||
static void ndpi_int_ftp_control_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
static void ndpi_int_ftp_control_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FTP_CONTROL, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FTP_CONTROL, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -948,29 +944,31 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
|
|
||||||
/* Exclude SMTP, which uses similar commands. */
|
/* Exclude SMTP, which uses similar commands. */
|
||||||
if (packet->tcp->dest == htons(25) || packet->tcp->source == htons(25)) {
|
if (packet->tcp->dest == htons(25) || packet->tcp->source == htons(25)) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_CONTROL.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_CONTROL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Break after 20 packets. */
|
/* Break after 20 packets. */
|
||||||
if (flow->packet_counter > 20) {
|
if (flow->packet_counter > 20) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_CONTROL.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_CONTROL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check if we so far detected the protocol in the request or not. */
|
/* Check if we so far detected the protocol in the request or not. */
|
||||||
if (flow->ftp_control_stage == 0) {
|
if (flow->ftp_control_stage == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "FTP_CONTROL stage 0: \n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL stage 0: \n");
|
||||||
|
|
||||||
if ((payload_len > 0) && ndpi_ftp_control_check_request(packet->payload, payload_len)) {
|
if ((payload_len > 0) && ndpi_ftp_control_check_request(packet->payload, payload_len)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Possible FTP_CONTROL request detected, we will look further for the response..\n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Possible FTP_CONTROL request detected, we will look further for the response...\n");
|
||||||
|
|
||||||
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
/* Encode the direction of the packet in the stage, so we will know when we need to look for the response packet. */
|
||||||
flow->ftp_control_stage = packet->packet_direction + 1;
|
flow->ftp_control_stage = packet->packet_direction + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "FTP_CONTROL stage %u: \n", flow->ftp_control_stage);
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL stage %u: \n", flow->ftp_control_stage);
|
||||||
|
|
||||||
/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
|
/* At first check, if this is for sure a response packet (in another direction. If not, do nothing now and return. */
|
||||||
if ((flow->ftp_control_stage - packet->packet_direction) == 1) {
|
if ((flow->ftp_control_stage - packet->packet_direction) == 1) {
|
||||||
@@ -979,10 +977,10 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
|
|
||||||
/* This is a packet in another direction. Check if we find the proper response. */
|
/* This is a packet in another direction. Check if we find the proper response. */
|
||||||
if ((payload_len > 0) && ndpi_ftp_control_check_response(packet->payload, payload_len)) {
|
if ((payload_len > 0) && ndpi_ftp_control_check_response(packet->payload, payload_len)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found FTP_CONTROL\n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "Found FTP_CONTROL.\n");
|
||||||
ndpi_int_ftp_control_add_connection(ndpi_struct, flow);
|
ndpi_int_ftp_control_add_connection(ndpi_struct, flow);
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "The reply did not seem to belong to FTP_CONTROL, resetting the stage to 0\n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "The reply did not seem to belong to FTP_CONTROL, resetting the stage to 0...\n");
|
||||||
flow->ftp_control_stage = 0;
|
flow->ftp_control_stage = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -992,7 +990,7 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
void ndpi_search_ftp_control(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
void ndpi_search_ftp_control(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 FTP_CONTROL\n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_CONTROL, ndpi_struct, NDPI_LOG_DEBUG, "FTP_CONTROL detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_FTP_CONTROL) {
|
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_FTP_CONTROL) {
|
||||||
|
|||||||
@@ -23,14 +23,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_FTP_DATA
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FTP_DATA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_FTP_DATA
|
||||||
static void ndpi_int_ftp_data_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
static void ndpi_int_ftp_data_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FTP_DATA, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FTP_DATA, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
@@ -228,21 +223,22 @@ static void ndpi_check_ftp_data(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
|| ndpi_match_ftp_data_port(ndpi_struct, flow)
|
|| ndpi_match_ftp_data_port(ndpi_struct, flow)
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found FTP_DATA request\n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_DATA, ndpi_struct, NDPI_LOG_DEBUG, "Possible FTP_DATA request detected...\n");
|
||||||
ndpi_int_ftp_data_add_connection(ndpi_struct, flow);
|
ndpi_int_ftp_data_add_connection(ndpi_struct, flow);
|
||||||
} else
|
} else
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_DATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_ftp_data(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
void ndpi_search_ftp_data(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
|
|
||||||
/* Break after 20 packets. */
|
/* Break after 20 packets. */
|
||||||
if(flow->packet_counter > 20) {
|
if(flow->packet_counter > 20) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_FTP_DATA, ndpi_struct, NDPI_LOG_DEBUG, "Exclude FTP_DATA.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FTP_DATA);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search FTP_DATA\n");
|
NDPI_LOG(NDPI_PROTOCOL_FTP_DATA, ndpi_struct, NDPI_LOG_DEBUG, "FTP_DATA detection...\n");
|
||||||
ndpi_check_ftp_data(ndpi_struct, flow);
|
ndpi_check_ftp_data(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-11
@@ -17,16 +17,10 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_GIT
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GIT
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_GIT
|
||||||
|
|
||||||
#define GIT_PORT 9418
|
#define GIT_PORT 9418
|
||||||
|
|
||||||
@@ -35,8 +29,6 @@ void ndpi_search_git(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct * packet = &flow->packet;
|
struct ndpi_packet_struct * packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search Git\n");
|
|
||||||
|
|
||||||
if((packet->tcp != NULL) && (packet->payload_packet_len > 4)) {
|
if((packet->tcp != NULL) && (packet->payload_packet_len > 4)) {
|
||||||
if((ntohs(packet->tcp->source) == GIT_PORT)
|
if((ntohs(packet->tcp->source) == GIT_PORT)
|
||||||
|| (ntohs(packet->tcp->dest) == GIT_PORT)) {
|
|| (ntohs(packet->tcp->dest) == GIT_PORT)) {
|
||||||
@@ -60,14 +52,15 @@ void ndpi_search_git(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(found_git) {
|
if(found_git) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Git\n");
|
NDPI_LOG(NDPI_PROTOCOL_GIT, ndpi_struct, NDPI_LOG_DEBUG, "found Git.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GIT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GIT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_GIT, ndpi_struct, NDPI_LOG_DEBUG, "exclude Git.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_GIT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,15 +22,13 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
/* include files */
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_GNUTELLA
|
#ifdef NDPI_PROTOCOL_GNUTELLA
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GNUTELLA
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_gnutella_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_gnutella_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow/* , */
|
struct ndpi_flow_struct *flow/* , */
|
||||||
/* ndpi_protocol_type_t protocol_type */)
|
/* ndpi_protocol_type_t protocol_type */)
|
||||||
@@ -40,21 +38,22 @@ static void ndpi_int_gnutella_add_connection(struct ndpi_detection_module_struct
|
|||||||
struct ndpi_id_struct *dst = flow->dst;
|
struct ndpi_id_struct *dst = flow->dst;
|
||||||
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GNUTELLA, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GNUTELLA, NDPI_PROTOCOL_UNKNOWN);
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found GNUTELLA\n");
|
|
||||||
|
|
||||||
if (src != NULL) {
|
if (src != NULL) {
|
||||||
src->gnutella_ts = packet->tick_timestamp;
|
src->gnutella_ts = packet->tick_timestamp;
|
||||||
if (packet->udp != NULL) {
|
if (packet->udp != NULL) {
|
||||||
if (!src->detected_gnutella_udp_port1) {
|
if (!src->detected_gnutella_udp_port1) {
|
||||||
src->detected_gnutella_udp_port1 = (packet->udp->source);
|
src->detected_gnutella_udp_port1 = (packet->udp->source);
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct,
|
||||||
"GNUTELLA UDP PORT1 DETECTED as %u\n", src->detected_gnutella_udp_port1);
|
NDPI_LOG_DEBUG, "GNUTELLA UDP PORT1 DETECTED as %u\n",
|
||||||
|
src->detected_gnutella_udp_port1);
|
||||||
|
|
||||||
} else if ((ntohs(packet->udp->source) != src->detected_gnutella_udp_port1)
|
} else if ((ntohs(packet->udp->source) != src->detected_gnutella_udp_port1)
|
||||||
&& !src->detected_gnutella_udp_port2) {
|
&& !src->detected_gnutella_udp_port2) {
|
||||||
src->detected_gnutella_udp_port2 = (packet->udp->source);
|
src->detected_gnutella_udp_port2 = (packet->udp->source);
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct,
|
||||||
"GNUTELLA UDP PORT2 DETECTED as %u\n", src->detected_gnutella_udp_port2);
|
NDPI_LOG_DEBUG, "GNUTELLA UDP PORT2 DETECTED as %u\n",
|
||||||
|
src->detected_gnutella_udp_port2);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,17 +71,16 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
struct ndpi_id_struct *dst = flow->dst;
|
struct ndpi_id_struct *dst = flow->dst;
|
||||||
|
|
||||||
u_int16_t c;
|
u_int16_t c;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search GNUTELLA\n");
|
|
||||||
|
|
||||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_GNUTELLA) {
|
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_GNUTELLA) {
|
||||||
if (src != NULL && ((u_int32_t)
|
if (src != NULL && ((u_int32_t)
|
||||||
(packet->tick_timestamp - src->gnutella_ts) < ndpi_struct->gnutella_timeout)) {
|
(packet->tick_timestamp - src->gnutella_ts) < ndpi_struct->gnutella_timeout)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "save src connection packet detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "gnutella : save src connection packet detected\n");
|
||||||
src->gnutella_ts = packet->tick_timestamp;
|
src->gnutella_ts = packet->tick_timestamp;
|
||||||
} else if (dst != NULL && ((u_int32_t)
|
} else if (dst != NULL && ((u_int32_t)
|
||||||
(packet->tick_timestamp - dst->gnutella_ts) < ndpi_struct->gnutella_timeout)) {
|
(packet->tick_timestamp - dst->gnutella_ts) < ndpi_struct->gnutella_timeout)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "save dst connection packet detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "gnutella : save dst connection packet detected\n");
|
||||||
dst->gnutella_ts = packet->tick_timestamp;
|
dst->gnutella_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
if (src != NULL && (packet->tick_timestamp - src->gnutella_ts) > ndpi_struct->gnutella_timeout) {
|
if (src != NULL && (packet->tick_timestamp - src->gnutella_ts) > ndpi_struct->gnutella_timeout) {
|
||||||
@@ -104,11 +102,13 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
if (packet->tcp != NULL) {
|
if (packet->tcp != NULL) {
|
||||||
/* this case works asymmetrically */
|
/* this case works asymmetrically */
|
||||||
if (packet->payload_packet_len > 10 && memcmp(packet->payload, "GNUTELLA/", 9) == 0) {
|
if (packet->payload_packet_len > 10 && memcmp(packet->payload, "GNUTELLA/", 9) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "GNUTELLA DETECTED\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* this case works asymmetrically */
|
/* this case works asymmetrically */
|
||||||
if (packet->payload_packet_len > 17 && memcmp(packet->payload, "GNUTELLA CONNECT/", 17) == 0) {
|
if (packet->payload_packet_len > 17 && memcmp(packet->payload, "GNUTELLA CONNECT/", 17) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "GNUTELLA DETECTED\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -123,6 +123,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
|| (packet->line[c].len > 7 && memcmp(packet->line[c].ptr, "X-Queue:", 8) == 0)
|
|| (packet->line[c].len > 7 && memcmp(packet->line[c].ptr, "X-Queue:", 8) == 0)
|
||||||
|| (packet->line[c].len > 36 && memcmp(packet->line[c].ptr,
|
|| (packet->line[c].len > 36 && memcmp(packet->line[c].ptr,
|
||||||
"Content-Type: application/x-gnutella-", 37) == 0)) {
|
"Content-Type: application/x-gnutella-", 37) == 0)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG, "DETECTED GNUTELLA GET.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -134,6 +135,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& memcmp(packet->user_agent_line.ptr, "BearShare Lite ", 15) == 0)
|
&& memcmp(packet->user_agent_line.ptr, "BearShare Lite ", 15) == 0)
|
||||||
|| (packet->accept_line.ptr != NULL && packet->accept_line.len > 24
|
|| (packet->accept_line.ptr != NULL && packet->accept_line.len > 24
|
||||||
&& memcmp(packet->accept_line.ptr, "application n/x-gnutella", 24) == 0)) {
|
&& memcmp(packet->accept_line.ptr, "application n/x-gnutella", 24) == 0)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG, "DETECTED GNUTELLA GET.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,7 +151,8 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (c < (packet->payload_packet_len - 9) && memcmp(&packet->payload[c], "urn:sha1:", 9) == 0) {
|
if (c < (packet->payload_packet_len - 9) && memcmp(&packet->payload[c], "urn:sha1:", 9) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected GET /get/ or GET /uri-res/\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"detected GET /get/ or GET /uri-res/.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,14 +161,14 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
/* answer to this packet is HTTP/1.1 ..... Content-Type: application/x-gnutella-packets,
|
/* answer to this packet is HTTP/1.1 ..... Content-Type: application/x-gnutella-packets,
|
||||||
* it is searched in the upper paragraph. */
|
* it is searched in the upper paragraph. */
|
||||||
if (packet->payload_packet_len > 30 && memcmp(packet->payload, "HEAD /gnutella/push-proxy?", 26) == 0) {
|
if (packet->payload_packet_len > 30 && memcmp(packet->payload, "HEAD /gnutella/push-proxy?", 26) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected HEAD /gnutella/push-proxy?\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "detected HEAD /gnutella/push-proxy?\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* haven't found any trace with this pattern */
|
/* haven't found any trace with this pattern */
|
||||||
if (packet->payload_packet_len == 46
|
if (packet->payload_packet_len == 46
|
||||||
&& memcmp(packet->payload, "\x50\x55\x53\x48\x20\x67\x75\x69\x64\x3a", 10) == 0) {
|
&& memcmp(packet->payload, "\x50\x55\x53\x48\x20\x67\x75\x69\x64\x3a", 10) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"detected \x50\x55\x53\x48\x20\x67\x75\x69\x64\x3a\n");
|
"detected \x50\x55\x53\x48\x20\x67\x75\x69\x64\x3a\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -186,7 +189,8 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
44) == 0) || (end - c > 10 && memcmp(&packet->payload[c], "\r\nX-Queue:", 10) == 0)
|
44) == 0) || (end - c > 10 && memcmp(&packet->payload[c], "\r\nX-Queue:", 10) == 0)
|
||||||
|| (end - c > 13 && memcmp(&packet->payload[c], "\r\nX-Features:", 13) == 0)) {
|
|| (end - c > 13 && memcmp(&packet->payload[c], "\r\nX-Features:", 13) == 0)) {
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "FOXY :: GNUTELLA GET 2 DETECTED\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA,
|
||||||
|
ndpi_struct, NDPI_LOG_TRACE, "FOXY :: GNUTELLA GET 2 DETECTED\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -198,7 +202,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
if (packet->payload_packet_len > 1 && packet->payload[packet->payload_packet_len - 1] == 0x0a
|
if (packet->payload_packet_len > 1 && packet->payload[packet->payload_packet_len - 1] == 0x0a
|
||||||
&& packet->payload[packet->payload_packet_len - 2] == 0x0a) {
|
&& packet->payload[packet->payload_packet_len - 2] == 0x0a) {
|
||||||
if (packet->payload_packet_len > 3 && memcmp(packet->payload, "GIV", 3) == 0) {
|
if (packet->payload_packet_len > 3 && memcmp(packet->payload, "GIV", 3) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "MORPHEUS GIV DETECTED\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "MORPHEUS GIV DETECTED\n");
|
||||||
/* Not Excluding the flow now.. We shall Check the next Packet too for Gnutella Patterns */
|
/* Not Excluding the flow now.. We shall Check the next Packet too for Gnutella Patterns */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -207,21 +211,21 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
if (packet->payload_packet_len == 46 && get_u_int32_t(packet->payload, 0) == htonl(0x802c0103) &&
|
if (packet->payload_packet_len == 46 && get_u_int32_t(packet->payload, 0) == htonl(0x802c0103) &&
|
||||||
get_u_int32_t(packet->payload, 4) == htonl(0x01000300) && get_u_int32_t(packet->payload, 8) == htonl(0x00002000) &&
|
get_u_int32_t(packet->payload, 4) == htonl(0x01000300) && get_u_int32_t(packet->payload, 8) == htonl(0x00002000) &&
|
||||||
get_u_int16_t(packet->payload, 12) == htons(0x0034)) {
|
get_u_int16_t(packet->payload, 12) == htons(0x0034)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella len == 46\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "detected gnutella len == 46.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 49 &&
|
if (packet->payload_packet_len == 49 &&
|
||||||
memcmp(packet->payload, "\x80\x2f\x01\x03\x01\x00\x06\x00\x00\x00\x20\x00\x00\x34\x00\x00\xff\x4d\x6c",
|
memcmp(packet->payload, "\x80\x2f\x01\x03\x01\x00\x06\x00\x00\x00\x20\x00\x00\x34\x00\x00\xff\x4d\x6c",
|
||||||
19) == 0) {
|
19) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella len == 49\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "detected gnutella len == 49.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 89 && memcmp(&packet->payload[43], "\x20\x4d\x6c", 3) == 0 &&
|
if (packet->payload_packet_len == 89 && memcmp(&packet->payload[43], "\x20\x4d\x6c", 3) == 0 &&
|
||||||
memcmp(packet->payload, "\x16\x03\x01\x00\x54\x01\x00\x00\x50\x03\x01\x4d\x6c", 13) == 0 &&
|
memcmp(packet->payload, "\x16\x03\x01\x00\x54\x01\x00\x00\x50\x03\x01\x4d\x6c", 13) == 0 &&
|
||||||
memcmp(&packet->payload[76], "\x00\x02\x00\x34\x01\x00\x00\x05", 8) == 0) {
|
memcmp(&packet->payload[76], "\x00\x02\x00\x34\x01\x00\x00\x05", 8) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"detected gnutella asymmetrically len == 388.\n");
|
"detected gnutella asymmetrically len == 388.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -231,7 +235,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& get_u_int16_t(packet->payload, 8) == htons(0x4903)
|
&& get_u_int16_t(packet->payload, 8) == htons(0x4903)
|
||||||
&& get_u_int16_t(packet->payload, 76) == htons(0x0002)
|
&& get_u_int16_t(packet->payload, 76) == htons(0x0002)
|
||||||
&& get_u_int32_t(packet->payload, 78) == htonl(0x00340100)) {
|
&& get_u_int32_t(packet->payload, 78) == htonl(0x00340100)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected len == 82\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "detected len == 82.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -240,7 +244,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
if (src != NULL && (packet->udp->source == src->detected_gnutella_udp_port1 ||
|
if (src != NULL && (packet->udp->source == src->detected_gnutella_udp_port1 ||
|
||||||
packet->udp->source == src->detected_gnutella_udp_port2) &&
|
packet->udp->source == src->detected_gnutella_udp_port2) &&
|
||||||
(packet->tick_timestamp - src->gnutella_ts) < ndpi_struct->gnutella_timeout) {
|
(packet->tick_timestamp - src->gnutella_ts) < ndpi_struct->gnutella_timeout) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "port based detection\n\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG, "port based detection\n\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
/* observations:
|
/* observations:
|
||||||
@@ -253,7 +257,8 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& packet->payload[16] == 0x41 && packet->payload[17] == 0x01
|
&& packet->payload[16] == 0x41 && packet->payload[17] == 0x01
|
||||||
&& packet->payload[18] == 0x00 && packet->payload[19] == 0x00
|
&& packet->payload[18] == 0x00 && packet->payload[19] == 0x00
|
||||||
&& packet->payload[20] == 0x00 && packet->payload[21] == 0x00 && packet->payload[22] == 0x00) {
|
&& packet->payload[20] == 0x00 && packet->payload[21] == 0x00 && packet->payload[22] == 0x00) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 23\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 23.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@@ -262,25 +267,29 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& packet->payload[26] == 0x50 && packet->payload[27] == 0x40
|
&& packet->payload[26] == 0x50 && packet->payload[27] == 0x40
|
||||||
&& packet->payload[28] == 0x83 && packet->payload[29] == 0x53
|
&& packet->payload[28] == 0x83 && packet->payload[29] == 0x53
|
||||||
&& packet->payload[30] == 0x43 && packet->payload[31] == 0x50 && packet->payload[32] == 0x41) {
|
&& packet->payload[30] == 0x43 && packet->payload[31] == 0x50 && packet->payload[32] == 0x41) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 35\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 35.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 32
|
if (packet->payload_packet_len == 32
|
||||||
&& (memcmp(&packet->payload[16], "\x31\x01\x00\x09\x00\x00\x00\x4c\x49\x4d\x45", 11) == 0)) {
|
&& (memcmp(&packet->payload[16], "\x31\x01\x00\x09\x00\x00\x00\x4c\x49\x4d\x45", 11) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 32\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 32.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 34 && (memcmp(&packet->payload[25], "SCP@", 4) == 0)
|
if (packet->payload_packet_len == 34 && (memcmp(&packet->payload[25], "SCP@", 4) == 0)
|
||||||
&& (memcmp(&packet->payload[30], "DNA@", 4) == 0)) {
|
&& (memcmp(&packet->payload[30], "DNA@", 4) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 34\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 34.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ((packet->payload_packet_len == 73 || packet->payload_packet_len == 96)
|
if ((packet->payload_packet_len == 73 || packet->payload_packet_len == 96)
|
||||||
&& memcmp(&packet->payload[32], "urn:sha1:", 9) == 0) {
|
&& memcmp(&packet->payload[32], "urn:sha1:", 9) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 73,96\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 73,96.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -299,7 +308,8 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& (memcmp(&packet->payload[6], "\x01\x01\x5c\x1b\x50\x55\x53\x48\x48\x10", 10) == 0))
|
&& (memcmp(&packet->payload[6], "\x01\x01\x5c\x1b\x50\x55\x53\x48\x48\x10", 10) == 0))
|
||||||
|| (packet->payload_packet_len > 200 && packet->payload_packet_len < 300 && packet->payload[3] == 0x03)
|
|| (packet->payload_packet_len > 200 && packet->payload_packet_len < 300 && packet->payload[3] == 0x03)
|
||||||
|| (packet->payload_packet_len > 300 && (packet->payload[3] == 0x01 || packet->payload[3] == 0x03))) {
|
|| (packet->payload_packet_len > 300 && (packet->payload[3] == 0x01 || packet->payload[3] == 0x03))) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, GND\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, GND.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -307,13 +317,15 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
|
|
||||||
if ((packet->payload_packet_len == 32)
|
if ((packet->payload_packet_len == 32)
|
||||||
&& memcmp(&packet->payload[16], "\x31\x01\x00\x09\x00\x00\x00", 7) == 0) {
|
&& memcmp(&packet->payload[16], "\x31\x01\x00\x09\x00\x00\x00", 7) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 32 ii\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 32 ii.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ((packet->payload_packet_len == 23)
|
if ((packet->payload_packet_len == 23)
|
||||||
&& memcmp(&packet->payload[16], "\x00\x01\x00\x00\x00\x00\x00", 7) == 0) {
|
&& memcmp(&packet->payload[16], "\x00\x01\x00\x00\x00\x00\x00", 7) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected gnutella udp, len = 23 ii\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"detected gnutella udp, len = 23 ii.\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -338,7 +350,8 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& flow->l4.tcp.gnutella_msg_id[1] == packet->payload[2]
|
&& flow->l4.tcp.gnutella_msg_id[1] == packet->payload[2]
|
||||||
&& flow->l4.tcp.gnutella_msg_id[2] == packet->payload[4]
|
&& flow->l4.tcp.gnutella_msg_id[2] == packet->payload[4]
|
||||||
&& NDPI_SRC_OR_DST_HAS_PROTOCOL(src, dst, NDPI_PROTOCOL_GNUTELLA)) {
|
&& NDPI_SRC_OR_DST_HAS_PROTOCOL(src, dst, NDPI_PROTOCOL_GNUTELLA)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "GNUTELLA DETECTED due to message ID match (NEONet protocol)\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "GNUTELLA DETECTED due to message ID match (NEONet protocol)\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -348,14 +361,15 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
&& flow->l4.tcp.gnutella_msg_id[1] == packet->payload[2]
|
&& flow->l4.tcp.gnutella_msg_id[1] == packet->payload[2]
|
||||||
&& flow->l4.tcp.gnutella_msg_id[2] == packet->payload[4]
|
&& flow->l4.tcp.gnutella_msg_id[2] == packet->payload[4]
|
||||||
&& NDPI_SRC_OR_DST_HAS_PROTOCOL(src, dst, NDPI_PROTOCOL_GNUTELLA)) {
|
&& NDPI_SRC_OR_DST_HAS_PROTOCOL(src, dst, NDPI_PROTOCOL_GNUTELLA)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "GNUTELLA DETECTED due to message ID match (NEONet protocol)\n");
|
NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "GNUTELLA DETECTED due to message ID match (NEONet protocol)\n");
|
||||||
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
ndpi_int_gnutella_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_GNUTELLA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,14 +18,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_GTP
|
#ifdef NDPI_PROTOCOL_GTP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GTP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
struct gtp_header_generic {
|
struct gtp_header_generic {
|
||||||
u_int8_t flags, message_type;
|
u_int8_t flags, message_type;
|
||||||
u_int16_t message_len;
|
u_int16_t message_len;
|
||||||
@@ -54,7 +50,7 @@ static void ndpi_check_gtp(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
u_int16_t message_len = ntohs(gtp->message_len);
|
u_int16_t message_len = ntohs(gtp->message_len);
|
||||||
|
|
||||||
if(message_len <= (payload_len-sizeof(struct gtp_header_generic))) {
|
if(message_len <= (payload_len-sizeof(struct gtp_header_generic))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found gtp\n");
|
NDPI_LOG(NDPI_PROTOCOL_GTP, ndpi_struct, NDPI_LOG_DEBUG, "Found gtp.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GTP, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GTP, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -62,7 +58,7 @@ static void ndpi_check_gtp(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_GTP);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,7 +66,7 @@ void ndpi_search_gtp(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 gtp\n");
|
NDPI_LOG(NDPI_PROTOCOL_GTP, ndpi_struct, NDPI_LOG_DEBUG, "gtp detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_GTP)
|
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_GTP)
|
||||||
|
|||||||
@@ -22,14 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
#ifdef NDPI_PROTOCOL_GUILDWARS
|
#ifdef NDPI_PROTOCOL_GUILDWARS
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GUILDWARS
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_guildwars_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_guildwars_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -39,31 +35,35 @@ static void ndpi_int_guildwars_add_connection(struct ndpi_detection_module_struc
|
|||||||
void ndpi_search_guildwars_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_guildwars_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
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 guildwars\n");
|
NDPI_LOG(NDPI_PROTOCOL_GUILDWARS, ndpi_struct, NDPI_LOG_DEBUG, "search guildwars.\n");
|
||||||
|
|
||||||
if (packet->payload_packet_len == 64 && get_u_int16_t(packet->payload, 1) == ntohs(0x050c)
|
if (packet->payload_packet_len == 64 && get_u_int16_t(packet->payload, 1) == ntohs(0x050c)
|
||||||
&& memcmp(&packet->payload[50], "@2&P", 4) == 0) {
|
&& memcmp(&packet->payload[50], "@2&P", 4) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found GuildWars version 29.350\n");
|
NDPI_LOG(NDPI_PROTOCOL_GUILDWARS, ndpi_struct, NDPI_LOG_DEBUG, "GuildWars version 29.350: found.\n");
|
||||||
ndpi_int_guildwars_add_connection(ndpi_struct, flow);
|
ndpi_int_guildwars_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 16 && get_u_int16_t(packet->payload, 1) == ntohs(0x040c)
|
if (packet->payload_packet_len == 16 && get_u_int16_t(packet->payload, 1) == ntohs(0x040c)
|
||||||
&& get_u_int16_t(packet->payload, 4) == ntohs(0xa672)
|
&& get_u_int16_t(packet->payload, 4) == ntohs(0xa672)
|
||||||
&& packet->payload[8] == 0x01 && packet->payload[12] == 0x04) {
|
&& packet->payload[8] == 0x01 && packet->payload[12] == 0x04) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found GuildWars version 29.350\n");
|
NDPI_LOG(NDPI_PROTOCOL_GUILDWARS, ndpi_struct, NDPI_LOG_DEBUG, "GuildWars version 29.350: found.\n");
|
||||||
ndpi_int_guildwars_add_connection(ndpi_struct, flow);
|
ndpi_int_guildwars_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 21 && get_u_int16_t(packet->payload, 0) == ntohs(0x0100)
|
if (packet->payload_packet_len == 21 && get_u_int16_t(packet->payload, 0) == ntohs(0x0100)
|
||||||
&& get_u_int32_t(packet->payload, 5) == ntohl(0xf1001000)
|
&& get_u_int32_t(packet->payload, 5) == ntohl(0xf1001000)
|
||||||
&& packet->payload[9] == 0x01) {
|
&& packet->payload[9] == 0x01) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found GuildWars version 216.107.245.50\n");
|
NDPI_LOG(NDPI_PROTOCOL_GUILDWARS, ndpi_struct, NDPI_LOG_DEBUG, "GuildWars version 216.107.245.50: found.\n");
|
||||||
ndpi_int_guildwars_add_connection(ndpi_struct, flow);
|
ndpi_int_guildwars_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_GUILDWARS, ndpi_struct, NDPI_LOG_DEBUG, "exclude guildwars.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_GUILDWARS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+10
-17
@@ -7,15 +7,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_H323
|
#ifdef NDPI_PROTOCOL_H323
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_H323
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
struct tpkt {
|
struct tpkt {
|
||||||
u_int8_t version, reserved;
|
u_int8_t version, reserved;
|
||||||
u_int16_t len;
|
u_int16_t len;
|
||||||
@@ -26,10 +21,10 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
u_int16_t dport = 0, sport = 0;
|
u_int16_t dport = 0, sport = 0;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search H323\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "search H323.\n");
|
||||||
|
|
||||||
if(packet->tcp != NULL) {
|
if(packet->tcp != NULL) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculated dport over tcp\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over tcp.\n");
|
||||||
|
|
||||||
/* H323 */
|
/* H323 */
|
||||||
if(packet->payload_packet_len >= 3
|
if(packet->payload_packet_len >= 3
|
||||||
@@ -49,7 +44,6 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
/* ISO 8073/X.224 */
|
/* ISO 8073/X.224 */
|
||||||
if((packet->payload[5] == 0xE0 /* CC Connect Request */)
|
if((packet->payload[5] == 0xE0 /* CC Connect Request */)
|
||||||
|| (packet->payload[5] == 0xD0 /* CC Connect Confirm */)) {
|
|| (packet->payload[5] == 0xD0 /* CC Connect Confirm */)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found RDP\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RDP, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RDP, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -58,24 +52,23 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
flow->l4.tcp.h323_valid_packets++;
|
flow->l4.tcp.h323_valid_packets++;
|
||||||
|
|
||||||
if(flow->l4.tcp.h323_valid_packets >= 2) {
|
if(flow->l4.tcp.h323_valid_packets >= 2) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found H323 broadcast\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "found H323 broadcast.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* This is not H.323 */
|
/* This is not H.323 */
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_H323);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if(packet->udp != NULL) {
|
} else if(packet->udp != NULL) {
|
||||||
sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
|
sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculated dport over udp\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over udp.\n");
|
||||||
|
|
||||||
if(packet->payload_packet_len >= 6 && packet->payload[0] == 0x80 && packet->payload[1] == 0x08 &&
|
if(packet->payload_packet_len >= 6 && packet->payload[0] == 0x80 && packet->payload[1] == 0x08 &&
|
||||||
(packet->payload[2] == 0xe7 || packet->payload[2] == 0x26) &&
|
(packet->payload[2] == 0xe7 || packet->payload[2] == 0x26) &&
|
||||||
packet->payload[4] == 0x00 && packet->payload[5] == 0x00)
|
packet->payload[4] == 0x00 && packet->payload[5] == 0x00)
|
||||||
{
|
{
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found H323 broadcast\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "found H323 broadcast.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -84,19 +77,19 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
{
|
{
|
||||||
if(packet->payload[0] == 0x16 && packet->payload[1] == 0x80 && packet->payload[4] == 0x06 && packet->payload[5] == 0x00)
|
if(packet->payload[0] == 0x16 && packet->payload[1] == 0x80 && packet->payload[4] == 0x06 && packet->payload[5] == 0x00)
|
||||||
{
|
{
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found H323 broadcast\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "found H323 broadcast.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if(packet->payload_packet_len >= 20 && packet->payload_packet_len <= 117)
|
else if(packet->payload_packet_len >= 20 && packet->payload_packet_len <= 117)
|
||||||
{
|
{
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found H323 broadcast\n");
|
NDPI_LOG(NDPI_PROTOCOL_H323, ndpi_struct, NDPI_LOG_DEBUG, "found H323 broadcast.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_H323, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_H323);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,14 +23,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_HALFLIFE2
|
#ifdef NDPI_PROTOCOL_HALFLIFE2
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HALFLIFE2
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_halflife2_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_halflife2_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -41,14 +36,15 @@ void ndpi_search_halflife2(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search halflife2\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
if (flow->l4.udp.halflife2_stage == 0) {
|
if (flow->l4.udp.halflife2_stage == 0) {
|
||||||
if (packet->payload_packet_len >= 20
|
if (packet->payload_packet_len >= 20
|
||||||
&& get_u_int32_t(packet->payload, 0) == 0xFFFFFFFF
|
&& get_u_int32_t(packet->payload, 0) == 0xFFFFFFFF
|
||||||
&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0x30303000)) {
|
&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0x30303000)) {
|
||||||
flow->l4.udp.halflife2_stage = 1 + packet->packet_direction;
|
flow->l4.udp.halflife2_stage = 1 + packet->packet_direction;
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HALFLIFE2, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"halflife2 client req detected, waiting for server reply\n");
|
"halflife2 client req detected, waiting for server reply\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -57,12 +53,13 @@ void ndpi_search_halflife2(struct ndpi_detection_module_struct *ndpi_struct, str
|
|||||||
&& get_u_int32_t(packet->payload, 0) == 0xFFFFFFFF
|
&& get_u_int32_t(packet->payload, 0) == 0xFFFFFFFF
|
||||||
&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0x30303000)) {
|
&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0x30303000)) {
|
||||||
ndpi_int_halflife2_add_connection(ndpi_struct, flow);
|
ndpi_int_halflife2_add_connection(ndpi_struct, flow);
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found halflife2\n");
|
NDPI_LOG(NDPI_PROTOCOL_HALFLIFE2, ndpi_struct, NDPI_LOG_DEBUG, "halflife2 server reply detected\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HALFLIFE2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,15 +17,9 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_HANGOUT
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HANGOUT
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_HANGOUT
|
||||||
|
|
||||||
/* https://support.google.com/a/answer/1279090?hl=en */
|
/* https://support.google.com/a/answer/1279090?hl=en */
|
||||||
#define HANGOUT_UDP_LOW_PORT 19302
|
#define HANGOUT_UDP_LOW_PORT 19302
|
||||||
@@ -79,20 +73,19 @@ void ndpi_search_hangout(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;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search Hangout\n");
|
|
||||||
|
|
||||||
if((packet->payload_packet_len > 24) && is_google_flow(ndpi_struct, flow)) {
|
if((packet->payload_packet_len > 24) && is_google_flow(ndpi_struct, flow)) {
|
||||||
if(
|
if(
|
||||||
((packet->udp != NULL) && (isHangoutUDPPort(ntohs(packet->udp->source)) || isHangoutUDPPort(ntohs(packet->udp->dest))))
|
((packet->udp != NULL) && (isHangoutUDPPort(ntohs(packet->udp->source)) || isHangoutUDPPort(ntohs(packet->udp->dest))))
|
||||||
||
|
||
|
||||||
((packet->tcp != NULL) && (isHangoutTCPPort(ntohs(packet->tcp->source)) || isHangoutTCPPort(ntohs(packet->tcp->dest))))) {
|
((packet->tcp != NULL) && (isHangoutTCPPort(ntohs(packet->tcp->source)) || isHangoutTCPPort(ntohs(packet->tcp->dest))))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Hangout\n");
|
NDPI_LOG(NDPI_PROTOCOL_HANGOUT, ndpi_struct, NDPI_LOG_DEBUG, "Found Hangout.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HANGOUT, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HANGOUT, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_HANGOUT, ndpi_struct, NDPI_LOG_DEBUG, "No Hangout.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HANGOUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ***************************************************************** */
|
/* ***************************************************************** */
|
||||||
|
|||||||
+5
-10
@@ -24,15 +24,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_HEP
|
#ifdef NDPI_PROTOCOL_HEP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HEP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_hep_add_connection(struct ndpi_detection_module_struct
|
static void ndpi_int_hep_add_connection(struct ndpi_detection_module_struct
|
||||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -45,16 +39,17 @@ void ndpi_search_hep(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
const u_int8_t *packet_payload = packet->payload;
|
const u_int8_t *packet_payload = packet->payload;
|
||||||
u_int32_t payload_len = packet->payload_packet_len;
|
u_int32_t payload_len = packet->payload_packet_len;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "searching HEP\n");
|
NDPI_LOG(NDPI_PROTOCOL_HEP, ndpi_struct, NDPI_LOG_DEBUG, "searching for HEP.\n");
|
||||||
if (payload_len > 10) {
|
if (payload_len > 10) {
|
||||||
if (memcmp(packet_payload, "HEP3", 4) == 0) {
|
if (memcmp(packet_payload, "HEP3", 4) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HEP3\n");
|
NDPI_LOG(NDPI_PROTOCOL_HEP, ndpi_struct, NDPI_LOG_DEBUG, "found HEP3.\n");
|
||||||
ndpi_int_hep_add_connection(ndpi_struct, flow);
|
ndpi_int_hep_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_HEP, ndpi_struct, NDPI_LOG_DEBUG, "exclude HEP.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HEP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+114
-132
@@ -20,15 +20,10 @@
|
|||||||
* 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_HTTP
|
#ifdef NDPI_PROTOCOL_HTTP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HTTP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* global variables used for 1kxun protocol and iqiyi service */
|
/* global variables used for 1kxun protocol and iqiyi service */
|
||||||
|
|
||||||
@@ -68,7 +63,7 @@ static void flash_check_http_payload(struct ndpi_detection_module_struct
|
|||||||
if(memcmp(pos, "FLV", 3) == 0 && pos[3] == 0x01 && (pos[4] == 0x01 || pos[4] == 0x04 || pos[4] == 0x05)
|
if(memcmp(pos, "FLV", 3) == 0 && pos[3] == 0x01 && (pos[4] == 0x01 || pos[4] == 0x04 || pos[4] == 0x05)
|
||||||
&& pos[5] == 0x00 && pos[6] == 0x00 && pos[7] == 0x00 && pos[8] == 0x09) {
|
&& pos[5] == 0x00 && pos[6] == 0x00 && pos[7] == 0x00 && pos[8] == 0x09) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Flash content in HTTP\n");
|
NDPI_LOG(NDPI_CONTENT_FLASH, ndpi_struct, NDPI_LOG_DEBUG, "Flash content in HTTP detected\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_FLASH);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_FLASH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,7 +75,7 @@ static void avi_check_http_payload(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "called avi_check_http_payload: %u %u %u\n",
|
NDPI_LOG(NDPI_CONTENT_AVI, ndpi_struct, NDPI_LOG_DEBUG, "called avi_check_http_payload: %u %u %u\n",
|
||||||
packet->empty_line_position_set, flow->l4.tcp.http_empty_line_seen, packet->empty_line_position);
|
packet->empty_line_position_set, flow->l4.tcp.http_empty_line_seen, packet->empty_line_position);
|
||||||
|
|
||||||
if(packet->empty_line_position_set == 0 && flow->l4.tcp.http_empty_line_seen == 0)
|
if(packet->empty_line_position_set == 0 && flow->l4.tcp.http_empty_line_seen == 0)
|
||||||
@@ -95,7 +90,7 @@ static void avi_check_http_payload(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
if(flow->l4.tcp.http_empty_line_seen == 1) {
|
if(flow->l4.tcp.http_empty_line_seen == 1) {
|
||||||
if(packet->payload_packet_len > 20 && memcmp(packet->payload, "RIFF", 4) == 0
|
if(packet->payload_packet_len > 20 && memcmp(packet->payload, "RIFF", 4) == 0
|
||||||
&& memcmp(packet->payload + 8, "AVI LIST", 8) == 0) {
|
&& memcmp(packet->payload + 8, "AVI LIST", 8) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Avi content in HTTP\n");
|
NDPI_LOG(NDPI_CONTENT_AVI, ndpi_struct, NDPI_LOG_DEBUG, "Avi content in HTTP detected\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_AVI);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_AVI);
|
||||||
}
|
}
|
||||||
flow->l4.tcp.http_empty_line_seen = 0;
|
flow->l4.tcp.http_empty_line_seen = 0;
|
||||||
@@ -110,11 +105,11 @@ static void avi_check_http_payload(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
u_int32_t p = packet->empty_line_position + 2;
|
u_int32_t p = packet->empty_line_position + 2;
|
||||||
|
|
||||||
// check for avi header
|
// check for avi header
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "p = %u\n", p);
|
NDPI_LOG(NDPI_CONTENT_AVI, ndpi_struct, NDPI_LOG_DEBUG, "p = %u\n", p);
|
||||||
|
|
||||||
if((p + 16) <= packet->payload_packet_len && memcmp(&packet->payload[p], "RIFF", 4) == 0
|
if((p + 16) <= packet->payload_packet_len && memcmp(&packet->payload[p], "RIFF", 4) == 0
|
||||||
&& memcmp(&packet->payload[p + 8], "AVI LIST", 8) == 0) {
|
&& memcmp(&packet->payload[p + 8], "AVI LIST", 8) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Avi content in HTTP\n");
|
NDPI_LOG(NDPI_CONTENT_AVI, ndpi_struct, NDPI_LOG_DEBUG, "Avi content in HTTP detected\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_AVI);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_AVI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,7 +122,7 @@ static void teamviewer_check_http_payload(struct ndpi_detection_module_struct *n
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
const u_int8_t *pos;
|
const u_int8_t *pos;
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "called teamviewer_check_http_payload: %u %u %u\n",
|
NDPI_LOG(NDPI_PROTOCOL_TEAMVIEWER, ndpi_struct, NDPI_LOG_DEBUG, "called teamviewer_check_http_payload: %u %u %u\n",
|
||||||
packet->empty_line_position_set, flow->l4.tcp.http_empty_line_seen, packet->empty_line_position);
|
packet->empty_line_position_set, flow->l4.tcp.http_empty_line_seen, packet->empty_line_position);
|
||||||
|
|
||||||
if(packet->empty_line_position_set == 0 || (packet->empty_line_position + 5) > (packet->payload_packet_len))
|
if(packet->empty_line_position_set == 0 || (packet->empty_line_position + 5) > (packet->payload_packet_len))
|
||||||
@@ -136,7 +131,7 @@ static void teamviewer_check_http_payload(struct ndpi_detection_module_struct *n
|
|||||||
pos = &packet->payload[packet->empty_line_position] + 2;
|
pos = &packet->payload[packet->empty_line_position] + 2;
|
||||||
|
|
||||||
if(pos[0] == 0x17 && pos[1] == 0x24) {
|
if(pos[0] == 0x17 && pos[1] == 0x24) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found TeamViewer content in HTTP\n");
|
NDPI_LOG(NDPI_PROTOCOL_TEAMVIEWER, ndpi_struct, NDPI_LOG_DEBUG, "TeamViewer content in HTTP detected\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_TEAMVIEWER);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_TEAMVIEWER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -150,7 +145,7 @@ static void rtsp_parse_packet_acceptline(struct ndpi_detection_module_struct
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
if(packet->accept_line.len >= 28 && memcmp(packet->accept_line.ptr, "application/x-rtsp-tunnelled", 28) == 0) {
|
if(packet->accept_line.len >= 28 && memcmp(packet->accept_line.ptr, "application/x-rtsp-tunnelled", 28) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found RTSP accept line\n");
|
NDPI_LOG(NDPI_PROTOCOL_RTSP, ndpi_struct, NDPI_LOG_DEBUG, "RTSP accept line detected\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_RTSP);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_RTSP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -204,12 +199,12 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
#if defined(NDPI_PROTOCOL_1KXUN) || defined(NDPI_PROTOCOL_IQIYI)
|
#if defined(NDPI_PROTOCOL_1KXUN) || defined(NDPI_PROTOCOL_IQIYI)
|
||||||
/* PPStream */
|
/* PPStream */
|
||||||
if(flow->l4.tcp.ppstream_stage > 0 && flow->iqiyi_counter == 0) {
|
if(flow->l4.tcp.ppstream_stage > 0 && flow->iqiyi_counter == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found PPStream\n");
|
NDPI_LOG(NDPI_PROTOCOL_PPSTREAM, ndpi_struct, NDPI_LOG_DEBUG, "PPStream found.\n");
|
||||||
/* ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_PPSTREAM); */
|
/* ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_PPSTREAM); */
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_HTTP);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_HTTP);
|
||||||
}
|
}
|
||||||
else if(flow->iqiyi_counter > 0) {
|
else if(flow->iqiyi_counter > 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found iQiyi\n");
|
NDPI_LOG(NDPI_PROTOCOL_IQIYI, ndpi_struct, NDPI_LOG_DEBUG, "iQiyi found.\n");
|
||||||
/* ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_IQIYI); */
|
/* ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_IQIYI); */
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_HTTP);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_HTTP);
|
||||||
}
|
}
|
||||||
@@ -218,7 +213,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
#if defined(NDPI_PROTOCOL_1KXUN) || defined(NDPI_PROTOCOL_IQIYI)
|
#if defined(NDPI_PROTOCOL_1KXUN) || defined(NDPI_PROTOCOL_IQIYI)
|
||||||
/* 1KXUN */
|
/* 1KXUN */
|
||||||
if(flow->kxun_counter > 0) {
|
if(flow->kxun_counter > 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found 1kxun\n");
|
NDPI_LOG(NDPI_PROTOCOL_1KXUN, ndpi_struct, NDPI_LOG_DEBUG, "1kxun found.\n");
|
||||||
/* ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_1KXUN); */
|
/* ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_1KXUN); */
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_HTTP);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_HTTP);
|
||||||
}
|
}
|
||||||
@@ -335,13 +330,12 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(memcmp(ua, "netflix-ios-app", 15) == 0) {
|
else if(memcmp(ua, "netflix-ios-app", 15) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found netflix\n");
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_NETFLIX);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_NETFLIX);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "User Agent Type line found %.*s\n",
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "User Agent Type line found %.*s\n",
|
||||||
packet->user_agent_line.len, packet->user_agent_line.ptr);
|
packet->user_agent_line.len, packet->user_agent_line.ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -349,7 +343,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
if(packet->host_line.ptr != NULL) {
|
if(packet->host_line.ptr != NULL) {
|
||||||
u_int len;
|
u_int len;
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "HOST line found %.*s\n",
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HOST line found %.*s\n",
|
||||||
packet->host_line.len, packet->host_line.ptr);
|
packet->host_line.len, packet->host_line.ptr);
|
||||||
|
|
||||||
/* call ndpi_match_host_subprotocol to see if there is a match with known-host HTTP subprotocol */
|
/* call ndpi_match_host_subprotocol to see if there is a match with known-host HTTP subprotocol */
|
||||||
@@ -401,8 +395,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
|
|
||||||
if(flow->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
if(flow->detected_protocol_stack[0] != NDPI_PROTOCOL_UNKNOWN) {
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_HTTP) {
|
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_HTTP) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP/%s\n",
|
|
||||||
ndpi_get_proto_name(ndpi_struct, packet->detected_protocol_stack[0]));
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, packet->detected_protocol_stack[0]);
|
ndpi_int_http_add_connection(ndpi_struct, flow, packet->detected_protocol_stack[0]);
|
||||||
return; /* We have identified a sub-protocol so we're done */
|
return; /* We have identified a sub-protocol so we're done */
|
||||||
}
|
}
|
||||||
@@ -417,7 +409,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
|
|
||||||
/* check for accept line */
|
/* check for accept line */
|
||||||
if(packet->accept_line.ptr != NULL) {
|
if(packet->accept_line.ptr != NULL) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Accept line found %.*s\n",
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Accept line found %.*s\n",
|
||||||
packet->accept_line.len, packet->accept_line.ptr);
|
packet->accept_line.len, packet->accept_line.ptr);
|
||||||
#ifdef NDPI_PROTOCOL_RTSP
|
#ifdef NDPI_PROTOCOL_RTSP
|
||||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_RTSP) != 0) {
|
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_RTSP) != 0) {
|
||||||
@@ -430,7 +422,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
#ifdef NDPI_CONTENT_MPEG
|
#ifdef NDPI_CONTENT_MPEG
|
||||||
for (a = 0; a < packet->parsed_lines; a++) {
|
for (a = 0; a < packet->parsed_lines; a++) {
|
||||||
if(packet->line[a].len > 11 && memcmp(packet->line[a].ptr, "Icy-MetaData", 12) == 0) {
|
if(packet->line[a].len > 11 && memcmp(packet->line[a].ptr, "Icy-MetaData", 12) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MPEG: Icy-MetaData\n");
|
NDPI_LOG(NDPI_CONTENT_MPEG, ndpi_struct, NDPI_LOG_DEBUG, "MPEG: Icy-MetaData found.\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_MPEG);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_CONTENT_MPEG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -440,7 +432,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(packet->content_line.ptr != NULL && packet->content_line.len != 0) {
|
if(packet->content_line.ptr != NULL && packet->content_line.len != 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Content Type line found %.*s\n",
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Content Type line found %.*s\n",
|
||||||
packet->content_line.len, packet->content_line.ptr);
|
packet->content_line.len, packet->content_line.ptr);
|
||||||
|
|
||||||
if((ndpi_struct->http_dont_dissect_response) || flow->http_detected)
|
if((ndpi_struct->http_dont_dissect_response) || flow->http_detected)
|
||||||
@@ -452,7 +444,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
|||||||
|
|
||||||
static void check_http_payload(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void check_http_payload(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "called check_http_payload\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "called check_http_payload.\n");
|
||||||
|
|
||||||
#ifdef NDPI_CONTENT_FLASH
|
#ifdef NDPI_CONTENT_FLASH
|
||||||
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_CONTENT_FLASH) != 0)
|
if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_CONTENT_FLASH) != 0)
|
||||||
@@ -474,55 +466,54 @@ static void check_http_payload(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
* @returnvalue 0 if no valid request has been found
|
* @returnvalue 0 if no valid request has been found
|
||||||
* @returnvalue >0 indicates start of filename but not necessarily in packet limit
|
* @returnvalue >0 indicates start of filename but not necessarily in packet limit
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define STATIC_STRING_L(a) {.str=a, .len=sizeof(a)-1 }
|
|
||||||
|
|
||||||
static struct l_string {
|
|
||||||
const char *str;
|
|
||||||
size_t len;
|
|
||||||
} http_methods[] = {
|
|
||||||
STATIC_STRING_L("GET "),
|
|
||||||
STATIC_STRING_L("POST "),
|
|
||||||
STATIC_STRING_L("OPTIONS "),
|
|
||||||
STATIC_STRING_L("HEAD "),
|
|
||||||
STATIC_STRING_L("PUT "),
|
|
||||||
STATIC_STRING_L("DELETE "),
|
|
||||||
STATIC_STRING_L("CONNECT "),
|
|
||||||
STATIC_STRING_L("PROPFIND "),
|
|
||||||
STATIC_STRING_L("REPORT ") };
|
|
||||||
static const char *http_fs = "CDGHOPR";
|
|
||||||
|
|
||||||
static uint8_t non_ctrl(uint8_t c) {
|
|
||||||
return c < 32 ? '.':c;
|
|
||||||
}
|
|
||||||
|
|
||||||
static u_int16_t http_request_url_offset(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static u_int16_t http_request_url_offset(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;
|
||||||
int i;
|
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "====>>>> HTTP: %c%c%c%c [len: %u]\n",
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "====>>>> HTTP: %c%c%c%c [len: %u]\n",
|
||||||
non_ctrl(packet->payload[0]), non_ctrl(packet->payload[1]),
|
packet->payload[0], packet->payload[1], packet->payload[2], packet->payload[3],
|
||||||
non_ctrl(packet->payload[2]), non_ctrl(packet->payload[3]),
|
|
||||||
packet->payload_packet_len);
|
packet->payload_packet_len);
|
||||||
|
|
||||||
/* Check first char */
|
|
||||||
if(!strchr(http_fs,packet->payload[0])) return 0;
|
|
||||||
/**
|
/**
|
||||||
FIRST PAYLOAD PACKET FROM CLIENT
|
FIRST PAYLOAD PACKET FROM CLIENT
|
||||||
**/
|
**/
|
||||||
for(i=0; i < sizeof(http_methods)/sizeof(http_methods[0]); i++) {
|
|
||||||
if(packet->payload_packet_len >= http_methods[i].len &&
|
/* check if the packet starts with POST or GET */
|
||||||
memcmp(packet->payload,http_methods[i].str,http_methods[i].len) == 0) {
|
if(packet->payload_packet_len >= 4 && memcmp(packet->payload, "GET ", 4) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "HTTP: %sFOUND\n",http_methods[i].str);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: GET FOUND\n");
|
||||||
return http_methods[i].len;
|
return 4;
|
||||||
}
|
} else if(packet->payload_packet_len >= 5 && memcmp(packet->payload, "POST ", 5) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: POST FOUND\n");
|
||||||
|
return 5;
|
||||||
|
} else if(packet->payload_packet_len >= 8 && memcmp(packet->payload, "OPTIONS ", 8) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: OPTIONS FOUND\n");
|
||||||
|
return 8;
|
||||||
|
} else if(packet->payload_packet_len >= 5 && memcmp(packet->payload, "HEAD ", 5) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: HEAD FOUND\n");
|
||||||
|
return 5;
|
||||||
|
} else if(packet->payload_packet_len >= 4 && memcmp(packet->payload, "PUT ", 4) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: PUT FOUND\n");
|
||||||
|
return 4;
|
||||||
|
} else if(packet->payload_packet_len >= 7 && memcmp(packet->payload, "DELETE ", 7) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: DELETE FOUND\n");
|
||||||
|
return 7;
|
||||||
|
} else if(packet->payload_packet_len >= 8 && memcmp(packet->payload, "CONNECT ", 8) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: CONNECT FOUND\n");
|
||||||
|
return 8;
|
||||||
|
} else if(packet->payload_packet_len >= 9 && memcmp(packet->payload, "PROPFIND ", 9) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: PROFIND FOUND\n");
|
||||||
|
return 9;
|
||||||
|
} else if(packet->payload_packet_len >= 7 && memcmp(packet->payload, "REPORT ", 7) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: REPORT FOUND\n");
|
||||||
|
return 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void http_bitmask_exclude_other(struct ndpi_flow_struct *flow)
|
static void http_bitmask_exclude(struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HTTP);
|
||||||
#ifdef NDPI_CONTENT_MPEG
|
#ifdef NDPI_CONTENT_MPEG
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_CONTENT_MPEG);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_CONTENT_MPEG);
|
||||||
#endif
|
#endif
|
||||||
@@ -541,6 +532,9 @@ static void http_bitmask_exclude_other(struct ndpi_flow_struct *flow)
|
|||||||
#ifdef NDPI_CONTENT_OGG
|
#ifdef NDPI_CONTENT_OGG
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_CONTENT_OGG);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_CONTENT_OGG);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef NDPI_PROTOCOL_MOVE
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MOVE);
|
||||||
|
#endif
|
||||||
#ifdef NDPI_PROTOCOL_XBOX
|
#ifdef NDPI_PROTOCOL_XBOX
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX);
|
||||||
#endif
|
#endif
|
||||||
@@ -549,55 +543,40 @@ static void http_bitmask_exclude_other(struct ndpi_flow_struct *flow)
|
|||||||
/*************************************************************************************************/
|
/*************************************************************************************************/
|
||||||
|
|
||||||
static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_check_http_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;
|
||||||
u_int16_t filename_start; /* the filename in the request method line, e.g., "GET filename_start..."*/
|
u_int16_t filename_start; /* the filename in the request method line, e.g., "GET filename_start..."*/
|
||||||
|
|
||||||
packet->packet_lines_parsed_complete = 0;
|
packet->packet_lines_parsed_complete = 0;
|
||||||
|
|
||||||
/* Check if we so far detected the protocol in the request or not. */
|
/* Check if we so far detected the protocol in the request or not. */
|
||||||
if(flow->l4.tcp.http_stage == 0) {
|
if(flow->l4.tcp.http_stage == 0) { /* Expected a request */
|
||||||
/* Expected a request */
|
|
||||||
flow->http_detected = 0;
|
flow->http_detected = 0;
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "HTTP stage %d: \n", flow->l4.tcp.http_stage);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP stage %d: \n",
|
||||||
|
flow->l4.tcp.http_stage);
|
||||||
|
|
||||||
filename_start = http_request_url_offset(ndpi_struct, flow);
|
filename_start = http_request_url_offset(ndpi_struct, flow);
|
||||||
|
|
||||||
if(filename_start == 0) { /* not a regular request. In the HTTP first stage, may be a truncated flow or other protocols */
|
if(filename_start == 0) { /* not a regular request. In the HTTP first stage, may be a truncated flow or other protocols */
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Filename HTTP not found, we look for possible truncate flow..\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"Filename HTTP not found, we look for possible truncate flow...\n");
|
||||||
|
|
||||||
if(packet->payload_packet_len >= 7 && memcmp(packet->payload, "HTTP/1.", 7) == 0) {
|
if(packet->payload_packet_len >= 7 && memcmp(packet->payload, "HTTP/1.", 7) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP response\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"HTTP response found (truncated flow ?)\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((packet->payload_packet_len == 3) && memcmp(packet->payload, "HI\n", 3) == 0) {
|
if((packet->payload_packet_len == 3) && memcmp(packet->payload, "HI\n", 3) == 0) {
|
||||||
/* This looks like Ookla: we don't give up with HTTP yet */
|
/* This looks like Ookla: we don't give up with HTTP yet */
|
||||||
flow->l4.tcp.http_stage = 1;
|
flow->l4.tcp.http_stage = 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((packet->payload_packet_len == 40) && (flow->l4.tcp.http_stage == 0)) {
|
|
||||||
/*
|
|
||||||
-> QR O06L0072-6L91-4O43-857J-K8OO172L6L51
|
|
||||||
<- QNUUX 2.5 2017-08-15.1314.4jn12m5
|
|
||||||
-> MXFWUXJM 31625365
|
|
||||||
*/
|
|
||||||
|
|
||||||
if((packet->payload[2] == ' ')
|
|
||||||
&& (packet->payload[11] == '-')
|
|
||||||
&& (packet->payload[16] == '-')
|
|
||||||
&& (packet->payload[21] == '-')
|
|
||||||
&& (packet->payload[26] == '-')
|
|
||||||
&& (packet->payload[39] == 0x0A)
|
|
||||||
)
|
|
||||||
flow->l4.tcp.http_stage = 1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if((packet->payload_packet_len == 23) && (memcmp(packet->payload, "<policy-file-request/>", 23) == 0)) {
|
if((packet->payload_packet_len == 23) && (memcmp(packet->payload, "<policy-file-request/>", 23) == 0)) {
|
||||||
/*
|
/*
|
||||||
<policy-file-request/>
|
<policy-file-request/>
|
||||||
@@ -610,18 +589,18 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Exclude HTTP\n");
|
||||||
http_bitmask_exclude_other(flow);
|
http_bitmask_exclude(flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"Filename HTTP found: %d, we look for line info..\n", filename_start);
|
"Filename HTTP found: %d, we look for line info..\n", filename_start);
|
||||||
|
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
|
|
||||||
if(packet->parsed_lines <= 1) {
|
if(packet->parsed_lines <= 1) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"Found just one line, we will look further for the next packet...\n");
|
"Found just one line, we will look further for the next packet...\n");
|
||||||
|
|
||||||
packet->http_method.ptr = packet->line[0].ptr;
|
packet->http_method.ptr = packet->line[0].ptr;
|
||||||
@@ -632,7 +611,7 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"Found more than one line, we look further for the next packet...\n");
|
"Found more than one line, we look further for the next packet...\n");
|
||||||
|
|
||||||
if(packet->line[0].len >= (9 + filename_start)
|
if(packet->line[0].len >= (9 + filename_start)
|
||||||
@@ -664,7 +643,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
/* Check for additional field introduced by Steam */
|
/* Check for additional field introduced by Steam */
|
||||||
int x = 1;
|
int x = 1;
|
||||||
if((memcmp(packet->line[x].ptr, "x-steam-sid", 11)) == 0) {
|
if((memcmp(packet->line[x].ptr, "x-steam-sid", 11)) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found STEAM\n");
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_STEAM);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_STEAM);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -674,7 +652,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
x = 1;
|
x = 1;
|
||||||
while(packet->line[x].len != 0) {
|
while(packet->line[x].len != 0) {
|
||||||
if(packet->line[x].len >= 12 && (memcmp(packet->line[x].ptr, "X-FB-SIM-HNI", 12)) == 0) {
|
if(packet->line[x].len >= 12 && (memcmp(packet->line[x].ptr, "X-FB-SIM-HNI", 12)) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found FACEBOOK\n");
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_FACEBOOK);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_FACEBOOK);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
@@ -727,19 +704,19 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
|
|
||||||
if((packet->http_url_name.len > 7)
|
if((packet->http_url_name.len > 7)
|
||||||
&& (!strncmp((const char*) packet->http_url_name.ptr, "http://", 7))) {
|
&& (!strncmp((const char*) packet->http_url_name.ptr, "http://", 7))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP_PROXY\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP_PROXY Found.\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_PROXY);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_PROXY);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(filename_start == 8 && (memcmp(packet->payload, "CONNECT ", 8) == 0)) {
|
if(filename_start == 8 && (memcmp(packet->payload, "CONNECT ", 8) == 0)) {
|
||||||
/* nathan@getoffmalawn.com */
|
/* nathan@getoffmalawn.com */
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP_CONNECT\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP_CONNECT Found.\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_CONNECT);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_CONNECT);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"HTTP START Found, we will look for sub-protocols (content and host)...\n");
|
"HTTP START Found, we will look for sub-protocols (content and host)...\n");
|
||||||
|
|
||||||
if(packet->host_line.ptr != NULL) {
|
if(packet->host_line.ptr != NULL) {
|
||||||
@@ -752,11 +729,10 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
|
|
||||||
if(ndpi_struct->http_dont_dissect_response) {
|
if(ndpi_struct->http_dont_dissect_response) {
|
||||||
if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) /* No subprotocol found */
|
if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) /* No subprotocol found */
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP\n");
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||||
} else {
|
} else {
|
||||||
flow->http_detected = 1;
|
flow->http_detected = 1;
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"HTTP START Found, we will look further for the response...\n");
|
"HTTP START Found, we will look further for the response...\n");
|
||||||
flow->l4.tcp.http_stage = packet->packet_direction + 1; // packet_direction 0: stage 1, packet_direction 1: stage 2
|
flow->l4.tcp.http_stage = packet->packet_direction + 1; // packet_direction 0: stage 1, packet_direction 1: stage 2
|
||||||
}
|
}
|
||||||
@@ -766,27 +742,24 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP: REQUEST NOT HTTP CONFORM\n");
|
||||||
http_bitmask_exclude_other(flow);
|
http_bitmask_exclude(flow);
|
||||||
|
|
||||||
} else if((flow->l4.tcp.http_stage == 1) || (flow->l4.tcp.http_stage == 2)) {
|
} else if((flow->l4.tcp.http_stage == 1) || (flow->l4.tcp.http_stage == 2)) {
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "HTTP stage %u: \n", flow->l4.tcp.http_stage);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP stage %u: \n",
|
||||||
|
flow->l4.tcp.http_stage);
|
||||||
if((packet->payload_packet_len == 34) && (flow->l4.tcp.http_stage == 1)) {
|
|
||||||
if((packet->payload[5] == ' ') && (packet->payload[9] == ' ')) {
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA);
|
if(flow->l4.tcp.http_stage == 1) {
|
||||||
return;
|
if((packet->payload_packet_len > 6) && memcmp(packet->payload, "HELLO ", 6) == 0) {
|
||||||
}
|
/* This looks like Ookla */
|
||||||
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
return;
|
||||||
|
} else
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OOKLA);
|
||||||
}
|
}
|
||||||
|
|
||||||
if((packet->payload_packet_len > 6) && memcmp(packet->payload, "HELLO ", 6) == 0) {
|
|
||||||
/* This looks like Ookla */
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
return;
|
|
||||||
} else
|
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OOKLA);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
At first check, if this is for sure a response packet (in another direction. If not, if HTTP is detected do nothing now and return,
|
At first check, if this is for sure a response packet (in another direction. If not, if HTTP is detected do nothing now and return,
|
||||||
otherwise check the second packet for the HTTP request
|
otherwise check the second packet for the HTTP request
|
||||||
@@ -796,7 +769,7 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
if(flow->http_detected)
|
if(flow->http_detected)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
" SECOND PAYLOAD TRAFFIC FROM CLIENT, FIRST PACKET MIGHT HAVE BEEN HTTP...UNKNOWN TRAFFIC, HERE FOR HTTP again.. \n");
|
" SECOND PAYLOAD TRAFFIC FROM CLIENT, FIRST PACKET MIGHT HAVE BEEN HTTP...UNKNOWN TRAFFIC, HERE FOR HTTP again.. \n");
|
||||||
|
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
@@ -807,13 +780,14 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
if(packet->parsed_lines <= 1) {
|
if(packet->parsed_lines <= 1) {
|
||||||
/* wait some packets in case request is split over more than 2 packets */
|
/* wait some packets in case request is split over more than 2 packets */
|
||||||
if(flow->packet_counter < 5) {
|
if(flow->packet_counter < 5) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "line still not finished, search next packet\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"line still not finished, search next packet\n");
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
/* stop parsing here */
|
/* stop parsing here */
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "exclude HTTP: PACKET DOES NOT HAVE A LINE STRUCTURE\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
"HTTP: PACKET DOES NOT HAVE A LINE STRUCTURE\n");
|
||||||
http_bitmask_exclude_other(flow);
|
http_bitmask_exclude(flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -821,11 +795,11 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
if(packet->line[0].len >= 9
|
if(packet->line[0].len >= 9
|
||||||
&& 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_INFO(ndpi_struct, "found HTTP\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Found HTTP.\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"HTTP START Found in 2. packet, we will look further for the response....\n");
|
"HTTP START Found in 2. packet, we will look further for the response....\n");
|
||||||
flow->http_detected = 1;
|
flow->http_detected = 1;
|
||||||
}
|
}
|
||||||
@@ -843,17 +817,15 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
*/
|
*/
|
||||||
if((packet->parsed_lines == 1) && (packet->packet_direction == 1 /* server -> client */)) {
|
if((packet->parsed_lines == 1) && (packet->packet_direction == 1 /* server -> client */)) {
|
||||||
/* In Apache if you do "GET /\n\n" the response comes without any header */
|
/* In Apache if you do "GET /\n\n" the response comes without any header */
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP. (apache)\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Found HTTP. (apache)\n");
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||||
check_content_type_and_change_protocol(ndpi_struct, flow);
|
check_content_type_and_change_protocol(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we already detected the HTTP request, we can add the connection and then check for the sub-protocol */
|
/* If we already detected the HTTP request, we can add the connection and then check for the sub-protocol */
|
||||||
if(flow->http_detected) {
|
if(flow->http_detected)
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found HTTP\n");
|
|
||||||
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP);
|
||||||
}
|
|
||||||
|
|
||||||
/* Parse packet line and we look for the subprotocols */
|
/* Parse packet line and we look for the subprotocols */
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
@@ -864,13 +836,14 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(packet->empty_line_position_set != 0 || flow->l4.tcp.http_empty_line_seen == 1) {
|
if(packet->empty_line_position_set != 0 || flow->l4.tcp.http_empty_line_seen == 1) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "empty line. check_http_payload\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "empty line. check_http_payload.\n");
|
||||||
check_http_payload(ndpi_struct, flow);
|
check_http_payload(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
flow->l4.tcp.http_stage = 0;
|
flow->l4.tcp.http_stage = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
void ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
@@ -879,8 +852,8 @@ void ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
|
|
||||||
/* Break after 20 packets. */
|
/* Break after 20 packets. */
|
||||||
if(flow->packet_counter > 20) {
|
if(flow->packet_counter > 20) {
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "Exclude HTTP.\n");
|
||||||
http_bitmask_exclude_other(flow);
|
http_bitmask_exclude(flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -888,7 +861,7 @@ void ndpi_search_http_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search HTTP\n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP, ndpi_struct, NDPI_LOG_DEBUG, "HTTP detection...\n");
|
||||||
ndpi_check_http_tcp(ndpi_struct, flow);
|
ndpi_check_http_tcp(ndpi_struct, flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1034,6 +1007,15 @@ void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
|||||||
ADD_TO_DETECTION_BITMASK);
|
ADD_TO_DETECTION_BITMASK);
|
||||||
*id += 1;
|
*id += 1;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef NDPI_PROTOCOL_MOVE
|
||||||
|
ndpi_set_bitmask_protocol_detection("Move", ndpi_struct, detection_bitmask, *id,
|
||||||
|
NDPI_PROTOCOL_MOVE,
|
||||||
|
ndpi_search_http_tcp,
|
||||||
|
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
|
||||||
|
NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||||
|
ADD_TO_DETECTION_BITMASK);
|
||||||
|
*id += 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Update excluded protocol bitmask */
|
/* Update excluded protocol bitmask */
|
||||||
NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
|
NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
|
||||||
|
|||||||
@@ -24,14 +24,8 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC
|
#ifdef NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
static void ndpi_int_activesync_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_activesync_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC, NDPI_PROTOCOL_HTTP);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC, NDPI_PROTOCOL_HTTP);
|
||||||
@@ -41,19 +35,20 @@ void ndpi_search_activesync(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 activesync\n");
|
|
||||||
if (packet->tcp != NULL) {
|
if (packet->tcp != NULL) {
|
||||||
|
|
||||||
if (packet->payload_packet_len > 150
|
if (packet->payload_packet_len > 150
|
||||||
&& ((memcmp(packet->payload, "OPTIONS /Microsoft-Server-ActiveSync?", 37) == 0)
|
&& ((memcmp(packet->payload, "OPTIONS /Microsoft-Server-ActiveSync?", 37) == 0)
|
||||||
|| (memcmp(packet->payload, "POST /Microsoft-Server-ActiveSync?", 34) == 0))) {
|
|| (memcmp(packet->payload, "POST /Microsoft-Server-ActiveSync?", 34) == 0))) {
|
||||||
ndpi_int_activesync_add_connection(ndpi_struct, flow);
|
ndpi_int_activesync_add_connection(ndpi_struct, flow);
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ActiveSync \n");
|
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
" flow marked as ActiveSync \n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC, ndpi_struct, NDPI_LOG_DEBUG, "exclude activesync\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,15 +23,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_IAX
|
#ifdef NDPI_PROTOCOL_IAX
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_IAX
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define NDPI_IAX_MAX_INFORMATION_ELEMENTS 15
|
#define NDPI_IAX_MAX_INFORMATION_ELEMENTS 15
|
||||||
|
|
||||||
static void ndpi_int_iax_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_iax_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
@@ -63,7 +58,7 @@ static void ndpi_search_setup_iax(struct ndpi_detection_module_struct *ndpi_stru
|
|||||||
&& packet->payload[11] <= 15) {
|
&& packet->payload[11] <= 15) {
|
||||||
|
|
||||||
if (packet->payload_packet_len == 12) {
|
if (packet->payload_packet_len == 12) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IAX\n");
|
NDPI_LOG(NDPI_PROTOCOL_IAX, ndpi_struct, NDPI_LOG_DEBUG, "found IAX.\n");
|
||||||
ndpi_int_iax_add_connection(ndpi_struct, flow);
|
ndpi_int_iax_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -71,7 +66,7 @@ static void ndpi_search_setup_iax(struct ndpi_detection_module_struct *ndpi_stru
|
|||||||
for (i = 0; i < NDPI_IAX_MAX_INFORMATION_ELEMENTS; i++) {
|
for (i = 0; i < NDPI_IAX_MAX_INFORMATION_ELEMENTS; i++) {
|
||||||
packet_len = packet_len + 2 + packet->payload[packet_len + 1];
|
packet_len = packet_len + 2 + packet->payload[packet_len + 1];
|
||||||
if (packet_len == packet->payload_packet_len) {
|
if (packet_len == packet->payload_packet_len) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IAX\n");
|
NDPI_LOG(NDPI_PROTOCOL_IAX, ndpi_struct, NDPI_LOG_DEBUG, "found IAX.\n");
|
||||||
ndpi_int_iax_add_connection(ndpi_struct, flow);
|
ndpi_int_iax_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -82,13 +77,16 @@ static void ndpi_search_setup_iax(struct ndpi_detection_module_struct *ndpi_stru
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IAX);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_iax(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_iax(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
// struct ndpi_flow_struct *flow=ndpi_struct->flow;
|
||||||
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
if(packet->udp
|
if(packet->udp
|
||||||
&& (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN))
|
&& (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN))
|
||||||
|
|||||||
@@ -22,14 +22,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_ICECAST
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_ICECAST
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_ICECAST
|
||||||
|
|
||||||
static void ndpi_int_icecast_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_icecast_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ICECAST, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ICECAST, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -40,17 +37,17 @@ void ndpi_search_icecast_tcp(struct ndpi_detection_module_struct *ndpi_struct, s
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
u_int8_t i;
|
u_int8_t i;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search icecast\n");
|
NDPI_LOG(NDPI_PROTOCOL_ICECAST, ndpi_struct, NDPI_LOG_DEBUG, "search icecast.\n");
|
||||||
|
|
||||||
if ((packet->payload_packet_len < 500 &&
|
if ((packet->payload_packet_len < 500 &&
|
||||||
packet->payload_packet_len >= 7 && memcmp(packet->payload, "SOURCE ", 7) == 0)
|
packet->payload_packet_len >= 7 && memcmp(packet->payload, "SOURCE ", 7) == 0)
|
||||||
|| flow->l4.tcp.icecast_stage) {
|
|| flow->l4.tcp.icecast_stage) {
|
||||||
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "Icecast lines=%d\n", packet->parsed_lines);
|
NDPI_LOG(NDPI_PROTOCOL_ICECAST, ndpi_struct, NDPI_LOG_DEBUG, "Icecast lines=%d\n", packet->parsed_lines);
|
||||||
for (i = 0; i < packet->parsed_lines; i++) {
|
for (i = 0; i < packet->parsed_lines; i++) {
|
||||||
if (packet->line[i].ptr != NULL && packet->line[i].len > 4
|
if (packet->line[i].ptr != NULL && packet->line[i].len > 4
|
||||||
&& memcmp(packet->line[i].ptr, "ice-", 4) == 0) {
|
&& memcmp(packet->line[i].ptr, "ice-", 4) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Icecast\n");
|
NDPI_LOG(NDPI_PROTOCOL_ICECAST, ndpi_struct, NDPI_LOG_DEBUG, "Icecast detected.\n");
|
||||||
ndpi_int_icecast_add_connection(ndpi_struct, flow);
|
ndpi_int_icecast_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -78,17 +75,18 @@ void ndpi_search_icecast_tcp(struct ndpi_detection_module_struct *ndpi_struct, s
|
|||||||
|
|
||||||
if (packet->server_line.ptr != NULL && packet->server_line.len > NDPI_STATICSTRING_LEN("Icecast") &&
|
if (packet->server_line.ptr != NULL && packet->server_line.len > NDPI_STATICSTRING_LEN("Icecast") &&
|
||||||
memcmp(packet->server_line.ptr, "Icecast", NDPI_STATICSTRING_LEN("Icecast")) == 0) {
|
memcmp(packet->server_line.ptr, "Icecast", NDPI_STATICSTRING_LEN("Icecast")) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_ICECAST, ndpi_struct, NDPI_LOG_DEBUG, "Icecast detected.\n");
|
||||||
/* TODO maybe store the previous protocol type as subtype?
|
/* TODO maybe store the previous protocol type as subtype?
|
||||||
* e.g. ogg or mpeg
|
* e.g. ogg or mpeg
|
||||||
*/
|
*/
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Icecast\n");
|
|
||||||
ndpi_int_icecast_add_connection(ndpi_struct, flow);
|
ndpi_int_icecast_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
icecast_exclude:
|
icecast_exclude:
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_ICECAST);
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_ICECAST, ndpi_struct, NDPI_LOG_DEBUG, "Icecast excluded.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+17
-18
@@ -22,15 +22,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_IPP
|
#ifdef NDPI_PROTOCOL_IPP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_IPP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_ipp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_ipp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
|
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
|
||||||
{
|
{
|
||||||
@@ -40,20 +36,22 @@ static void ndpi_int_ipp_add_connection(struct ndpi_detection_module_struct *ndp
|
|||||||
void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
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_int8_t i;
|
u_int8_t i;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search ipp\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "search ipp\n");
|
||||||
|
|
||||||
if (packet->payload_packet_len > 20) {
|
if (packet->payload_packet_len > 20) {
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"searching for a payload with a pattern like 'number(1to8)blanknumber(1to3)ipp://.\n");
|
"searching for a payload with a pattern like 'number(1to8)blanknumber(1to3)ipp://.\n");
|
||||||
/* this pattern means that there is a printer saying that his state is idle,
|
/* this pattern means that there is a printer saying that his state is idle,
|
||||||
* means that he is not printing anything at the moment */
|
* means that he is not printing anything at the moment */
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
if (packet->payload[i] < '0' || packet->payload[i] > '9') {
|
if (packet->payload[i] < '0' || packet->payload[i] > '9') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "payload does not begin with a number\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "payload does not begin with a number.\n");
|
||||||
goto search_for_next_pattern;
|
goto search_for_next_pattern;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,37 +60,37 @@ void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
if (!((packet->payload[i] >= '0' && packet->payload[i] <= '9') ||
|
if (!((packet->payload[i] >= '0' && packet->payload[i] <= '9') ||
|
||||||
(packet->payload[i] >= 'a' && packet->payload[i] <= 'f') ||
|
(packet->payload[i] >= 'a' && packet->payload[i] <= 'f') ||
|
||||||
(packet->payload[i] >= 'A' && packet->payload[i] <= 'F')) || i > 8) {
|
(packet->payload[i] >= 'A' && packet->payload[i] <= 'F')) || i > 8) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"read symbols while the symbol is a number.\n");
|
"read symbols while the symbol is a number.\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload[i++] != ' ') {
|
if (packet->payload[i++] != ' ') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "there is no blank following the number\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "there is no blank following the number.\n");
|
||||||
goto search_for_next_pattern;
|
goto search_for_next_pattern;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload[i] < '0' || packet->payload[i] > '9') {
|
if (packet->payload[i] < '0' || packet->payload[i] > '9') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "no number following the blank\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "no number following the blank.\n");
|
||||||
goto search_for_next_pattern;
|
goto search_for_next_pattern;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
i++;
|
i++;
|
||||||
if (packet->payload[i] < '0' || packet->payload[i] > '9' || i > 12) {
|
if (packet->payload[i] < '0' || packet->payload[i] > '9' || i > 12) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"read symbols while the symbol is a number.\n");
|
"read symbols while the symbol is a number.\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (memcmp(&packet->payload[i], " ipp://", 7) != 0) {
|
if (memcmp(&packet->payload[i], " ipp://", 7) != 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "the string ' ipp://' does not follow\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "the string ' ipp://' does not follow.\n");
|
||||||
goto search_for_next_pattern;
|
goto search_for_next_pattern;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ipp\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "found ipp\n");
|
||||||
ndpi_int_ipp_add_connection(ndpi_struct, flow);
|
ndpi_int_ipp_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -103,12 +101,13 @@ void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
|||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
if (packet->content_line.ptr != NULL && packet->content_line.len > 14
|
if (packet->content_line.ptr != NULL && packet->content_line.len > 14
|
||||||
&& memcmp(packet->content_line.ptr, "application/ipp", 15) == 0) {
|
&& memcmp(packet->content_line.ptr, "application/ipp", 15) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ipp via POST ... application/ipp\n");
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "found ipp via POST ... application/ipp.\n");
|
||||||
ndpi_int_ipp_add_connection(ndpi_struct, flow);
|
ndpi_int_ipp_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "no ipp detected.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IPP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+91
-65
@@ -23,14 +23,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_IRC
|
#ifdef NDPI_PROTOCOL_IRC
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_IRC
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
#define NDPI_IRC_FIND_LESS(time_err,less) {int t1 = 0; \
|
#define NDPI_IRC_FIND_LESS(time_err,less) {int t1 = 0; \
|
||||||
u_int32_t timestamp = time_err[0]; \
|
u_int32_t timestamp = time_err[0]; \
|
||||||
for(t1=0;t1 < NDPI_PROTOCOL_IRC_MAXPORT;t1++) { \
|
for(t1=0;t1 < NDPI_PROTOCOL_IRC_MAXPORT;t1++) { \
|
||||||
@@ -73,7 +68,7 @@ static u_int8_t ndpi_check_for_NOTICE_or_PRIVMSG(struct ndpi_detection_module_st
|
|||||||
for (i = 0; i < packet->payload_packet_len - 7; i++) {
|
for (i = 0; i < packet->payload_packet_len - 7; i++) {
|
||||||
if (packet->payload[i] == 'N' || packet->payload[i] == 'P') {
|
if (packet->payload[i] == 'N' || packet->payload[i] == 'P') {
|
||||||
if (memcmp(&packet->payload[i + 1], "OTICE ", 6) == 0 || memcmp(&packet->payload[i + 1], "RIVMSG ", 7) == 0) {
|
if (memcmp(&packet->payload[i + 1], "OTICE ", 6) == 0 || memcmp(&packet->payload[i + 1], "RIVMSG ", 7) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found NOTICE or PRIVMSG\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "found NOTICE or PRIVMSG\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -102,7 +97,7 @@ static u_int8_t ndpi_check_for_Nickname(struct ndpi_detection_module_struct *ndp
|
|||||||
if ((((packetl - (i + 1)) >= 4) && memcmp(&packet->payload[i + 1], "ick=", 4) == 0)
|
if ((((packetl - (i + 1)) >= 4) && memcmp(&packet->payload[i + 1], "ick=", 4) == 0)
|
||||||
|| (((packetl - (i + 1)) >= 8) && (memcmp(&packet->payload[i + 1], "ickname=", 8) == 0))
|
|| (((packetl - (i + 1)) >= 8) && (memcmp(&packet->payload[i + 1], "ickname=", 8) == 0))
|
||||||
|| (((packetl - (i + 1)) >= 8) && (memcmp(&packet->payload[i + 1], "ickName=", 8) == 0))) {
|
|| (((packetl - (i + 1)) >= 8) && (memcmp(&packet->payload[i + 1], "ickName=", 8) == 0))) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found HTTP IRC Nickname pattern\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "found HTTP IRC Nickname pattern\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -122,7 +117,7 @@ static u_int8_t ndpi_check_for_cmd(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
for (i = 0; i < packet->payload_packet_len - 4; i++) {
|
for (i = 0; i < packet->payload_packet_len - 4; i++) {
|
||||||
if (packet->payload[i] == 'c') {
|
if (packet->payload[i] == 'c') {
|
||||||
if (memcmp(&packet->payload[i + 1], "md=", 3) == 0) {
|
if (memcmp(&packet->payload[i + 1], "md=", 3) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found HTTP IRC cmd pattern \n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "found HTTP IRC cmd pattern \n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -155,7 +150,8 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "start fast detect\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"called ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast\n");
|
||||||
|
|
||||||
/* case 1: len 1460, len 1460, len 1176 several times in one direction, than len = 4, 4096, 8192 in the other direction */
|
/* case 1: len 1460, len 1460, len 1176 several times in one direction, than len = 4, 4096, 8192 in the other direction */
|
||||||
if (packet->payload_packet_len == 1460
|
if (packet->payload_packet_len == 1460
|
||||||
@@ -181,7 +177,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 0x1000
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 0x1000
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
0x2000)) {
|
0x2000)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1460,1460,1176,<-4096||8192");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1460,1460,1176,<-4096||8192");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -192,27 +188,27 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
1 + packet->packet_direction))) {
|
1 + packet->packet_direction))) {
|
||||||
flow->l4.tcp.irc_stage2 = 4;
|
flow->l4.tcp.irc_stage2 = 4;
|
||||||
flow->l4.tcp.irc_direction = 1 + packet->packet_direction;
|
flow->l4.tcp.irc_direction = 1 + packet->packet_direction;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "len = 1448 first\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "len = 1448 first\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 1448 && flow->l4.tcp.irc_stage2 == 4
|
if (packet->payload_packet_len == 1448 && flow->l4.tcp.irc_stage2 == 4
|
||||||
&& flow->l4.tcp.irc_direction == 1 + packet->packet_direction) {
|
&& flow->l4.tcp.irc_direction == 1 + packet->packet_direction) {
|
||||||
flow->l4.tcp.irc_stage2 = 5;
|
flow->l4.tcp.irc_stage2 = 5;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "len = 1448 second \n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "len = 1448 second \n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 1200 && flow->l4.tcp.irc_stage2 == 5
|
if (packet->payload_packet_len == 1200 && flow->l4.tcp.irc_stage2 == 5
|
||||||
&& flow->l4.tcp.irc_direction == 1 + packet->packet_direction) {
|
&& flow->l4.tcp.irc_direction == 1 + packet->packet_direction) {
|
||||||
flow->l4.tcp.irc_stage2 = 6;
|
flow->l4.tcp.irc_stage2 = 6;
|
||||||
flow->l4.tcp.irc_0x1000_full = 1;
|
flow->l4.tcp.irc_0x1000_full = 1;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "len = 1200 \n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "len = 1200 \n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 4 && (flow->l4.tcp.irc_stage2 == 6 || flow->l4.tcp.irc_0x1000_full == 1)
|
if (packet->payload_packet_len == 4 && (flow->l4.tcp.irc_stage2 == 6 || flow->l4.tcp.irc_0x1000_full == 1)
|
||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 0x1000
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 0x1000
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
0x2000)) {
|
0x2000)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1448,1448,1200,<-4096||8192");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1448,1448,1200,<-4096||8192");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -229,7 +225,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1380
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1380
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
2760)) {
|
2760)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1380,<-1380||2760");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1380,<-1380||2760");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -244,7 +240,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1200
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1200
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
2400)) {
|
2400)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1200,<-1200||2400");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1200,<-1200||2400");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -259,7 +255,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1024
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1024
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
2048)) {
|
2048)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1024,<-1024||2048");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1024,<-1024||2048");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -274,7 +270,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1248
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1248
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
2496)) {
|
2496)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1248,<-1248||2496");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1248,<-1248||2496");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -289,7 +285,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1448
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && (ntohs(get_u_int16_t(packet->payload, 2)) == 1448
|
||||||
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
|| ntohs(get_u_int16_t(packet->payload, 2)) ==
|
||||||
2896)) {
|
2896)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1448,<-1448||2896");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1448,<-1448||2896");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -312,7 +308,8 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
if (packet->payload_packet_len == 4
|
if (packet->payload_packet_len == 4
|
||||||
&& flow->l4.tcp.irc_stage2 == 14
|
&& flow->l4.tcp.irc_stage2 == 14
|
||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && ntohs(get_u_int16_t(packet->payload, 2)) == 8192) {
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && ntohs(get_u_int16_t(packet->payload, 2)) == 8192) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1448,1448,1448,1448,1448,952,<-8192");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"IRC SSL detected: ->1448,1448,1448,1448,1448,952,<-8192");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -345,7 +342,8 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
if (packet->payload_packet_len == 4
|
if (packet->payload_packet_len == 4
|
||||||
&& flow->l4.tcp.irc_stage2 == 19
|
&& flow->l4.tcp.irc_stage2 == 19
|
||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && ntohs(get_u_int16_t(packet->payload, 2)) == 7168) {
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && ntohs(get_u_int16_t(packet->payload, 2)) == 7168) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1024,1448,1448,1200,1448,600,<-7168");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"IRC SSL detected: ->1024,1448,1448,1200,1448,600,<-7168");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -358,7 +356,7 @@ u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_det
|
|||||||
if (packet->payload_packet_len == 4
|
if (packet->payload_packet_len == 4
|
||||||
&& flow->l4.tcp.irc_stage2 == 20
|
&& flow->l4.tcp.irc_stage2 == 20
|
||||||
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && ntohs(get_u_int16_t(packet->payload, 2)) == 2404) {
|
&& flow->l4.tcp.irc_direction == 2 - packet->packet_direction && ntohs(get_u_int16_t(packet->payload, 2)) == 2404) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC SSL: ->1024,1380 <-2404");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC SSL detected: ->1024,1380 <-2404");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
@@ -387,26 +385,26 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
u_int16_t http_content_ptr_len = 0;
|
u_int16_t http_content_ptr_len = 0;
|
||||||
u_int8_t space = 0;
|
u_int8_t space = 0;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search irc\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "irc : search irc\n");
|
||||||
if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_IRC && flow->packet_counter > 70) {
|
if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_IRC && flow->packet_counter > 70) {
|
||||||
NDPI_LOG_DBG(ndpi_struct, "exclude irc, packet_counter > 70\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "exclude irc, packet_counter > 70\n");
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IRC);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IRC);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_IRC && flow->packet_counter > 30 &&
|
if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_IRC && flow->packet_counter > 30 &&
|
||||||
flow->l4.tcp.irc_stage2 == 0) {
|
flow->l4.tcp.irc_stage2 == 0) {
|
||||||
NDPI_LOG_DBG(ndpi_struct, "exclude irc, packet_counter > 30\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "packet_counter > 30, exclude irc.\n");
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IRC);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IRC);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_IRC) {
|
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_IRC) {
|
||||||
if (src != NULL && ((u_int32_t)
|
if (src != NULL && ((u_int32_t)
|
||||||
(packet->tick_timestamp - src->irc_ts) < ndpi_struct->irc_timeout)) {
|
(packet->tick_timestamp - src->irc_ts) < ndpi_struct->irc_timeout)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "irc : save src connection packet detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "irc : save src connection packet detected\n");
|
||||||
src->irc_ts = packet->tick_timestamp;
|
src->irc_ts = packet->tick_timestamp;
|
||||||
} else if (dst != NULL && ((u_int32_t)
|
} else if (dst != NULL && ((u_int32_t)
|
||||||
(packet->tick_timestamp - dst->irc_ts) < ndpi_struct->irc_timeout)) {
|
(packet->tick_timestamp - dst->irc_ts) < ndpi_struct->irc_timeout)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "irc : save dst connection packet detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "irc : save dst connection packet detected\n");
|
||||||
dst->irc_ts = packet->tick_timestamp;
|
dst->irc_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -428,7 +426,8 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
for (counter = 0; counter < dst->irc_number_of_port; counter++) {
|
for (counter = 0; counter < dst->irc_number_of_port; counter++) {
|
||||||
if (dst->irc_port[counter] == sport || dst->irc_port[counter] == dport) {
|
if (dst->irc_port[counter] == sport || dst->irc_port[counter] == dport) {
|
||||||
dst->last_time_port_used[counter] = packet->tick_timestamp;
|
dst->last_time_port_used[counter] = packet->tick_timestamp;
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC: dest port matched with the DCC port");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"dest port matched with the DCC port and the flow is marked as IRC");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -438,8 +437,9 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
for (counter = 0; counter < src->irc_number_of_port; counter++) {
|
for (counter = 0; counter < src->irc_number_of_port; counter++) {
|
||||||
if (src->irc_port[counter] == sport || src->irc_port[counter] == dport) {
|
if (src->irc_port[counter] == sport || src->irc_port[counter] == dport) {
|
||||||
src->last_time_port_used[counter] = packet->tick_timestamp;
|
src->last_time_port_used[counter] = packet->tick_timestamp;
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC: Source port matched with the DCC port");
|
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"Source port matched with the DCC port and the flow is marked as IRC");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -468,8 +468,8 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
|| (memcmp(&packet->payload[c1], "irc.discostars.de1", 18)
|
|| (memcmp(&packet->payload[c1], "irc.discostars.de1", 18)
|
||||||
== 0)
|
== 0)
|
||||||
|| (memcmp(&packet->payload[c1], "irc.rizon.net", 13) == 0)) {
|
|| (memcmp(&packet->payload[c1], "irc.rizon.net", 13) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"found IRC SSL: - irc.hackthissite.org0 | irc.gamepad.ca1 | dungeon.axenet.org0 "
|
"IRC SSL detected with :- irc.hackthissite.org0 | irc.gamepad.ca1 | dungeon.axenet.org0 "
|
||||||
"| dazed.nuggethaus.net | irc.indymedia.org | irc.discostars.de1 ");
|
"| dazed.nuggethaus.net | irc.indymedia.org | irc.discostars.de1 ");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
break;
|
break;
|
||||||
@@ -499,14 +499,14 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
if (packet->line[i].ptr[0] == ':') {
|
if (packet->line[i].ptr[0] == ':') {
|
||||||
flow->l4.tcp.irc_3a_counter++;
|
flow->l4.tcp.irc_3a_counter++;
|
||||||
if (flow->l4.tcp.irc_3a_counter == 7) { /* ':' == 0x3a */
|
if (flow->l4.tcp.irc_3a_counter == 7) { /* ':' == 0x3a */
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found irc. 0x3a. seven times.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "0x3a. seven times. found irc.");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
goto detected_irc;
|
goto detected_irc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (flow->l4.tcp.irc_3a_counter == 7) { /* ':' == 0x3a */
|
if (flow->l4.tcp.irc_3a_counter == 7) { /* ':' == 0x3a */
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found irc. 0x3a. seven times.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "0x3a. seven times. found irc.");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
goto detected_irc;
|
goto detected_irc;
|
||||||
}
|
}
|
||||||
@@ -521,19 +521,19 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
|| (memcmp(packet->payload, "NOTICE ", 7) == 0)
|
|| (memcmp(packet->payload, "NOTICE ", 7) == 0)
|
||||||
|| (memcmp(packet->payload, "PRIVMSG ", 8) == 0)
|
|| (memcmp(packet->payload, "PRIVMSG ", 8) == 0)
|
||||||
|| (memcmp(packet->payload, "VERSION ", 8) == 0)) {
|
|| (memcmp(packet->payload, "VERSION ", 8) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"USER, NICK, PASS, NOTICE, PRIVMSG one time");
|
"USER, NICK, PASS, NOTICE, PRIVMSG one time");
|
||||||
if (flow->l4.tcp.irc_stage == 2) {
|
if (flow->l4.tcp.irc_stage == 2) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found irc");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "found irc");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
flow->l4.tcp.irc_stage = 3;
|
flow->l4.tcp.irc_stage = 3;
|
||||||
}
|
}
|
||||||
if (flow->l4.tcp.irc_stage == 1) {
|
if (flow->l4.tcp.irc_stage == 1) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "second time, stage=2");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "second time, stage=2");
|
||||||
flow->l4.tcp.irc_stage = 2;
|
flow->l4.tcp.irc_stage = 2;
|
||||||
}
|
}
|
||||||
if (flow->l4.tcp.irc_stage == 0) {
|
if (flow->l4.tcp.irc_stage == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "first time, stage=1");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "first time, stage=1");
|
||||||
flow->l4.tcp.irc_stage = 1;
|
flow->l4.tcp.irc_stage = 1;
|
||||||
}
|
}
|
||||||
/* irc packets can have either windows line breaks (0d0a) or unix line breaks (0a) */
|
/* irc packets can have either windows line breaks (0d0a) or unix line breaks (0a) */
|
||||||
@@ -541,11 +541,13 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
&& packet->payload[packet->payload_packet_len - 1] == 0x0a) {
|
&& packet->payload[packet->payload_packet_len - 1] == 0x0a) {
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
if (packet->parsed_lines > 1) {
|
if (packet->parsed_lines > 1) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "packet contains more than one line");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"packet contains more than one line");
|
||||||
for (c = 1; c < packet->parsed_lines; c++) {
|
for (c = 1; c < packet->parsed_lines; c++) {
|
||||||
if (packet->line[c].len > 4 && (memcmp(packet->line[c].ptr, "NICK ", 5) == 0
|
if (packet->line[c].len > 4 && (memcmp(packet->line[c].ptr, "NICK ", 5) == 0
|
||||||
|| memcmp(packet->line[c].ptr, "USER ", 5) == 0)) {
|
|| memcmp(packet->line[c].ptr, "USER ", 5) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC: two icq signal words in the same packet");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct,
|
||||||
|
NDPI_LOG_TRACE, "two icq signal words in the same packet");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
flow->l4.tcp.irc_stage = 3;
|
flow->l4.tcp.irc_stage = 3;
|
||||||
return;
|
return;
|
||||||
@@ -556,12 +558,14 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
} else if (packet->payload[packet->payload_packet_len - 1] == 0x0a) {
|
} else if (packet->payload[packet->payload_packet_len - 1] == 0x0a) {
|
||||||
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
||||||
if (packet->parsed_lines > 1) {
|
if (packet->parsed_lines > 1) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "packet contains more than one line");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"packet contains more than one line");
|
||||||
for (c = 1; c < packet->parsed_lines; c++) {
|
for (c = 1; c < packet->parsed_lines; c++) {
|
||||||
if (packet->line[c].len > 4 && (memcmp(packet->line[c].ptr, "NICK ", 5) == 0
|
if (packet->line[c].len > 4 && (memcmp(packet->line[c].ptr, "NICK ", 5) == 0
|
||||||
|| memcmp(packet->line[c].ptr, "USER ",
|
|| memcmp(packet->line[c].ptr, "USER ",
|
||||||
5) == 0)) {
|
5) == 0)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC: two icq signal words in the same packet");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"two icq signal words in the same packet");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
flow->l4.tcp.irc_stage = 3;
|
flow->l4.tcp.irc_stage = 3;
|
||||||
return;
|
return;
|
||||||
@@ -593,7 +597,7 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
&& (ndpi_check_for_IRC_traces(packet->http_url_name.ptr, packet->http_url_name.len)))
|
&& (ndpi_check_for_IRC_traces(packet->http_url_name.ptr, packet->http_url_name.len)))
|
||||||
|| ((packet->referer_line.ptr)
|
|| ((packet->referer_line.ptr)
|
||||||
&& (ndpi_check_for_IRC_traces(packet->referer_line.ptr, packet->referer_line.len)))) {
|
&& (ndpi_check_for_IRC_traces(packet->referer_line.ptr, packet->referer_line.len)))) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"IRC detected from the Http URL/ Referer header ");
|
"IRC detected from the Http URL/ Referer header ");
|
||||||
flow->l4.tcp.irc_stage = 1;
|
flow->l4.tcp.irc_stage = 1;
|
||||||
// HTTP POST Request body is not in the same packet.
|
// HTTP POST Request body is not in the same packet.
|
||||||
@@ -612,21 +616,22 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
|| (((packet->payload_packet_len - http_content_ptr_len) > 5)
|
|| (((packet->payload_packet_len - http_content_ptr_len) > 5)
|
||||||
&& (memcmp(packet->payload + http_content_ptr_len, "item=", 5) == 0)
|
&& (memcmp(packet->payload + http_content_ptr_len, "item=", 5) == 0)
|
||||||
&& (ndpi_check_for_cmd(ndpi_struct, flow) != 0))) {
|
&& (ndpi_check_for_cmd(ndpi_struct, flow) != 0))) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found IRC: Nickname, cmd, one time");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "IRC Nickname, cmd, one time");
|
||||||
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
ndpi_int_irc_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
detected_irc:
|
detected_irc:
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "detected_irc:");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "detected_irc:");
|
||||||
|
|
||||||
if (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_IRC) {
|
if (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_IRC) {
|
||||||
/* maybe this can be deleted at the end */
|
/* maybe this can be deleted at the end */
|
||||||
|
|
||||||
if (packet->payload[packet->payload_packet_len - 2] != 0x0d
|
if (packet->payload[packet->payload_packet_len - 2] != 0x0d
|
||||||
&& packet->payload[packet->payload_packet_len - 1] == 0x0a) {
|
&& packet->payload[packet->payload_packet_len - 1] == 0x0a) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "ndpi_parse_packet_line_info_any(ndpi_struct, flow);");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"ndpi_parse_packet_line_info_any(ndpi_struct, flow);");
|
||||||
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
ndpi_parse_packet_line_info_any(ndpi_struct, flow);
|
||||||
} else if (packet->payload[packet->payload_packet_len - 2] == 0x0d) {
|
} else if (packet->payload[packet->payload_packet_len - 2] == 0x0d) {
|
||||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||||
@@ -635,27 +640,27 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
}
|
}
|
||||||
for (i = 0; i < packet->parsed_lines; i++) {
|
for (i = 0; i < packet->parsed_lines; i++) {
|
||||||
if (packet->line[i].len > 6 && memcmp(packet->line[i].ptr, "NOTICE ", 7) == 0) {
|
if (packet->line[i].len > 6 && memcmp(packet->line[i].ptr, "NOTICE ", 7) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "NOTICE");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "NOTICE");
|
||||||
for (j = 7; j < packet->line[i].len - 8; j++) {
|
for (j = 7; j < packet->line[i].len - 8; j++) {
|
||||||
if (packet->line[i].ptr[j] == ':') {
|
if (packet->line[i].ptr[j] == ':') {
|
||||||
if (memcmp(&packet->line[i].ptr[j + 1], "DCC SEND ", 9) == 0
|
if (memcmp(&packet->line[i].ptr[j + 1], "DCC SEND ", 9) == 0
|
||||||
|| memcmp(&packet->line[i].ptr[j + 1], "DCC CHAT ", 9) == 0) {
|
|| memcmp(&packet->line[i].ptr[j + 1], "DCC CHAT ", 9) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
"found NOTICE and DCC CHAT or DCC SEND.");
|
"found NOTICE and DCC CHAT or DCC SEND.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len > 0 && packet->payload[0] == 0x3a /* 0x3a = ':' */ ) {
|
if (packet->payload_packet_len > 0 && packet->payload[0] == 0x3a /* 0x3a = ':' */ ) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "3a");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "3a");
|
||||||
for (j = 1; j < packet->line[i].len - 9; j++) {
|
for (j = 1; j < packet->line[i].len - 9; j++) {
|
||||||
if (packet->line[i].ptr[j] == ' ') {
|
if (packet->line[i].ptr[j] == ' ') {
|
||||||
j++;
|
j++;
|
||||||
if (packet->line[i].ptr[j] == 'P') {
|
if (packet->line[i].ptr[j] == 'P') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "P");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "P");
|
||||||
j++;
|
j++;
|
||||||
if (memcmp(&packet->line[i].ptr[j], "RIVMSG ", 7) == 0)
|
if (memcmp(&packet->line[i].ptr[j], "RIVMSG ", 7) == 0)
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "RIVMSG");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "RIVMSG");
|
||||||
h = j + 7;
|
h = j + 7;
|
||||||
goto read_privmsg;
|
goto read_privmsg;
|
||||||
}
|
}
|
||||||
@@ -663,24 +668,25 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (packet->line[i].len > 7 && (memcmp(packet->line[i].ptr, "PRIVMSG ", 8) == 0)) {
|
if (packet->line[i].len > 7 && (memcmp(packet->line[i].ptr, "PRIVMSG ", 8) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "PRIVMSG ");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG, "PRIVMSG ");
|
||||||
h = 7;
|
h = 7;
|
||||||
read_privmsg:
|
read_privmsg:
|
||||||
for (j = h; j < packet->line[i].len - 9; j++) {
|
for (j = h; j < packet->line[i].len - 9; j++) {
|
||||||
if (packet->line[i].ptr[j] == ':') {
|
if (packet->line[i].ptr[j] == ':') {
|
||||||
if (memcmp(&packet->line[i].ptr[j + 1], "xdcc ", 5) == 0) {
|
if (memcmp(&packet->line[i].ptr[j + 1], "xdcc ", 5) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "xdcc should match.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "xdcc should match.");
|
||||||
}
|
}
|
||||||
j += 2;
|
j += 2;
|
||||||
if (memcmp(&packet->line[i].ptr[j], "DCC ", 4) == 0) {
|
if (memcmp(&packet->line[i].ptr[j], "DCC ", 4) == 0) {
|
||||||
j += 4;
|
j += 4;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found DCC.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "found DCC.");
|
||||||
if (memcmp(&packet->line[i].ptr[j], "SEND ", 5) == 0
|
if (memcmp(&packet->line[i].ptr[j], "SEND ", 5) == 0
|
||||||
|| (memcmp(&packet->line[i].ptr[j], "CHAT", 4) == 0)
|
|| (memcmp(&packet->line[i].ptr[j], "CHAT", 4) == 0)
|
||||||
|| (memcmp(&packet->line[i].ptr[j], "chat", 4) == 0)
|
|| (memcmp(&packet->line[i].ptr[j], "chat", 4) == 0)
|
||||||
|| (memcmp(&packet->line[i].ptr[j], "sslchat", 7) == 0)
|
|| (memcmp(&packet->line[i].ptr[j], "sslchat", 7) == 0)
|
||||||
|| (memcmp(&packet->line[i].ptr[j], "TSEND", 5) == 0)) {
|
|| (memcmp(&packet->line[i].ptr[j], "TSEND", 5) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found CHAT,chat,sslchat,TSEND.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"found CHAT,chat,sslchat,TSEND.");
|
||||||
j += 4;
|
j += 4;
|
||||||
|
|
||||||
while (packet->line[i].len > j &&
|
while (packet->line[i].len > j &&
|
||||||
@@ -693,29 +699,35 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
|
|
||||||
if (packet->line[i].ptr[j] == ' ') {
|
if (packet->line[i].ptr[j] == ' ') {
|
||||||
space++;
|
space++;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "space %u.", space);
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "space %u.", space);
|
||||||
}
|
}
|
||||||
if (space == 3) {
|
if (space == 3) {
|
||||||
j++;
|
j++;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "read port.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "read port.");
|
||||||
if (src != NULL) {
|
if (src != NULL) {
|
||||||
k = j;
|
k = j;
|
||||||
port =
|
port =
|
||||||
ntohs_ndpi_bytestream_to_number
|
ntohs_ndpi_bytestream_to_number
|
||||||
(&packet->line[i].ptr[j], packet->payload_packet_len - j, &j);
|
(&packet->line[i].ptr[j], packet->payload_packet_len - j, &j);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "port %u.",
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "port %u.",
|
||||||
port);
|
port);
|
||||||
j = k;
|
j = k;
|
||||||
// hier jetzt überlegen, wie die ports abgespeichert werden sollen
|
// hier jetzt überlegen, wie die ports abgespeichert werden sollen
|
||||||
if (src->irc_number_of_port < NDPI_PROTOCOL_IRC_MAXPORT)
|
if (src->irc_number_of_port < NDPI_PROTOCOL_IRC_MAXPORT)
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "src->irc_number_of_port < NDPI_PROTOCOL_IRC_MAXPORT.");
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE,
|
||||||
|
"src->irc_number_of_port < NDPI_PROTOCOL_IRC_MAXPORT.");
|
||||||
if (src->irc_number_of_port < NDPI_PROTOCOL_IRC_MAXPORT && port != 0) {
|
if (src->irc_number_of_port < NDPI_PROTOCOL_IRC_MAXPORT && port != 0) {
|
||||||
if (!ndpi_is_duplicate(src, port)) {
|
if (!ndpi_is_duplicate(src, port)) {
|
||||||
src->irc_port[src->irc_number_of_port]
|
src->irc_port[src->irc_number_of_port]
|
||||||
= port;
|
= port;
|
||||||
src->irc_number_of_port++;
|
src->irc_number_of_port++;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found port=%d jjeeeeeeeeeeeeeeeeeeeeeeeee",
|
NDPI_LOG
|
||||||
|
(NDPI_PROTOCOL_IRC,
|
||||||
|
ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found port=%d",
|
||||||
ntohs(get_u_int16_t(src->irc_port, 0)));
|
ntohs(get_u_int16_t(src->irc_port, 0)));
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"jjeeeeeeeeeeeeeeeeeeeeeeeee");
|
||||||
}
|
}
|
||||||
src->irc_ts = packet->tick_timestamp;
|
src->irc_ts = packet->tick_timestamp;
|
||||||
} else if (port != 0 && src->irc_number_of_port == NDPI_PROTOCOL_IRC_MAXPORT) {
|
} else if (port != 0 && src->irc_number_of_port == NDPI_PROTOCOL_IRC_MAXPORT) {
|
||||||
@@ -723,7 +735,11 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
less = 0;
|
less = 0;
|
||||||
NDPI_IRC_FIND_LESS(src->last_time_port_used, less);
|
NDPI_IRC_FIND_LESS(src->last_time_port_used, less);
|
||||||
src->irc_port[less] = port;
|
src->irc_port[less] = port;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found port=%d", ntohs(get_u_int16_t(src->irc_port, 0)));
|
NDPI_LOG
|
||||||
|
(NDPI_PROTOCOL_IRC,
|
||||||
|
ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found port=%d",
|
||||||
|
ntohs(get_u_int16_t(src->irc_port, 0)));
|
||||||
}
|
}
|
||||||
src->irc_ts = packet->tick_timestamp;
|
src->irc_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
@@ -734,7 +750,8 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
if (dst != NULL) {
|
if (dst != NULL) {
|
||||||
port = ntohs_ndpi_bytestream_to_number
|
port = ntohs_ndpi_bytestream_to_number
|
||||||
(&packet->line[i].ptr[j], packet->payload_packet_len - j, &j);
|
(&packet->line[i].ptr[j], packet->payload_packet_len - j, &j);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "port %u.", port);
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_TRACE, "port %u.",
|
||||||
|
port);
|
||||||
// hier das gleiche wie oben.
|
// hier das gleiche wie oben.
|
||||||
/* hier werden NDPI_PROTOCOL_IRC_MAXPORT ports pro irc flows mitgespeichert. könnte man denn nicht ein-
|
/* hier werden NDPI_PROTOCOL_IRC_MAXPORT ports pro irc flows mitgespeichert. könnte man denn nicht ein-
|
||||||
* fach an die dst oder src einen flag setzten, dass dieser port für eine bestimmte
|
* fach an die dst oder src einen flag setzten, dass dieser port für eine bestimmte
|
||||||
@@ -745,8 +762,13 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
dst->irc_port[dst->irc_number_of_port]
|
dst->irc_port[dst->irc_number_of_port]
|
||||||
= port;
|
= port;
|
||||||
dst->irc_number_of_port++;
|
dst->irc_number_of_port++;
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found port=%d", ntohs(get_u_int16_t(dst->irc_port, 0)));
|
NDPI_LOG
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "juuuuuuuuuuuuuuuu");
|
(NDPI_PROTOCOL_IRC,
|
||||||
|
ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found port=%d",
|
||||||
|
ntohs(get_u_int16_t(dst->irc_port, 0)));
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"juuuuuuuuuuuuuuuu");
|
||||||
}
|
}
|
||||||
dst->irc_ts = packet->tick_timestamp;
|
dst->irc_ts = packet->tick_timestamp;
|
||||||
} else if (port != 0 && dst->irc_number_of_port == NDPI_PROTOCOL_IRC_MAXPORT) {
|
} else if (port != 0 && dst->irc_number_of_port == NDPI_PROTOCOL_IRC_MAXPORT) {
|
||||||
@@ -755,7 +777,11 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
|||||||
NDPI_IRC_FIND_LESS(dst->last_time_port_used, less);
|
NDPI_IRC_FIND_LESS(dst->last_time_port_used, less);
|
||||||
dst->irc_port[less] = port;
|
dst->irc_port[less] = port;
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "found port=%d", ntohs(get_u_int16_t(dst->irc_port, 0)));
|
NDPI_LOG
|
||||||
|
(NDPI_PROTOCOL_IRC,
|
||||||
|
ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found port=%d",
|
||||||
|
ntohs(get_u_int16_t(dst->irc_port, 0)));
|
||||||
}
|
}
|
||||||
dst->irc_ts = packet->tick_timestamp;
|
dst->irc_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
|
|||||||
+52
-42
@@ -22,14 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
|
||||||
struct jabber_string {
|
struct jabber_string {
|
||||||
char *string;
|
char *string;
|
||||||
u_int ndpi_protocol;
|
u_int ndpi_protocol;
|
||||||
@@ -74,47 +70,51 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|
|
||||||
u_int16_t x;
|
u_int16_t x;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search JABBER\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER detection....\n");
|
||||||
|
|
||||||
/* search for jabber file transfer */
|
/* search for jabber file transfer */
|
||||||
/* this part is working asymmetrically */
|
/* this part is working asymmetrically */
|
||||||
if (packet->tcp != NULL && packet->tcp->syn != 0 && packet->payload_packet_len == 0) {
|
if (packet->tcp != NULL && packet->tcp->syn != 0 && packet->payload_packet_len == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "check jabber syn\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "check jabber syn\n");
|
||||||
if (src != NULL && src->jabber_file_transfer_port[0] != 0) {
|
if (src != NULL && src->jabber_file_transfer_port[0] != 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "src jabber ft port set, ports are: %u, %u\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
ntohs(src->jabber_file_transfer_port[0]),
|
"src jabber ft port set, ports are: %u, %u\n", ntohs(src->jabber_file_transfer_port[0]),
|
||||||
ntohs(src->jabber_file_transfer_port[1]));
|
ntohs(src->jabber_file_transfer_port[1]));
|
||||||
if (((u_int32_t)
|
if (((u_int32_t)
|
||||||
(packet->tick_timestamp - src->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
|
(packet->tick_timestamp - src->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER src stun timeout %u %u\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
src->jabber_stun_or_ft_ts, packet->tick_timestamp);
|
NDPI_LOG_DEBUG, "JABBER src stun timeout %u %u\n", src->jabber_stun_or_ft_ts,
|
||||||
|
packet->tick_timestamp);
|
||||||
src->jabber_file_transfer_port[0] = 0;
|
src->jabber_file_transfer_port[0] = 0;
|
||||||
src->jabber_file_transfer_port[1] = 0;
|
src->jabber_file_transfer_port[1] = 0;
|
||||||
} else if (src->jabber_file_transfer_port[0] == packet->tcp->dest
|
} else if (src->jabber_file_transfer_port[0] == packet->tcp->dest
|
||||||
|| src->jabber_file_transfer_port[0] == packet->tcp->source
|
|| src->jabber_file_transfer_port[0] == packet->tcp->source
|
||||||
|| src->jabber_file_transfer_port[1] == packet->tcp->dest
|
|| src->jabber_file_transfer_port[1] == packet->tcp->dest
|
||||||
|| src->jabber_file_transfer_port[1] == packet->tcp->source) {
|
|| src->jabber_file_transfer_port[1] == packet->tcp->source) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found jabber file transfer\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"found jabber file transfer.\n");
|
||||||
|
|
||||||
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
||||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dst != NULL && dst->jabber_file_transfer_port[0] != 0) {
|
if (dst != NULL && dst->jabber_file_transfer_port[0] != 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "dst jabber ft port set, ports are: %u, %u\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
ntohs(dst->jabber_file_transfer_port[0]),
|
"dst jabber ft port set, ports are: %u, %u\n", ntohs(dst->jabber_file_transfer_port[0]),
|
||||||
ntohs(dst->jabber_file_transfer_port[1]));
|
ntohs(dst->jabber_file_transfer_port[1]));
|
||||||
if (((u_int32_t)
|
if (((u_int32_t)
|
||||||
(packet->tick_timestamp - dst->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
|
(packet->tick_timestamp - dst->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER dst stun timeout %u %u\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
dst->jabber_stun_or_ft_ts, packet->tick_timestamp);
|
NDPI_LOG_DEBUG, "JABBER dst stun timeout %u %u\n", dst->jabber_stun_or_ft_ts,
|
||||||
|
packet->tick_timestamp);
|
||||||
dst->jabber_file_transfer_port[0] = 0;
|
dst->jabber_file_transfer_port[0] = 0;
|
||||||
dst->jabber_file_transfer_port[1] = 0;
|
dst->jabber_file_transfer_port[1] = 0;
|
||||||
} else if (dst->jabber_file_transfer_port[0] == packet->tcp->dest
|
} else if (dst->jabber_file_transfer_port[0] == packet->tcp->dest
|
||||||
|| dst->jabber_file_transfer_port[0] == packet->tcp->source
|
|| dst->jabber_file_transfer_port[0] == packet->tcp->source
|
||||||
|| dst->jabber_file_transfer_port[1] == packet->tcp->dest
|
|| dst->jabber_file_transfer_port[1] == packet->tcp->dest
|
||||||
|| dst->jabber_file_transfer_port[1] == packet->tcp->source) {
|
|| dst->jabber_file_transfer_port[1] == packet->tcp->source) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found jabber file transfer\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
|
"found jabber file transfer.\n");
|
||||||
|
|
||||||
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
ndpi_int_jabber_add_connection(ndpi_struct, flow,
|
||||||
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||||
@@ -135,17 +135,17 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
/* check for google jabber voip connections ... */
|
/* check for google jabber voip connections ... */
|
||||||
/* need big packet */
|
/* need big packet */
|
||||||
if (packet->payload_packet_len < 100) {
|
if (packet->payload_packet_len < 100) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "packet too small, return\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "packet too small, return.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* need message to or type for file-transfer */
|
/* need message to or type for file-transfer */
|
||||||
if (memcmp(packet->payload, "<iq from=\"", 8) == 0 || memcmp(packet->payload, "<iq from=\'", 8) == 0) {
|
if (memcmp(packet->payload, "<iq from=\"", 8) == 0 || memcmp(packet->payload, "<iq from=\'", 8) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER <iq from=\"\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq from=\".\n");
|
||||||
lastlen = packet->payload_packet_len - 11;
|
lastlen = packet->payload_packet_len - 11;
|
||||||
for (x = 10; x < lastlen; x++) {
|
for (x = 10; x < lastlen; x++) {
|
||||||
if (packet->payload[x] == 'p') {
|
if (packet->payload[x] == 'p') {
|
||||||
if (memcmp(&packet->payload[x], "port=", 5) == 0) {
|
if (memcmp(&packet->payload[x], "port=", 5) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "port=\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
|
||||||
if (src != NULL) {
|
if (src != NULL) {
|
||||||
src->jabber_stun_or_ft_ts = packet->tick_timestamp;
|
src->jabber_stun_or_ft_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
@@ -155,25 +155,30 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
}
|
}
|
||||||
x += 6;
|
x += 6;
|
||||||
j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
|
j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER port : %u\n", ntohs(j_port));
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "JABBER port : %u\n", ntohs(j_port));
|
||||||
if (src != NULL) {
|
if (src != NULL) {
|
||||||
if (src->jabber_file_transfer_port[0] == 0 || src->jabber_file_transfer_port[0] == j_port) {
|
if (src->jabber_file_transfer_port[0] == 0 || src->jabber_file_transfer_port[0] == j_port) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "src->jabber_file_transfer_port[0] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[0] = j_port = %u;\n",
|
||||||
ntohs(j_port));
|
ntohs(j_port));
|
||||||
src->jabber_file_transfer_port[0] = j_port;
|
src->jabber_file_transfer_port[0] = j_port;
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||||
ntohs(j_port));
|
ntohs(j_port));
|
||||||
src->jabber_file_transfer_port[1] = j_port;
|
src->jabber_file_transfer_port[1] = j_port;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dst != NULL) {
|
if (dst != NULL) {
|
||||||
if (dst->jabber_file_transfer_port[0] == 0 || dst->jabber_file_transfer_port[0] == j_port) {
|
if (dst->jabber_file_transfer_port[0] == 0 || dst->jabber_file_transfer_port[0] == j_port) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "dst->jabber_file_transfer_port[0] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[0] = j_port = %u;\n",
|
||||||
ntohs(j_port));
|
ntohs(j_port));
|
||||||
dst->jabber_file_transfer_port[0] = j_port;
|
dst->jabber_file_transfer_port[0] = j_port;
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||||
ntohs(j_port));
|
ntohs(j_port));
|
||||||
dst->jabber_file_transfer_port[1] = j_port;
|
dst->jabber_file_transfer_port[1] = j_port;
|
||||||
}
|
}
|
||||||
@@ -186,7 +191,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|
|
||||||
} else if (memcmp(packet->payload, "<iq to=\"", 8) == 0 || memcmp(packet->payload, "<iq to=\'", 8) == 0
|
} else if (memcmp(packet->payload, "<iq to=\"", 8) == 0 || memcmp(packet->payload, "<iq to=\'", 8) == 0
|
||||||
|| memcmp(packet->payload, "<iq type=", 9) == 0) {
|
|| memcmp(packet->payload, "<iq type=", 9) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER <iq to=\"/type=\"\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq to=\"/type=\"\n");
|
||||||
lastlen = packet->payload_packet_len - 21;
|
lastlen = packet->payload_packet_len - 21;
|
||||||
for (x = 8; x < lastlen; x++) {
|
for (x = 8; x < lastlen; x++) {
|
||||||
/* invalid character */
|
/* invalid character */
|
||||||
@@ -194,7 +199,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload[x] == '@') {
|
if (packet->payload[x] == '@') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER @\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER @\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -206,7 +211,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
for (; x < lastlen; x++) {
|
for (; x < lastlen; x++) {
|
||||||
if (packet->payload[x] == 'p') {
|
if (packet->payload[x] == 'p') {
|
||||||
if (memcmp(&packet->payload[x], "port=", 5) == 0) {
|
if (memcmp(&packet->payload[x], "port=", 5) == 0) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "port=\n");
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
|
||||||
if (src != NULL) {
|
if (src != NULL) {
|
||||||
src->jabber_stun_or_ft_ts = packet->tick_timestamp;
|
src->jabber_stun_or_ft_ts = packet->tick_timestamp;
|
||||||
}
|
}
|
||||||
@@ -217,7 +222,8 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
|
|
||||||
x += 6;
|
x += 6;
|
||||||
j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
|
j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "JABBER port : %u\n", ntohs(j_port));
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "JABBER port : %u\n", ntohs(j_port));
|
||||||
|
|
||||||
if (src != NULL && src->jabber_voice_stun_used_ports < JABBER_MAX_STUN_PORTS - 1) {
|
if (src != NULL && src->jabber_voice_stun_used_ports < JABBER_MAX_STUN_PORTS - 1) {
|
||||||
if (packet->payload[5] == 'o') {
|
if (packet->payload[5] == 'o') {
|
||||||
@@ -226,12 +232,13 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
} else {
|
} else {
|
||||||
if (src->jabber_file_transfer_port[0] == 0
|
if (src->jabber_file_transfer_port[0] == 0
|
||||||
|| src->jabber_file_transfer_port[0] == j_port) {
|
|| src->jabber_file_transfer_port[0] == j_port) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "src->jabber_file_transfer_port[0] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
ntohs(j_port));
|
"src->jabber_file_transfer_port[0] = j_port = %u;\n", ntohs(j_port));
|
||||||
src->jabber_file_transfer_port[0] = j_port;
|
src->jabber_file_transfer_port[0] = j_port;
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
ntohs(j_port));
|
NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||||
|
ntohs(j_port));
|
||||||
src->jabber_file_transfer_port[1] = j_port;
|
src->jabber_file_transfer_port[1] = j_port;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -244,12 +251,13 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
} else {
|
} else {
|
||||||
if (dst->jabber_file_transfer_port[0] == 0
|
if (dst->jabber_file_transfer_port[0] == 0
|
||||||
|| dst->jabber_file_transfer_port[0] == j_port) {
|
|| dst->jabber_file_transfer_port[0] == j_port) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "dst->jabber_file_transfer_port[0] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
ntohs(j_port));
|
"dst->jabber_file_transfer_port[0] = j_port = %u;\n", ntohs(j_port));
|
||||||
dst->jabber_file_transfer_port[0] = j_port;
|
dst->jabber_file_transfer_port[0] = j_port;
|
||||||
} else {
|
} else {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
ntohs(j_port));
|
NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
|
||||||
|
ntohs(j_port));
|
||||||
dst->jabber_file_transfer_port[1] = j_port;
|
dst->jabber_file_transfer_port[1] = j_port;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -283,14 +291,16 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (flow->packet_counter < 3) {
|
if (flow->packet_counter < 3) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "packet_counter: %u\n", flow->packet_counter);
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "packet_counter: %u\n", flow->packet_counter);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER Excluded.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_TRUPHONE
|
#ifdef NDPI_PROTOCOL_TRUPHONE
|
||||||
ndpi_exclude_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TRUPHONE,__FILE__,__FUNCTION__,__LINE__);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TRUPHONE);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,20 +24,13 @@
|
|||||||
|
|
||||||
http://www.kakao.com/services/talk/voices
|
http://www.kakao.com/services/talk/voices
|
||||||
*/
|
*/
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_KAKAOTALK_VOICE
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_KAKAOTALK_VOICE
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_KAKAOTALK_VOICE
|
||||||
void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search kakaotalk_voice\n");
|
|
||||||
|
|
||||||
if(packet->iph
|
if(packet->iph
|
||||||
&& packet->udp
|
&& packet->udp
|
||||||
&& (packet->payload_packet_len >= 4)
|
&& (packet->payload_packet_len >= 4)
|
||||||
@@ -55,14 +48,14 @@ void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struc
|
|||||||
|
|
||||||
if(((ntohl(packet->iph->saddr) & 0xFFFF0000 /* 255.255.0.0 */) == 0x01C90000 /* 1.201.0.0/16 */)
|
if(((ntohl(packet->iph->saddr) & 0xFFFF0000 /* 255.255.0.0 */) == 0x01C90000 /* 1.201.0.0/16 */)
|
||||||
|| ((ntohl(packet->iph->daddr) & 0xFFFF0000 /* 255.255.0.0 */) == 0x01C90000 /* 1.201.0.0/16 */)) {
|
|| ((ntohl(packet->iph->daddr) & 0xFFFF0000 /* 255.255.0.0 */) == 0x01C90000 /* 1.201.0.0/16 */)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found kakaotalk_voice\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_KAKAOTALK_VOICE, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_KAKAOTALK_VOICE, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_KAKAOTALK_VOICE, ndpi_struct, NDPI_LOG_DEBUG, "Exclude kakaotalk_voice.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_KAKAOTALK_VOICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,28 +22,24 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_KERBEROS
|
#ifdef NDPI_PROTOCOL_KERBEROS
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_KERBEROS
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_kerberos_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_kerberos_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_KERBEROS, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_KERBEROS, NDPI_PROTOCOL_UNKNOWN);
|
||||||
NDPI_LOG_DBG(ndpi_struct, "trace KERBEROS\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
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 KERBEROS\n");
|
|
||||||
|
|
||||||
/* I have observed 0a,0c,0d,0e at packet->payload[19/21], maybe there are other possibilities */
|
/* I have observed 0a,0c,0d,0e at packet->payload[19/21], maybe there are other possibilities */
|
||||||
if (packet->payload_packet_len >= 4 && ntohl(get_u_int32_t(packet->payload, 0)) == packet->payload_packet_len - 4) {
|
if (packet->payload_packet_len >= 4 && ntohl(get_u_int32_t(packet->payload, 0)) == packet->payload_packet_len - 4) {
|
||||||
@@ -51,6 +47,7 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
packet->payload[14] == 0x05 &&
|
packet->payload[14] == 0x05 &&
|
||||||
(packet->payload[19] == 0x0a ||
|
(packet->payload[19] == 0x0a ||
|
||||||
packet->payload[19] == 0x0c || packet->payload[19] == 0x0d || packet->payload[19] == 0x0e)) {
|
packet->payload[19] == 0x0c || packet->payload[19] == 0x0d || packet->payload[19] == 0x0e)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_KERBEROS, ndpi_struct, NDPI_LOG_DEBUG, "found KERBEROS\n");
|
||||||
ndpi_int_kerberos_add_connection(ndpi_struct, flow);
|
ndpi_int_kerberos_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -59,12 +56,18 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, stru
|
|||||||
packet->payload[16] == 0x05 &&
|
packet->payload[16] == 0x05 &&
|
||||||
(packet->payload[21] == 0x0a ||
|
(packet->payload[21] == 0x0a ||
|
||||||
packet->payload[21] == 0x0c || packet->payload[21] == 0x0d || packet->payload[21] == 0x0e)) {
|
packet->payload[21] == 0x0c || packet->payload[21] == 0x0d || packet->payload[21] == 0x0e)) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_KERBEROS, ndpi_struct, NDPI_LOG_DEBUG, "found KERBEROS\n");
|
||||||
ndpi_int_kerberos_add_connection(ndpi_struct, flow);
|
ndpi_int_kerberos_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_KERBEROS, ndpi_struct, NDPI_LOG_DEBUG, "no KERBEROS detected.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_KERBEROS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,46 +23,44 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_KONTIKI
|
#ifdef NDPI_PROTOCOL_KONTIKI
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_KONTIKI
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_kontiki_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_kontiki_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_KONTIKI, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_KONTIKI, NDPI_PROTOCOL_UNKNOWN);
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found Kontiki UDP\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_kontiki(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_kontiki(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search Kontiki\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
|
|
||||||
if (packet->payload_packet_len == 4 && (get_u_int32_t(packet->payload, 0) == htonl(0x02010100))) {
|
if (packet->payload_packet_len == 4 && (get_u_int32_t(packet->payload, 0) == htonl(0x02010100))) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_KONTIKI, ndpi_struct, NDPI_LOG_DEBUG, "Kontiki UDP detected.\n");
|
||||||
ndpi_int_kontiki_add_connection(ndpi_struct, flow);
|
ndpi_int_kontiki_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload_packet_len > 0 && packet->payload[0] == 0x02) {
|
if (packet->payload_packet_len > 0 && packet->payload[0] == 0x02) {
|
||||||
|
|
||||||
if (packet->payload_packet_len == 20 && (get_u_int32_t(packet->payload, 16) == htonl(0x02040100))) {
|
if (packet->payload_packet_len == 20 && (get_u_int32_t(packet->payload, 16) == htonl(0x02040100))) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_KONTIKI, ndpi_struct, NDPI_LOG_DEBUG, "Kontiki UDP detected.\n");
|
||||||
ndpi_int_kontiki_add_connection(ndpi_struct, flow);
|
ndpi_int_kontiki_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (packet->payload_packet_len == 16 && (get_u_int32_t(packet->payload, 12) == htonl(0x000004e4))) {
|
if (packet->payload_packet_len == 16 && (get_u_int32_t(packet->payload, 12) == htonl(0x000004e4))) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_KONTIKI, ndpi_struct, NDPI_LOG_DEBUG, "Kontiki UDP detected.\n");
|
||||||
ndpi_int_kontiki_add_connection(ndpi_struct, flow);
|
ndpi_int_kontiki_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_KONTIKI);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+17
-12
@@ -22,15 +22,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_LDAP
|
#ifdef NDPI_PROTOCOL_LDAP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_LDAP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_ldap_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
static void ndpi_int_ldap_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow)
|
struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
@@ -41,7 +37,15 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search ldap\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
|
// u_int16_t dport;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "search ldap\n");
|
||||||
|
|
||||||
|
|
||||||
if (packet->payload_packet_len >= 14 && packet->payload[0] == 0x30) {
|
if (packet->payload_packet_len >= 14 && packet->payload[0] == 0x30) {
|
||||||
|
|
||||||
@@ -51,14 +55,14 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
|
|
||||||
if (packet->payload[3] == 0x01 &&
|
if (packet->payload[3] == 0x01 &&
|
||||||
(packet->payload[5] == 0x60 || packet->payload[5] == 0x61) && packet->payload[6] == 0x07) {
|
(packet->payload[5] == 0x60 || packet->payload[5] == 0x61) && packet->payload[6] == 0x07) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ldap simple type 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap simple type 1\n");
|
||||||
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload[3] == 0x02 &&
|
if (packet->payload[3] == 0x02 &&
|
||||||
(packet->payload[6] == 0x60 || packet->payload[6] == 0x61) && packet->payload[7] == 0x07) {
|
(packet->payload[6] == 0x60 || packet->payload[6] == 0x61) && packet->payload[7] == 0x07) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ldap simple type 2\n");
|
NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap simple type 2\n");
|
||||||
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -71,7 +75,7 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
(packet->payload[9] == 0x60 || packet->payload[9] == 0x61 || packet->payload[9] == 0x63 ||
|
(packet->payload[9] == 0x60 || packet->payload[9] == 0x61 || packet->payload[9] == 0x63 ||
|
||||||
packet->payload[9] == 0x64) && packet->payload[10] == 0x84) {
|
packet->payload[9] == 0x64) && packet->payload[10] == 0x84) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ldap type 1\n");
|
NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap type 1\n");
|
||||||
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -80,7 +84,7 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
(packet->payload[10] == 0x60 || packet->payload[10] == 0x61 || packet->payload[10] == 0x63 ||
|
(packet->payload[10] == 0x60 || packet->payload[10] == 0x61 || packet->payload[10] == 0x63 ||
|
||||||
packet->payload[10] == 0x64) && packet->payload[11] == 0x84) {
|
packet->payload[10] == 0x64) && packet->payload[11] == 0x84) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found ldap type 2\n");
|
NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap type 2\n");
|
||||||
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
ndpi_int_ldap_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -88,7 +92,8 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "ldap excluded.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_LDAP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_LISP
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_LISP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
#ifdef NDPI_PROTOCOL_LISP
|
||||||
|
|
||||||
#define LISP_PORT 4341
|
#define LISP_PORT 4341
|
||||||
#define LISP_PORT1 4342
|
#define LISP_PORT1 4342
|
||||||
@@ -21,8 +16,9 @@ static void ndpi_check_lisp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
{
|
{
|
||||||
|
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
u_int32_t payload_len = packet->payload_packet_len;
|
||||||
|
|
||||||
if(packet->udp != NULL) {
|
if(packet->udp != NULL) {
|
||||||
|
|
||||||
u_int16_t lisp_port = htons(LISP_PORT);
|
u_int16_t lisp_port = htons(LISP_PORT);
|
||||||
u_int16_t lisp_port1 = htons(LISP_PORT1);
|
u_int16_t lisp_port1 = htons(LISP_PORT1);
|
||||||
@@ -32,21 +28,22 @@ static void ndpi_check_lisp(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
((packet->udp->source == lisp_port1)
|
((packet->udp->source == lisp_port1)
|
||||||
&& (packet->udp->dest == lisp_port1)) ) {
|
&& (packet->udp->dest == lisp_port1)) ) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found lisp\n");
|
NDPI_LOG(NDPI_PROTOCOL_LISP, ndpi_struct, NDPI_LOG_DEBUG, "Found lisp.\n");
|
||||||
ndpi_int_lisp_add_connection(ndpi_struct, flow, 0);
|
ndpi_int_lisp_add_connection(ndpi_struct, flow, 0);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_LISP, ndpi_struct, NDPI_LOG_DEBUG, "exclude lisp.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_LISP);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_lisp(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)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search lisp\n");
|
NDPI_LOG(NDPI_PROTOCOL_LISP, ndpi_struct, NDPI_LOG_DEBUG, "lisp detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_LISP) {
|
if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_LISP) {
|
||||||
|
|||||||
@@ -18,14 +18,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_LOTUS_NOTES
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_LOTUS_NOTES
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_LOTUS_NOTES
|
||||||
|
|
||||||
/* ************************************ */
|
/* ************************************ */
|
||||||
|
|
||||||
@@ -36,35 +32,38 @@ static void ndpi_check_lotus_notes(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
// const u_int8_t *packet_payload = packet->payload;
|
// const u_int8_t *packet_payload = packet->payload;
|
||||||
u_int32_t payload_len = packet->payload_packet_len;
|
u_int32_t payload_len = packet->payload_packet_len;
|
||||||
|
|
||||||
if(packet->tcp == NULL) return;
|
if(packet->tcp != NULL) {
|
||||||
|
flow->l4.tcp.lotus_notes_packet_id++;
|
||||||
|
|
||||||
|
if((flow->l4.tcp.lotus_notes_packet_id == 1)
|
||||||
|
/* We have seen the 3-way handshake */
|
||||||
|
&& flow->l4.tcp.seen_syn
|
||||||
|
&& flow->l4.tcp.seen_syn_ack
|
||||||
|
&& flow->l4.tcp.seen_ack) {
|
||||||
|
if(payload_len > 16) {
|
||||||
|
char lotus_notes_header[] = { 0x00, 0x00, 0x02, 0x00, 0x00, 0x40, 0x02, 0x0F };
|
||||||
|
|
||||||
|
if(memcmp(&packet->payload[6], lotus_notes_header, sizeof(lotus_notes_header)) == 0) {
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_LOTUS_NOTES, ndpi_struct, NDPI_LOG_DEBUG, "Found lotus_notes.\n");
|
||||||
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_LOTUS_NOTES, NDPI_PROTOCOL_UNKNOWN);
|
||||||
|
}
|
||||||
|
|
||||||
flow->l4.tcp.lotus_notes_packet_id++;
|
return;
|
||||||
|
|
||||||
if((flow->l4.tcp.lotus_notes_packet_id == 1)
|
|
||||||
/* We have seen the 3-way handshake */
|
|
||||||
&& flow->l4.tcp.seen_syn
|
|
||||||
&& flow->l4.tcp.seen_syn_ack
|
|
||||||
&& flow->l4.tcp.seen_ack) {
|
|
||||||
if(payload_len > 16) {
|
|
||||||
char lotus_notes_header[] = { 0x00, 0x00, 0x02, 0x00, 0x00, 0x40, 0x02, 0x0F };
|
|
||||||
|
|
||||||
if(memcmp(&packet->payload[6], lotus_notes_header, sizeof(lotus_notes_header)) == 0) {
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found lotus_notes\n");
|
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_LOTUS_NOTES, NDPI_PROTOCOL_UNKNOWN);
|
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if(flow->l4.tcp.lotus_notes_packet_id <= 3) return;
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_LOTUS_NOTES);
|
||||||
|
} else if(flow->l4.tcp.lotus_notes_packet_id > 3)
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_LOTUS_NOTES);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndpi_search_lotus_notes(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_lotus_notes(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search lotus_notes\n");
|
NDPI_LOG(NDPI_PROTOCOL_LOTUS_NOTES, ndpi_struct, NDPI_LOG_DEBUG, "lotus_notes detection...\n");
|
||||||
|
|
||||||
/* skip marked packets */
|
/* skip marked packets */
|
||||||
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_LOTUS_NOTES)
|
if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_LOTUS_NOTES)
|
||||||
|
|||||||
@@ -22,15 +22,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_MAIL_IMAP
|
#ifdef NDPI_PROTOCOL_MAIL_IMAP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MAIL_IMAP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_mail_imap_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_mail_imap_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_IMAP, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_IMAP, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -45,11 +40,11 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
u_int8_t saw_command = 0;
|
u_int8_t saw_command = 0;
|
||||||
/* const u_int8_t *command = 0; */
|
/* const u_int8_t *command = 0; */
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search IMAP_IMAP\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG, "search IMAP.\n");
|
||||||
|
|
||||||
if (flow->l4.tcp.mail_imap_starttls == 2) {
|
if (flow->l4.tcp.mail_imap_starttls == 2) {
|
||||||
#ifdef NDPI_PROTOCOL_SSL
|
#ifdef NDPI_PROTOCOL_SSL
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "starttls detected\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG, "starttls detected\n");
|
||||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAIL_IMAP);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAIL_IMAP);
|
||||||
NDPI_DEL_PROTOCOL_FROM_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSL);
|
NDPI_DEL_PROTOCOL_FROM_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSL);
|
||||||
return;
|
return;
|
||||||
@@ -280,7 +275,7 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
|
|
||||||
if (saw_command == 1) {
|
if (saw_command == 1) {
|
||||||
if (flow->l4.tcp.mail_imap_stage == 3 || flow->l4.tcp.mail_imap_stage == 5) {
|
if (flow->l4.tcp.mail_imap_stage == 3 || flow->l4.tcp.mail_imap_stage == 5) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MAIL_IMAP\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG, "mail imap identified\n");
|
||||||
ndpi_int_mail_imap_add_connection(ndpi_struct, flow);
|
ndpi_int_mail_imap_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -288,7 +283,7 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (packet->payload_packet_len > 1 && packet->payload[packet->payload_packet_len - 1] == ' ') {
|
if (packet->payload_packet_len > 1 && packet->payload[packet->payload_packet_len - 1] == ' ') {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"maybe a split imap command -> need next packet and imap_stage is set to 4.\n");
|
"maybe a split imap command -> need next packet and imap_stage is set to 4.\n");
|
||||||
flow->l4.tcp.mail_imap_stage = 4;
|
flow->l4.tcp.mail_imap_stage = 4;
|
||||||
return;
|
return;
|
||||||
@@ -300,12 +295,13 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
// if the packet count is low enough and at least one command or response was seen before
|
// if the packet count is low enough and at least one command or response was seen before
|
||||||
if ((packet->payload_packet_len >= 2 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)
|
if ((packet->payload_packet_len >= 2 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)
|
||||||
&& flow->packet_counter < 6 && flow->l4.tcp.mail_imap_stage >= 1) {
|
&& flow->packet_counter < 6 && flow->l4.tcp.mail_imap_stage >= 1) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"no imap command or response but packet count < 6 and imap stage >= 1 -> skip\n");
|
"no imap command or response but packet count < 6 and imap stage >= 1 -> skip\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_IMAP, ndpi_struct, NDPI_LOG_DEBUG, "exclude IMAP.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAIL_IMAP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,15 +23,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_MAIL_POP
|
#ifdef NDPI_PROTOCOL_MAIL_POP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MAIL_POP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define POP_BIT_AUTH 0x0001
|
#define POP_BIT_AUTH 0x0001
|
||||||
#define POP_BIT_APOP 0x0002
|
#define POP_BIT_APOP 0x0002
|
||||||
#define POP_BIT_USER 0x0004
|
#define POP_BIT_USER 0x0004
|
||||||
@@ -57,6 +52,9 @@ static int ndpi_int_mail_pop_check_for_client_commands(struct ndpi_detection_mod
|
|||||||
{
|
{
|
||||||
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;
|
||||||
|
|
||||||
if (packet->payload_packet_len > 4) {
|
if (packet->payload_packet_len > 4) {
|
||||||
if ((packet->payload[0] == 'A' || packet->payload[0] == 'a')
|
if ((packet->payload[0] == 'A' || packet->payload[0] == 'a')
|
||||||
&& (packet->payload[1] == 'U' || packet->payload[1] == 'u')
|
&& (packet->payload[1] == 'U' || packet->payload[1] == 'u')
|
||||||
@@ -135,10 +133,13 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct
|
|||||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
u_int8_t a = 0;
|
u_int8_t a = 0;
|
||||||
u_int8_t bit_count = 0;
|
u_int8_t bit_count = 0;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search mail_pop\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_POP, ndpi_struct, NDPI_LOG_DEBUG, "search mail_pop\n");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -164,12 +165,12 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_POP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"mail_pop +OK/-ERR responses: %u, unique commands: %u\n", flow->l4.tcp.mail_pop_stage, bit_count);
|
"mail_pop +OK/-ERR responses: %u, unique commands: %u\n", flow->l4.tcp.mail_pop_stage, bit_count);
|
||||||
|
|
||||||
if ((bit_count + flow->l4.tcp.mail_pop_stage) >= 3) {
|
if ((bit_count + flow->l4.tcp.mail_pop_stage) >= 3) {
|
||||||
if (flow->l4.tcp.mail_pop_stage > 0) {
|
if (flow->l4.tcp.mail_pop_stage > 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "mail_pop identified\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_POP, ndpi_struct, NDPI_LOG_DEBUG, "mail_pop identified\n");
|
||||||
ndpi_int_mail_pop_add_connection(ndpi_struct, flow);
|
ndpi_int_mail_pop_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
@@ -181,7 +182,7 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
// first part of a split packet
|
// first part of a split packet
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_POP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"mail_pop command without line ending -> skip\n");
|
"mail_pop command without line ending -> skip\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -192,12 +193,13 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct
|
|||||||
if (((packet->payload_packet_len > 2 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)
|
if (((packet->payload_packet_len > 2 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)
|
||||||
|| flow->l4.tcp.pop_command_bitmask != 0 || flow->l4.tcp.mail_pop_stage != 0) && flow->packet_counter < 12) {
|
|| flow->l4.tcp.pop_command_bitmask != 0 || flow->l4.tcp.mail_pop_stage != 0) && flow->packet_counter < 12) {
|
||||||
// maybe part of a split pop packet
|
// maybe part of a split pop packet
|
||||||
NDPI_LOG_DBG2(ndpi_struct,
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_POP, ndpi_struct, NDPI_LOG_DEBUG,
|
||||||
"maybe part of split mail_pop packet -> skip\n");
|
"maybe part of split mail_pop packet -> skip\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_POP, ndpi_struct, NDPI_LOG_DEBUG, "exclude mail_pop\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAIL_POP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,15 +23,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_MAIL_SMTP
|
#ifdef NDPI_PROTOCOL_MAIL_SMTP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MAIL_SMTP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define SMTP_BIT_220 0x01
|
#define SMTP_BIT_220 0x01
|
||||||
#define SMTP_BIT_250 0x02
|
#define SMTP_BIT_250 0x02
|
||||||
#define SMTP_BIT_235 0x04
|
#define SMTP_BIT_235 0x04
|
||||||
@@ -58,7 +53,12 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct
|
|||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search mail_smtp\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
|
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_SMTP, ndpi_struct, NDPI_LOG_DEBUG, "search mail_smtp.\n");
|
||||||
|
|
||||||
|
|
||||||
if (packet->payload_packet_len > 2 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a) {
|
if (packet->payload_packet_len > 2 && ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a) {
|
||||||
u_int8_t a;
|
u_int8_t a;
|
||||||
@@ -152,11 +152,11 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct
|
|||||||
bit_count += (flow->l4.tcp.smtp_command_bitmask >> a) & 0x01;
|
bit_count += (flow->l4.tcp.smtp_command_bitmask >> a) & 0x01;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "seen smtp commands and responses: %u\n",
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_SMTP, ndpi_struct, NDPI_LOG_DEBUG, "seen smtp commands and responses: %u.\n",
|
||||||
bit_count);
|
bit_count);
|
||||||
|
|
||||||
if (bit_count >= 3) {
|
if (bit_count >= 3) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "mail smtp identified\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_SMTP, ndpi_struct, NDPI_LOG_DEBUG, "mail smtp identified\n");
|
||||||
ndpi_int_mail_smtp_add_connection(ndpi_struct, flow);
|
ndpi_int_mail_smtp_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -169,11 +169,12 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct
|
|||||||
packet->payload_packet_len >= 4 &&
|
packet->payload_packet_len >= 4 &&
|
||||||
(ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a
|
(ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a
|
||||||
|| memcmp(packet->payload, "220", 3) == 0 || memcmp(packet->payload, "EHLO", 4) == 0)) {
|
|| memcmp(packet->payload, "220", 3) == 0 || memcmp(packet->payload, "EHLO", 4) == 0)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "maybe SMTP, need next packet\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_SMTP, ndpi_struct, NDPI_LOG_DEBUG, "maybe SMTP, need next packet.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_MAIL_SMTP, ndpi_struct, NDPI_LOG_DEBUG, "exclude smtp\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAIL_SMTP);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,14 +22,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_MAPLESTORY
|
#ifdef NDPI_PROTOCOL_MAPLESTORY
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MAPLESTORY
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
static void ndpi_int_maplestory_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
static void ndpi_int_maplestory_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAPLESTORY, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAPLESTORY, NDPI_PROTOCOL_UNKNOWN);
|
||||||
@@ -40,13 +36,16 @@ void ndpi_search_maplestory(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 maplestory\n");
|
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||||
|
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (packet->payload_packet_len == 16
|
if (packet->payload_packet_len == 16
|
||||||
&& (ntohl(get_u_int32_t(packet->payload, 0)) == 0x0e003a00 || ntohl(get_u_int32_t(packet->payload, 0)) == 0x0e003b00
|
&& (ntohl(get_u_int32_t(packet->payload, 0)) == 0x0e003a00 || ntohl(get_u_int32_t(packet->payload, 0)) == 0x0e003b00
|
||||||
|| ntohl(get_u_int32_t(packet->payload, 0)) == 0x0e004200)
|
|| ntohl(get_u_int32_t(packet->payload, 0)) == 0x0e004200)
|
||||||
&& ntohs(get_u_int16_t(packet->payload, 4)) == 0x0100 && (packet->payload[6] == 0x32 || packet->payload[6] == 0x33)) {
|
&& ntohs(get_u_int16_t(packet->payload, 4)) == 0x0100 && (packet->payload[6] == 0x32 || packet->payload[6] == 0x33)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found maplestory\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAPLESTORY, ndpi_struct, NDPI_LOG_DEBUG, "found maplestory.\n");
|
||||||
ndpi_int_maplestory_add_connection(ndpi_struct, flow);
|
ndpi_int_maplestory_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -64,7 +63,7 @@ void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
NDPI_STATICSTRING_LEN("patch")) == 0
|
NDPI_STATICSTRING_LEN("patch")) == 0
|
||||||
&& memcmp(packet->user_agent_line.ptr, "Patcher", NDPI_STATICSTRING_LEN("Patcher")) == 0
|
&& memcmp(packet->user_agent_line.ptr, "Patcher", NDPI_STATICSTRING_LEN("Patcher")) == 0
|
||||||
&& memcmp(packet->host_line.ptr, "patch.", NDPI_STATICSTRING_LEN("patch.")) == 0) {
|
&& memcmp(packet->host_line.ptr, "patch.", NDPI_STATICSTRING_LEN("patch.")) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found maplestory update\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAPLESTORY, ndpi_struct, NDPI_LOG_DEBUG, "found maplestory update.\n");
|
||||||
ndpi_int_maplestory_add_connection(ndpi_struct, flow);
|
ndpi_int_maplestory_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -72,13 +71,14 @@ void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
&& memcmp(&packet->payload[NDPI_STATICSTRING_LEN("GET /maple")], "story/",
|
&& memcmp(&packet->payload[NDPI_STATICSTRING_LEN("GET /maple")], "story/",
|
||||||
NDPI_STATICSTRING_LEN("story/")) == 0
|
NDPI_STATICSTRING_LEN("story/")) == 0
|
||||||
&& memcmp(packet->user_agent_line.ptr, "AspINet", NDPI_STATICSTRING_LEN("AspINet")) == 0) {
|
&& memcmp(packet->user_agent_line.ptr, "AspINet", NDPI_STATICSTRING_LEN("AspINet")) == 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found maplestory update\n");
|
NDPI_LOG(NDPI_PROTOCOL_MAPLESTORY, ndpi_struct, NDPI_LOG_DEBUG, "found maplestory update.\n");
|
||||||
ndpi_int_maplestory_add_connection(ndpi_struct, flow);
|
ndpi_int_maplestory_add_connection(ndpi_struct, flow);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_MAPLESTORY, ndpi_struct, NDPI_LOG_DEBUG, "exclude maplestory.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MAPLESTORY);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,14 +20,10 @@
|
|||||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "ndpi_protocol_ids.h"
|
#include "ndpi_protocols.h"
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_MDNS
|
#ifdef NDPI_PROTOCOL_MDNS
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MDNS
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
#define NDPI_MAX_MDNS_REQUESTS 128
|
#define NDPI_MAX_MDNS_REQUESTS 128
|
||||||
|
|
||||||
PACK_ON
|
PACK_ON
|
||||||
@@ -69,7 +65,7 @@ static int ndpi_int_check_mdns_payload(struct ndpi_detection_module_struct
|
|||||||
if(((packet->payload[2] & 0x80) == 0)
|
if(((packet->payload[2] & 0x80) == 0)
|
||||||
&& (questions <= NDPI_MAX_MDNS_REQUESTS)
|
&& (questions <= NDPI_MAX_MDNS_REQUESTS)
|
||||||
&& (answers <= NDPI_MAX_MDNS_REQUESTS)) {
|
&& (answers <= NDPI_MAX_MDNS_REQUESTS)) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MDNS with question query\n");
|
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct, NDPI_LOG_DEBUG, "found MDNS with question query.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else if(((packet->payload[2] & 0x80) != 0)
|
else if(((packet->payload[2] & 0x80) != 0)
|
||||||
@@ -90,7 +86,7 @@ static int ndpi_int_check_mdns_payload(struct ndpi_detection_module_struct
|
|||||||
strncpy(flow->protos.mdns.answer, (const char *)answer, len);
|
strncpy(flow->protos.mdns.answer, (const char *)answer, len);
|
||||||
flow->protos.mdns.answer[len] = '\0';
|
flow->protos.mdns.answer[len] = '\0';
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MDNS with answer query\n");
|
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct, NDPI_LOG_DEBUG, "found MDNS with answer query.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,8 +98,6 @@ void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
u_int16_t dport;
|
u_int16_t dport;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search MDNS\n");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
information from http://www.it-administrator.de/lexikon/multicast-dns.html
|
information from http://www.it-administrator.de/lexikon/multicast-dns.html
|
||||||
*/
|
*/
|
||||||
@@ -118,7 +112,8 @@ void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
/* mdns protocol must have destination address 224.0.0.251 */
|
/* mdns protocol must have destination address 224.0.0.251 */
|
||||||
if(packet->iph != NULL /* && ntohl(packet->iph->daddr) == 0xe00000fb */) {
|
if(packet->iph != NULL /* && ntohl(packet->iph->daddr) == 0xe00000fb */) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MDNS with destination address 224.0.0.251 (=0xe00000fb)\n");
|
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found MDNS with destination address 224.0.0.251 (=0xe00000fb)\n");
|
||||||
|
|
||||||
if(ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
if(ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
||||||
ndpi_int_mdns_add_connection(ndpi_struct, flow);
|
ndpi_int_mdns_add_connection(ndpi_struct, flow);
|
||||||
@@ -130,7 +125,8 @@ void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
const u_int32_t *daddr = packet->iphv6->ip6_dst.u6_addr.u6_addr32;
|
const u_int32_t *daddr = packet->iphv6->ip6_dst.u6_addr.u6_addr32;
|
||||||
if(daddr[0] == htonl(0xff020000) /* && daddr[1] == 0 && daddr[2] == 0 && daddr[3] == htonl(0xfb) */) {
|
if(daddr[0] == htonl(0xff020000) /* && daddr[1] == 0 && daddr[2] == 0 && daddr[3] == htonl(0xfb) */) {
|
||||||
|
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MDNS with destination address ff02::fb\n");
|
NDPI_LOG(NDPI_PROTOCOL_MDNS, ndpi_struct,
|
||||||
|
NDPI_LOG_DEBUG, "found MDNS with destination address ff02::fb\n");
|
||||||
|
|
||||||
if(ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
if(ndpi_int_check_mdns_payload(ndpi_struct, flow) == 1) {
|
||||||
ndpi_int_mdns_add_connection(ndpi_struct, flow);
|
ndpi_int_mdns_add_connection(ndpi_struct, flow);
|
||||||
@@ -141,7 +137,7 @@ void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MDNS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,20 +18,16 @@
|
|||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ndpi_protocol_ids.h"
|
|
||||||
|
|
||||||
#ifdef NDPI_PROTOCOL_MEGACO
|
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MEGACO
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
#include "ndpi_api.h"
|
||||||
|
|
||||||
|
#ifdef NDPI_PROTOCOL_MEGACO
|
||||||
|
|
||||||
void ndpi_search_megaco(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
void ndpi_search_megaco(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
{
|
{
|
||||||
struct ndpi_packet_struct *packet = &flow->packet;
|
struct ndpi_packet_struct *packet = &flow->packet;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search for MEGACO\n");
|
NDPI_LOG(NDPI_PROTOCOL_MEGACO, ndpi_struct, NDPI_LOG_DEBUG, "search for MEGACO.\n");
|
||||||
|
|
||||||
if(packet->udp != NULL) {
|
if(packet->udp != NULL) {
|
||||||
if((packet->payload_packet_len > 4 && packet->payload[0] == '!' && packet->payload[1] == '/' &&
|
if((packet->payload_packet_len > 4 && packet->payload[0] == '!' && packet->payload[1] == '/' &&
|
||||||
@@ -40,13 +36,14 @@ void ndpi_search_megaco(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
packet->payload[2] == 'G' && packet->payload[3] == 'A' && packet->payload[4] == 'C' &&
|
packet->payload[2] == 'G' && packet->payload[3] == 'A' && packet->payload[4] == 'C' &&
|
||||||
packet->payload[5] == 'O' && packet->payload[6] == '/' &&
|
packet->payload[5] == 'O' && packet->payload[6] == '/' &&
|
||||||
packet->payload[7] == '1' && packet->payload[8] == ' ' && packet->payload[9] == '[')) {
|
packet->payload[7] == '1' && packet->payload[8] == ' ' && packet->payload[9] == '[')) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MEGACO\n");
|
NDPI_LOG(NDPI_PROTOCOL_MEGACO, ndpi_struct, NDPI_LOG_DEBUG, "found MEGACO.\n");
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MEGACO, NDPI_PROTOCOL_UNKNOWN);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MEGACO, NDPI_PROTOCOL_UNKNOWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_LOG(NDPI_PROTOCOL_MEGACO, ndpi_struct, NDPI_LOG_DEBUG, "exclude MEGACO.\n");
|
||||||
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MEGACO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+31
-36
@@ -20,16 +20,10 @@
|
|||||||
* 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_MGCP
|
#ifdef NDPI_PROTOCOL_MGCP
|
||||||
|
|
||||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MGCP
|
|
||||||
|
|
||||||
#include "ndpi_api.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void ndpi_int_mgcp_add_connection(struct ndpi_detection_module_struct
|
static void ndpi_int_mgcp_add_connection(struct ndpi_detection_module_struct
|
||||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||||
@@ -45,39 +39,40 @@ void ndpi_search_mgcp(struct ndpi_detection_module_struct *ndpi_struct, struct n
|
|||||||
|
|
||||||
u_int16_t pos = 5;
|
u_int16_t pos = 5;
|
||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search MGCP\n");
|
if (packet->payload_packet_len < 8) {
|
||||||
|
goto mgcp_excluded;
|
||||||
|
}
|
||||||
|
|
||||||
do {
|
/* packet must end with 0x0d0a or with 0x0a */
|
||||||
if (packet->payload_packet_len < 8) break;
|
if (packet->payload[packet->payload_packet_len - 1] != 0x0a) {
|
||||||
|
goto mgcp_excluded;
|
||||||
|
}
|
||||||
|
|
||||||
/* packet must end with 0x0d0a or with 0x0a */
|
if (packet->payload[0] != 'A' && packet->payload[0] != 'C' && packet->payload[0] != 'D' &&
|
||||||
if (packet->payload[packet->payload_packet_len - 1] != 0x0a) break;
|
packet->payload[0] != 'E' && packet->payload[0] != 'M' && packet->payload[0] != 'N' &&
|
||||||
|
packet->payload[0] != 'R') {
|
||||||
if (packet->payload[0] != 'A' && packet->payload[0] != 'C' && packet->payload[0] != 'D' &&
|
goto mgcp_excluded;
|
||||||
packet->payload[0] != 'E' && packet->payload[0] != 'M' && packet->payload[0] != 'N' &&
|
}
|
||||||
packet->payload[0] != 'R')
|
if (memcmp(packet->payload, "AUEP ", 5) != 0 && memcmp(packet->payload, "AUCX ", 5) != 0 &&
|
||||||
break;
|
memcmp(packet->payload, "CRCX ", 5) != 0 && memcmp(packet->payload, "DLCX ", 5) != 0 &&
|
||||||
|
memcmp(packet->payload, "EPCF ", 5) != 0 && memcmp(packet->payload, "MDCX ", 5) != 0 &&
|
||||||
if (memcmp(packet->payload, "AUEP ", 5) != 0 && memcmp(packet->payload, "AUCX ", 5) != 0 &&
|
memcmp(packet->payload, "NTFY ", 5) != 0 && memcmp(packet->payload, "RQNT ", 5) != 0 &&
|
||||||
memcmp(packet->payload, "CRCX ", 5) != 0 && memcmp(packet->payload, "DLCX ", 5) != 0 &&
|
memcmp(packet->payload, "RSIP ", 5) != 0) {
|
||||||
memcmp(packet->payload, "EPCF ", 5) != 0 && memcmp(packet->payload, "MDCX ", 5) != 0 &&
|
goto mgcp_excluded;
|
||||||
memcmp(packet->payload, "NTFY ", 5) != 0 && memcmp(packet->payload, "RQNT ", 5) != 0 &&
|
}
|
||||||
memcmp(packet->payload, "RSIP ", 5) != 0)
|
// now search for string "MGCP " in the rest of the message
|
||||||
break;
|
while ((pos + 4) < packet->payload_packet_len) {
|
||||||
|
if (memcmp(&packet->payload[pos], "MGCP ", 5) == 0) {
|
||||||
// now search for string "MGCP " in the rest of the message
|
NDPI_LOG(NDPI_PROTOCOL_MGCP, ndpi_struct, NDPI_LOG_DEBUG, "MGCP match.\n");
|
||||||
while ((pos + 4) < packet->payload_packet_len) {
|
ndpi_int_mgcp_add_connection(ndpi_struct, flow);
|
||||||
if (memcmp(&packet->payload[pos], "MGCP ", 5) == 0) {
|
return;
|
||||||
NDPI_LOG_INFO(ndpi_struct, "found MGCP\n");
|
|
||||||
ndpi_int_mgcp_add_connection(ndpi_struct, flow);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
pos++;
|
|
||||||
}
|
}
|
||||||
|
pos++;
|
||||||
|
}
|
||||||
|
|
||||||
} while(0);
|
mgcp_excluded:
|
||||||
|
NDPI_LOG(NDPI_PROTOCOL_MGCP, ndpi_struct, NDPI_LOG_DEBUG, "exclude MGCP.\n");
|
||||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MGCP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user