]> git.ipfire.org Git - thirdparty/pdns.git/log
thirdparty/pdns.git
8 months agoBetter name for FWCatz: FWCatalogZone 14759/head
Otto Moerbeek [Tue, 5 Nov 2024 14:02:33 +0000 (15:02 +0100)] 
Better name for FWCatz: FWCatalogZone

8 months agoApply suggestions from code review
Otto Moerbeek [Tue, 5 Nov 2024 13:57:33 +0000 (14:57 +0100)] 
Apply suggestions from code review

Co-authored-by: Kevin P. Fleming <kpfleming@users.noreply.github.com>
8 months agoImplement ForwardingCatalogZone.to_yaml_map()
Otto Moerbeek [Tue, 5 Nov 2024 13:52:45 +0000 (14:52 +0100)] 
Implement ForwardingCatalogZone.to_yaml_map()

8 months agoApply suggestions from code review
Otto Moerbeek [Tue, 5 Nov 2024 12:38:06 +0000 (13:38 +0100)] 
Apply suggestions from code review

Co-authored-by: Remi Gacogne <github@coredump.fr>
8 months agoReview comments by @chbruyand, remove some redundant code for the catz case
Otto Moerbeek [Tue, 5 Nov 2024 08:50:23 +0000 (09:50 +0100)] 
Review comments by @chbruyand, remove some redundant code for the catz case

8 months agoTypo noted by @phonedph1
Otto Moerbeek [Mon, 4 Nov 2024 14:24:47 +0000 (15:24 +0100)] 
Typo noted by @phonedph1

8 months agooldZone can be nullptr, don't deref just like that
Otto Moerbeek [Tue, 8 Oct 2024 14:25:24 +0000 (16:25 +0200)] 
oldZone can be nullptr, don't deref just like that

8 months agoMove new FWCatz test to non-clashing port
Otto Moerbeek [Tue, 8 Oct 2024 14:03:35 +0000 (16:03 +0200)] 
Move new FWCatz test to non-clashing port

8 months agoReformat
Otto Moerbeek [Tue, 8 Oct 2024 13:21:24 +0000 (15:21 +0200)] 
Reformat

8 months agoDetect faulty config (catz used but api-dir not set)
Otto Moerbeek [Tue, 8 Oct 2024 13:05:45 +0000 (15:05 +0200)] 
Detect faulty config (catz used but api-dir not set)

8 months agoAllow meson build
Otto Moerbeek [Tue, 8 Oct 2024 13:02:01 +0000 (15:02 +0200)] 
Allow meson build

8 months agoBasic docs
Otto Moerbeek [Tue, 8 Oct 2024 12:41:01 +0000 (14:41 +0200)] 
Basic docs

8 months agoAdd regression test for FWCatz
Otto Moerbeek [Tue, 8 Oct 2024 11:58:46 +0000 (13:58 +0200)] 
Add regression test for FWCatz

8 months agoDo all-is-default processing for fwcatz
Otto Moerbeek [Tue, 8 Oct 2024 09:22:20 +0000 (11:22 +0200)] 
Do all-is-default processing for fwcatz

8 months agoSmall refactor: split out forwarding cat zone code from xfr code
Otto Moerbeek [Tue, 8 Oct 2024 07:49:48 +0000 (09:49 +0200)] 
Small refactor: split out forwarding cat zone code from xfr code

In an ideal world we should share the xfr code between RPZ and catz, but
that is for a later day.

8 months agoAllow notify of catz; rename name field to zone for consistency
Otto Moerbeek [Tue, 8 Oct 2024 07:39:00 +0000 (09:39 +0200)] 
Allow notify of catz; rename name field to zone for consistency

8 months agoAdd group processing
Otto Moerbeek [Wed, 2 Oct 2024 15:19:21 +0000 (17:19 +0200)] 
Add group processing

8 months agoBasic functionality works
Otto Moerbeek [Tue, 1 Oct 2024 13:58:44 +0000 (15:58 +0200)] 
Basic functionality works

Missing: group handling, cleanup of catz no longer in config, tests

8 months agoThreads started and doing xfr
Otto Moerbeek [Mon, 30 Sep 2024 13:31:01 +0000 (15:31 +0200)] 
Threads started and doing xfr

