commit acf9865f7fcec6a8d47df6ed7946a5e8ca398918
author Christian Franke <chris@opensourcerouting.org> Thu Nov 12 14:24:22 2015 +0100
committer Donald Sharp <sharpd@cumulusnetworks.com> Tue Dec 08 14:12:50 2015 -0500
tree fac7d9ce2d2b6d984bde675641556e5063e8f655
parent 9dfcca6122c9f4f3642241ff50029d7669af3999

isisd: add support to import routes from other protocols

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

lib/prefix.c

diff --git a/lib/prefix.c b/lib/prefix.c
index 63742f3..936e9fc 100644
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -187,6 +187,17 @@
   return prefix_bit((const u_char *) &prefix->s6_addr, prefixlen);
 }
 
+int
+str2family(const char *string)
+{
+  if (!strcmp("ipv4", string))
+    return AF_INET;
+  else if (!strcmp("ipv6", string))
+    return AF_INET6;
+  else
+    return -1;
+}
+
 /* Address Famiy Identifier to Address Family converter. */
 int
 afi2family (afi_t afi)

lib/prefix.h

diff --git a/lib/prefix.h b/lib/prefix.h
index bc8aebc..a517d79 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -170,6 +170,7 @@
 #endif /*s6_addr32*/
 
 /* Prototypes. */
+extern int str2family(const char *);
 extern int afi2family (afi_t);
 extern afi_t family2afi (int);
 

lib/routemap.h

diff --git a/lib/routemap.h b/lib/routemap.h
index ba64553..2479c81 100644
--- a/lib/routemap.h
+++ b/lib/routemap.h
@@ -47,7 +47,8 @@
   RMAP_OSPF,
   RMAP_OSPF6,
   RMAP_BGP,
-  RMAP_ZEBRA
+  RMAP_ZEBRA,
+  RMAP_ISIS,
 } route_map_object_t;
 
 typedef enum