Changeset 18797 for src/router/quagga/ospf6d/ospf6_top.c

Timestamp:

03/22/12 02:00:38 (14 months ago)

Author:

BrainSlayer

Message:

update quagga

File:

• src/router/quagga/ospf6d/ospf6_top.c (modified) (6 diffs)

src/router/quagga/ospf6d/ospf6_top.c

@@ -52 +52 @@
 struct ospf6 *ospf6;
 
+static void ospf6_disable (struct ospf6 *o);
+
 static void
 ospf6_top_lsdb_hook_add (struct ospf6_lsa *lsa)
@@ -144 +146 @@
 }
 
-#if 0
-static void
+void
 ospf6_delete (struct ospf6 *o)
 {
@@ -151 +152 @@
   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);
@@ -165 +169 @@
   XFREE (MTYPE_OSPF6_TOP, o);
 }
-#endif
 
 static void
@@ -592 +595 @@
        OSPF6_STR
        ROUTE_STR
-       "Dispaly Intra-Area routes\n"
-       "Dispaly Inter-Area routes\n"
-       "Dispaly Type-1 External routes\n"
-       "Dispaly Type-2 External routes\n"
+       "Display Intra-Area routes\n"
+       "Display Inter-Area routes\n"
+       "Display Type-1 External routes\n"
+       "Display Type-2 External routes\n"
        )
 
@@ -605 +608 @@
        OSPF6_STR
        ROUTE_STR
-       "Dispaly Intra-Area routes\n"
-       "Dispaly Inter-Area routes\n"
-       "Dispaly Type-1 External routes\n"
-       "Dispaly Type-2 External routes\n"
+       "Display Intra-Area routes\n"
+       "Display Inter-Area routes\n"
+       "Display Type-1 External routes\n"
+       "Display Type-2 External routes\n"
        "Detailed information\n"
        )