* [libnftnl PATCH 1/3] example: fix the example for deleting rules
@ 2014-03-08 14:00 Alvaro Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add Alvaro Neira Ayuso
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Alvaro Neira Ayuso @ 2014-03-08 14:00 UTC (permalink / raw)
To: netfilter-devel
From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
Fixed the example for deleting rules. Before this patch,
the program tried to delete the rule without using
the correct header
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
examples/nft-rule-del.c | 43 +++++++++++++++++++++++++++++++++++++++----
1 file changed, 39 insertions(+), 4 deletions(-)
diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
index 6f665b0..06a28c7 100644
--- a/examples/nft-rule-del.c
+++ b/examples/nft-rule-del.c
@@ -17,15 +17,33 @@
#include <linux/netfilter.h>
#include <linux/netfilter/nf_tables.h>
+#include <linux/netfilter/nfnetlink.h>
#include <libmnl/libmnl.h>
#include <libnftnl/rule.h>
+static void nft_mnl_batch_put(char *buf, uint16_t type, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ struct nfgenmsg *nfg;
+
+ nlh = mnl_nlmsg_put_header(buf);
+ nlh->nlmsg_type = type;
+ nlh->nlmsg_flags = NLM_F_REQUEST;
+ nlh->nlmsg_seq = seq;
+
+ nfg = mnl_nlmsg_put_extra_header(nlh, sizeof(*nfg));
+ nfg->nfgen_family = AF_INET;
+ nfg->version = NFNETLINK_V0;
+ nfg->res_id = NFNL_SUBSYS_NFTABLES;
+}
+
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;
struct nft_rule *r = NULL;
int ret, family;
@@ -56,8 +74,6 @@ int main(int argc, char *argv[])
}
seq = time(NULL);
- nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_DELRULE, family,
- NLM_F_ACK, seq);
nft_rule_attr_set(r, NFT_RULE_ATTR_TABLE, argv[2]);
nft_rule_attr_set(r, NFT_RULE_ATTR_CHAIN, argv[3]);
@@ -69,8 +85,24 @@ int main(int argc, char *argv[])
nft_rule_snprintf(tmp, sizeof(tmp), r, 0, 0);
printf("%s\n", tmp);
+ batch = mnl_nlmsg_batch_start(buf, sizeof(buf));
+
+ nft_mnl_batch_put(mnl_nlmsg_batch_current(batch),
+ 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_nlmsg_build_payload(nlh, r);
nft_rule_free(r);
+ mnl_nlmsg_batch_next(batch);
+
+ nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), NFNL_MSG_BATCH_END,
+ seq++);
+ mnl_nlmsg_batch_next(batch);
nl = mnl_socket_open(NETLINK_NETFILTER);
if (nl == NULL) {
@@ -84,14 +116,17 @@ int main(int argc, char *argv[])
}
portid = mnl_socket_get_portid(nl);
- if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
+ if (mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch),
+ mnl_nlmsg_batch_size(batch)) < 0) {
perror("mnl_socket_send");
exit(EXIT_FAILURE);
}
+ mnl_nlmsg_batch_stop(batch);
+
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
while (ret > 0) {
- ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL);
+ ret = mnl_cb_run(buf, ret, 0, portid, NULL, NULL);
if (ret <= 0)
break;
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
--
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 related [flat|nested] 5+ messages in thread
* [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add
2014-03-08 14:00 [libnftnl PATCH 1/3] example: fix the example for deleting rules Alvaro Neira Ayuso
@ 2014-03-08 14:00 ` Alvaro Neira Ayuso
2014-03-08 14:16 ` Pablo Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 3/3] example: removed printf rule function Alvaro Neira Ayuso
2014-03-08 14:17 ` [libnftnl PATCH 1/3] example: fix the example for deleting rules Pablo Neira Ayuso
2 siblings, 1 reply; 5+ messages in thread
From: Alvaro Neira Ayuso @ 2014-03-08 14:00 UTC (permalink / raw)
To: netfilter-devel
From: Álvaro Neira Ayuso <anayuso@sysmocom.de>
Merged the example for inserting rules and fixed for using
the correct header.
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Signed-off-by: Alvaro Neira Ayuso <anayuso@sysmocom.de>
---
examples/nft-rule-add.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
index 21b3bf8..7407a78 100644
--- a/examples/nft-rule-add.c
+++ b/examples/nft-rule-add.c
@@ -80,11 +80,12 @@ static void add_counter(struct nft_rule *r)
}
static struct nft_rule *setup_rule(uint8_t family, const char *table,
- const char *chain)
+ const char *chain, const char *handle)
{
struct nft_rule *r = NULL;
uint8_t proto;
uint16_t dport;
+ uint64_t hand;
r = nft_rule_alloc();
if (r == NULL) {
@@ -96,6 +97,12 @@ static struct nft_rule *setup_rule(uint8_t family, const char *table,
nft_rule_attr_set(r, NFT_RULE_ATTR_CHAIN, chain);
nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FAMILY, family);
+ if (handle != NULL) {
+ printf("entra\n");
+ hand = atoi(handle);
+ nft_rule_attr_set(r, NFT_RULE_ATTR_POSITION, &hand);
+ }
+
proto = IPPROTO_TCP;
add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
offsetof(struct iphdr, protocol), sizeof(uint8_t));
@@ -138,7 +145,7 @@ int main(int argc, char *argv[])
uint32_t seq = time(NULL);
int ret;
- if (argc != 4) {
+ if (argc < 4 || argc > 5) {
fprintf(stderr, "Usage: %s <family> <table> <chain>\n", argv[0]);
exit(EXIT_FAILURE);
}
@@ -152,7 +159,10 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- r = setup_rule(family, argv[2], argv[3]);
+ if (argc != 5)
+ r = setup_rule(family, argv[2], argv[3], NULL);
+ else
+ r = setup_rule(family, argv[2], argv[3], argv[4]);
nl = mnl_socket_open(NETLINK_NETFILTER);
if (nl == NULL) {
--
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 related [flat|nested] 5+ messages in thread
* [libnftnl PATCH 3/3] example: removed printf rule function
2014-03-08 14:00 [libnftnl PATCH 1/3] example: fix the example for deleting rules Alvaro Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add Alvaro Neira Ayuso
@ 2014-03-08 14:00 ` Alvaro Neira Ayuso
2014-03-08 14:17 ` [libnftnl PATCH 1/3] example: fix the example for deleting rules Pablo Neira Ayuso
2 siblings, 0 replies; 5+ messages in thread
From: Alvaro Neira Ayuso @ 2014-03-08 14:00 UTC (permalink / raw)
To: netfilter-devel
From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
Removed this code because with that we have a strange
output. Example:
we have a rule with handle 4 and we execute
nft-rule-del ip filter input 4
Output: unknown filter input 4 0
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
examples/nft-rule-del.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
index 06a28c7..8d875b3 100644
--- a/examples/nft-rule-del.c
+++ b/examples/nft-rule-del.c
@@ -81,10 +81,6 @@ int main(int argc, char *argv[])
if (argc == 5)
nft_rule_attr_set_u64(r, NFT_RULE_ATTR_HANDLE, atoi(argv[4]));
- char tmp[1024];
- nft_rule_snprintf(tmp, sizeof(tmp), r, 0, 0);
- printf("%s\n", tmp);
-
batch = mnl_nlmsg_batch_start(buf, sizeof(buf));
nft_mnl_batch_put(mnl_nlmsg_batch_current(batch),
--
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 related [flat|nested] 5+ messages in thread
* Re: [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add
2014-03-08 14:00 ` [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add Alvaro Neira Ayuso
@ 2014-03-08 14:16 ` Pablo Neira Ayuso
0 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-03-08 14:16 UTC (permalink / raw)
To: Alvaro Neira Ayuso; +Cc: netfilter-devel
On Sat, Mar 08, 2014 at 03:00:45PM +0100, Alvaro Neira Ayuso wrote:
> From: Álvaro Neira Ayuso <anayuso@sysmocom.de>
>
> Merged the example for inserting rules and fixed for using
> the correct header.
>
> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
> Signed-off-by: Alvaro Neira Ayuso <anayuso@sysmocom.de>
> ---
> examples/nft-rule-add.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
> index 21b3bf8..7407a78 100644
> --- a/examples/nft-rule-add.c
> +++ b/examples/nft-rule-add.c
> @@ -80,11 +80,12 @@ static void add_counter(struct nft_rule *r)
> }
>
> static struct nft_rule *setup_rule(uint8_t family, const char *table,
> - const char *chain)
> + const char *chain, const char *handle)
> {
> struct nft_rule *r = NULL;
> uint8_t proto;
> uint16_t dport;
> + uint64_t hand;
Oh, this variable name is horrible, better handle_num?
> r = nft_rule_alloc();
> if (r == NULL) {
> @@ -96,6 +97,12 @@ static struct nft_rule *setup_rule(uint8_t family, const char *table,
> nft_rule_attr_set(r, NFT_RULE_ATTR_CHAIN, chain);
> nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FAMILY, family);
>
> + if (handle != NULL) {
> + printf("entra\n");
^----------------^
I think you have to remove that.
> + hand = atoi(handle);
This is u64, atoi is just 32 bits. You can use atoll or strtoull.
> + nft_rule_attr_set(r, NFT_RULE_ATTR_POSITION, &hand);
Use nft_rule_attr_set_u64, please.
> + }
> +
> proto = IPPROTO_TCP;
> add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
> offsetof(struct iphdr, protocol), sizeof(uint8_t));
> @@ -138,7 +145,7 @@ int main(int argc, char *argv[])
> uint32_t seq = time(NULL);
> int ret;
>
> - if (argc != 4) {
> + if (argc < 4 || argc > 5) {
> fprintf(stderr, "Usage: %s <family> <table> <chain>\n", argv[0]);
> exit(EXIT_FAILURE);
> }
> @@ -152,7 +159,10 @@ int main(int argc, char *argv[])
> exit(EXIT_FAILURE);
> }
>
> - r = setup_rule(family, argv[2], argv[3]);
> + if (argc != 5)
> + r = setup_rule(family, argv[2], argv[3], NULL);
> + else
> + r = setup_rule(family, argv[2], argv[3], argv[4]);
>
> nl = mnl_socket_open(NETLINK_NETFILTER);
> if (nl == NULL) {
>
> --
> 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
--
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/3] example: fix the example for deleting rules
2014-03-08 14:00 [libnftnl PATCH 1/3] example: fix the example for deleting rules Alvaro Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add Alvaro Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 3/3] example: removed printf rule function Alvaro Neira Ayuso
@ 2014-03-08 14:17 ` Pablo Neira Ayuso
2 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-03-08 14:17 UTC (permalink / raw)
To: Alvaro Neira Ayuso; +Cc: netfilter-devel
On Sat, Mar 08, 2014 at 03:00:39PM +0100, Alvaro Neira Ayuso wrote:
> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
>
> Fixed the example for deleting rules. Before this patch,
> the program tried to delete the rule without using
> the correct header
>
> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
> ---
> examples/nft-rule-del.c | 43 +++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 39 insertions(+), 4 deletions(-)
>
> diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
> index 6f665b0..06a28c7 100644
> --- a/examples/nft-rule-del.c
> +++ b/examples/nft-rule-del.c
> @@ -17,15 +17,33 @@
>
> #include <linux/netfilter.h>
> #include <linux/netfilter/nf_tables.h>
> +#include <linux/netfilter/nfnetlink.h>
>
> #include <libmnl/libmnl.h>
> #include <libnftnl/rule.h>
>
> +static void nft_mnl_batch_put(char *buf, uint16_t type, uint32_t seq)
> +{
> + struct nlmsghdr *nlh;
> + struct nfgenmsg *nfg;
> +
> + nlh = mnl_nlmsg_put_header(buf);
> + nlh->nlmsg_type = type;
> + nlh->nlmsg_flags = NLM_F_REQUEST;
> + nlh->nlmsg_seq = seq;
> +
> + nfg = mnl_nlmsg_put_extra_header(nlh, sizeof(*nfg));
> + nfg->nfgen_family = AF_INET;
> + nfg->version = NFNETLINK_V0;
> + nfg->res_id = NFNL_SUBSYS_NFTABLES;
> +}
> +
> 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;
> struct nft_rule *r = NULL;
> int ret, family;
> @@ -56,8 +74,6 @@ int main(int argc, char *argv[])
> }
>
> seq = time(NULL);
> - nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_DELRULE, family,
> - NLM_F_ACK, seq);
> nft_rule_attr_set(r, NFT_RULE_ATTR_TABLE, argv[2]);
> nft_rule_attr_set(r, NFT_RULE_ATTR_CHAIN, argv[3]);
>
> @@ -69,8 +85,24 @@ int main(int argc, char *argv[])
> nft_rule_snprintf(tmp, sizeof(tmp), r, 0, 0);
> printf("%s\n", tmp);
>
> + batch = mnl_nlmsg_batch_start(buf, sizeof(buf));
> +
> + nft_mnl_batch_put(mnl_nlmsg_batch_current(batch),
> + 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_nlmsg_build_payload(nlh, r);
> nft_rule_free(r);
> + mnl_nlmsg_batch_next(batch);
> +
> + nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), NFNL_MSG_BATCH_END,
> + seq++);
Wrong coding style, this has to be:
nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), NFNL_MSG_BATCH_END,
seq++);
> + mnl_nlmsg_batch_next(batch);
>
> nl = mnl_socket_open(NETLINK_NETFILTER);
> if (nl == NULL) {
> @@ -84,14 +116,17 @@ int main(int argc, char *argv[])
> }
> portid = mnl_socket_get_portid(nl);
>
> - if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
> + if (mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch),
> + mnl_nlmsg_batch_size(batch)) < 0) {
> perror("mnl_socket_send");
> exit(EXIT_FAILURE);
> }
>
> + mnl_nlmsg_batch_stop(batch);
> +
> ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
> while (ret > 0) {
> - ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL);
> + ret = mnl_cb_run(buf, ret, 0, portid, NULL, NULL);
> if (ret <= 0)
> break;
> ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
>
> --
> 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
--
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
end of thread, other threads:[~2014-03-08 14:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-08 14:00 [libnftnl PATCH 1/3] example: fix the example for deleting rules Alvaro Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 2/3] example/nft-rule-insert: fixed and merged this example with nft-rule-add Alvaro Neira Ayuso
2014-03-08 14:16 ` Pablo Neira Ayuso
2014-03-08 14:00 ` [libnftnl PATCH 3/3] example: removed printf rule function Alvaro Neira Ayuso
2014-03-08 14:17 ` [libnftnl PATCH 1/3] example: fix the example for deleting rules Pablo Neira Ayuso
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).