netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH conntrack-tools v3 0/2] conntrack: introduce --labelmap option to specify connlabel.conf path
@ 2025-06-23  9:29 Christoph Heiss
  2025-06-23  9:29 ` [PATCH conntrack-tools v3 1/2] conntrack: move label parsing to after argument parsing Christoph Heiss
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Christoph Heiss @ 2025-06-23  9:29 UTC (permalink / raw)
  To: netfilter-devel

Enables specifying a path to a connlabel.conf to load instead of the
default one at /etc/xtables/connlabel.conf.

nfct_labelmap_new() already allows supplying a custom path to load
labels from, so it just needs to be passed in there.

First patch is preparatory only; to make --labelmap
position-independent.

v1: https://lore.kernel.org/netfilter-devel/20250613102742.409820-1-c.heiss@proxmox.com/
v2: https://lore.kernel.org/netfilter-devel/20250617104837.939280-1-c.heiss@proxmox.com/

Changes v2 -> v3:
  * addressed minor cosmetic nits, no functional changes

Changes v1 -> v2:
  * introduced preparatory patch moving label merging after arg parsing
  * removed redundant `if` around free() call
  * abort if --labelmap is specified multiple times

Christoph Heiss (2):
  conntrack: move label parsing to after argument parsing
  conntrack: introduce --labelmap option to specify connlabel.conf path

 conntrack.8         |   5 ++
 include/conntrack.h |   2 +-
 src/conntrack.c     | 126 +++++++++++++++++++++++++++++---------------
 3 files changed, 90 insertions(+), 43 deletions(-)

-- 
2.49.0



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-06-23 13:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-23  9:29 [PATCH conntrack-tools v3 0/2] conntrack: introduce --labelmap option to specify connlabel.conf path Christoph Heiss
2025-06-23  9:29 ` [PATCH conntrack-tools v3 1/2] conntrack: move label parsing to after argument parsing Christoph Heiss
2025-06-23  9:29 ` [PATCH conntrack-tools v3 2/2] conntrack: introduce --labelmap option to specify connlabel.conf path Christoph Heiss
2025-06-23 13:11 ` [PATCH conntrack-tools v3 0/2] " Florian Westphal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).