diff options
| author | David Lamparter <equinox@diac24.net> | 2012-04-11 23:52:46 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-28 01:21:43 +0200 |
| commit | 09a484dd1d27580d98c4b94d3ed77e47d7aac0b5 (patch) | |
| tree | ac178c846ddabfe4d6c80d5f6b5f4ba6025bbea2 /nhrpd | |
| parent | Merge pull request #1054 from dslicenc/eigrp-connected (diff) | |
| download | frr-09a484dd1d27580d98c4b94d3ed77e47d7aac0b5.tar.xz frr-09a484dd1d27580d98c4b94d3ed77e47d7aac0b5.zip | |
*: remove ZEBRA_FLAG_{BLACKHOLE,REJECT} from API
FLAG_BLACKHOLE is used for different things in different places. remove
it from the zclient API, instead indicate blackholes as proper nexthops
inside the message.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/nhrp_route.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c index 4b86bca5f..495e226f1 100644 --- a/nhrpd/nhrp_route.c +++ b/nhrpd/nhrp_route.c @@ -99,7 +99,9 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type, const struct prefix switch (type) { case NHRP_CACHE_NEGATIVE: - SET_FLAG(api.flags, ZEBRA_FLAG_REJECT); + zapi_route_set_blackhole(&api, BLACKHOLE_REJECT); + ifp = NULL; + nexthop = NULL; break; case NHRP_CACHE_DYNAMIC: case NHRP_CACHE_NHS: @@ -158,7 +160,7 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type, const struct prefix " count %d dev %s", add ? "add" : "del", buf[0], nexthop ? inet_ntop(api.prefix.family, &api_nh->gate, buf[1], sizeof(buf[1])) : "<onlink>", - api.metric, api.nexthop_num, ifp->name); + api.metric, api.nexthop_num, ifp ? ifp->name : "none"); } zclient_route_send(add ? ZEBRA_ROUTE_ADD : ZEBRA_ROUTE_DELETE, zclient, |