8 months agoSkeleton code of catalog zone transfer, untested
Otto Moerbeek [Mon, 30 Sep 2024 07:50:59 +0000 (09:50 +0200)] 
Skeleton code of catalog zone transfer, untested

8 months agoRefactor XFR parameters of RPZParams out
Otto Moerbeek [Fri, 27 Sep 2024 12:11:44 +0000 (14:11 +0200)] 
Refactor XFR parameters of RPZParams out

8 months agoMerge pull request #14796 from omoerbeek/rec-cache-dump-undump
Otto Moerbeek [Mon, 4 Nov 2024 14:10:37 +0000 (15:10 +0100)] 
Merge pull request #14796 from omoerbeek/rec-cache-dump-undump

rec: provide a few more Lua functions, most importantly record cache dump and load

8 months agoMerge pull request #14809 from omoerbeek/rec-deprecate-old-style
Otto Moerbeek [Mon, 4 Nov 2024 13:46:15 +0000 (14:46 +0100)] 
Merge pull request #14809 from omoerbeek/rec-deprecate-old-style

rec: actively deprecate old style settings

8 months agoApply suggestions from code review 14809/head
Otto Moerbeek [Mon, 4 Nov 2024 12:10:47 +0000 (13:10 +0100)] 
Apply suggestions from code review

Co-authored-by: Remi Gacogne <github@coredump.fr>
8 months agoReplace a few asserts with throws and make sure we've seen the version and type field... 14796/head
Otto Moerbeek [Mon, 4 Nov 2024 12:07:52 +0000 (13:07 +0100)] 
Replace a few asserts with throws and make sure we've seen the version and type fields in putRecordSet.

An exception will be handled by the catch at the end of putRecordSets()

Prompted by @rgacogne

8 months agoApply suggestions from code review
Otto Moerbeek [Mon, 4 Nov 2024 11:54:21 +0000 (12:54 +0100)] 
Apply suggestions from code review

Co-authored-by: Remi Gacogne <github@coredump.fr>
8 months agoDocs tweaks (not neccesarily related)
Otto Moerbeek [Tue, 29 Oct 2024 10:09:53 +0000 (11:09 +0100)] 
Docs tweaks (not neccesarily related)

8 months agoDocs of new behaviour: do not do old-style by default
Otto Moerbeek [Tue, 29 Oct 2024 09:54:40 +0000 (10:54 +0100)] 
Docs of new behaviour: do not do old-style by default

8 months agoGive a more sensible message for rec_control show-yaml if recursor.conf already conta...
Otto Moerbeek [Tue, 29 Oct 2024 09:52:37 +0000 (10:52 +0100)] 
Give a more sensible message for rec_control show-yaml if recursor.conf already contains YAML

8 months agorec: disable parsing of old-style settings by default
Otto Moerbeek [Mon, 28 Oct 2024 16:02:07 +0000 (17:02 +0100)] 
rec: disable parsing of old-style settings by default

8 months agoMerge pull request #14816 from omoerbeek/rec-periodic-stats
Otto Moerbeek [Mon, 4 Nov 2024 11:41:01 +0000 (12:41 +0100)] 
Merge pull request #14816 from omoerbeek/rec-periodic-stats

rec: periodic stats cleanup and rename outqueries-per-query to outqueries-per-query-perc

8 months agoMerge pull request #14801 from omoerbeek/rec-valgrind
Otto Moerbeek [Mon, 4 Nov 2024 11:01:09 +0000 (12:01 +0100)] 
Merge pull request #14801 from omoerbeek/rec-valgrind

rec: make valgrind build and testrunner run work again

8 months agoMissing quotes as noted by @chbruyand 14816/head
Otto Moerbeek [Mon, 4 Nov 2024 11:00:48 +0000 (12:00 +0100)] 
Missing quotes as noted by @chbruyand

Co-authored-by: Charles-Henri Bruyand <charleshenri.bruyand+github@gmail.com>
8 months agorec: periodic stats cleanup and rename outqueries-per-query to outqueries-per-query...
Otto Moerbeek [Fri, 1 Nov 2024 10:38:03 +0000 (11:38 +0100)] 
rec: periodic stats cleanup and rename outqueries-per-query to outqueries-per-query-perc

Also
- cleans up two TCounters that where unused and/or redundant.
- group the log lines more naturally
- print doubles with two decimal places

