Skip to content

Commit 47f4dbb

Browse files
cejkato2cejkato2
authored
Merge branch 'master' into dpdkinit
2 parents 29efa1d + e471b6c commit 47f4dbb

File tree

11 files changed

+602
-207
lines changed

11 files changed

+602
-207
lines changed

‎ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2022-12-12 ipfixprobe-4.7.1
2+
* http: Removed trailing '\r' from HTTP exported fields
3+
* tcp: fixed seq&ack tracking
4+
* dpdk: reworked plugin
5+
6+
2022-10-03 ipfixprobe-4.7.0
7+
* dpdk: support for multi-queues
8+
* dpdk: improved config file and init script
9+
* flexprobe: changed flexprobe packet conversion to zero-copy mode
10+
* build: bugfix - fixed missing -PIC
11+
* tls: bugfix - replaced bad data type
12+
113
2022-07-26 ipfixprobe-4.6.0
214
* QUIC: refactor plugin, version 2 added
315
* Zero-copy packet processing

‎NEWS‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
2022-12-05 (Karel Hynek): Merge pull request #110 from CESNET/tcp_seq_ack_fix
2+
2022-12-05 (Tomas Cejka): Merge pull request #109 from CESNET/HTTPS_plugin_fix
3+
2022-12-05 (Karel Hynek): FIX: Parsing TCP SEQ and TCP ACK numbers
4+
2022-11-25 (Karel Hynek): BUGFIX: Removed trailing '\r' from HTTP exported fields
5+
2022-11-24 (SiskaPavel): Merge pull request #108 from CESNET/dpdk-rework
6+
2022-11-22 (xsiska12): dpdk: updated README
7+
2022-11-22 (xsiska12): dpdk - rework dpdk plugin
8+
2022-10-14 (Tomas Cejka): Merge pull request #105 from CESNET/dpdk-older-version-support
9+
2022-10-03 (xsiska12): dpdk: support dpdk version < 21.11
10+
2022-10-03 (SiskaPavel): Merge pull request #104 from CESNET/new_version
11+
12+
2022-10-03 (Tomas Cejka): Merge pull request #103 from CESNET/dpdk-queues
13+
2022-10-03 (xsiska12): dpdk: Updated README.md
14+
2022-10-03 (xsiska12): dpdk: added DPDK into daemon wrapper and example config
15+
2022-10-03 (xsiska12): DPDK: added support of multi queues packets reading
16+
2022-09-13 (SiskaPavel): Merge pull request #102 from CESNET/flexprobe-zerocopy
17+
2022-09-12 (xsiska12): flexprobe: Changed flexprobe packet conversion to zero copy mode
18+
2022-09-02 (Karel Hynek): Merge pull request #100 from CESNET/bugfix_relocation
19+
2022-08-13 (Tomas Cejka): build: BUGFIX dangerous relocation
20+
2022-08-05 (Tomas Cejka): Merge pull request #99 from CESNET/openwrt-bugfix-quic
21+
2022-08-05 (Tomas Cejka): tls: BUGFIX replaced unknown uint with size_t, add missing header file
22+
2022-07-27 (Karel Hynek): Merge pull request #98 from CESNET/new_version
23+
124
2022-07-26 (OndrejSedlacek): SSDP Plugin: Fixed payload handling.
225
2022-07-26 (Andrej Lukacovic): QUIC: parse_header variables changed to const, decrypt_header copies from original pkt payload
326
2022-07-26 (Karel Hynek): Updated copyright and license in QUIC and TLS plugins/parsers

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,12 @@ Here are the examples of various plugins usage:
146146
# Read packets from pcap file, enable 4 processing plugins, sends L7 HTTP extended biflows to unirec interface named `http` and data from 3 other plugins to the `stats` interface
147147
./ipfixprobe -i 'pcap;file=pcaps/http.pcap' -p http -p pstats -p idpcontent -p phists -o 'unirec;i=u:http:timeout=WAIT,u:stats:timeout=WAIT;p=http,(pstats,phists,idpcontent)'
148148
149-
# Read packets using DPDK input interface, enable plugins for basic statistics, http and tls, output to IPFIX on a local machine
150-
# Note that parameters for the ipfixprobe application go AFTER the '--'. Parameters before are passed into the DPDK EAL
151-
# The application will run on a core 0 as defined with EAL parameter -c using mask 0x1
152-
For example: `./ipfixprobe -c 0x1 -a "<[domain:]bus:devid.func>" -- -i "dpdk;p=0" -p http "-p" bstats -p tls -o "ipfix;h=127.0.0.1"`, where correct values for `-c` and `-a` must be specified.
149+
# Read packets using DPDK input interface and 1 DPDK queue, enable plugins for basic statistics, http and tls, output to IPFIX on a local machine
150+
# DPDK EAL parameters are passed in `e, eal` parameters
151+
# DPDK plugin configuration has to be specified in the first input interface.
152+
# The following `dpdk` interfaces are given without parameters; their configuration is inherited from the first one.
153+
# Example for the queue of 3 DPDK input plugins (q=3):
154+
`./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"`
153155
```
154156

155157
## Extension

‎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.6.0], [[email protected]])
5+
AC_INIT([ipfixprobe], [4.7.1], [[email protected]])
66

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

‎init/ipfixprobed‎

100755100644
File mode changed.

‎init/link0.conf.example‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535
#
3636
#INPUT[0]="raw;ifc=eno2"
3737

38+
# Other examples:
39+
#
40+
# INPUT[0]="dpdk;p=0;q=16;i=0"
41+
42+
# INPUT[0]="raw;i=wlo1"
43+
44+
# INPUT[0]="pcap;i=wlo1"
45+
3846
# or specify inputs using loop
3947
# for i in `seq 0 15`; do
4048
# INPUT[$i]="ndp;dev=/dev/nfb0:$i"

0 commit comments

Comments
 (0)