Merge pull request #2764 from opensourcerouting/isis-srcdest

IS-IS dst-src routing support

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/srcdest_table.c b/lib/srcdest_table.c
index 32f8e8ca5b..4497faf6fc 100644
--- a/lib/srcdest_table.c
+++ b/lib/srcdest_table.c
@@ -281,13 +281,12 @@ void srcdest_rnode_prefixes(struct route_node *rn, const struct prefix **p,
 	}
 }
 
-const char *srcdest_rnode2str(struct route_node *rn, char *str, int size)
+const char *srcdest2str(const struct prefix *dst_p,
+			const struct prefix_ipv6 *src_p,
+			char *str, int size)
 {
-	const struct prefix *dst_p, *src_p;
 	char dst_buf[PREFIX_STRLEN], src_buf[PREFIX_STRLEN];
 
-	srcdest_rnode_prefixes(rn, &dst_p, &src_p);
-
 	snprintf(str, size, "%s%s%s",
 		 prefix2str(dst_p, dst_buf, sizeof(dst_buf)),
 		 (src_p && src_p->prefixlen) ? " from " : "",
@@ -296,3 +295,11 @@ const char *srcdest_rnode2str(struct route_node *rn, char *str, int size)
 			 : "");
 	return str;
 }
+
+const char *srcdest_rnode2str(struct route_node *rn, char *str, int size)
+{
+	const struct prefix *dst_p, *src_p;
+
+	srcdest_rnode_prefixes(rn, &dst_p, &src_p);
+	return srcdest2str(dst_p, (struct prefix_ipv6*)src_p, str, size);
+}