Skip to content

Commit ddd13e3

Browse files
BonnyAD9BonnyAD9
authored
Merge branch 'master' into icmp-plugin
2 parents 59f4406 + 0178a55 commit ddd13e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+428
-1538
lines changed

‎ChangeLog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2023-05-16 ipfixprobe-4.8.0
2+
* DPDK: bugfix of HW timestamps
3+
* DPDK: compliance, different constant names
4+
* pstats: bugfix of recognition of zero length packets
5+
* SSADetector: add new plugin to detect possible SYN-SYNACK-ACK
6+
17
2023-03-27 ipfixprobe-4.7.4
28
* Support parsing of ipv6 mobility header
39
* Support TLS v1.3

‎Makefile.am‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,9 @@ endif
159159
if WITH_DPDK
160160
ipfixprobe_input_src+=\
161161
input/dpdk.cpp \
162-
input/dpdk.h
162+
input/dpdk.h \
163+
input/dpdk-ring.cpp \
164+
input/dpdk-ring.h
163165
endif
164166

165167
ipfixprobe_headers_src=\

‎NEWS‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2023-05-05 (SiskaPavel): Merge pull request #148 from CESNET/dpdk-version
2+
2023-05-05 (Pavel Siska): dpdk - support HW timestamp only when metadata are available
3+
2023-05-04 (Pavel Siska): Dpdk - support different constant names acros dpdk versions
4+
2023-04-18 (SiskaPavel): Merge pull request #146 from CESNET/ssadetector_plugin
5+
2023-04-18 (SiskaPavel): Merge pull request #143 from BonnyAD9/http-invalid-method
6+
2023-04-18 (Karel Hynek): Merge pull request #145 from CESNET/pstats_zerolen_fix
7+
2023-04-18 (Karel Hynek): SSADetector: Updated coding style, Removed unnamed constants
8+
2023-04-17 (Karel Hynek): PSTATS BUGFIX: Fixed zero-len packets recognition
9+
2023-04-04 (Jakub Antonín Štigler): Increase the method field size in http
10+
2023-03-27 (Jakub Antonín Štigler): Set back the default size of http method
11+
2023-03-27 (Jakub Antonín Štigler): parse http requests with invalid header
12+
2023-03-27 (SiskaPavel): Merge pull request #142 from CESNET/new_version
13+
2023-03-15 (Karel Hynek): SSADetector: Added functional tests
14+
2023-03-15 (Karel Hynek): SSADetector: Added ext record modification methods
15+
2023-03-15 (Karel Hynek): SSADetector: Added transition functions to detection automaton
16+
2023-03-15 (Karel Hynek): SSADetector: SSADetectorRecord EXT completely defined
17+
2023-03-15 (Karel Hynek): SSADetector: Added pkt table structure
18+
2023-03-15 (Karel Hynek): SSADetector: Added pkt entry structure
19+
2023-03-15 (jirakja7): SSADetector plugin: initial files.
20+
121
2023-03-20 (Jakub Antonín Štigler): Skip ipv6 mobility header
222
2023-03-15 (Karel Hynek): Updated .gitignore
323
2023-03-13 (Karel Hynek): tls: Updated tls test reference

