netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH nft] xt: use struct xt_xlate_{mt,tg}_params
@ 2016-07-24 10:55 Pablo Neira Ayuso
  0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2016-07-24 10:55 UTC (permalink / raw)
  To: netfilter-devel; +Cc: pablombg

Adapt this code to the new interface that introduces
struct xt_xlate_{mt,tg}_params.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/xt.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/xt.c b/src/xt.c
index afcc836..0777d9c 100644
--- a/src/xt.c
+++ b/src/xt.c
@@ -35,9 +35,14 @@ void xt_stmt_xlate(const struct stmt *stmt)
 		if (stmt->xt.match == NULL && stmt->xt.opts) {
 			printf("%s", stmt->xt.opts);
 		} else if (stmt->xt.match->xlate) {
-			stmt->xt.match->xlate(stmt->xt.entry,
-					      stmt->xt.match->m, xl, 0);
-				printf("%s", xt_xlate_get(xl));
+			struct xt_xlate_mt_params params = {
+				.ip		= stmt->xt.entry,
+				.match		= stmt->xt.match->m,
+				.numeric        = 0,
+			};
+
+			stmt->xt.match->xlate(xl, &params);
+			printf("%s", xt_xlate_get(xl));
 		} else if (stmt->xt.match->print) {
 			printf("#");
 			stmt->xt.match->print(&stmt->xt.entry,
@@ -49,8 +54,13 @@ void xt_stmt_xlate(const struct stmt *stmt)
 		if (stmt->xt.target == NULL && stmt->xt.opts) {
 			printf("%s", stmt->xt.opts);
 		} else if (stmt->xt.target->xlate) {
-			stmt->xt.target->xlate(stmt->xt.entry,
-					       stmt->xt.target->t, xl, 0);
+			struct xt_xlate_tg_params params = {
+				.ip		= stmt->xt.entry,
+				.target		= stmt->xt.target->t,
+				.numeric        = 0,
+			};
+
+			stmt->xt.target->xlate(xl, &params);
 			printf("%s", xt_xlate_get(xl));
 		} else if (stmt->xt.target->print) {
 			printf("#");
-- 
2.1.4


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-07-24 10:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-24 10:55 [PATCH nft] xt: use struct xt_xlate_{mt,tg}_params 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).