Skip to contentSkip to conversation

extensions: libip6t_hl: Add translation to nft

PATCH In review Shivani Bhardwaj 2 participants 2 messages Jan 7, 2016 – Jan 11, 2016 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 extensions: libip6t_hl: Add translation to nft

Add translation for hop limit to nftables.

Examples:

$ sudo ip6tables-translate -t nat -A postrouting -m hl --hl-gt 3
nft add rule ip6 nat postrouting ip6 hoplimit gt 3 counter
$ sudo ip6tables-translate -t nat -A postrouting -m hl ! --hl-eq 3
nft add rule ip6 nat postrouting ip6 hoplimit != 3 counter
---
 extensions/libip6t_hl.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
extensions/libip6t_hl.c +18 -0
index 3559db4..0e13df1 100644
@@ -97,6 +97,23 @@ static const struct xt_option_entry hl_opts[] = {
 };
 #undef s
 
+static int hl_xlate(const struct xt_entry_match *match,
+		    struct xt_buf *buf, int numeric)
+{
+	static const char *const op[] = {
+		[IP6T_HL_EQ] = "ip6 hoplimit",
+		[IP6T_HL_NE] = "ip6 hoplimit !=",
+		[IP6T_HL_LT] = "ip6 hoplimit lt",
+		[IP6T_HL_GT] = "ip6 hoplimit gt" };
+
+	const struct ip6t_hl_info *info =
+			(struct ip6t_hl_info *) match->data;
+
+	xt_buf_add(buf, "%s %u ", op[info->mode], info->hop_limit);
+
+	return 1;
+}
+
 static struct xtables_match hl_mt6_reg = {
 	.name          = "hl",
 	.version       = XTABLES_VERSION,
@@ -109,6 +126,7 @@ static struct xtables_match hl_mt6_reg = {
 	.x6_parse      = hl_parse,
 	.x6_fcheck     = hl_check,
 	.x6_options    = hl_opts,
+	.xlate	       = hl_xlate,
 };
 
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 21 lines · Shivani Bhardwaj

Add translation for hop limit to nftables.

Examples:

$ sudo ip6tables-translate -t nat -A postrouting -m hl --hl-gt 3
nft add rule ip6 nat postrouting ip6 hoplimit gt 3 counter
$ sudo ip6tables-translate -t nat -A postrouting -m hl ! --hl-eq 3
nft add rule ip6 nat postrouting ip6 hoplimit != 3 counter
---
 extensions/libip6t_hl.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
extensions/libip6t_hl.c +0 -0
index 3559db4..0e13df1 100644
@@ -97,6 +97,23 @@ static const struct xt_option_entry hl_opts[] = {
 };

extensions/libip6t_hl.c static const struct xt_option_entry hl_opts[] = { · line 107

Quoted 10 lines
extensions/libip6t_hl.c +8 -0
 #undef s
 
+static int hl_xlate(const struct xt_entry_match *match,
+		    struct xt_buf *buf, int numeric)
+{
+	static const char *const op[] = {
+		[IP6T_HL_EQ] = "ip6 hoplimit",
+		[IP6T_HL_NE] = "ip6 hoplimit !=",
+		[IP6T_HL_LT] = "ip6 hoplimit lt",
+		[IP6T_HL_GT] = "ip6 hoplimit gt" };

I'd suggest you use something like:

	static const char *const op[] = {
                [IP6T_HL_EQ] = "",
                [IP6T_HL_NE] = "!=",
                [IP6T_HL_LT] = "lt",
                [IP6T_HL_GT] = "gt"
        };

We can later on consolidate this code by providing a common function from libxtables for everyone.

Thanks.