‎README.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ Here are the examples of various plugins usage:
159159
# The following `dpdk` interfaces are given without parameters; their configuration is inherited from the first one.
160160
# Example for the queue of 3 DPDK input plugins (q=3):
161161
`./ipfixprobe -i "dpdk;p=0;q=3;e=-c 0x1 -a <[domain:]bus:devid.func>" -i dpdk -i dpdk -p http "-p" bstats -p tls -o "ipfix;h=127.0.0.1"`
162+
163+
# Read packets using DPDK input interface as secondary process with shared memory (DPDK rings) - in this case, 4 DPDK rings are used
164+
`./ipfixprobe -i 'dpdk-ring;r=rx_ipfixprobe_0;e= --proc-type=secondary' -i 'dpdk-ring;r=rx_ipfixprobe_1' -i 'dpdk-ring;r=rx_ipfixprobe_2' -i 'dpdk-ring;r=rx_ipfixprobe_3' -o 'text'`
162165
```
163166

164167
## Flow Data Extension - Processing Plugins
@@ -559,7 +562,7 @@ ipfixprobe 'pcap;file=pcaps/http.pcap' -p "phists;includezeros" -o 'unirec;i=u:h
559562

560563
List of fields exported together with basic flow fields on the interface by BSTATS plugin.
561564
The plugin is compiled to export the first `BSTATS_MAXELENCOUNT` (15 by default) burst in each direction.
562-
The bursts are computed separately for each direction. Burst is defined by `MINIMAL_PACKETS_IN_BURST` (3 by default) and by `MAXIMAL_INTERPKT_TIME` (1000 ms by default) between packets to be included in a burst.
565+
The bursts are computed separately for each direction. Burst is defined by `MINIMAL_PACKETS_IN_BURST` (3 by default) and by `MAXIMAL_INTERPKT_TIME` (1000 ms by default) between packets to be included in a burst. When the flow contains less then `MINIMAL_PACKETS_IN_BURST` packets, the fields are not exported to reduce output bandwidth.
563566

564567
| Output field | Type | Description |
565568
|:-------------------:|:-------:|:---------------------------------------------------------------:|
@@ -598,6 +601,15 @@ List of fields exported together with basic flow fields on interface by icmp plu
598601
|:------------------:|:------:|:-------------------------------:|
599602
| L4_ICMP_TYPE_CODE | uint16 | ICMP type (MSB) and code (LSB) |
600603

604+
### SSADetector
605+
606+
List of fields exported together with basic flow fields on interface by ssadetector plugin.
607+
The detector search for the SYN SYN-ACK ACK pattern in packet lengths. Multiple occurrences of this pattern suggest a tunneled connection.
608+
609+
| Output field | Type | Description |
610+
|:------------------:|:------:|:---------------------------------------:|
611+
| SSA_CONF_LEVEL | uint8 | 1 if SSA sequence detected, 0 otherwise |
612+
601613
## Simplified function diagram
602614
Diagram below shows how `ipfixprobe` works.
603615

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([ipfixprobe], [4.7.4], [[email protected]])
5+
AC_INIT([ipfixprobe], [4.8.0], [[email protected]])
66

77
AC_CONFIG_SRCDIR([main.cpp])
88
AC_CONFIG_HEADERS([config.h])

‎include/ipfixprobe/byte-utils.hpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,7 @@
2424
* may be used to endorse or promote products derived from this
2525
* software without specific prior written permission.
2626
*
27-
* ALTERNATIVELY, provided that this notice is retained in full, this
28-
* product may be distributed under the terms of the GNU General Public
29-
* License (GPL) version 2 or later, in which case the provisions
30-
* of the GPL apply INSTEAD OF those given above.
3127
*
32-
* This software is provided ``as is'', and any express or implied
33-
* warranties, including, but not limited to, the implied warranties of
34-
* merchantability and fitness for a particular purpose are disclaimed.
35-
* In no event shall the company or contributors be liable for any
36-
* direct, indirect, incidental, special, exemplary, or consequential
37-
* damages (including, but not limited to, procurement of substitute
38-
* goods or services; loss of use, data, or profits; or business
39-
* interruption) however caused and on any theory of liability, whether
40-
* in contract, strict liability, or tort (including negligence or
41-
* otherwise) arising in any way out of the use of this software, even
42-
* if advised of the possibility of such damage.
4328
*
4429
*/
4530

‎include/ipfixprobe/flowifc.hpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,7 @@
2525
* may be used to endorse or promote products derived from this
2626
* software without specific prior written permission.
2727
*
28-
* ALTERNATIVELY, provided that this notice is retained in full, this
29-
* product may be distributed under the terms of the GNU General Public
30-
* License (GPL) version 2 or later, in which case the provisions
31-
* of the GPL apply INSTEAD OF those given above.
3228
*
33-
* This software is provided ``as is'', and any express or implied
34-
* warranties, including, but not limited to, the implied warranties of
35-
* merchantability and fitness for a particular purpose are disclaimed.
36-
* In no event shall the company or contributors be liable for any
37-
* direct, indirect, incidental, special, exemplary, or consequential
38-
* damages (including, but not limited to, procurement of substitute
39-
* goods or services; loss of use, data, or profits; or business
40-
* interruption) however caused and on any theory of liability, whether
41-
* in contract, strict liability, or tort (including negligence or
42-
* otherwise) arising in any way out of the use of this software, even
43-
* if advised of the possibility of such damage.
4429
*
4530
*/
4631

‎include/ipfixprobe/input.hpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,7 @@
2323
* may be used to endorse or promote products derived from this
2424
* software without specific prior written permission.
2525
*
26-
* ALTERNATIVELY, provided that this notice is retained in full, this
27-
* product may be distributed under the terms of the GNU General Public
28-
* License (GPL) version 2 or later, in which case the provisions
29-
* of the GPL apply INSTEAD OF those given above.
3026
*
31-
* This software is provided ``as is'', and any express or implied
32-
* warranties, including, but not limited to, the implied warranties of
33-
* merchantability and fitness for a particular purpose are disclaimed.
34-
* In no event shall the company or contributors be liable for any
35-
* direct, indirect, incidental, special, exemplary, or consequential
36-
* damages (including, but not limited to, procurement of substitute
37-
* goods or services; loss of use, data, or profits; or business
38-
* interruption) however caused and on any theory of liability, whether
39-
* in contract, strict liability, or tort (including negligence or
40-
* otherwise) arising in any way out of the use of this software, even
41-
* if advised of the possibility of such damage.
4227
*
4328
*/
4429

‎include/ipfixprobe/ipaddr.hpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,7 @@
2222
* may be used to endorse or promote products derived from this
2323
* software without specific prior written permission.
2424
*
25-
* ALTERNATIVELY, provided that this notice is retained in full, this
26-
* product may be distributed under the terms of the GNU General Public
27-
* License (GPL) version 2 or later, in which case the provisions
28-
* of the GPL apply INSTEAD OF those given above.
2925
*
30-
* This software is provided ``as is'', and any express or implied
31-
* warranties, including, but not limited to, the implied warranties of
32-
* merchantability and fitness for a particular purpose are disclaimed.
33-
* In no event shall the company or contributors be liable for any
34-
* direct, indirect, incidental, special, exemplary, or consequential
35-
* damages (including, but not limited to, procurement of substitute
36-
* goods or services; loss of use, data, or profits; or business
37-
* interruption) however caused and on any theory of liability, whether
38-
* in contract, strict liability, or tort (including negligence or
39-
* otherwise) arising in any way out of the use of this software, even
40-
* if advised of the possibility of such damage.
4126
*
4227
*/
4328

‎include/ipfixprobe/ipfix-basiclist.hpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,7 @@
2222
* may be used to endorse or promote products derived from this
2323
* software without specific prior written permission.
2424
*
25-
* ALTERNATIVELY, provided that this notice is retained in full, this
26-
* product may be distributed under the terms of the GNU General Public
27-
* License (GPL) version 2 or later, in which case the provisions
28-
* of the GPL apply INSTEAD OF those given above.
2925
*
30-
* This software is provided as is'', and any express or implied
31-
* warranties, including, but not limited to, the implied warranties of
32-
* merchantability and fitness for a particular purpose are disclaimed.
33-
* In no event shall the company or contributors be liable for any
34-
* direct, indirect, incidental, special, exemplary, or consequential
35-
* damages (including, but not limited to, procurement of substitute
36-
* goods or services; loss of use, data, or profits; or business
37-
* interruption) however caused and on any theory of liability, whether
38-
* in contract, strict liability, or tort (including negligence or
39-
* otherwise) arising in any way out of the use of this software, even
40-
* if advised of the possibility of such damage.
4126
*
4227
*/
4328

0 commit comments

Comments
 (0)