From eed84494b4e434cb3846383771f3482269e48466 Mon Sep 17 00:00:00 2001
From: Renato Westphal <renato@opensourcerouting.org>
Date: Wed, 7 Aug 2019 12:24:43 -0300
Subject: [PATCH] lib: add yang wrappers for IP prefixes

We had wrappers for IPv4 and IPv6 prefixes, but not for IP (version
agnostic) prefixes. This commit addresses this issue.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---
 lib/yang_wrappers.c                   | 54 +++++++++++++++++++++++++++
 lib/yang_wrappers.h                   | 10 +++++
 yang/libyang_plugins/frr_user_types.c | 17 +++++++++
 3 files changed, 81 insertions(+)

diff --git a/lib/yang_wrappers.c b/lib/yang_wrappers.c
index cd776f333d..50225f35a0 100644
--- a/lib/yang_wrappers.c
+++ b/lib/yang_wrappers.c
@@ -781,6 +781,60 @@ void yang_get_default_string_buf(char *buf, size_t size, const char *xpath_fmt,
 			  xpath);
 }
 
+/*
+ * Derived type: IP prefix.
+ */
+void yang_str2prefix(const char *value, union prefixptr prefix)
+{
+	(void)str2prefix(value, prefix.p);
+	apply_mask(prefix.p);
+}
+
+struct yang_data *yang_data_new_prefix(const char *xpath,
+				       union prefixconstptr prefix)
+{
+	char value_str[PREFIX2STR_BUFFER];
+
+	(void)prefix2str(prefix.p, value_str, sizeof(value_str));
+	return yang_data_new(xpath, value_str);
+}
+
+void yang_dnode_get_prefix(union prefixptr prefix, const struct lyd_node *dnode,
+			   const char *xpath_fmt, ...)
+{
+	const struct lyd_node_leaf_list *dleaf;
+
+	assert(dnode);
+	if (xpath_fmt) {
+		va_list ap;
+		char xpath[XPATH_MAXLEN];
+
+		va_start(ap, xpath_fmt);
+		vsnprintf(xpath, sizeof(xpath), xpath_fmt, ap);
+		va_end(ap);
+		dnode = yang_dnode_get(dnode, xpath);
+		YANG_DNODE_GET_ASSERT(dnode, xpath);
+	}
+
+	dleaf = (const struct lyd_node_leaf_list *)dnode;
+	assert(dleaf->value_type == LY_TYPE_STRING);
+	(void)str2prefix(dleaf->value_str, prefix.p);
+}
+
+void yang_get_default_prefix(union prefixptr var, const char *xpath_fmt, ...)
+{
+	char xpath[XPATH_MAXLEN];
+	const char *value;
+	va_list ap;
+
+	va_start(ap, xpath_fmt);
+	vsnprintf(xpath, sizeof(xpath), xpath_fmt, ap);
+	va_end(ap);
+
+	value = yang_get_default_value(xpath);
+	yang_str2prefix(value, var);
+}
+
 /*
  * Derived type: ipv4.
  */
diff --git a/lib/yang_wrappers.h b/lib/yang_wrappers.h
index ab7abe173c..1a30ff3686 100644
--- a/lib/yang_wrappers.h
+++ b/lib/yang_wrappers.h
@@ -114,6 +114,16 @@ extern const char *yang_get_default_string(const char *xpath_fmt, ...);
 extern void yang_get_default_string_buf(char *buf, size_t size,
 					const char *xpath_fmt, ...);
 
+/* ip prefix */
+extern void yang_str2prefix(const char *value, union prefixptr prefix);
+extern struct yang_data *yang_data_new_prefix(const char *xpath,
+					      union prefixconstptr prefix);
+extern void yang_dnode_get_prefix(union prefixptr prefix,
+				  const struct lyd_node *dnode,
+				  const char *xpath_fmt, ...);
+extern void yang_get_default_prefix(union prefixptr var, const char *xpath_fmt,
+				    ...);
+
 /* ipv4 */
 extern void yang_str2ipv4(const char *value, struct in_addr *addr);
 extern struct yang_data *yang_data_new_ipv4(const char *xpath,
diff --git a/yang/libyang_plugins/frr_user_types.c b/yang/libyang_plugins/frr_user_types.c
index a293c3a883..48cdceccf4 100644
--- a/yang/libyang_plugins/frr_user_types.c
+++ b/yang/libyang_plugins/frr_user_types.c
@@ -99,6 +99,21 @@ static int ipv6_prefix_store_clb(const char *type_name, const char *value_str,
 	return 0;
 }
 
+static int ip_prefix_store_clb(const char *type_name, const char *value_str,
+			       lyd_val *value, char **err_msg)
+{
+	value->ptr = malloc(sizeof(struct prefix));
+	if (!value->ptr)
+		return 1;
+
+	if (str2prefix(value_str, value->ptr) == 0) {
+		free(value->ptr);
+		return 1;
+	}
+
+	return 0;
+}
+
 struct lytype_plugin_list frr_user_types[] = {
 	{"ietf-inet-types", "2013-07-15", "ipv4-address",
 	 ipv4_address_store_clb, free},
@@ -114,5 +129,7 @@ struct lytype_plugin_list frr_user_types[] = {
 	 free},
 	{"ietf-inet-types", "2013-07-15", "ipv6-prefix", ipv6_prefix_store_clb,
 	 free},
+	{"ietf-inet-types", "2013-07-15", "ip-prefix", ip_prefix_store_clb,
+	 free},
 	{NULL, NULL, NULL, NULL, NULL} /* terminating item */
 };
-- 
2.39.5