diff mbox

[libnftnl] exthdr: Add missing exthdr flags cases

Message ID 20170216113224.30193-1-phil@nwl.cc
State Accepted
Delegated to: Florian Westphal
Headers show

Commit Message

Phil Sutter Feb. 16, 2017, 11:32 a.m. UTC 
Looks like some chunks went by the board while merging with exthdr->op
patch.

Fixes: 4196376330468 ("exthdr: Add support for exthdr flags")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/expr/exthdr.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Florian Westphal Feb. 16, 2017, 12:33 p.m. UTC | #1 
Phil Sutter <phil@nwl.cc> wrote:
> Looks like some chunks went by the board while merging with exthdr->op
> patch.

I've pushed this one, thanks Phil.
--
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
diff mbox

Patch

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 143ad549ee1ea..c44c1a75a5ea9 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -292,6 +292,8 @@  static int nftnl_expr_exthdr_export(char *buf, size_t len,
 		nftnl_buf_u32(&b, type, exthdr->len, LEN);
 	if (e->flags & (1 << NFTNL_EXPR_EXTHDR_OP))
 		nftnl_buf_u32(&b, type, exthdr->op, OP);
+	if (e->flags & (1 << NFTNL_EXPR_EXTHDR_FLAGS))
+		nftnl_buf_u32(&b, type, exthdr->flags, FLAGS);
 
 	return nftnl_buf_done(&b);
 }
@@ -338,6 +340,8 @@  static bool nftnl_expr_exthdr_cmp(const struct nftnl_expr *e1,
 		eq &= (h1->type == h2->type);
 	if (e1->flags & (1 << NFTNL_EXPR_EXTHDR_OP))
 		eq &= (h1->op == h2->op);
+	if (e1->flags & (1 << NFTNL_EXPR_EXTHDR_FLAGS))
+		eq &= (h1->flags == h2->flags);
 
 	return eq;
 }