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@xxxxxxxxxxx/ v2: https://lore.kernel.org/netfilter-devel/20250617104837.939280-1-c.heiss@xxxxxxxxxxx/ 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
