* [PATCH 1/2 nft] ct: add missing slash to connlabel path @ 2016-08-17 11:13 Pablo Neira Ayuso 2016-08-17 11:13 ` [PATCH 2/2 nft] ct: release ct_label table on exit Pablo Neira Ayuso 2016-08-17 11:36 ` [PATCH 1/2 nft] ct: add missing slash to connlabel path Florian Westphal 0 siblings, 2 replies; 4+ messages in thread From: Pablo Neira Ayuso @ 2016-08-17 11:13 UTC (permalink / raw) To: netfilter-devel; +Cc: fw If I configure nftables via: ./configure --prefix=/usr the connlabel path breaks due to missing slash, so append this after DEFAULT_INCLUDE_PATH. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- src/ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ct.c b/src/ct.c index f383f29..f6b1dc1 100644 --- a/src/ct.c +++ b/src/ct.c @@ -29,7 +29,7 @@ #include <utils.h> #include <statement.h> -#define CONNLABEL_CONF DEFAULT_INCLUDE_PATH "connlabel.conf" +#define CONNLABEL_CONF DEFAULT_INCLUDE_PATH "/connlabel.conf" static const struct symbol_table ct_state_tbl = { .symbols = { -- 2.1.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2 nft] ct: release ct_label table on exit 2016-08-17 11:13 [PATCH 1/2 nft] ct: add missing slash to connlabel path Pablo Neira Ayuso @ 2016-08-17 11:13 ` Pablo Neira Ayuso 2016-08-17 11:36 ` Florian Westphal 2016-08-17 11:36 ` [PATCH 1/2 nft] ct: add missing slash to connlabel path Florian Westphal 1 sibling, 1 reply; 4+ messages in thread From: Pablo Neira Ayuso @ 2016-08-17 11:13 UTC (permalink / raw) To: netfilter-devel; +Cc: fw Just like we do with other symbol tables. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- src/ct.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ct.c b/src/ct.c index f6b1dc1..f6018d8 100644 --- a/src/ct.c +++ b/src/ct.c @@ -164,6 +164,11 @@ static void __init ct_label_table_init(void) ct_label_tbl = rt_symbol_table_init(CONNLABEL_CONF); } +static void __exit ct_label_table_exit(void) +{ + rt_symbol_table_free(ct_label_tbl); +} + #ifndef NF_CT_HELPER_NAME_LEN #define NF_CT_HELPER_NAME_LEN 16 #endif -- 2.1.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2 nft] ct: release ct_label table on exit 2016-08-17 11:13 ` [PATCH 2/2 nft] ct: release ct_label table on exit Pablo Neira Ayuso @ 2016-08-17 11:36 ` Florian Westphal 0 siblings, 0 replies; 4+ messages in thread From: Florian Westphal @ 2016-08-17 11:36 UTC (permalink / raw) To: Pablo Neira Ayuso; +Cc: netfilter-devel, fw Pablo Neira Ayuso <pablo@netfilter.org> wrote: > Just like we do with other symbol tables. > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Acked-by: Florian Westphal <fw@strlen.de> ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2 nft] ct: add missing slash to connlabel path 2016-08-17 11:13 [PATCH 1/2 nft] ct: add missing slash to connlabel path Pablo Neira Ayuso 2016-08-17 11:13 ` [PATCH 2/2 nft] ct: release ct_label table on exit Pablo Neira Ayuso @ 2016-08-17 11:36 ` Florian Westphal 1 sibling, 0 replies; 4+ messages in thread From: Florian Westphal @ 2016-08-17 11:36 UTC (permalink / raw) To: Pablo Neira Ayuso; +Cc: netfilter-devel, fw Pablo Neira Ayuso <pablo@netfilter.org> wrote: > If I configure nftables via: > > ./configure --prefix=/usr > > the connlabel path breaks due to missing slash, so append this after > DEFAULT_INCLUDE_PATH. > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Acked-by: Florian Westphal <fw@strlen.de> ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-17 11:36 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-08-17 11:13 [PATCH 1/2 nft] ct: add missing slash to connlabel path Pablo Neira Ayuso 2016-08-17 11:13 ` [PATCH 2/2 nft] ct: release ct_label table on exit Pablo Neira Ayuso 2016-08-17 11:36 ` Florian Westphal 2016-08-17 11:36 ` [PATCH 1/2 nft] ct: add missing slash to connlabel path Florian Westphal
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.