Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netperfmeter for openSUSE:Factory checked in at 2026-07-13 14:28:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netperfmeter (Old) and /work/SRC/openSUSE:Factory/.netperfmeter.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netperfmeter" Mon Jul 13 14:28:33 2026 rev:8 rq:1365259 version:2.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/netperfmeter/netperfmeter.changes 2026-07-02 20:15:14.361400421 +0200 +++ /work/SRC/openSUSE:Factory/.netperfmeter.new.1991/netperfmeter.changes 2026-07-13 14:29:10.109676598 +0200 @@ -1,0 +2,9 @@ +Mon Jul 13 08:27:40 UTC 2026 - Martin Hauke <[email protected]> + +- Update to version 2.0.9 + * Bugfix: fixed missing "ext_" to allow for SocketAPI support. + * Bugfix: Fixed broken QUIC ticket handling. + * Improved service unit. + * Improved X.509 example. + +------------------------------------------------------------------- Old: ---- netperfmeter-2.0.8.tar.xz netperfmeter-2.0.8.tar.xz.asc New: ---- netperfmeter-2.0.9.tar.xz netperfmeter-2.0.9.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netperfmeter.spec ++++++ --- /var/tmp/diff_new_pack.voIfHC/_old 2026-07-13 14:29:10.965705861 +0200 +++ /var/tmp/diff_new_pack.voIfHC/_new 2026-07-13 14:29:10.965705861 +0200 @@ -18,7 +18,7 @@ %define services netperfmeter.service netperfmeter-module-loader.service Name: netperfmeter -Version: 2.0.8 +Version: 2.0.9 Release: 0 Summary: Network performance meter for the UDP, TCP, SCTP and DCCP protocols License: GPL-3.0-or-later ++++++ netperfmeter-2.0.8.tar.xz -> netperfmeter-2.0.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/CMakeLists.txt new/netperfmeter-2.0.9/CMakeLists.txt --- old/netperfmeter-2.0.8/CMakeLists.txt 2026-07-01 17:38:00.000000000 +0200 +++ new/netperfmeter-2.0.9/CMakeLists.txt 2026-07-11 13:21:18.000000000 +0200 @@ -30,7 +30,7 @@ SET(BUILD_MAJOR "2") SET(BUILD_MINOR "0") -SET(BUILD_PATCH "8") +SET(BUILD_PATCH "9") SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/ChangeLog new/netperfmeter-2.0.9/ChangeLog --- old/netperfmeter-2.0.8/ChangeLog 2026-07-01 17:38:01.000000000 +0200 +++ new/netperfmeter-2.0.9/ChangeLog 2026-07-11 13:21:19.000000000 +0200 @@ -1,3 +1,57 @@ +commit 95090e53e0e13cb387e8519c01009d47397baf28 +Author: Thomas Dreibholz <[email protected]> +Date: Mon Jul 6 12:10:52 2026 +0200 + + Bugfix: fixed missing "ext_" to allow for SocketAPI support. + +commit f188afdd427652199ef8eb61cfa6d0f9909c8b88 +Author: Thomas Dreibholz <[email protected]> +Date: Mon Jul 6 12:10:29 2026 +0200 + + Bugfix: Fixed broken QUIC ticket handling. + +commit da2591a3bd3717f4880e0b0658ede010519c9686 +Author: NorNet Praesum Presum <nornetpp@pilestredet> +Date: Mon Jul 6 11:00:34 2026 +0200 + + Grep syntax fix. + +commit 20fc16c4cffe584e9ec69705aea119ef08fa19ea +Author: Thomas Dreibholz <[email protected]> +Date: Mon Jul 6 10:48:20 2026 +0200 + + Improved service unit. + +commit 047189d192081db43ccce4b0a3452ce1c16e25b1 +Author: Thomas Dreibholz <[email protected]> +Date: Mon Jul 6 10:32:45 2026 +0200 + + Improved X.509 example. + +commit b6a4027059aaae77a944df22b2eaf8f8df4a7e91 +Author: Thomas Dreibholz <[email protected]> +Date: Thu Jul 2 15:49:06 2026 +0200 + + FreeBSD port update. + +commit 2e017643b814a1175ec8ee53586348575044d6a1 +Author: Thomas Dreibholz <[email protected]> +Date: Thu Jul 2 15:17:44 2026 +0200 + + Minor clean-up. + +commit 401cc81a1c2380ceda2667d2a161891657c773c8 +Author: Thomas Dreibholz <[email protected]> +Date: Wed Jul 1 17:53:06 2026 +0200 + + Updated APKBUILD file. + +commit bac28e73777eb9875651f4f904749c93278e90a6 +Author: Thomas Dreibholz <[email protected]> +Date: Wed Jul 1 17:38:01 2026 +0200 + + New release netperfmeter-2.0.8. + commit 6becf2455008d500967cf61c25c9e37c78607728 Author: Thomas Dreibholz <[email protected]> Date: Wed Jul 1 17:34:44 2026 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/debian/changelog new/netperfmeter-2.0.9/debian/changelog --- old/netperfmeter-2.0.8/debian/changelog 2026-07-01 17:38:00.000000000 +0200 +++ new/netperfmeter-2.0.9/debian/changelog 2026-07-11 13:21:18.000000000 +0200 @@ -1,3 +1,9 @@ +netperfmeter (2.0.9-1ubuntu1) unstable; urgency=medium + + * New upstream release. + + -- Thomas Dreibholz <[email protected]> Sat, 11 Jul 2026 13:21:18 +0200 + netperfmeter (2.0.8-1ubuntu1) unstable; urgency=medium * New upstream release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/freebsd/netperfmeter/Makefile new/netperfmeter-2.0.9/freebsd/netperfmeter/Makefile --- old/netperfmeter-2.0.8/freebsd/netperfmeter/Makefile 2026-07-01 17:38:00.000000000 +0200 +++ new/netperfmeter-2.0.9/freebsd/netperfmeter/Makefile 2026-07-11 13:21:18.000000000 +0200 @@ -1,5 +1,5 @@ PORTNAME= netperfmeter -DISTVERSION= 2.0.8 +DISTVERSION= 2.0.9 CATEGORIES= benchmarks MASTER_SITES= https://www.nntb.no/~dreibh/netperfmeter/download/ @@ -15,6 +15,10 @@ SHEBANG_FILES= src/pdfembedfonts src/plot-netperfmeter-results \ src/setpdfmetadata +# Work-around for build issue on ARM: +# https://bugs.freebsd.org/285706 https://bugs.freebsd.org/292237 +MAKE_ENV= OMP_NUM_THREADS=1 + OPTIONS_DEFINE= ICONS \ PLOT_PROGRAMS \ EXAMPLE_SCRIPTS \ @@ -23,28 +27,25 @@ OPTIONS_DEFAULT= ${OPTIONS_DEFINE} OPTIONS_SUB= yes +EXAMPLE_RESULTS_DESC= Include example results +EXAMPLE_SCRIPTS_DESC= Include example scripts ICONS_DESC= Include icons PLOT_PROGRAMS_DESC= Include plot programs -EXAMPLE_SCRIPTS_DESC= Include example scripts -EXAMPLE_RESULTS_DESC= Include example results -ICONS_CMAKE_BOOL= WITH_ICONS +EXAMPLE_RESULTS_CMAKE_BOOL= WITH_EXAMPLE_RESULTS + +EXAMPLE_SCRIPTS_CMAKE_BOOL= WITH_EXAMPLE_SCRIPTS + ICONS_BUILD_DEPENDS= gm:graphics/GraphicsMagick \ mutool:graphics/mupdf ICONS_USES= ghostscript shared-mime-info +ICONS_CMAKE_BOOL= WITH_ICONS -PLOT_PROGRAMS_CMAKE_BOOL= WITH_PLOT_PROGRAMS PLOT_PROGRAMS_RUN_DEPENDS= R-cran-bit64>0:devel/R-cran-bit64 \ R-cran-data.table>0:devel/R-cran-data.table \ R-cran-dplyr>0:math/R-cran-dplyr \ R-cran-ggplot2>0:graphics/R-cran-ggplot2 \ R-cran-R.utils>0:devel/R-cran-R.utils - -EXAMPLE_SCRIPTS_CMAKE_BOOL= WITH_EXAMPLE_SCRIPTS -EXAMPLE_RESULTS_CMAKE_BOOL= WITH_EXAMPLE_RESULTS - -# Work-around for build issue on ARM: -# https://bugs.freebsd.org/285706 https://bugs.freebsd.org/292237 -MAKE_ENV= OMP_NUM_THREADS=1 +PLOT_PROGRAMS_CMAKE_BOOL= WITH_PLOT_PROGRAMS .include <bsd.port.mk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/freebsd/netperfmeter/distinfo new/netperfmeter-2.0.9/freebsd/netperfmeter/distinfo --- old/netperfmeter-2.0.8/freebsd/netperfmeter/distinfo 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/freebsd/netperfmeter/distinfo 2026-07-03 10:11:27.000000000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1780050346 -SHA256 (netperfmeter-2.0.5.tar.xz) = 3033f4a30270601ed0e1226224822e38a68f968a6ef8fbcba954a9dca96b9ca2 -SIZE (netperfmeter-2.0.5.tar.xz) = 1985808 +TIMESTAMP = 1782920811 +SHA256 (netperfmeter-2.0.8.tar.xz) = ec720e8786d9a64c508b84b80bdd11294a69d62c9166c60ceeb718cb934e0f0b +SIZE (netperfmeter-2.0.8.tar.xz) = 1994660 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/freebsd/netperfmeter/pkg-plist new/netperfmeter-2.0.9/freebsd/netperfmeter/pkg-plist --- old/netperfmeter-2.0.8/freebsd/netperfmeter/pkg-plist 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/freebsd/netperfmeter/pkg-plist 2026-07-03 10:11:27.000000000 +0200 @@ -1,7 +1,60 @@ +bin/combinesummaries +bin/createsummary +bin/extractvectors +bin/getabstime +bin/netperfmeter +bin/netperfmeter-module-loader +bin/runtimeestimator +bin/setpdfmetadata +etc/rc.d/netperfmeter +etc/rc.d/netperfmeter-module-loader +share/bash-completion/completions/combinesummaries +share/bash-completion/completions/createsummary +share/bash-completion/completions/extractvectors +share/bash-completion/completions/netperfmeter +share/man/man1/combinesummaries.1.gz +share/man/man1/createsummary.1.gz +share/man/man1/extractvectors.1.gz +share/man/man1/getabstime.1.gz +share/man/man1/netperfmeter-module-loader.1.gz +share/man/man1/netperfmeter.1.gz +share/man/man1/runtimeestimator.1.gz %%DATADIR%%/netperfmeter.bib %%DATADIR%%/netperfmeter.pdf %%DATADIR%%/netperfmeter.png %%DATADIR%%/plotter.R +%%PLOT_PROGRAMS%%bin/pdfembedfonts +%%PLOT_PROGRAMS%%bin/plot-netperfmeter-results +%%PLOT_PROGRAMS%%share/bash-completion/completions/pdfembedfonts +%%PLOT_PROGRAMS%%share/bash-completion/completions/plot-netperfmeter-results +%%PLOT_PROGRAMS%%share/bash-completion/completions/setpdfmetadata +%%ICONS%%share/icons/hicolor/128x128/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/150x150/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/16x16/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/192x192/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/20x20/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/22x22/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/24x24/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/256x256/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/310x310/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/32x32/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/36x36/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/40x40/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/42x42/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/44x44/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/48x48/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/512x512/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/64x64/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/72x72/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/8x8/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/96x96/apps/netperfmeter.png +%%ICONS%%share/icons/hicolor/scalable/apps/netperfmeter.svg +%%PLOT_PROGRAMS%%share/man/man1/pdfembedfonts.1.gz +%%PLOT_PROGRAMS%%share/man/man1/plot-netperfmeter-results.1.gz +%%PLOT_PROGRAMS%%share/man/man1/setpdfmetadata.1.gz +%%ICONS%%share/mime/packages/netperfmeter.xml +%%EXAMPLE_SCRIPTS%%%%DATADIR%%/plot-experiment +%%PLOT_PROGRAMS%%%%DATADIR%%/plot-netperfmeter-results.R %%EXAMPLE_RESULTS%%%%DATADIR%%/results-examples/1411722408-skoeyen.simula.nornet-hafslund-baldeneysee.ude.nornet-dfn-default-mptcp-default-16-ipv4--active.sca.bz2 %%EXAMPLE_RESULTS%%%%DATADIR%%/results-examples/1411722408-skoeyen.simula.nornet-hafslund-baldeneysee.ude.nornet-dfn-default-mptcp-default-16-ipv4--passive.sca.bz2 %%EXAMPLE_RESULTS%%%%DATADIR%%/results-examples/1411722408-skoeyen.simula.nornet-hafslund-baldeneysee.ude.nornet-dfn-default-mptcp-default-16-ipv6--active.sca.bz2 @@ -29,53 +82,4 @@ %%EXAMPLE_RESULTS%%%%DATADIR%%/results-examples/multi-passive.sca %%EXAMPLE_RESULTS%%%%DATADIR%%/results-examples/multi-passive.vec %%EXAMPLE_RESULTS%%%%DATADIR%%/results-examples/multi.pcap.gz -%%EXAMPLE_SCRIPTS%%%%DATADIR%%/plot-experiment %%EXAMPLE_SCRIPTS%%%%DATADIR%%/run-experiment1 -%%ICONS%%share/icons/hicolor/128x128/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/150x150/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/16x16/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/192x192/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/20x20/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/22x22/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/24x24/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/256x256/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/310x310/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/32x32/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/36x36/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/40x40/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/42x42/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/44x44/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/48x48/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/512x512/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/64x64/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/72x72/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/8x8/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/96x96/apps/netperfmeter.png -%%ICONS%%share/icons/hicolor/scalable/apps/netperfmeter.svg -%%ICONS%%share/mime/packages/netperfmeter.xml -%%PLOT_PROGRAMS%%%%DATADIR%%/plot-netperfmeter-results.R -%%PLOT_PROGRAMS%%bin/pdfembedfonts -%%PLOT_PROGRAMS%%bin/plot-netperfmeter-results -%%PLOT_PROGRAMS%%share/bash-completion/completions/pdfembedfonts -%%PLOT_PROGRAMS%%share/bash-completion/completions/plot-netperfmeter-results -%%PLOT_PROGRAMS%%share/bash-completion/completions/setpdfmetadata -%%PLOT_PROGRAMS%%share/man/man1/pdfembedfonts.1.gz -%%PLOT_PROGRAMS%%share/man/man1/plot-netperfmeter-results.1.gz -%%PLOT_PROGRAMS%%share/man/man1/setpdfmetadata.1.gz -bin/combinesummaries -bin/createsummary -bin/extractvectors -bin/getabstime -bin/netperfmeter -bin/runtimeestimator -bin/setpdfmetadata -share/bash-completion/completions/combinesummaries -share/bash-completion/completions/createsummary -share/bash-completion/completions/extractvectors -share/bash-completion/completions/netperfmeter -share/man/man1/combinesummaries.1.gz -share/man/man1/createsummary.1.gz -share/man/man1/extractvectors.1.gz -share/man/man1/getabstime.1.gz -share/man/man1/netperfmeter.1.gz -share/man/man1/runtimeestimator.1.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/packaging/APKBUILD new/netperfmeter-2.0.9/packaging/APKBUILD --- old/netperfmeter-2.0.8/packaging/APKBUILD 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/packaging/APKBUILD 2026-07-03 10:11:27.000000000 +0200 @@ -1,6 +1,6 @@ # Maintainer: Thomas Dreibholz <[email protected]> pkgname=netperfmeter -pkgver=2.0.7 +pkgver=2.0.8 pkgrel=1 pkgdesc="Network performance meter for UDP, TCP, MPTCP, SCTP, DCCP and QUIC protocols" url="https://www.nntb.no/~dreibh/netperfmeter/" @@ -129,5 +129,5 @@ } sha512sums=" -11157383ebe6a7c092f175e270a25f1f7c8a99edc7156b68f30169e2ec36bb5b6cf4f33186b9c03d37ba528dd6387d0bddc5c31b93429ffe5fe9284bf5f38322 netperfmeter-2.0.7.tar.xz +42e811236db6362ab58ab02ae43dfa099606075c779330260a9cfa0bc91c2b801036a1ca688ad3677a25791fc3c47170247cef4d5b58f1c6dd0e0f33e45c7e35 netperfmeter-2.0.8.tar.xz " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/rpm/netperfmeter.spec new/netperfmeter-2.0.9/rpm/netperfmeter.spec --- old/netperfmeter-2.0.8/rpm/netperfmeter.spec 2026-07-01 17:38:00.000000000 +0200 +++ new/netperfmeter-2.0.9/rpm/netperfmeter.spec 2026-07-11 13:21:18.000000000 +0200 @@ -1,5 +1,5 @@ Name: netperfmeter -Version: 2.0.8 +Version: 2.0.9 Release: 1 Summary: Network performance meter for the UDP, TCP, MPTCP, SCTP and DCCP protocols License: GPL-3.0-or-later @@ -304,6 +304,8 @@ %changelog +* Sat Jul 11 2026 Thomas Dreibholz <[email protected]> - 2.0.9-1 +- New upstream release. * Wed Jul 01 2026 Thomas Dreibholz <[email protected]> - 2.0.8-1 - New upstream release. * Tue Jun 23 2026 Thomas Dreibholz <[email protected]> - 2.0.7-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/src/ext_socket.h new/netperfmeter-2.0.9/src/ext_socket.h --- old/netperfmeter-2.0.8/src/ext_socket.h 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/src/ext_socket.h 2026-07-03 10:11:27.000000000 +0200 @@ -37,10 +37,10 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/uio.h> -#include <sys/fcntl.h> #include <sys/time.h> #include <inttypes.h> #include <netinet/in.h> +#include <fcntl.h> #include <poll.h> @@ -237,16 +237,16 @@ uint16_t sn_type; uint16_t sn_flags; uint32_t sn_length; - } sn_header; - struct sctp_assoc_change sn_assoc_change; - struct sctp_paddr_change sn_paddr_change; - struct sctp_remote_error sn_remote_error; - struct sctp_send_failed sn_send_failed; - struct sctp_shutdown_event sn_shutdown_event; - struct sctp_adaptation_event sn_adaptation_event; - struct sctp_pdapi_event sn_pdapi_event; + } sn_header; + struct sctp_assoc_change sn_assoc_change; + struct sctp_paddr_change sn_paddr_change; + struct sctp_remote_error sn_remote_error; + struct sctp_send_failed sn_send_failed; + struct sctp_shutdown_event sn_shutdown_event; + struct sctp_adaptation_event sn_adaptation_event; + struct sctp_pdapi_event sn_pdapi_event; - struct sctp_data_arrive sn_data_arrive; + struct sctp_data_arrive sn_data_arrive; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/src/netperfmeter-module-loader new/netperfmeter-2.0.9/src/netperfmeter-module-loader --- old/netperfmeter-2.0.8/src/netperfmeter-module-loader 2026-07-01 17:35:21.000000000 +0200 +++ new/netperfmeter-2.0.9/src/netperfmeter-module-loader 2026-07-06 11:02:12.000000000 +0200 @@ -94,7 +94,7 @@ # ------ Print the relevant modules -------------------------------------- if [ "${UNAME}" == "Linux" ] ; then - modules="$(lsmod | ( grep "^tcp_\|^mptcp_\|^sctp\|^dccp|^quic" || true ) | awk '{ print $1 }' | sort | xargs)" + modules="$(lsmod | ( grep "^tcp_\|^mptcp_\|^sctp\|^dccp\|^quic" || true ) | awk '{ print $1 }' | sort | xargs)" allowedCCs="$(sysctl -n net.ipv4.tcp_allowed_congestion_control)" defaultCC="$(sysctl -n net.ipv4.tcp_congestion_control)" elif [ "${UNAME}" == "FreeBSD" ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/src/netperfmeter-module-loader.service new/netperfmeter-2.0.9/src/netperfmeter-module-loader.service --- old/netperfmeter-2.0.8/src/netperfmeter-module-loader.service 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/src/netperfmeter-module-loader.service 2026-07-06 11:02:12.000000000 +0200 @@ -28,7 +28,7 @@ [Unit] Description=NetPerfMeter Kernel Module Loader Documentation=man:netperfmeter-module-loader(1) -After=network-online.target netperfmeter-module-loader.service +After=network-online.target netperfmeter.service Wants=network-online.target [Service] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/src/netperfmeter.cc new/netperfmeter-2.0.9/src/netperfmeter.cc --- old/netperfmeter-2.0.8/src/netperfmeter.cc 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/src/netperfmeter.cc 2026-07-06 13:07:31.000000000 +0200 @@ -1541,15 +1541,15 @@ uint8_t sessionKey[64]; unsigned int sessionKeyLength = sizeof(sessionKey); - if(getsockopt(gQUICSocket, /* NOTE: accepting socket, not newSD! */ - SOL_QUIC, QUIC_SOCKOPT_SESSION_TICKET, - &sessionKey, &sessionKeyLength) == 0) { + if(ext_getsockopt(newSD, + SOL_QUIC, QUIC_SOCKOPT_SESSION_TICKET, + &sessionKey, &sessionKeyLength) == 0) { if(server_handshake(newSD, ALPN_NETPERFMETER_DATA, gQUICCA, gQUICCertificate, gQUICKey, sessionKey, sessionKeyLength) == 0) { LOG_TRACE stdlog << format("Accept on QUIC data socket %d -> new QUIC data connection %d", - gQUICSocket, newSD) << "\n"; + gQUICSocket, newSD) << "\n"; LOG_END FlowManager::getFlowManager()->addUnidentifiedSocket(IPPROTO_QUIC, newSD); } @@ -1560,7 +1560,7 @@ else { LOG_WARNING stdlog << "getsockopt(QUIC_SOCKOPT_SESSION_TICKET): " - << strerror(errno); + << strerror(errno) << "\n"; LOG_END ext_close(newSD); } @@ -2188,7 +2188,7 @@ memcpy(&paddr.spp_address, &controlAddress.sa, getSocklen(&controlAddress.sa)); paddr.spp_flags = SPP_HB_ENABLE; paddr.spp_hbinterval = 30000; - if(setsockopt(gControlSocket, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &paddr, sizeof(paddr)) < 0) { + if(ext_setsockopt(gControlSocket, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &paddr, sizeof(paddr)) < 0) { LOG_WARNING stdlog << format("Unable to enable heartbeats on control association: %s!", strerror(errno)) << "\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/src/quic-setup/generate-test-certificates new/netperfmeter-2.0.9/src/quic-setup/generate-test-certificates --- old/netperfmeter-2.0.8/src/quic-setup/generate-test-certificates 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.9/src/quic-setup/generate-test-certificates 2026-07-06 10:22:54.000000000 +0200 @@ -37,14 +37,16 @@ # ###### Print usage and exit ############################################### def usage(exitCode : int = 0) -> None: - sys.stderr.write('Usage: ' + sys.argv[0] + ' ssl_directory [-s|--server|-c|--client|-u|--user] [-x|--revoke-if-existing|-i|--ignore-if-existing] [-r|--revoke] [-S|--san|--subjectAltName subjectAltName|LOCAL|LOOKUP] [-K|--keylen-ca length] [-k|--keylen-cert length] name ...\n') + sys.stderr.write('Usage: ' + sys.argv[0] + ' ssl_directory [-s|--server|-c|--client|-u|--user] [-x|--revoke-if-existing|-i|--ignore-if-existing] [-r|--revoke] [-S|--san|--subjectAltName subjectAltName|LOCAL|LOOKUP] [-A|--key-algorithm RSA|EC|ED25519|ED448] [-C|--ec-curve curve] [-K|--keylen-ca length] [-k|--keylen-cert length] name ...\n') sys.exit(exitCode) # ###### Main program ####################################################### -caKeyLength : int = DefaultCAKeyLength -certKeyLength : int = DefaultCertKeyLength +keyAlgorithm : KeyAlgorithm = KeyAlgorithm.RSA +caKeyLength : int = DefaultCAKeyLength +certKeyLength : int = DefaultCertKeyLength +ecCurve : str = 'brainpoolP512r1' # ====== Handle command-line parameters ===================================== certificatesToCreate : list[dict[str,Any]] = [] @@ -57,7 +59,7 @@ try: options, args = getopt.gnu_getopt( sys.argv[1:], - 'scuxirS:K:k:', + 'scuxirS:A:C:K:k:', [ 'server', 'client', 'user', @@ -65,8 +67,10 @@ 'ignore-if-existing', 'revoke', 'san=', + 'key-algorithm=', 'keylen-ca=', - 'keylen-cert=' + 'keylen-cert=', + 'ec-curve=' ]) for option, optarg in options: if option in ( '-s', '--server' ): @@ -83,6 +87,14 @@ revokeIfExisting = False elif option in ( '-S', '--san', '--subjectAltName' ): subjectAltName = optarg + elif option in ( '-A', '--key-algorithm' ): + try: + keyAlgorithm = KeyAlgorithm[optarg.upper()] + except: + sys.stderr.write(f'ERROR: Invalid key-algorithm value {optarg}!\n') + usage(1) + elif option in ( '-C', '--ec-curve' ): + ecCurve = optarg elif option in ( '-K', '--keylen-ca' ): caKeyLength = int(optarg) elif option in ( '-k', '--keylen-cert' ): @@ -125,36 +137,41 @@ TestLevel1 = CA(mainDirectory, 'TestLevel1', parentCA = None, subject = '/C=NO/ST=Oslo/L=Oslo/O=Simula Research Laboratory/streetAddress=Kristian Augusts gate 23/postalCode=0164/CN=Test Level-1 CA Certificate', - certType = CertificateType.RootCA, - keyLength = caKeyLength, globalCRLFileName = globalCRLFileName) + certType = CertificateType.RootCA, + keyAlgorithm = keyAlgorithm, keyLength = caKeyLength, ecCurve = ecCurve, + globalCRLFileName = globalCRLFileName) # Create Test Root Level-2 CA certificate (signed by Test Root Level-1): TestLevel2 = CA(mainDirectory, 'TestLevel2', parentCA = TestLevel1, subject = '/C=NO/ST=Oslo/L=Oslo/O=Simula Research Laboratory/streetAddress=Kristian Augusts gate 23/postalCode=0164/CN=Test Level-2 CA Certificate', - certType = CertificateType.IntermediateCA, - keyLength = caKeyLength, globalCRLFileName = globalCRLFileName) + certType = CertificateType.IntermediateCA, + keyAlgorithm = keyAlgorithm, keyLength = caKeyLength, ecCurve = ecCurve, + globalCRLFileName = globalCRLFileName) # Create Test Intermediate CA certificate (signed by Test Root Level-2): TestIntermediate1 = CA(mainDirectory, 'TestIntermediate1', parentCA = TestLevel2, subject = '/C=NO/ST=Oslo/L=Oslo/O=Simula Metropolitan Centre for Digital Engineering (SimulaMet)/streetAddress=Stensberggata 27/postalCode=0170/CN=*', - certType = CertificateType.IntermediateCA, - keyLength = caKeyLength, globalCRLFileName = globalCRLFileName) + certType = CertificateType.IntermediateCA, + keyAlgorithm = keyAlgorithm, keyLength = caKeyLength, ecCurve = ecCurve, + globalCRLFileName = globalCRLFileName) # Create Test Intermediate CA certificate (signed by Test Root Level-2): TestIntermediate2 = CA(mainDirectory, 'TestIntermediate2', parentCA = TestIntermediate1, subject = '/C=NO/ST=Oslo/L=Oslo/O=Simula Metropolitan Centre for Digital Engineering (SimulaMet)/OU=Centre for Resilient Networks and Applications (CRNA)/streetAddress=Stensberggata 27/postalCode=0170/CN=*', - certType = CertificateType.IntermediateCA, - keyLength = caKeyLength, globalCRLFileName = globalCRLFileName) + certType = CertificateType.IntermediateCA, + keyAlgorithm = keyAlgorithm, keyLength = caKeyLength, ecCurve = ecCurve, + globalCRLFileName = globalCRLFileName) # Create Test Leaf CA certificate (signed by Test Intermediate): TestLeaf = CA(mainDirectory, 'TestLeaf', parentCA = TestIntermediate2, subject = '/C=NO/ST=Oslo/L=Oslo/O=Simula Metropolitan Centre for Digital Engineering (SimulaMet)/OU=SimulaMet Interoperability Lab (SMIL)/streetAddress=Stensberggata 27/postalCode=0170/CN=*/', - certType = CertificateType.LeafCA, - keyLength = caKeyLength, globalCRLFileName = globalCRLFileName) + certType = CertificateType.LeafCA, + keyAlgorithm = keyAlgorithm, keyLength = caKeyLength, ecCurve = ecCurve, + globalCRLFileName = globalCRLFileName) # ====== Create Test Servers ================================================ @@ -172,7 +189,9 @@ certificates[name] = Certificate(mainDirectory, name, TestLeaf, subjectWithoutCN, certificateToCreate['subjectAltName'], certificateToCreate['type'], + keyAlgorithm = keyAlgorithm, keyLength = certKeyLength, + ecCurve = ecCurve, revokeIfExisting = revokeIfExisting) if revoke: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.8/src/quic-setup/make-test-certificates new/netperfmeter-2.0.9/src/quic-setup/make-test-certificates --- old/netperfmeter-2.0.8/src/quic-setup/make-test-certificates 2026-07-01 16:51:20.000000000 +0200 +++ new/netperfmeter-2.0.9/src/quic-setup/make-test-certificates 2026-07-06 13:04:22.000000000 +0200 @@ -43,24 +43,29 @@ PATH="/opt/homebrew/opt/openssl/bin:$PATH" fi +# parameters=( "--key-algorithm" "RSA" "--keylen-ca" "16384" "--keylen-cert" "16384" ) +# parameters=( "--key-algorithm" "EC" "--ec-curve" "brainpoolP512r1" ) +# parameters=( "--key-algorithm" "ED25519" ) +parameters=( "--key-algorithm" "ED448" ) + # Generate a client certificate for the local machine (hostname as FQDN): -"${DIRNAME}/generate-test-certificates" TestCA --client --san LOCAL "${HOSTNAME}" +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --client --san LOCAL "${HOSTNAME}" # Generate some test server certificates: # NOTE: These lines must contain resolvable (/etc/hosts or DNS) hostnames: -# "${DIRNAME}/generate-test-certificates" TestCA --server --san LOOKUP besserud.proxmox.crnalab.net -# "${DIRNAME}/generate-test-certificates" TestCA --server --san LOOKUP lillevann.proxmox.crnalab.net -# "${DIRNAME}/generate-test-certificates" TestCA --server --san LOOKUP midtstuen.proxmox.crnalab.net +# "${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server --san LOOKUP besserud.proxmox.crnalab.net +# "${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server --san LOOKUP lillevann.proxmox.crnalab.net +# "${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server --san LOOKUP midtstuen.proxmox.crnalab.net # Generate some test server certificates: -"${DIRNAME}/generate-test-certificates" TestCA --server sognsvann.company.example -"${DIRNAME}/generate-test-certificates" TestCA --server svartkulp.company.example -"${DIRNAME}/generate-test-certificates" TestCA --server maridalsvannet.company.example -"${DIRNAME}/generate-test-certificates" TestCA --server blanksjoe.company.example -"${DIRNAME}/generate-test-certificates" TestCA --server tryvann.company.example -"${DIRNAME}/generate-test-certificates" TestCA --server aaklungen.company.example +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server sognsvann.company.example +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server svartkulp.company.example +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server maridalsvannet.company.example +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server blanksjoe.company.example +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server tryvann.company.example +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --server aaklungen.company.example # Generate some test user certificates: -"${DIRNAME}/generate-test-certificates" TestCA --user "Dr. Al Bundy <[email protected]>" -"${DIRNAME}/generate-test-certificates" TestCA --user "James Bond <[email protected]>" +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --user "Dr. Al Bundy <[email protected]>" +"${DIRNAME}/generate-test-certificates" TestCA "${parameters[@]}" --user "James Bond <[email protected]>"
