flower: extend classifier with ttl API

Signed-off-by: Volodymyr Bendiuga <[email protected]>
westermo · Apr 8, 2024 · 42088f6 · 42088f6
1 parent 6189b77
commit 42088f6
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 0 deletions.
diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h
@@ -641,6 +641,8 @@ struct rtnl_flower
 	uint8_t          cf_ip_dscp;
 	uint8_t          cf_ip_dscp_mask;
 	uint8_t          cf_ip_proto;
+	uint8_t          cf_ip_ttl;
+	uint8_t          cf_ip_ttl_mask;
 };
 
 struct rtnl_cgroup

diff --git a/include/netlink/route/cls/flower.h b/include/netlink/route/cls/flower.h
@@ -40,6 +40,9 @@ extern int rtnl_flower_get_src_mac(struct rtnl_cls *, unsigned char *,
 extern int rtnl_flower_set_ip_dscp(struct rtnl_cls *, uint8_t, uint8_t);
 extern int rtnl_flower_get_ip_dscp(struct rtnl_cls *, uint8_t *, uint8_t *);
 
+extern int rtnl_flower_set_ip_ttl(struct rtnl_cls *, uint8_t, uint8_t);
+extern int rtnl_flower_get_ip_ttl(struct rtnl_cls *, uint8_t *, uint8_t *);
+
 extern int rtnl_flower_set_ipv4_src(struct rtnl_cls *, in_addr_t, in_addr_t);
 extern int rtnl_flower_get_ipv4_src(struct rtnl_cls *, in_addr_t *,
 				    in_addr_t *);

diff --git a/lib/route/cls/flower.c b/lib/route/cls/flower.c
@@ -32,10 +32,14 @@
 #define FLOWER_ATTR_IPV4_DST      (1 << 14)
 #define FLOWER_ATTR_IPV4_DST_MASK (1 << 15)
 #define FLOWER_ATTR_IP_PROTO      (1 << 16)
+#define FLOWER_ATTR_IP_TTL        (1 << 17)
+#define FLOWER_ATTR_IP_TTL_MASK   (1 << 18)
 /** @endcond */
 
 #define FLOWER_DSCP_MAX             0xe0
 #define FLOWER_DSCP_MASK_MAX        0xe0
+#define FLOWER_TTL_MAX              0xfe
+#define FLOWER_TTL_MASK_MAX         0xfe
 #define FLOWER_VID_MAX              4095
 #define FLOWER_VLAN_PRIO_MAX        7
 
@@ -131,6 +135,16 @@ static int flower_msg_parser(struct rtnl_tc *tc, void *data)
 		f->cf_mask |= FLOWER_ATTR_IP_DSCP_MASK;
 	}
 
