ipvti: Add fwmark API

This is a new option that was added in Linux v4.12.

Signed-off-by: Thomas Winter <Thomas.Winter@alliedtelesis.co.nz>

4 files changed, 64 insertions, 0 deletions

diff --git a/doc/route.txt b/doc/route.txt
index d303978..d51a394 100644
--- a/doc/route.txt
+++ b/doc/route.txt
@@ -1164,6 +1164,9 @@ extern uint32_t rtnl_link_ipvti_get_local(struct rtnl_link *link);
 extern int rtnl_link_ipvti_set_remote(struct rtnl_link *link, uint32_t addr);
 extern uint32_t rtnl_link_ipvti_get_remote(struct rtnl_link *link);
 
+extern int rtnl_link_ipvti_set_fwmark(struct rtnl_link *link, uint32_t fwmark);
+extern int rtnl_link_ipvti_get_fwmark(struct rtnl_link *link, uint32_t *fwmark);
+
 -----
 
 .Example: Add a ipvti tunnel device
diff --git a/include/netlink/route/link/ipvti.h b/include/netlink/route/link/ipvti.h
index cb8f2d9..8e31dab 100644
--- a/include/netlink/route/link/ipvti.h
+++ b/include/netlink/route/link/ipvti.h
@@ -32,6 +32,9 @@ extern "C" {
 	extern int rtnl_link_ipvti_set_remote(struct rtnl_link *link, uint32_t addr);
 	extern uint32_t rtnl_link_ipvti_get_remote(struct rtnl_link *link);
 
+	extern int rtnl_link_ipvti_set_fwmark(struct rtnl_link *link, uint32_t fwmark);
+	extern int rtnl_link_ipvti_get_fwmark(struct rtnl_link *link, uint32_t *fwmark);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/route/link/ipvti.c b/lib/route/link/ipvti.c
index 03ee31b..9f9d3d6 100644
--- a/lib/route/link/ipvti.c
+++ b/lib/route/link/ipvti.c
@@ -31,6 +31,7 @@
 #define IPVTI_ATTR_OKEY		 (1 << 2)
 #define IPVTI_ATTR_LOCAL	 (1 << 3)
 #define IPVTI_ATTR_REMOTE	 (1 << 4)
+#define IPVTI_ATTR_FWMARK	 (1 << 5)
 
 struct ipvti_info
 {
@@ -39,6 +40,7 @@ struct ipvti_info
 	uint32_t   okey;
 	uint32_t   local;
 	uint32_t   remote;
+	uint32_t   fwmark;
 	uint32_t   ipvti_mask;
 };
 
@@ -48,6 +50,7 @@ static	struct nla_policy ipvti_policy[IFLA_VTI_MAX + 1] = {
 	[IFLA_VTI_OKEY]     = { .type = NLA_U32 },
 	[IFLA_VTI_LOCAL]    = { .type = NLA_U32 },
 	[IFLA_VTI_REMOTE]   = { .type = NLA_U32 },
+	[IFLA_VTI_FWMARK]   = { .type = NLA_U32 },
 };
 
 static int ipvti_alloc(struct rtnl_link *link)
@@ -111,6 +114,11 @@ static int ipvti_parse(struct rtnl_link *link, struct nlattr *data,
 		ipvti->ipvti_mask |= IPVTI_ATTR_REMOTE;
 	}
 
+	if (tb[IFLA_VTI_FWMARK]) {
+		ipvti->fwmark = nla_get_u32(tb[IFLA_VTI_FWMARK]);
+		ipvti->ipvti_mask |= IPVTI_ATTR_FWMARK;
+	}
+
 	err = 0;
 
 errout:
@@ -141,6 +149,9 @@ static int ipvti_put_attrs(struct nl_msg *msg, struct rtnl_link *link)
 	if (ipvti->ipvti_mask & IPVTI_ATTR_REMOTE)
 		NLA_PUT_U32(msg, IFLA_VTI_REMOTE, ipvti->remote);
 
+	if (ipvti->ipvti_mask & IPVTI_ATTR_FWMARK)
+		NLA_PUT_U32(msg, IFLA_VTI_FWMARK, ipvti->fwmark);
+
 	nla_nest_end(msg, data);
 
 nla_put_failure:
@@ -206,6 +217,11 @@ static void ipvti_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
 		else
 			nl_dump_line(p, "%#x\n", ntohs(ipvti->remote));
 	}
+
+	if (ipvti->ipvti_mask & IPVTI_ATTR_FWMARK) {
+		nl_dump(p, "      fwmark ");
+		nl_dump_line(p, "%x\n", ipvti->fwmark);
+	}
 }
 
 static int ipvti_clone(struct rtnl_link *dst, struct rtnl_link *src)
@@ -471,6 +487,46 @@ uint32_t rtnl_link_ipvti_get_remote(struct rtnl_link *link)
 	return ipvti->remote;
 }
 
+/**
+ * Set IPVTI tunnel fwmark
+ * @arg link            Link object
+ * @arg fwmark          fwmark
+ *
+ * @return 0 on success or a negative error code
+ */
+int rtnl_link_ipvti_set_fwmark(struct rtnl_link *link, uint32_t fwmark)
+{
+	struct ipvti_info *ipvti = link->l_info;
+
+	IS_IPVTI_LINK_ASSERT(link);
+
+	ipvti->fwmark = fwmark;
+	ipvti->ipvti_mask |= IPVTI_ATTR_FWMARK;
+
+	return 0;
+}
+
+/**
+ * Get IPVTI tunnel fwmark
+ * @arg link            Link object
+ * @arg fwmark          addr to fill in with the fwmark
+ *
+ * @return 0 on success or a negative error code
+ */
+int rtnl_link_ipvti_get_fwmark(struct rtnl_link *link, uint32_t *fwmark)
+{
+	struct ipvti_info *ipvti = link->l_info;
+
+	IS_IPVTI_LINK_ASSERT(link);
+
+	if (!(ipvti->ipvti_mask & IPVTI_ATTR_FWMARK))
+		return -NLE_NOATTR;
+
+	*fwmark = ipvti->fwmark;
+
+	return 0;
+}
+
 static void __init ipvti_init(void)
 {
 	rtnl_link_register_info(&ipvti_info_ops);
diff --git a/libnl-route-3.sym b/libnl-route-3.sym
index ec66f27..7d585b6 100644
--- a/libnl-route-3.sym
+++ b/libnl-route-3.sym
@@ -1191,6 +1191,8 @@ global:
 	rtnl_link_ip6vti_set_remote;
 	rtnl_link_ipgre_get_fwmark;
 	rtnl_link_ipgre_set_fwmark;
+	rtnl_link_ipvti_get_fwmark;
+	rtnl_link_ipvti_set_fwmark;
 	rtnl_link_is_ip6gre;
 	rtnl_link_is_ip6vti;
 	rtnl_link_macsec_get_offload;