8 months agoMerge pull request #14792 from rgacogne/ddist-coverity-202410
Remi Gacogne [Mon, 4 Nov 2024 08:25:57 +0000 (09:25 +0100)] 
Merge pull request #14792 from rgacogne/ddist-coverity-202410

dnsdist: Fix Coverity warning 445614: " Argument cannot be negative"

8 months agoMerge pull request #14794 from phonedph1/no-makerule
Remi Gacogne [Mon, 4 Nov 2024 08:25:06 +0000 (09:25 +0100)] 
Merge pull request #14794 from phonedph1/no-makerule

dnsdist: stop using makeRule, update Qname to QName so links should work

9 months agoAllow zero for no limit in getRecordCacheRecords()
Otto Moerbeek [Mon, 28 Oct 2024 09:52:56 +0000 (10:52 +0100)] 
Allow zero for no limit in getRecordCacheRecords()

Also better distinction between the term record and record set in code and docs

9 months agorec: make valgrind build and testrunner run work again 14801/head
Otto Moerbeek [Fri, 25 Oct 2024 12:49:04 +0000 (14:49 +0200)] 
rec: make valgrind build and testrunner run work again

The testrunner run becomes very slow, a non-zero inception skew is needed.

9 months agoMerge pull request #14787 from fredmorcos/lmdb-typed-cleanups
Peter van Dijk [Thu, 24 Oct 2024 14:29:57 +0000 (16:29 +0200)] 
Merge pull request #14787 from fredmorcos/lmdb-typed-cleanups

Cleanup lints & macros in lmdb-typed.hh

9 months agoclang-tidy tweaks
Otto Moerbeek [Thu, 24 Oct 2024 13:49:29 +0000 (15:49 +0200)] 
clang-tidy tweaks

9 months agoRefactor prompted by CodeQL
Otto Moerbeek [Thu, 24 Oct 2024 12:17:48 +0000 (14:17 +0200)] 
Refactor prompted by CodeQL

9 months agoReorganize a few things, add a Lua hook that's called on startup and (nice) shutdown
Otto Moerbeek [Thu, 24 Oct 2024 08:30:48 +0000 (10:30 +0200)] 
Reorganize a few things, add a Lua hook that's called on startup and (nice) shutdown

9 months agoAdd a test and a fix a few things in getRecordCacheRecords/putIntoRecordCache
Otto Moerbeek [Mon, 21 Oct 2024 13:55:11 +0000 (15:55 +0200)] 
Add a test and a fix a few things in getRecordCacheRecords/putIntoRecordCache

9 months agoDocument putIntoRecordCache and getRecordCacheRecords
Otto Moerbeek [Mon, 21 Oct 2024 13:54:53 +0000 (15:54 +0200)] 
Document putIntoRecordCache and getRecordCacheRecords

9 months agoRefactor some code, fix RU scanning (it produced LRU instead of MRU entries before)
Otto Moerbeek [Tue, 15 Oct 2024 08:49:38 +0000 (10:49 +0200)] 
Refactor some code, fix RU scanning (it produced LRU instead of MRU entries before)

9 months agoMake Lua startup script customizable
Otto Moerbeek [Mon, 14 Oct 2024 13:22:25 +0000 (15:22 +0200)] 
Make Lua startup script customizable

9 months agoExtend pdnslog to allow for structured key-value pairs
Otto Moerbeek [Mon, 14 Oct 2024 11:56:39 +0000 (13:56 +0200)] 
Extend pdnslog to allow for structured key-value pairs

9 months agoCleanup of PB encoding, including logging and some meta info
Otto Moerbeek [Mon, 14 Oct 2024 09:29:17 +0000 (11:29 +0200)] 
Cleanup of PB encoding, including logging and some meta info

9 months agoBetter (faster) encoding/decoding
Otto Moerbeek [Fri, 11 Oct 2024 11:03:03 +0000 (13:03 +0200)] 
Better (faster) encoding/decoding

9 months agoBasic functions to dump and undump record cache content
Otto Moerbeek [Fri, 11 Oct 2024 09:42:44 +0000 (11:42 +0200)] 
Basic functions to dump and undump record cache content

9 months agostop using makeRule, update Qname to QName so links should work 14794/head
phonedph1 [Thu, 24 Oct 2024 02:19:26 +0000 (20:19 -0600)] 
stop using makeRule, update Qname to QName so links should work

