diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-27 17:58:51 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-27 17:58:51 -0700 |
| commit | 060f36a30a71a96ec2bf88e6d9e52ce7f6f37dbd (patch) | |
| tree | f292bbe77652744e068041d3b166e4d326f2d0ab | |
| parent | 3ea593d4664b070cdf638946a9dea57c7045b3dd (diff) | |
| parent | 49a1b59f935674c35019c7f6bd8b8a5a83dd619c (diff) | |
| download | quagga-060f36a30a71a96ec2bf88e6d9e52ce7f6f37dbd.tar.bz2 quagga-060f36a30a71a96ec2bf88e6d9e52ce7f6f37dbd.tar.xz | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-quagga into jenner
| -rw-r--r-- | zebra/zebra_rib.c | 6 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 5ea93112..ade13578 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -451,8 +451,7 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set, return 1; } } - else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL) - || match->type == ZEBRA_ROUTE_STATIC) + else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL)) { for (newhop = match->nexthop; newhop; newhop = newhop->next) if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB) @@ -589,8 +588,7 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set, return 1; } } - else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL) || - match->type == ZEBRA_ROUTE_STATIC) + else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL)) { for (newhop = match->nexthop; newhop; newhop = newhop->next) if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index ecb5d10a..d4e3a4ae 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -87,6 +87,9 @@ zebra_static_ipv4 (struct vty *vty, int add_cmd, const char *dest_str, return CMD_SUCCESS; } + /* Mark static routes as internal so they get evaluated as recursive */ + SET_FLAG (flag, ZEBRA_FLAG_INTERNAL); + /* Route flags */ if (flag_str) { switch(flag_str[0]) { |