Fix ctt

.gitignore

@@ -116,4 +116,8 @@ tests/unit/utils
 # vscode settings files
 .vscode
 
-
+# jekyll files
+docs/_site/
+docs/.sass-cache/
+docs/.jekyll-metadata/
+docs/.jekyll-cache/

ChangeLog

@@ -1,3 +1,14 @@
+2024-12-27 ipfixprobe-4.15.0
+	* dpdk: Add DPDK telemetry
+	* dpdk: add DPDK port telemetry
+	* dpdk: fix RSS configuration
+	* ipfix-elements: fix NTP_USEC_TO_FRAC macro
+	* docs: revision of web page
+	* README: update telemetry section
+
+2024-11-14 ipfixprobe-4.14.0
+	* dpdk: set mempool size as rx queue size
+
 2024-10-17 ipfixprobe-4.13.0
 	* usability: introduce docker/podman container to convert PCAP files to CSV
 	* IPFIX: fix order of TCP options flags

Makefile.am

@@ -70,6 +70,14 @@ ipfixprobe_storage_src=\
 		storage/fragmentationCache/fragmentationCache.cpp \
 		storage/cache.cpp \
 		storage/cache.hpp \
+		storage/cacheOptParser.hpp \
+		storage/cacheOptParser.cpp \
+		storage/flowRecord.hpp \
+		storage/flowRecord.cpp \
+		storage/cttController.hpp \
+		storage/cttController.cpp \
+		storage/cacheRowSpan.hpp \
+		storage/cacheRowSpan.cpp \
 		storage/xxhash.c \
 		storage/xxhash.h
 
@@ -180,6 +188,11 @@ ipfixprobe_input_src+=\
 		input/dpdk/dpdkMbuf.cpp \
 		input/dpdk/dpdkDevice.hpp \
 		input/dpdk/dpdkDevice.cpp \
+		input/dpdk/dpdkCompat.hpp \
+		input/dpdk/dpdkPortTelemetry.hpp \
+		input/dpdk/dpdkPortTelemetry.cpp \
+		input/dpdk/dpdkTelemetry.hpp \
+		input/dpdk/dpdkTelemetry.cpp \
         input/dpdk.cpp \
         input/dpdk.h \
 	input/dpdk-ring.cpp \
@@ -203,7 +216,8 @@ ipfixprobe_headers_src=\
 		include/ipfixprobe/ipfix-elements.hpp \
 		include/ipfixprobe/rtp.hpp \
 		include/ipfixprobe/telemetry-utils.hpp \
-		include/ipfixprobe/parser-stats.hpp
+		include/ipfixprobe/parser-stats.hpp \
+		include/ipfixprobe/cttmeta.hpp
 
 ipfixprobe_src=\
 		$(ipfixprobe_input_src) \

NEWS