9 months agodnsdist: Fix Coverity warning 445614: " Argument cannot be negative" 14792/head
Remi Gacogne [Tue, 22 Oct 2024 09:53:25 +0000 (11:53 +0200)] 
dnsdist: Fix Coverity warning 445614: " Argument cannot be negative"

9 months agoCleanup lints & macros in lmdb-typed.hh 14787/head
Fred Morcos [Sun, 20 Oct 2024 19:04:27 +0000 (21:04 +0200)] 
Cleanup lints & macros in lmdb-typed.hh

9 months agoMerge pull request #14784 from fredmorcos/small-cleanups
Peter van Dijk [Sun, 20 Oct 2024 14:15:46 +0000 (16:15 +0200)] 
Merge pull request #14784 from fredmorcos/small-cleanups

Small cleanups

9 months agoMerge pull request #14714 from Habbie/el8-gcc-toolset-13
Peter van Dijk [Fri, 18 Oct 2024 15:21:16 +0000 (17:21 +0200)] 
Merge pull request #14714 from Habbie/el8-gcc-toolset-13

el-8: use gcc-toolset-13

9 months agoMerge pull request #14785 from rgacogne/fix-lmdb-safe-except
Fred Morcos [Fri, 18 Oct 2024 15:13:26 +0000 (17:13 +0200)] 
Merge pull request #14785 from rgacogne/fix-lmdb-safe-except

dnsdist: Add missing `stdexcept` include in `lmdb-safe.hh`

9 months agoMerge pull request #14777 from fredmorcos/fix-clang-tidy-again
Fred Morcos [Fri, 18 Oct 2024 15:12:48 +0000 (17:12 +0200)] 
Merge pull request #14777 from fredmorcos/fix-clang-tidy-again

Fix clang-tidy (again)

9 months agodnsdist: Add missing `stdexcept` include in `lmdb-safe.hh` 14785/head
Remi Gacogne [Fri, 18 Oct 2024 14:20:37 +0000 (16:20 +0200)] 
dnsdist: Add missing `stdexcept` include in `lmdb-safe.hh`

It was only included for non-dnsdist contexts, but `std::runtime_error`
is used in all contexts and gcc version 14.2.1 20240910 (at least) is
not happy about it:
```
In file included from ext/lmdb-safe/lmdb-safe.cc:2:
ext/lmdb-safe/lmdb-safe.hh: In member function ‘int MDBROTransactionImpl::get(MDB_dbi, const MDBInVal&, MDBOutVal&)’:
ext/lmdb-safe/lmdb-safe.hh:379:18: error: ‘runtime_error’ is not a member of ‘std’
  379 |       throw std::runtime_error("Attempt to use a closed RO transaction for get");
      |
```

9 months agoSome meson cleanup work before lmdb-safe tests 14784/head
Fred Morcos [Fri, 18 Oct 2024 11:52:07 +0000 (13:52 +0200)] 
Some meson cleanup work before lmdb-safe tests

9 months agoMinor formatting and cleanup
Fred Morcos [Fri, 18 Oct 2024 11:51:57 +0000 (13:51 +0200)] 
Minor formatting and cleanup

9 months agoMerge pull request #14782 from fredmorcos/rework-mdb-inout-vals
Fred Morcos [Fri, 18 Oct 2024 11:34:52 +0000 (13:34 +0200)] 
Merge pull request #14782 from fredmorcos/rework-mdb-inout-vals

Rework MDBIn/OutVal

9 months agoMerge pull request #14658 from phonedph1/moredump
Remi Gacogne [Fri, 18 Oct 2024 11:25:57 +0000 (13:25 +0200)] 
Merge pull request #14658 from phonedph1/moredump

dnsdist: dump more packet cache

9 months agoStatically ensure MDBInVal can store requested values 14782/head
Fred Morcos [Fri, 18 Oct 2024 10:42:00 +0000 (12:42 +0200)] 
Statically ensure MDBInVal can store requested values

9 months agoMerge pull request #14781 from bjacquin/dev/beber/pdns-version-string
Peter van Dijk [Fri, 18 Oct 2024 10:23:54 +0000 (12:23 +0200)] 
Merge pull request #14781 from bjacquin/dev/beber/pdns-version-string

pdns: allow empty string in version-string

