diff options
| author | paul <paul> | 2004-02-17 20:07:30 +0000 |
|---|---|---|
| committer | paul <paul> | 2004-02-17 20:07:30 +0000 |
| commit | d2a73ce3c89309c270ed7e8910b37e73f448dee4 (patch) | |
| tree | 2d66865af657ac8be41ef1304b0e5987bcf27d4d /ospfd/ospf_interface.c | |
| parent | 717592066c09962a23fb6cc57fba64b1b06cc97a (diff) | |
| download | quagga-d2a73ce3c89309c270ed7e8910b37e73f448dee4.tar.bz2 quagga-d2a73ce3c89309c270ed7e8910b37e73f448dee4.tar.xz | |
2004-02-17 Paul Jakma <paul@dishone.st>
* ospf_zebra.c: (ospf_interface_delete) Do not delete the interface
params, nor the interface structure, if an interface delete
message is received from zebra.
* ospf_interface.c: (ospf_if_delete_hook) Delete the interface
params and interface, ie that which was previously removed in
(ospf_interface_delete) above.
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 2f94b43f..acce9076 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -677,11 +677,18 @@ int ospf_if_delete_hook (struct interface *ifp) { int rc = 0; + struct route_node *rn; #ifdef HAVE_OPAQUE_LSA rc = ospf_opaque_del_if (ifp); #endif /* HAVE_OPAQUE_LSA */ + route_table_finish (IF_OIFS (ifp)); + + for (rn = route_top (IF_OIFS_PARAMS (ifp)); rn; rn = route_next (rn)) + if (rn->info) + ospf_del_if_params (rn->info); route_table_finish (IF_OIFS_PARAMS (ifp)); + ospf_del_if_params ((struct ospf_if_params *) IF_DEF_PARAMS (ifp)); XFREE (MTYPE_OSPF_IF_INFO, ifp->info); ifp->info = NULL; |