Skip to content

Commit 85d707d

Browse files
author
Pavel Siska
committed
Merge branch 'master' of https://github.com/CESNET/ipfixprobe into packet-zerocopy
2 parents 554d3f9 + 299e351 commit 85d707d

File tree

18 files changed

+1028
-34
lines changed

18 files changed

+1028
-34
lines changed

‎Makefile.am‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ ipfixprobe_process_src=\
121121
process/stats.cpp \
122122
process/stats.hpp \
123123
process/md5.hpp \
124-
process/md5.cpp
124+
process/md5.cpp \
125+
process/common.hpp
125126

126127
if WITH_QUIC
127128
ipfixprobe_process_src+=\
@@ -222,7 +223,10 @@ EXTRA_DIST=README.md \
222223
pcaps/idpcontent.pcap \
223224
pcaps/bstats.pcap \
224225
pcaps/wg.pcap \
225-
pcaps/quic_initial-sample.pcap
226+
pcaps/quic_initial-sample.pcap \
227+
debian/control debian/changelog debian/watch debian/copyright debian/patches debian/patches/series \
228+
debian/source debian/source/format debian/source/local-options debian/source/include-binaries \
229+
debian/rules debian/README.Debian debian/compat
226230

227231
bashcompl_DATA=ipfixprobe.bash
228232

@@ -283,3 +287,15 @@ else
283287
fields.h fields.c:
284288
touch $@
285289
endif
290+
291+
if MAKE_DEB
292+
.PHONY: deb-source
293+
deb-source:
294+
make dist && make distdir && ln -fs ipfixprobe-@[email protected] ipfixprobe_@VERSION@ubuntu@[email protected] && cd ipfixprobe-@VERSION@ && debuild -S
295+
296+
.PHONY: deb
297+
deb:
298+
make dist && make distdir && ln -fs ipfixprobe-@[email protected] ipfixprobe_@VERSION@ubuntu@[email protected] && cd ipfixprobe-@VERSION@ && debuild
299+
else
300+
endif
301+

‎debian/README.Debian‎

Lines changed: 608 additions & 0 deletions
Large diffs are not rendered by default.

‎debian/changelog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ipfixprobe (4.5.0ubuntu1) focal; urgency=medium
2+
3+
* Initial release. New architecture and new plugins
4+
5+
-- Tomas Cejka <[email protected]> Tue, 05 Apr 2022 22:20:54 +0000

‎debian/compat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10

‎debian/control‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Source: ipfixprobe
2+
Section: net
3+
Priority: standard
4+
Maintainer: Tomas Cejka <[email protected]>
5+
Build-Depends: autoconf (>=2.69), pkg-config, libtool, make (>=4.2.1), debhelper (>=9),
6+
openssl, libpcap-dev, libpcap0.8, libssl-dev
7+
Standards-Version: 4.5.0
8+
Homepage: https://github.com/CESNET/ipfixprobe
9+
Vcs-Git: https://github.com/CESNET/ipfixprobe
10+
Vcs-Browser: https://github.com/CESNET/ipfixprobe
11+
12+
Package: ipfixprobe
13+
Architecture: any
14+
Multi-Arch: same
15+
Pre-Depends: ${misc:Pre-Depends}
16+
Depends: ${misc:Depends}
17+
Description: IPFIX flow exporter is capable of capturing and online processing
18+
network packets to compute an aggregated IP flow record. The exporter contains
19+
several plugins that extend flow records with additional fields and
20+
characteristics.
21+

