diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 01:49:16 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 01:49:16 +0100 |
| commit | f9956b9524ddafdb9d0cec042213eaa8229aad8c (patch) | |
| tree | bf362c892837ef3f5a6a4d4265eb18e1b47ccf33 /ospf6d/ospf6_top.c | |
| parent | 9470cb2c32eab220f796b1438b787528272cbe84 (diff) | |
| download | quagga-ex15p.tar.bz2 quagga-ex15p.tar.xz | |
Bring "ex" version up to date with 0.99.18ex15p
Release: 0.99.18ex15p -- Pipework Branch
Also fixes issue with unknown attributes -- does not release them prematurely.
Contains the "bgpd: New show commands for improved view and address family
support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 9305b23f..bc0b477e 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -51,6 +51,8 @@ /* global ospf6d variable */ struct ospf6 *ospf6; +static void ospf6_disable (struct ospf6 *o); + static void ospf6_top_lsdb_hook_add (struct ospf6_lsa *lsa) { @@ -143,15 +145,17 @@ ospf6_create (void) return o; } -#if 0 -static void +void ospf6_delete (struct ospf6 *o) { struct listnode *node, *nnode; struct ospf6_area *oa; + ospf6_disable (ospf6); + for (ALL_LIST_ELEMENTS (o->area_list, node, nnode, oa)) ospf6_area_delete (oa); + list_delete (o->area_list); ospf6_lsdb_delete (o->lsdb); ospf6_lsdb_delete (o->lsdb_self); @@ -164,7 +168,6 @@ ospf6_delete (struct ospf6 *o) XFREE (MTYPE_OSPF6_TOP, o); } -#endif static void ospf6_enable (struct ospf6 *o) |