From d8e1d6bcc372d163fea7394a96f5c794315e3b9a Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 10 Aug 2003 04:04:41 +0000 Subject: 2003-08-10 Yasuyuki Haga * ospfd/ospf_zebra.c: (ospf_zebra_delete) Do not dereference the ifp, it mightn't exist. --- ospfd/ospf_zebra.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ospfd/ospf_zebra.c') 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); -- cgit v1.2.1