@@ -1,3 +1,23 @@
+2024-12-27 (Pavel Siska): dpdk: Add DPDK telemetry
+2024-12-27 (Pavel Siska): dpdk: add DPDK port telemetry
+2024-12-27 (Pavel Siska): dpdk: add compatible definition macro to dpdkCompact Add RTE_ETH_RSS_GENEVE macro
+2024-12-27 (Pavel Siska): dpdk: fix RSS configuration
+2024-12-27 (Pavel Siska): dpdk: Add dpdkCompact - compatibility definitions for DPDK versions
+2024-12-16 (Pavel Siska): README - update build requirements
+2024-12-16 (Pavel Siska): configure.ac - add checks for telemetry and appfs libraries - Added AC_CHECK_LIB for 'telemetry' and 'appfs' to verify library availability. - Ensured 'LIBS' includes '-lappFs -ltelemetry' for proper linking. - Updated RPM dependencies by appending 'telemetry' to RPM_REQUIRES and RPM_BUILDREQ.
+2024-12-09 (Jan Sobol): ipfix-elements: fix NTP_USEC_TO_FRAC macro Use standard conversion to ntp timestamps as in https://tickelton.gitlab.io/articles/ntp-timestamps/.
+2024-11-28 (Pavel Siska): Readme - update telemetry docs
+2024-11-25 (Karel Hynek): docs: fix jekyll links
+2024-11-25 (Karel Hynek): docs: fix jekyll base url and update docs description
+2024-11-25 (Karel Hynek): docs: fix centering in the website footer
+2024-11-20 (Tomas Cejka): docs: revision of web page
+2024-11-15 (Karel Hynek): doc: FIX GitHub logo in footer
+2024-11-15 (Karel Hynek): README: FIX ipfixprobe logo and link to documentation
+2024-11-15 (Karel Hynek): Introduce doc using Jekyll & Update README (#232)
+
+2024-11-12 (Jan Sobol): dpdkDevice: use mempool size as rx queue size instead of burst size
+2024-11-12 (Jan Sobol): dpdk: reduce value of DEFAULT_MBUF_POOL_SIZE to use it also as rx queue size
+
 2024-10-17 (Tomas Cejka): doc: include generated Doxyfile to create documentation
 2024-10-17 (Tomas Cejka): doc: add doxygen comment for parse_packet()
 2024-10-16 (Jan Sobol): dpdk-ring - fix checking if any packet has actually been parsed

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([ipfixprobe], [4.13.0], [nemea@cesnet.cz])
+AC_INIT([ipfixprobe], [4.15.0], [nemea@cesnet.cz])
 
 AC_CONFIG_SRCDIR([main.cpp])
 AC_CONFIG_HEADERS([config.h])
@@ -226,6 +226,32 @@ if [[ -z "$WITH_NDP_TRUE" ]]; then
    RPM_BUILDREQ+=" netcope-common-devel"
 fi
 
+AC_ARG_WITH([ctt],
+        AC_HELP_STRING([--with-ctt],[Compile ipfixprobe with ctt plugin for using Connection Tracking Table]),
+        [
+      if test "$withval" = "yes"; then
+         withctt="yes"
+      else
+         withctt="no"
+      fi
+        ], [withctt="no"]
+)
+
+if test x${withctt} = xyes; then
+   AC_LANG_PUSH([C++])
+   CXXFLAGS="$CXXFLAGS -std=c++17"
+   AC_CHECK_HEADERS([ctt.hpp], [libctt=yes], AC_MSG_ERROR([ctt.hpp not found. Try installing libctt-devel]))
+   AC_LANG_POP([C++])
+fi
+
+AM_CONDITIONAL(WITH_CTT, test x${libctt} = xyes && test x${withctt} = xyes)
+if [[ -z "$WITH_CTT_TRUE" ]]; then
+   AC_DEFINE([WITH_CTT], [1], [Define to 1 if the ctt is available])
+   LIBS="-lctt $LIBS"
+   RPM_REQUIRES+=" libctt"
+   RPM_BUILDREQ+=" libctt-devel"
+fi
+
 AC_ARG_WITH([pcap],
         AC_HELP_STRING([--with-pcap],[Compile ipfixprobe with pcap plugin for capturing using libpcap library]),
         [
@@ -382,6 +408,20 @@ AC_ARG_WITH([stem],
          [withstem="no"]
 )
 
+# Check if the telemetry library is available
+AC_CHECK_LIB([telemetry], [main],
+  [AC_MSG_RESULT([Found telemetry library.])],
+  [AC_MSG_ERROR([The telemetry library is required but was not found. Try to install telemetry.])])
+
+# Check if the appfs library is available
+AC_CHECK_LIB([appFs], [main],
+  [AC_MSG_RESULT([Found appfs library.])],
+  [AC_MSG_ERROR([The appfs library is required but was not found. Try to install telemetry])])
+
+LIBS="-lappFs -ltelemetry $LIBS"
+RPM_REQUIRES+=" telemetry"
+RPM_BUILDREQ+=" telemetry"
+
 AM_CONDITIONAL(WITH_STEM, test x${withstem} = xyes)
 if [[ -z "$WITH_STEM_TRUE" ]]; then
    AC_DEFINE([WITH_STEM], [1], [Define to 1 to use flexprobe testing interface])

docs/404.html

@@ -0,0 +1,6 @@
+---
+title: Not Found
+description: This does not exist
+permalink: /404.html
+sitemap: false
+---

docs/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+gem "webrick"
+gem 'jekyll', '~> 4.2.0'
+
+group :jekyll_plugins do
+  gem 'jekyll-archives', '~> 2.2.1'
+  gem 'jekyll-feed', '~> 0.15.1'
+  gem 'jekyll-paginate', '~> 1.1.0'
+  gem 'jekyll-seo-tag', '~> 2.7.1'
+  gem 'jekyll-sitemap', '~> 1.4.0'
+end

docs/Gemfile.lock

@@ -0,0 +1,83 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.9)
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.15.1)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.2.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
+    jekyll-archives (2.2.1)
+      jekyll (>= 3.6, < 5.0)
+    jekyll-feed (0.15.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.7.1)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.6)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+    webrick (1.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (~> 4.2.0)
+  jekyll-archives (~> 2.2.1)
+  jekyll-feed (~> 0.15.1)
+  jekyll-paginate (~> 1.1.0)
+  jekyll-seo-tag (~> 2.7.1)
+  jekyll-sitemap (~> 1.4.0)
+  webrick
+
+BUNDLED WITH
+   1.17.3

docs/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016-2020 CloudCannon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

docs/README.md

@@ -0,0 +1,71 @@
+# ipfixprobe website Hydra
+
+Based on Hydra opensource template [live demo](https://proud-alligator.cloudvent.net/)
+
+## Features
+
+* Contact form
+* Pre-built pages
+* Pre-styled components
+* Blog with pagination
+* Post category pages
+* Disqus comments for posts
+* Staff and author system
+* Configurable footer
+* Optimised for editing in [CloudCannon](http://cloudcannon.com/)
+* RSS/Atom feed
+* SEO tags
+* Google Analytics
+
+## Setup
+
+1. Add your site and author details in `_config.yml`.
+2. Add your Google Analytics and Disqus keys to `_config.yml`.
+3. Get a workflow going to see your site's output (with [CloudCannon](https://app.cloudcannon.com/) or Jekyll locally).
+
+## Develop
+
+Hydra was built with [Jekyll](http://jekyllrb.com/) version 3.3.1, but should support newer versions as well.
+
+Install the dependencies with [Bundler](http://bundler.io/):
+
+~~~bash
+$ bundle install
+~~~
+
+Run `jekyll` commands through Bundler to ensure you're using the right versions:
+
+~~~bash
+$ bundle exec jekyll serve
+~~~
+
+## Editing
+
+Hydra is already optimised for adding, updating and removing pages, staff, advice, company details and footer elements in CloudCannon.
+
+### Posts
+
+* Add, update or remove a post in the *Posts* collection.
+* The **Staff Author** field links to members in the **Staff** collection.
+* Documentation pages are organised in the navigation by category, with URLs based on the path inside the `_docs` folder.
+* Change the defaults when new posts are created in `_posts/_defaults.md`.
+
+### Contact Form
+
+* Preconfigured to work with CloudCannon, but easily changed to another provider (e.g. [FormSpree](https://formspree.io/)).
+* Sends email to the address listed in company details.
+
+### Staff
+
+* Reused around the site to save multiple editing locations.
+* Add `excluded_in_search: true` to any documentation page's front matter to exclude that page in the search results.
+
+### Navigation
+
+* Exposed as a data file to give clients better access.
+* Set in the *Data* / *Navigation* section.
+
+### Footer
+
+* Exposed as a data file to give clients better access.
+* Set in the *Data* / *Footer* section.