summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorpaul <paul>2003-08-10 04:04:41 +0000
committerpaul <paul>2003-08-10 04:04:41 +0000
commitd8e1d6bcc372d163fea7394a96f5c794315e3b9a (patch)
tree1bff3b086c15226238cb3df7f777d8803a344011 /ospfd
parent96735eeafe4713b60700915dd2fb6dcbd0f09c8f (diff)
2003-08-10 Yasuyuki Haga <yasuhaga@nifty.ne.jp>
* ospfd/ospf_zebra.c: (ospf_zebra_delete) Do not dereference the ifp, it mightn't exist.
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_zebra.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 3594b17c..39525d57 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -417,7 +417,6 @@ ospf_zebra_delete (struct prefix_ipv4 *p, struct ospf_route *or)
api.message = 0;
api.ifindex_num = 0;
api.nexthop_num = 0;
- SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
for (node = listhead (or->paths); node; nextnode (node))
{
@@ -425,17 +424,11 @@ ospf_zebra_delete (struct prefix_ipv4 *p, struct ospf_route *or)
if (path->nexthop.s_addr != INADDR_ANY)
{
+ SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
api.nexthop_num = 1;
nexthop = &path->nexthop;
api.nexthop = &nexthop;
}
- else
- {
- /* Commented out by Hasso because it introduces segfault.
- * See bug #29 in bugzilla for details. */
- /* api.ifindex_num = 1;
- api.ifindex = &path->oi->ifp->ifindex; */
- }
zapi_ipv4_delete (zclient, p, &api);