diff options
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_abr.c | 6 | ||||
| -rw-r--r-- | ospf6d/ospf6_area.c | 3 | ||||
| -rw-r--r-- | ospf6d/ospf6_interface.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_route.c | 6 | ||||
| -rw-r--r-- | ospf6d/ospf6_spf.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 2 |
6 files changed, 13 insertions, 10 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 586584c65c..1890e9bdc3 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -171,8 +171,9 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route, /* AS External routes are never considered */ if (route->path.type == OSPF6_PATH_TYPE_EXTERNAL1 || route->path.type == OSPF6_PATH_TYPE_EXTERNAL2) { - if (is_debug) - zlog_debug("Path type is external, skip"); +#if 0 + zlog_debug("Path type is external, skip"); +#endif return 0; } @@ -1004,6 +1005,7 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa) if (lsa->header->type == htons(OSPF6_LSTYPE_INTER_ROUTER)) { /* To pass test suites */ + assert(router_lsa); if (!OSPF6_OPT_ISSET(router_lsa->options, OSPF6_OPT_R) || !OSPF6_OPT_ISSET(router_lsa->options, OSPF6_OPT_V6)) { if (is_debug) diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 2cab69aac2..c848a16aa9 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -277,7 +277,7 @@ void ospf6_area_delete(struct ospf6_area *oa) for (ALL_LIST_ELEMENTS_RO(oa->if_list, n, oi)) oi->area = NULL; - list_delete_and_null(&oa->if_list); + list_delete(&oa->if_list); ospf6_lsdb_delete(oa->lsdb); ospf6_lsdb_delete(oa->lsdb_self); @@ -441,6 +441,7 @@ DEFUN (area_range, SET_FLAG(range->flag, OSPF6_ROUTE_DO_NOT_ADVERTISE); } else if (strmatch(argv[idx_type]->text, "advertise")) { UNSET_FLAG(range->flag, OSPF6_ROUTE_DO_NOT_ADVERTISE); + cost = range->path.u.cost_config; } else { cost = strtoul(argv[5]->arg, NULL, 10); UNSET_FLAG(range->flag, OSPF6_ROUTE_DO_NOT_ADVERTISE); diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 9777a01ae6..17a30188c7 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -241,7 +241,7 @@ void ospf6_interface_delete(struct ospf6_interface *oi) for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) ospf6_neighbor_delete(on); - list_delete_and_null(&oi->neighbor_list); + list_delete(&oi->neighbor_list); THREAD_OFF(oi->thread_send_hello); THREAD_OFF(oi->thread_send_lsupdate); diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index bba3c0db5e..79e1a44392 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -365,7 +365,7 @@ static int ospf6_path_cmp(struct ospf6_path *a, struct ospf6_path *b) void ospf6_path_free(struct ospf6_path *op) { if (op->nh_list) - list_delete_and_null(&op->nh_list); + list_delete(&op->nh_list); XFREE(MTYPE_OSPF6_PATH, op); } @@ -413,9 +413,9 @@ void ospf6_route_delete(struct ospf6_route *route) { if (route) { if (route->nh_list) - list_delete_and_null(&route->nh_list); + list_delete(&route->nh_list); if (route->paths) - list_delete_and_null(&route->paths); + list_delete(&route->paths); XFREE(MTYPE_OSPF6_ROUTE, route); } } diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index d9ddc1bb83..2d271c1dab 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -158,8 +158,8 @@ static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa) static void ospf6_vertex_delete(struct ospf6_vertex *v) { - list_delete_and_null(&v->nh_list); - list_delete_and_null(&v->child_list); + list_delete(&v->nh_list); + list_delete(&v->child_list); XFREE(MTYPE_OSPF6_VERTEX, v); } diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index ca1a65ff0b..901a35ccfa 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -202,7 +202,7 @@ void ospf6_delete(struct ospf6 *o) ospf6_area_delete(oa); - list_delete_and_null(&o->area_list); + list_delete(&o->area_list); ospf6_lsdb_delete(o->lsdb); ospf6_lsdb_delete(o->lsdb_self); |