+	if (tb[TCA_FLOWER_KEY_IP_TTL]) {
+		f->cf_ip_ttl = nla_get_u8(tb[TCA_FLOWER_KEY_IP_TTL]);
+		f->cf_mask |= FLOWER_ATTR_IP_TTL;
+	}
+
+	if (tb[TCA_FLOWER_KEY_IP_TTL_MASK]) {
+		f->cf_ip_ttl_mask = nla_get_u8(tb[TCA_FLOWER_KEY_IP_TTL_MASK]);
+		f->cf_mask |= FLOWER_ATTR_IP_TTL_MASK;
+	}
+
 	if (tb[TCA_FLOWER_KEY_IPV4_SRC]) {
 		f->cf_ipv4_src = nla_get_u32(tb[TCA_FLOWER_KEY_IPV4_SRC]);
 		f->cf_mask |= FLOWER_ATTR_IPV4_SRC;
@@ -208,6 +222,12 @@ static int flower_msg_fill(struct rtnl_tc *tc, void *data, struct nl_msg *msg)
 	if (f->cf_mask & FLOWER_ATTR_IP_DSCP_MASK)
 		NLA_PUT_U8(msg, TCA_FLOWER_KEY_IP_TOS_MASK, f->cf_ip_dscp_mask);
 
+	if (f->cf_mask & FLOWER_ATTR_IP_TTL)
+		NLA_PUT_U8(msg, TCA_FLOWER_KEY_IP_TTL, f->cf_ip_ttl);
+
+	if (f->cf_mask & FLOWER_ATTR_IP_TTL_MASK)
+		NLA_PUT_U8(msg, TCA_FLOWER_KEY_IP_TTL_MASK, f->cf_ip_ttl_mask);
+
 	if (f->cf_mask & FLOWER_ATTR_IPV4_SRC)
 		NLA_PUT_U32(msg, TCA_FLOWER_KEY_IPV4_SRC, f->cf_ipv4_src);
 
@@ -329,6 +349,12 @@ static void flower_dump_details(struct rtnl_tc *tc, void *data,
 	if (f->cf_mask & FLOWER_ATTR_IP_DSCP_MASK)
 		nl_dump(p, " dscp_mask %u", f->cf_ip_dscp_mask);
 
+	if (f->cf_mask & FLOWER_ATTR_IP_TTL)
+		nl_dump(p, " ip_ttl %u", f->cf_ip_ttl);
+
+	if (f->cf_mask & FLOWER_ATTR_IP_TTL_MASK)
+		nl_dump(p, " ip_ttl_mask %u", f->cf_ip_ttl_mask);
+
 	if (f->cf_mask & FLOWER_ATTR_IPV4_SRC) {
 		inet_ntop(AF_INET, &f->cf_ipv4_src, addr_str, sizeof(addr_str));
 		inet_ntop(AF_INET, &f->cf_ipv4_src_mask, mask_str, sizeof(mask_str));
@@ -690,6 +716,60 @@ int rtnl_flower_get_ip_dscp(struct rtnl_cls *cls, uint8_t *dscp, uint8_t *mask)
 	return 0;
 }
 
+/**
+ * Set ip ttl value for flower classifier
+ * @arg cls		Flower classifier.
+ * @arg ttl		ttl value
+ * @arg mask		mask for ttl value
+ * @return 0 on success or a negative error code.
+ */
+int rtnl_flower_set_ip_ttl(struct rtnl_cls *cls, uint8_t ttl, uint8_t mask)
+{
+	struct rtnl_flower *f;
+
+	if (!(f = rtnl_tc_data(TC_CAST(cls))))
+		return -NLE_NOMEM;
+
+	if (ttl > FLOWER_TTL_MAX)
+		return -NLE_RANGE;
+
+	if (mask > FLOWER_TTL_MASK_MAX)
+		return -NLE_RANGE;
+
+	f->cf_ip_ttl = ttl;
+	f->cf_mask |= FLOWER_ATTR_IP_TTL;
+
+	if (mask) {
+		f->cf_ip_ttl_mask = mask;
+		f->cf_mask |= FLOWER_ATTR_IP_TTL_MASK;
+	}
+
+	return 0;
+}
+
+/**
+ * Get ttl value for flower classifier
+ * @arg cls		Flower classifier.
+ * @arg ttl		ttl value
+ * @arg mask		mask for ttl value
+ * @return 0 on success or a negative error code.
+*/
+int rtnl_flower_get_ip_ttl(struct rtnl_cls *cls, uint8_t *ttl, uint8_t *mask)
+{
+	struct rtnl_flower *f;
+
+	if (!(f = rtnl_tc_data_peek(TC_CAST(cls))))
+		return -NLE_INVAL;
+
+	if (!(f->cf_mask & FLOWER_ATTR_IP_TTL))
+		return -NLE_MISSING_ATTR;
+
+	*ttl = f->cf_ip_ttl;
+	*mask = f->cf_ip_ttl_mask;
+
+	return 0;
+}
+
 /**
  * Set IPv4 source address for flower classifier
  * @arg cls		Flower classifier.

diff --git a/libnl-route-3.sym b/libnl-route-3.sym
@@ -1356,4 +1356,6 @@ global:
 	rtnl_interlink_set_lan_id;
 	rtnl_interlink_get_net_id;
 	rtnl_interlink_set_net_id;
+	rtnl_flower_set_ip_ttl;
+	rtnl_flower_get_ip_ttl;
 } libnl_3_6;