flower-New-API-for-fetching-vlan-ethertype-and-flags

westermo · Jan 12, 2024 · bcfda88 · bcfda88
1 parent 062546e
commit bcfda88
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/include/netlink/route/cls/flower.h b/include/netlink/route/cls/flower.h
@@ -25,6 +25,7 @@ extern int rtnl_flower_set_vlan_prio(struct rtnl_cls *, uint8_t);
 extern int rtnl_flower_get_vlan_prio(struct rtnl_cls *, uint8_t *);
 
 extern int rtnl_flower_set_vlan_ethtype(struct rtnl_cls *, uint16_t);
+extern int rtnl_flower_get_vlan_ethtype(struct rtnl_cls *, uint16_t *);
 
 extern int rtnl_flower_set_dst_mac(struct rtnl_cls *, unsigned char *,
                                    unsigned char *);
@@ -50,6 +51,7 @@ extern int rtnl_flower_set_ip_proto(struct rtnl_cls *, uint8_t);
 extern int rtnl_flower_get_ip_proto(struct rtnl_cls *, uint8_t *);
 
 extern int rtnl_flower_set_flags(struct rtnl_cls *, int);
+extern int rtnl_flower_get_flags(struct rtnl_cls *, int *);
 
 extern int rtnl_flower_append_action(struct rtnl_cls *, struct rtnl_act *);
 extern int rtnl_flower_del_action(struct rtnl_cls *, struct rtnl_act *);

diff --git a/lib/route/cls/flower.c b/lib/route/cls/flower.c
@@ -501,6 +501,27 @@ int rtnl_flower_set_vlan_ethtype(struct rtnl_cls *cls, uint16_t ethtype)
 	return 0;
 }
 
+/**
+ * Get vlan ethtype for flower classifier
+ * @arg cls		Flower classifier.
+ * @arg vet		vlan ethtype
+ * @return 0 on success or a negative error code.
+*/
+int rtnl_flower_get_vlan_ethtype(struct rtnl_cls *cls, uint16_t *vet)
+{
+	struct rtnl_flower *f;
+
+	if (!(f = rtnl_tc_data_peek(TC_CAST(cls))))
+		return -NLE_INVAL;
+
+	if (!(f->cf_mask & FLOWER_ATTR_VLAN_ETH_TYPE))
+		return -NLE_MISSING_ATTR;
+
+	*vet = ntohs(f->cf_vlan_ethtype);
+
+	return 0;
+}
+
 /**
  * Set destination mac address for flower classifier
  * @arg cls		Flower classifier.
@@ -923,6 +944,27 @@ int rtnl_flower_set_flags(struct rtnl_cls *cls, int flags)
 	return 0;
 }
 
+/**
+ * Get flags for flower classifier
+ * @arg cls		Flower classifier.
+ * @arg flags		flags
+ * @return 0 on success or a negative error code.
+*/
+int rtnl_flower_get_flags(struct rtnl_cls *cls, int *flags)
+{
+	struct rtnl_flower *f;
+
+	if (!(f = rtnl_tc_data_peek(TC_CAST(cls))))
+		return -NLE_INVAL;
+
+	if (!(f->cf_mask & FLOWER_ATTR_FLAGS))
+		return -NLE_MISSING_ATTR;
+
+	*flags = f->cf_flags;
+
+	return 0;
+}
+
 /** @} */
 
 static struct rtnl_tc_ops flower_ops = {

diff --git a/libnl-route-3.sym b/libnl-route-3.sym
@@ -1296,6 +1296,8 @@ global:
 	rtnl_tc_set_egress_block;
 	rtnl_flower_set_ip_proto;
 	rtnl_flower_get_ip_proto;
+	rtnl_flower_get_vlan_ethtype;
+	rtnl_flower_get_flags;
 	rtnl_nat_get_action;
 	rtnl_nat_get_flags;
 	rtnl_nat_get_mask;