diff options
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index e592d3c4f..dfda06678 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -13,10 +13,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with GNU Zebra; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; see the file COPYING; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <zebra.h> @@ -286,9 +285,9 @@ ospf6_maxage_remover (struct thread *thread) void ospf6_maxage_remove (struct ospf6 *o) { - if (o && ! o->maxage_remover) - o->maxage_remover = thread_add_timer (master, ospf6_maxage_remover, o, - OSPF_LSA_MAXAGE_REMOVE_DELAY_DEFAULT); + if (o) + thread_add_timer(master, ospf6_maxage_remover, o, OSPF_LSA_MAXAGE_REMOVE_DELAY_DEFAULT, + &o->maxage_remover); } /* start ospf6 */ @@ -604,7 +603,7 @@ DEFUN (ospf6_interface_area, /* find/create ospf6 area */ oa = ospf6_area_lookup (area_id, o); if (oa == NULL) - oa = ospf6_area_create (area_id, o); + oa = ospf6_area_create (area_id, o, OSPF6_AREA_FMT_DOTTEDQUAD); /* attach interface to area */ listnode_add (oa->if_list, oi); /* sort ?? */ |