summaryrefslogtreecommitdiffstats
path: root/zebra/zebra_rib.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-12-18 17:19:46 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-12-18 17:19:46 -0800
commit3111ae93268b1af36e469b1f7744e821f27f0a30 (patch)
tree0c6282fe70d9f0df38ec5136a046ce14311c0d42 /zebra/zebra_rib.c
parent0b49f5d475aa5503e60d8dbdc9b4dcc8f6a614ec (diff)
parent177fec0b82d18dc92fe40b51bf1a4a294fb9a7ff (diff)
downloadquagga-3111ae93268b1af36e469b1f7744e821f27f0a30.tar.bz2
quagga-3111ae93268b1af36e469b1f7744e821f27f0a30.tar.xz
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-quagga into jenner
Diffstat (limited to 'zebra/zebra_rib.c')
-rw-r--r--zebra/zebra_rib.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 69249779..0e9e8a26 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1623,7 +1623,8 @@ int
rib_add_ipv4 (int type, int flags, struct prefix_ipv4 *p,
struct in_addr *gate, struct in_addr *src,
unsigned int ifindex, u_int32_t vrf_id,
- u_int32_t metric, u_int8_t distance, u_int8_t scope)
+ u_int32_t metric, u_int8_t distance,
+ u_int8_t scope, u_int8_t proto)
{
struct rib *rib;
struct rib *same = NULL;
@@ -1688,6 +1689,7 @@ rib_add_ipv4 (int type, int flags, struct prefix_ipv4 *p,
rib->nexthop_num = 0;
rib->uptime = time (NULL);
rib->scope = scope;
+ rib->protocol = proto;
/* Nexthop settings. */
if (gate)
@@ -1701,7 +1703,7 @@ rib_add_ipv4 (int type, int flags, struct prefix_ipv4 *p,
nexthop_ifindex_add (rib, ifindex, src);
/* If this route is kernel route, set FIB flag to the route. */
- if (RIB_SYSTEM_ROUTE (rib))
+ if (RIB_SYSTEM_ROUTE (rib))
{
/* Mark system routes with the don't touch me flag */
if (! rib_system_routes)