‎debian/copyright‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: ipfixprobe
3+
Upstream-Contact: [email protected]
4+
Source: https://github.com/CESNET/ipfixprobe
5+
Disclaimer: Autogenerated by licensecheck
6+
7+
Files: input/benchmark.cpp
8+
input/benchmark.hpp
9+
input/dpdk.cpp
10+
input/dpdk.h
11+
input/headers.hpp
12+
input/ndp.cpp
13+
input/ndp.hpp
14+
input/parser.cpp
15+
input/parser.hpp
16+
input/pcap.cpp
17+
input/pcap.hpp
18+
input/raw.cpp
19+
input/raw.hpp
20+
input/stem.cpp
21+
input/stem.hpp
22+
ipfixprobe.cpp
23+
ipfixprobe.hpp
24+
ipfixprobe_stats.cpp
25+
main.cpp
26+
options.cpp
27+
output/ipfix-basiclist.cpp
28+
output/text.cpp
29+
output/text.hpp
30+
output/unirec.cpp
31+
output/unirec.hpp
32+
pluginmgr.cpp
33+
pluginmgr.hpp
34+
process/basicplus.cpp
35+
process/basicplus.hpp
36+
process/bstats.cpp
37+
process/bstats.hpp
38+
process/dns-utils.hpp
39+
process/dns.cpp
40+
process/dns.hpp
41+
process/dnssd.cpp
42+
process/dnssd.hpp
43+
process/flexprobe-data-processing.cpp
44+
process/flexprobe-data-processing.h
45+
process/flexprobe-data.h
46+
process/flexprobe-encryption-processing.cpp
47+
process/flexprobe-encryption-processing.h
48+
process/flexprobe-tcp-tracking.cpp
49+
process/flexprobe-tcp-tracking.h
50+
process/http.cpp
51+
process/http.hpp
52+
process/idpcontent.cpp
53+
process/idpcontent.hpp
54+
process/netbios.cpp
55+
process/netbios.hpp
56+
process/ntp.cpp
57+
process/ntp.hpp
58+
process/osquery.cpp
59+
process/osquery.hpp
60+
process/ovpn.cpp
61+
process/ovpn.hpp
62+
process/passivedns.cpp
63+
process/passivedns.hpp
64+
process/phists.cpp
65+
process/phists.hpp
66+
process/pstats.cpp
67+
process/pstats.hpp
68+
process/quic.cpp
69+
process/quic.hpp
70+
process/rtsp.cpp
71+
process/rtsp.hpp
72+
process/sip.cpp
73+
process/sip.hpp
74+
process/smtp.cpp
75+
process/smtp.hpp
76+
process/ssdp.cpp
77+
process/ssdp.hpp
78+
process/stats.cpp
79+
process/stats.hpp
80+
process/tls.cpp
81+
process/tls.hpp
82+
process/wg.cpp
83+
process/wg.hpp
84+
stacktrace.cpp
85+
stacktrace.hpp
86+
stats.cpp
87+
stats.hpp
88+
storage/cache.cpp
89+
storage/cache.hpp
90+
utils.cpp
91+
workers.cpp
92+
workers.hpp
93+
Copyright: 2014-2016, CESNET
94+
2015-2016, CESNET
95+
2016, CESNET
96+
2017, CESNET
97+
2018, CESNET
98+
2020, CESNET
99+
2020-2021, CESNET
100+
2021, CESNET
101+
License: BSD-3-clause
102+
103+
Files: output/ipfix.cpp
104+
output/ipfix.hpp
105+
Copyright: 2012, Masaryk University, Institute of Computer Science
106+
License: BSD-3-clause
107+
108+
Files: process/md5.cpp
109+
process/md5.hpp
110+
Copyright: 1991, -2, RSA Data Security, Inc. Created 1991. All
111+
License: NTP
112+
113+
Files: storage/xxhash.c
114+
Copyright: 2012-2016, Yann Collet
115+
License: BSD-2-clause
116+
117+
Files: storage/xxhash.h
118+
Copyright: 2012-2016, Yann Collet.
119+
License: BSD-2-clause
120+

‎debian/patches/series‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This is manually managed by users with dquilt (quilt(1) wrapper)
2+
# See http://www.debian.org/doc/manuals/maint-guide/modify.en.html#quiltrc
3+
# Also this may be updated by dpkg-source(1) when making a package.
4+

‎debian/rules‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/make -f
2+
# See debhelper(7) (uncomment to enable)
3+
# output every command that modifies files on the build system.
4+
DH_VERBOSE = 1
5+
# exclude VCS paths if needed.
6+
#DH_ALWAYS_EXCLUDE=CVS:.svn:.git
7+
8+
# see FEATURE AREAS in dpkg-buildflags(1))
9+
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
10+
# see ENVIRONMENT in dpkg-buildflags(1))
11+
# package maintainers to append CFLAGS
12+
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
13+
# package maintainers to append LDFLAGS
14+
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
15+
16+
#override_dh_auto_build:
17+
# $(MAKE) doc
18+
19+
%:
20+
dh $@
21+
22+
override_dh_auto_configure:
23+
dh_auto_configure -- --with-pcap --with-quic
24+
25+
# debmake generated override targets
26+
# For example, set multiarch library install file path.
27+
# See dpkg-architecture(1)
28+
#DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
29+
#override_dh_auto_configure:
30+
# cmake -DCMAKE_INSTALL_PREFIX=/usr \
31+
# -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
32+
33+
34+

‎debian/source/format‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
3.0 (quilt)
2+

‎debian/source/include-binaries‎

Whitespace-only changes.

0 commit comments

Comments
 (0)