[zebra] Include metric on connected routes.

2006-01-17 Gunnar Stigen <gunnar.stigen@axxessit.no>

	* connected.c: (connected_up_ipv{4,6}) Include interface metric on
	  connected routes.

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index bcc8364549e178de5eb4ee67c8baaf38d6a941f4..9c01492946d7b97a82687551491cf3fef3a0bb8b 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-17 Gunnar Stigen <gunnar.stigen@axxessit.no>
+
+       * connected.c: (connected_up_ipv{4,6}) Include interface metric on
+         connected routes.
+
 2006-01-16 Paul Jakma <paul.jakma@sun.com>
 
        * zserv.c: Read/write updated Zserv header.

diff --git a/zebra/connected.c b/zebra/connected.c
index 5417ffc56163cef62b41444a26a412d5a6c8f5b0..7e4f0fc7b9a8abb8269ff728ea3df7609867c7e4 100644 (file)
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -140,7 +140,8 @@ connected_up_ipv4 (struct interface *ifp, struct connected *ifc)
   if (prefix_ipv4_any (&p))
     return;
 
-  rib_add_ipv4 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0, 0, 0);
+  rib_add_ipv4 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0, 
+                ifp->metric, 0);
 
   rib_update ();
 }
@@ -322,7 +323,8 @@ connected_up_ipv6 (struct interface *ifp, struct connected *ifc)
     return;
 #endif
 
-  rib_add_ipv6 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0, 0, 0);
+  rib_add_ipv6 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0,
+                ifp->metric, 0);
 
   rib_update ();
 }