9 months agoFixup includes
Fred Morcos [Thu, 17 Oct 2024 17:09:33 +0000 (19:09 +0200)] 
Fixup includes

9 months agoRework MDBInVal
Fred Morcos [Thu, 17 Oct 2024 14:16:36 +0000 (16:16 +0200)] 
Rework MDBInVal

9 months agoRework MDBOutVal
Fred Morcos [Thu, 17 Oct 2024 14:02:17 +0000 (16:02 +0200)] 
Rework MDBOutVal

9 months agoFix std::string include in lmdb-typed header
Fred Morcos [Thu, 17 Oct 2024 13:45:18 +0000 (15:45 +0200)] 
Fix std::string include in lmdb-typed header

9 months agoLMDBLS Cleanups
Fred Morcos [Thu, 17 Oct 2024 13:42:16 +0000 (15:42 +0200)] 
LMDBLS Cleanups

9 months agolmdb-safe header lint & formatting cleanups
Fred Morcos [Thu, 17 Oct 2024 13:40:27 +0000 (15:40 +0200)] 
lmdb-safe header lint & formatting cleanups

9 months agoMerge pull request #14778 from fredmorcos/lmdb-safe-cleanups
Fred Morcos [Thu, 17 Oct 2024 12:03:42 +0000 (14:03 +0200)] 
Merge pull request #14778 from fredmorcos/lmdb-safe-cleanups

Some cleanups for lmdb-safe

9 months agoMerge pull request #14718 from emmanuel-ferdman/master
Peter van Dijk [Thu, 17 Oct 2024 11:24:25 +0000 (13:24 +0200)] 
Merge pull request #14718 from emmanuel-ferdman/master

regression-tests.auth-py: remove duplicate method

9 months agoCleanup includes in lmdbbackend 14778/head
Fred Morcos [Thu, 17 Oct 2024 08:29:31 +0000 (10:29 +0200)] 
Cleanup includes in lmdbbackend

9 months agoRefactor shards cmdline handling
Fred Morcos [Thu, 17 Oct 2024 08:27:35 +0000 (10:27 +0200)] 
Refactor shards cmdline handling

9 months agoCleanup LMDBBackend::upgradeToSchemav5
Fred Morcos [Thu, 17 Oct 2024 08:16:49 +0000 (10:16 +0200)] 
Cleanup LMDBBackend::upgradeToSchemav5

9 months agopdns: allow empty string in version-string 14781/head
Bertrand Jacquin [Wed, 16 Oct 2024 20:43:07 +0000 (21:43 +0100)] 
pdns: allow empty string in version-string

This change allow an empty string to be returned to CHAOS version.bind
request. version-string by default is set to "full" through
pdns/auth-main.cc declareArguments(), however does not allow an empty
string to be returned as PowerDNS Recursor does.

9 months agoSome cleanups in lmdbbackend
Fred Morcos [Wed, 16 Oct 2024 13:54:51 +0000 (15:54 +0200)] 
Some cleanups in lmdbbackend

9 months agoCleanup TypedDBI
Fred Morcos [Wed, 16 Oct 2024 13:49:30 +0000 (15:49 +0200)] 
Cleanup TypedDBI

9 months agoCleanup struct nullindex_t
Fred Morcos [Wed, 16 Oct 2024 13:47:19 +0000 (15:47 +0200)] 
Cleanup struct nullindex_t

9 months agoCleanup struct index_on and index_on_function
Fred Morcos [Wed, 16 Oct 2024 13:28:02 +0000 (15:28 +0200)] 
Cleanup struct index_on and index_on_function

9 months agoCleanup LMDBIndexOps
Fred Morcos [Wed, 16 Oct 2024 13:25:25 +0000 (15:25 +0200)] 
Cleanup LMDBIndexOps

9 months agoCleanup makeCombinedKey
Fred Morcos [Wed, 16 Oct 2024 13:22:32 +0000 (15:22 +0200)] 
Cleanup makeCombinedKey

9 months agoUse uint32_t in makeCombinedKey
Fred Morcos [Wed, 16 Oct 2024 13:17:53 +0000 (15:17 +0200)] 
Use uint32_t in makeCombinedKey

9 months agoSpecialize MDBOutVal::get/getNoStripHeader for uint32_t
Fred Morcos [Wed, 16 Oct 2024 13:15:11 +0000 (15:15 +0200)] 
Specialize MDBOutVal::get/getNoStripHeader for uint32_t

