summaryrefslogtreecommitdiffstats
path: root/zebra/zserv.c
diff options
context:
space:
mode:
authorhasso <hasso>2005-08-27 06:05:47 +0000
committerhasso <hasso>2005-08-27 06:05:47 +0000
commit05ecff24d81162311a2f57e8d0207b99330a5754 (patch)
tree47b3a7b60eda5a057314fed12ac5f9213eb2827e /zebra/zserv.c
parent6cb71af352fd7f481ed0a3638f8b80aba17dbbb7 (diff)
downloadquagga-05ecff24d81162311a2f57e8d0207b99330a5754.tar.bz2
quagga-05ecff24d81162311a2f57e8d0207b99330a5754.tar.xz
* zebra_rib.c, rib.h: Add distance and metric arguments to the
rib_add_ipv6() function so that IPv6 routes in RIB can have correct metric. No IPv6 routing daemon uses distance yet though. * zserv.c, connected.c, kernel_socket.c, rt_netlink.c, rtread_proc.c,zserv.c: Pass metric and distance info to the rib_add_ipv6(). Forwardport from stable branch.
Diffstat (limited to 'zebra/zserv.c')
-rw-r--r--zebra/zserv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c
index eb126feb..872ddb85 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -999,9 +999,11 @@ zread_ipv6_add (struct zserv *client, u_short length)
api.metric = 0;
if (IN6_IS_ADDR_UNSPECIFIED (&nexthop))
- rib_add_ipv6 (api.type, api.flags, &p, NULL, ifindex, 0);
+ rib_add_ipv6 (api.type, api.flags, &p, NULL, ifindex, 0, api.metric,
+ api.distance);
else
- rib_add_ipv6 (api.type, api.flags, &p, &nexthop, ifindex, 0);
+ rib_add_ipv6 (api.type, api.flags, &p, &nexthop, ifindex, 0, api.metric,
+ api.distance);
return 0;
}