* [libnftnl PATCH 1/2] src: add nft_*_build_msg functions
@ 2014-05-06 20:19 Arturo Borrero Gonzalez
2014-05-06 20:19 ` [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions Arturo Borrero Gonzalez
2014-05-12 16:13 ` [libnftnl PATCH 1/2] src: add nft_*_build_msg functions Pablo Neira Ayuso
0 siblings, 2 replies; 5+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-05-06 20:19 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo
These functions are likely to be used by all userspace programs to interact
with the nftables kernel subsystem.
Lets put in the library.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
include/libnftnl/chain.h | 2 ++
include/libnftnl/rule.h | 2 ++
include/libnftnl/set.h | 4 ++++
include/libnftnl/table.h | 2 ++
src/chain.c | 11 +++++++++++
src/libnftnl.map | 8 ++++++++
src/rule.c | 11 +++++++++++
src/set.c | 11 +++++++++++
src/set_elem.c | 11 +++++++++++
src/table.c | 11 +++++++++++
10 files changed, 73 insertions(+)
diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h
index c11cb5e..eecc7e9 100644
--- a/include/libnftnl/chain.h
+++ b/include/libnftnl/chain.h
@@ -56,6 +56,8 @@ uint64_t nft_chain_attr_get_u64(struct nft_chain *c, uint16_t attr);
struct nlmsghdr;
void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain *t);
+void nft_chain_build_msg(struct nft_chain *c, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq);
int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type,
const char *data, struct nft_parse_err *err);
diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h
index 62dba59..2412ce1 100644
--- a/include/libnftnl/rule.h
+++ b/include/libnftnl/rule.h
@@ -53,6 +53,8 @@ void nft_rule_add_expr(struct nft_rule *r, struct nft_rule_expr *expr);
struct nlmsghdr;
void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *t);
+void nft_rule_build_msg(struct nft_rule *r, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq);
int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type,
const char *data, struct nft_parse_err *err);
diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h
index a975f1c..e7e267a 100644
--- a/include/libnftnl/set.h
+++ b/include/libnftnl/set.h
@@ -44,6 +44,8 @@ struct nlmsghdr;
#define nft_set_nlmsg_build_hdr nft_nlmsg_build_hdr
void nft_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s);
+void nft_set_build_msg(struct nft_set *s, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq);
int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s);
int nft_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s);
@@ -104,6 +106,8 @@ bool nft_set_elem_attr_is_set(const struct nft_set_elem *s, uint16_t attr);
#define nft_set_elem_nlmsg_build_hdr nft_nlmsg_build_hdr
void nft_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s);
void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set_elem *e);
+void nft_set_elems_build_msg(struct nft_set *s, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq);
int nft_set_elem_parse(struct nft_set_elem *e, enum nft_parse_type type,
const char *data, struct nft_parse_err *err);
diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h
index fac79e7..cb4d06e 100644
--- a/include/libnftnl/table.h
+++ b/include/libnftnl/table.h
@@ -45,6 +45,8 @@ const char *nft_table_attr_get_str(struct nft_table *t, uint16_t attr);
struct nlmsghdr;
void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table *t);
+void nft_table_build_msg(struct nft_table *t, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq);
int nft_table_parse(struct nft_table *t, enum nft_parse_type type,
const char *data, struct nft_parse_err *err);
diff --git a/src/chain.c b/src/chain.c
index 5311af6..3c9ace7 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -372,6 +372,17 @@ void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain
}
EXPORT_SYMBOL(nft_chain_nlmsg_build_payload);
+void nft_chain_build_msg(struct nft_chain *c, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ uint32_t family = nft_chain_attr_get_u32(c, NFT_CHAIN_ATTR_FAMILY);
+
+ nlh = nft_chain_nlmsg_build_hdr(buf, msg, family, flags, seq);
+ nft_chain_nlmsg_build_payload(nlh, c);
+}
+EXPORT_SYMBOL(nft_chain_build_msg);
+
static int nft_chain_parse_attr_cb(const struct nlattr *attr, void *data)
{
const struct nlattr **tb = data;
diff --git a/src/libnftnl.map b/src/libnftnl.map
index b11db67..019eb6c 100644
--- a/src/libnftnl.map
+++ b/src/libnftnl.map
@@ -206,3 +206,11 @@ LIBNFTNL_1.1 {
nft_set_attr_set_data;
nft_set_attr_get_data;
} LIBNFTNL_1.0;
+
+LIBNFTNL_1.2 {
+ nft_table_build_msg;
+ nft_chain_build_msg;
+ nft_rule_build_msg;
+ nft_set_build_msg;
+ nft_set_elems_build_msg;
+} LIBNFTNL_1.1;
diff --git a/src/rule.c b/src/rule.c
index ac88abb..0c8e0d6 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -315,6 +315,17 @@ void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *r)
}
EXPORT_SYMBOL(nft_rule_nlmsg_build_payload);
+void nft_rule_build_msg(struct nft_rule *r, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ uint32_t family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
+
+ nlh = nft_rule_nlmsg_build_hdr(buf, msg, family, flags, seq);
+ nft_rule_nlmsg_build_payload(nlh, r);
+}
+EXPORT_SYMBOL(nft_rule_build_msg);
+
void nft_rule_add_expr(struct nft_rule *r, struct nft_rule_expr *expr)
{
list_add_tail(&expr->head, &r->expr_list);
diff --git a/src/set.c b/src/set.c
index 7c15857..417a3fe 100644
--- a/src/set.c
+++ b/src/set.c
@@ -245,6 +245,17 @@ void nft_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s)
}
EXPORT_SYMBOL(nft_set_nlmsg_build_payload);
+void nft_set_build_msg(struct nft_set *s, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ uint32_t family = nft_set_attr_get_u32(s, NFT_SET_ATTR_FAMILY);
+
+ nlh = nft_set_nlmsg_build_hdr(buf, msg, family, flags, seq);
+ nft_set_nlmsg_build_payload(nlh, s);
+}
+EXPORT_SYMBOL(nft_set_build_msg);
+
static int nft_set_parse_attr_cb(const struct nlattr *attr, void *data)
{
const struct nlattr **tb = data;
diff --git a/src/set_elem.c b/src/set_elem.c
index 1eddce2..b4f4a5a 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -220,6 +220,17 @@ void nft_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s)
}
EXPORT_SYMBOL(nft_set_elems_nlmsg_build_payload);
+void nft_set_elems_build_msg(struct nft_set *s, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ uint32_t family = nft_set_attr_get_u32(s, NFT_SET_ATTR_FAMILY);
+
+ nlh = nft_set_nlmsg_build_hdr(buf, msg, family, flags, seq);
+ nft_set_elems_nlmsg_build_payload(nlh, s);
+}
+EXPORT_SYMBOL(nft_set_elems_build_msg);
+
static int nft_set_elem_parse_attr_cb(const struct nlattr *attr, void *data)
{
const struct nlattr **tb = data;
diff --git a/src/table.c b/src/table.c
index b4d1663..a63bf64 100644
--- a/src/table.c
+++ b/src/table.c
@@ -196,6 +196,17 @@ void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table
}
EXPORT_SYMBOL(nft_table_nlmsg_build_payload);
+void nft_table_build_msg(struct nft_table *t, void *buf, uint16_t msg,
+ unsigned int flags, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ uint32_t family = nft_table_attr_get_u32(t, NFT_TABLE_ATTR_FAMILY);
+
+ nlh = nft_table_nlmsg_build_hdr(buf, msg, family, flags, seq);
+ nft_table_nlmsg_build_payload(nlh, t);
+}
+EXPORT_SYMBOL(nft_table_build_msg);
+
static int nft_table_parse_attr_cb(const struct nlattr *attr, void *data)
{
const struct nlattr **tb = data;
^ permalink raw reply related [flat|nested] 5+ messages in thread* [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions
2014-05-06 20:19 [libnftnl PATCH 1/2] src: add nft_*_build_msg functions Arturo Borrero Gonzalez
@ 2014-05-06 20:19 ` Arturo Borrero Gonzalez
2014-05-12 16:15 ` Pablo Neira Ayuso
2014-05-12 16:13 ` [libnftnl PATCH 1/2] src: add nft_*_build_msg functions Pablo Neira Ayuso
1 sibling, 1 reply; 5+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-05-06 20:19 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo
Let's use these new functions in the examples.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
examples/nft-rule-add.c | 9 ++-------
examples/nft-rule-del.c | 13 +++++--------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
index 6961d0d..32302c5 100644
--- a/examples/nft-rule-add.c
+++ b/examples/nft-rule-add.c
@@ -137,7 +137,6 @@ int main(int argc, char *argv[])
{
struct mnl_socket *nl;
struct nft_rule *r;
- struct nlmsghdr *nlh;
struct mnl_nlmsg_batch *batch;
uint8_t family;
char buf[MNL_SOCKET_BUFFER_SIZE];
@@ -180,12 +179,8 @@ int main(int argc, char *argv[])
NFNL_MSG_BATCH_BEGIN, seq++);
mnl_nlmsg_batch_next(batch);
- nlh = nft_rule_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch),
- NFT_MSG_NEWRULE,
- nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY),
- NLM_F_APPEND|NLM_F_CREATE|NLM_F_ACK, seq++);
-
- nft_rule_nlmsg_build_payload(nlh, r);
+ nft_rule_build_msg(r, mnl_nlmsg_batch_current(batch), NFT_MSG_NEWRULE,
+ NLM_F_APPEND|NLM_F_CREATE|NLM_F_ACK, seq++);
nft_rule_free(r);
mnl_nlmsg_batch_next(batch);
diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
index cec9440..50e8eb8 100644
--- a/examples/nft-rule-del.c
+++ b/examples/nft-rule-del.c
@@ -42,11 +42,10 @@ int main(int argc, char *argv[])
{
struct mnl_socket *nl;
char buf[MNL_SOCKET_BUFFER_SIZE];
- struct nlmsghdr *nlh;
struct mnl_nlmsg_batch *batch;
- uint32_t portid, seq;
+ uint32_t portid, seq, family;
struct nft_rule *r = NULL;
- int ret, family;
+ int ret;
if (argc < 4 || argc > 5) {
fprintf(stderr, "Usage: %s <family> <table> <chain> [<handle>]\n",
@@ -76,6 +75,7 @@ int main(int argc, char *argv[])
seq = time(NULL);
nft_rule_attr_set(r, NFT_RULE_ATTR_TABLE, argv[2]);
nft_rule_attr_set(r, NFT_RULE_ATTR_CHAIN, argv[3]);
+ nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FAMILY, family);
/* If no handle is specified, delete all rules in the chain */
if (argc == 5)
@@ -87,12 +87,9 @@ int main(int argc, char *argv[])
NFNL_MSG_BATCH_BEGIN, seq++);
mnl_nlmsg_batch_next(batch);
- nlh = nft_rule_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch),
- NFT_MSG_DELRULE,
- family,
- NLM_F_ACK, seq++);
+ nft_rule_build_msg(r, mnl_nlmsg_batch_current(batch), NFT_MSG_DELRULE,
+ NLM_F_ACK, seq++);
- nft_rule_nlmsg_build_payload(nlh, r);
nft_rule_free(r);
mnl_nlmsg_batch_next(batch);
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions
2014-05-06 20:19 ` [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions Arturo Borrero Gonzalez
@ 2014-05-12 16:15 ` Pablo Neira Ayuso
2014-05-13 8:18 ` Arturo Borrero Gonzalez
0 siblings, 1 reply; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-05-12 16:15 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel
On Tue, May 06, 2014 at 10:19:41PM +0200, Arturo Borrero Gonzalez wrote:
> Let's use these new functions in the examples.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
> examples/nft-rule-add.c | 9 ++-------
> examples/nft-rule-del.c | 13 +++++--------
> 2 files changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
> index 6961d0d..32302c5 100644
> --- a/examples/nft-rule-add.c
> +++ b/examples/nft-rule-add.c
> @@ -137,7 +137,6 @@ int main(int argc, char *argv[])
> {
> struct mnl_socket *nl;
> struct nft_rule *r;
> - struct nlmsghdr *nlh;
> struct mnl_nlmsg_batch *batch;
> uint8_t family;
> char buf[MNL_SOCKET_BUFFER_SIZE];
> @@ -180,12 +179,8 @@ int main(int argc, char *argv[])
> NFNL_MSG_BATCH_BEGIN, seq++);
> mnl_nlmsg_batch_next(batch);
>
> - nlh = nft_rule_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch),
> - NFT_MSG_NEWRULE,
> - nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY),
> - NLM_F_APPEND|NLM_F_CREATE|NLM_F_ACK, seq++);
> -
> - nft_rule_nlmsg_build_payload(nlh, r);
> + nft_rule_build_msg(r, mnl_nlmsg_batch_current(batch), NFT_MSG_NEWRULE,
> + NLM_F_APPEND|NLM_F_CREATE|NLM_F_ACK, seq++);
Is this the only potential user of this new _build_ function? If so,
I'd prefer to keep this back until we have more clients, I don't want
to prematurely increase the size of the library with code that we
don't need yet.
Let me know,
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions
2014-05-12 16:15 ` Pablo Neira Ayuso
@ 2014-05-13 8:18 ` Arturo Borrero Gonzalez
0 siblings, 0 replies; 5+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-05-13 8:18 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Development Mailing list
On 12 May 2014 18:15, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
>
> Is this the only potential user of this new _build_ function? If so,
> I'd prefer to keep this back until we have more clients, I don't want
> to prematurely increase the size of the library with code that we
> don't need yet.
>
We can make use of these functions in nft and nft-sync as well.
I think this is kind of the first step to get higher level functions.
A second step would be to add _delete() and _add() functions to
libnftnl or other, higher level, library.
You know, src/mnl.c is repeating over and over almost the same code.
Let me know your thoughts.
regards.
--
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libnftnl PATCH 1/2] src: add nft_*_build_msg functions
2014-05-06 20:19 [libnftnl PATCH 1/2] src: add nft_*_build_msg functions Arturo Borrero Gonzalez
2014-05-06 20:19 ` [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions Arturo Borrero Gonzalez
@ 2014-05-12 16:13 ` Pablo Neira Ayuso
1 sibling, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-05-12 16:13 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel
On Tue, May 06, 2014 at 10:19:36PM +0200, Arturo Borrero Gonzalez wrote:
> These functions are likely to be used by all userspace programs to interact
> with the nftables kernel subsystem.
>
> Lets put in the library.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
> include/libnftnl/chain.h | 2 ++
> include/libnftnl/rule.h | 2 ++
> include/libnftnl/set.h | 4 ++++
> include/libnftnl/table.h | 2 ++
> src/chain.c | 11 +++++++++++
> src/libnftnl.map | 8 ++++++++
> src/rule.c | 11 +++++++++++
> src/set.c | 11 +++++++++++
> src/set_elem.c | 11 +++++++++++
> src/table.c | 11 +++++++++++
> 10 files changed, 73 insertions(+)
>
> diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h
> index c11cb5e..eecc7e9 100644
> --- a/include/libnftnl/chain.h
> +++ b/include/libnftnl/chain.h
> @@ -56,6 +56,8 @@ uint64_t nft_chain_attr_get_u64(struct nft_chain *c, uint16_t attr);
> struct nlmsghdr;
>
> void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain *t);
> +void nft_chain_build_msg(struct nft_chain *c, void *buf, uint16_t msg,
> + unsigned int flags, uint32_t seq);
We should return the struct nlmsghdr * there, so we can still use the
_fprintf function from libmnl in case we need to debug the message
that has been made.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-13 8:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-06 20:19 [libnftnl PATCH 1/2] src: add nft_*_build_msg functions Arturo Borrero Gonzalez
2014-05-06 20:19 ` [libnftnl PATCH 2/2] examples: use new nft_*_build_msg() functions Arturo Borrero Gonzalez
2014-05-12 16:15 ` Pablo Neira Ayuso
2014-05-13 8:18 ` Arturo Borrero Gonzalez
2014-05-12 16:13 ` [libnftnl PATCH 1/2] src: add nft_*_build_msg functions Pablo Neira Ayuso
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.