9 months agoUse uint32_t in MDBGetMaxID and MDBGetRandomID
Fred Morcos [Wed, 16 Oct 2024 11:31:09 +0000 (13:31 +0200)] 
Use uint32_t in MDBGetMaxID and MDBGetRandomID

9 months agoClang-tidy cleanups of lmdb-typed
Fred Morcos [Wed, 16 Oct 2024 11:08:26 +0000 (13:08 +0200)] 
Clang-tidy cleanups of lmdb-typed

9 months agoFix clang-tidy (again) 14777/head
Fred Morcos [Wed, 16 Oct 2024 10:57:10 +0000 (12:57 +0200)] 
Fix clang-tidy (again)

9 months agoMerge pull request #14775 from omoerbeek/rec-zap-pdns_hw.cc
Otto Moerbeek [Tue, 15 Oct 2024 14:06:49 +0000 (16:06 +0200)] 
Merge pull request #14775 from omoerbeek/rec-zap-pdns_hw.cc

rec: Delete dangling symlink pdns_hw.cc

9 months agorec: Delete dangling symlink pdns_hw.cc 14775/head
Otto Moerbeek [Tue, 15 Oct 2024 13:30:23 +0000 (15:30 +0200)] 
rec: Delete dangling symlink pdns_hw.cc

9 months agoMerge pull request #14770 from omoerbeek/rec-docs-metrics
Otto Moerbeek [Mon, 14 Oct 2024 15:26:58 +0000 (17:26 +0200)] 
Merge pull request #14770 from omoerbeek/rec-docs-metrics

rec: generate metrics docs when publishing

9 months agoFix a few refs 14770/head
Otto Moerbeek [Mon, 14 Oct 2024 14:12:42 +0000 (16:12 +0200)] 
Fix a few refs

9 months agoGenerate metrics doc file
Otto Moerbeek [Mon, 14 Oct 2024 14:12:18 +0000 (16:12 +0200)] 
Generate metrics doc file

9 months agoMerge pull request #14621 from fredmorcos/meson-lmdb-regtests
Peter van Dijk [Mon, 14 Oct 2024 09:44:03 +0000 (11:44 +0200)] 
Merge pull request #14621 from fredmorcos/meson-lmdb-regtests

Add lmdb regression tests to meson

9 months agoMerge pull request #14766 from Habbie/rec-ignore-snmp-bookworm
Peter van Dijk [Fri, 11 Oct 2024 09:33:47 +0000 (11:33 +0200)] 
Merge pull request #14766 from Habbie/rec-ignore-snmp-bookworm

bump SNMP ignore from buster to bookworm after buildbot VM upgrade

9 months agobump SNMP ignore from buster to bookworm after buildbot VM upgrade 14766/head
Peter van Dijk [Fri, 11 Oct 2024 08:47:47 +0000 (10:47 +0200)] 
bump SNMP ignore from buster to bookworm after buildbot VM upgrade

9 months agofix name of notify binary 14621/head
Peter van Dijk [Fri, 11 Oct 2024 08:37:25 +0000 (10:37 +0200)] 
fix name of notify binary

9 months agoMerge pull request #14764 from chbruyand/dnsdist-load-tickets-key
Remi Gacogne [Fri, 11 Oct 2024 07:48:08 +0000 (09:48 +0200)] 
Merge pull request #14764 from chbruyand/dnsdist-load-tickets-key

dnsdist: add the ability to load a given TLS tickets key

9 months agoMerge pull request #12752 from kpfleming/issue-12714
Peter van Dijk [Thu, 10 Oct 2024 12:25:40 +0000 (14:25 +0200)] 
Merge pull request #12752 from kpfleming/issue-12714

auth doc: Document 2-step process for consumer zone updates.

9 months agoMerge pull request #14665 from Habbie/sdig-stdin-improvements
Peter van Dijk [Thu, 10 Oct 2024 11:58:02 +0000 (13:58 +0200)] 
Merge pull request #14665 from Habbie/sdig-stdin-improvements

auth sdig: some improvements for stdin mode

9 months agofix Remi's comments and some formatting 14764/head
Charles-Henri Bruyand [Thu, 10 Oct 2024 10:43:15 +0000 (12:43 +0200)] 
fix Remi's comments and some formatting