summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_spf.c
diff options
context:
space:
mode:
authorLou Berger <lberger@labn.net>2018-03-06 20:02:52 +0100
committerLou Berger <lberger@labn.net>2018-03-06 20:04:32 +0100
commit996c93142d3abfab0f6d6c800474e22a8cfbdbc5 (patch)
tree2b28846d256c84cf7b7f1a8988fb3267c8611722 /ospf6d/ospf6_spf.c
parentbgpd: another change to keep indent.py happy (diff)
downloadfrr-996c93142d3abfab0f6d6c800474e22a8cfbdbc5.tar.xz
frr-996c93142d3abfab0f6d6c800474e22a8cfbdbc5.zip
*: conform with COMMUNITY.md formatting rules, via 'make indent'
Signed-off-by: Lou Berger <lberger@labn.net>
Diffstat (limited to 'ospf6d/ospf6_spf.c')
-rw-r--r--ospf6d/ospf6_spf.c59
1 files changed, 30 insertions, 29 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 29ba1bcec..8d32f3505 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -114,12 +114,12 @@ static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa)
v->type = OSPF6_VERTEX_TYPE_ROUTER;
/* Router LSA use Link ID 0 as base in vertex_id */
ospf6_linkstate_prefix(lsa->header->adv_router, htonl(0),
- &v->vertex_id);
+ &v->vertex_id);
} else if (ntohs(lsa->header->type) == OSPF6_LSTYPE_NETWORK) {
v->type = OSPF6_VERTEX_TYPE_NETWORK;
/* vertex_id */
ospf6_linkstate_prefix(lsa->header->adv_router, lsa->header->id,
- &v->vertex_id);
+ &v->vertex_id);
} else
assert(0);
@@ -131,8 +131,8 @@ static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa)
__func__, v->name,
((ntohs(lsa->header->type) == OSPF6_LSTYPE_ROUTER)
? "Router"
- : "N/W"), ntohs(lsa->header->type),
- lsa->name);
+ : "N/W"),
+ ntohs(lsa->header->type), lsa->name);
/* Associated LSA */
@@ -146,7 +146,7 @@ static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa)
v->nh_list = list_new();
v->nh_list->cmp = (int (*)(void *, void *))ospf6_nexthop_cmp;
- v->nh_list->del = (void (*) (void *))ospf6_nexthop_delete;
+ v->nh_list->del = (void (*)(void *))ospf6_nexthop_delete;
v->parent = NULL;
v->child_list = list_new();
@@ -335,28 +335,29 @@ static int ospf6_spf_install(struct ospf6_vertex *v,
} else if (route && route->path.cost == v->cost) {
if (IS_OSPF6_DEBUG_SPF(PROCESS)) {
prefix2str(&route->prefix, pbuf, sizeof(pbuf));
- zlog_debug(" another path found to route %s lsa %s, merge",
- pbuf, v->lsa->name);
+ zlog_debug(
+ " another path found to route %s lsa %s, merge",
+ pbuf, v->lsa->name);
}
ospf6_spf_merge_nexthops_to_route(route, v);
prev = (struct ospf6_vertex *)route->route_option;
assert(prev->hops <= v->hops);
- if ((VERTEX_IS_TYPE(ROUTER, v) &&
- route->path.origin.id != v->lsa->header->id)) {
+ if ((VERTEX_IS_TYPE(ROUTER, v)
+ && route->path.origin.id != v->lsa->header->id)) {
if (IS_OSPF6_DEBUG_SPF(PROCESS)) {
- zlog_debug("%s: V lsa %s id %u, route id %u are different",
- __PRETTY_FUNCTION__, v->lsa->name,
- ntohl(v->lsa->header->id),
- ntohl(route->path.origin.id));
+ zlog_debug(
+ "%s: V lsa %s id %u, route id %u are different",
+ __PRETTY_FUNCTION__, v->lsa->name,
+ ntohl(v->lsa->header->id),
+ ntohl(route->path.origin.id));
}
return 0;
}
ospf6_vertex_delete(v);
return -1;
-
}
/* There should be no case where candidate being installed (variable
@@ -554,7 +555,7 @@ void ospf6_spf_calculation(u_int32_t router_id,
if (IS_OSPF6_DEBUG_SPF(PROCESS))
zlog_debug(
" New candidate: %s hops %d cost %d",
- w->name, w->hops, w->cost);
+ w->name, w->hops, w->cost);
pqueue_enqueue(w, candidate_list);
}
}
@@ -970,8 +971,8 @@ struct ospf6_lsa *ospf6_create_single_router_lsa(struct ospf6_area *area,
uint32_t interface_id;
caddr_t lsd;
- lsa_length = sizeof(struct ospf6_lsa_header) +
- sizeof(struct ospf6_router_lsa);
+ lsa_length = sizeof(struct ospf6_lsa_header)
+ + sizeof(struct ospf6_router_lsa);
total_lsa_length = lsa_length;
type = htons(OSPF6_LSTYPE_ROUTER);
@@ -991,15 +992,14 @@ struct ospf6_lsa *ospf6_create_single_router_lsa(struct ospf6_area *area,
rtr_lsa = ospf6_lsdb_next(end, rtr_lsa);
continue;
}
- lsa_header = (struct ospf6_lsa_header *) rtr_lsa->header;
- total_lsa_length += (ntohs(lsa_header->length)
- - lsa_length);
+ lsa_header = (struct ospf6_lsa_header *)rtr_lsa->header;
+ total_lsa_length += (ntohs(lsa_header->length) - lsa_length);
num_lsa++;
rtr_lsa = ospf6_lsdb_next(end, rtr_lsa);
}
if (IS_OSPF6_DEBUG_SPF(PROCESS))
zlog_debug("%s: adv_router %s num_lsa %u to convert.",
- __PRETTY_FUNCTION__, ifbuf, num_lsa);
+ __PRETTY_FUNCTION__, ifbuf, num_lsa);
if (num_lsa == 1)
return lsa;
@@ -1060,13 +1060,14 @@ struct ospf6_lsa *ospf6_create_single_router_lsa(struct ospf6_area *area,
lsd = OSPF6_LSA_HEADER_END(rtr_lsa->header) + 4;
interface_id = ROUTER_LSDESC_GET_IFID(lsd);
inet_ntop(AF_INET, &interface_id, ifbuf, sizeof(ifbuf));
- zlog_debug("%s: Next Router LSA %s to aggreat with len %u interface_id %s",
- __PRETTY_FUNCTION__, rtr_lsa->name,
- ntohs(lsa_header->length), ifbuf);
+ zlog_debug(
+ "%s: Next Router LSA %s to aggreat with len %u interface_id %s",
+ __PRETTY_FUNCTION__, rtr_lsa->name,
+ ntohs(lsa_header->length), ifbuf);
}
/* Append Next Link State ID LSA */
- lsa_header = (struct ospf6_lsa_header *) rtr_lsa->header;
+ lsa_header = (struct ospf6_lsa_header *)rtr_lsa->header;
memcpy(new_header, (OSPF6_LSA_HEADER_END(rtr_lsa->header) + 4),
(ntohs(lsa_header->length) - lsa_length));
new_header += (ntohs(lsa_header->length) - lsa_length);
@@ -1096,10 +1097,10 @@ void ospf6_remove_temp_router_lsa(struct ospf6_area *area)
for (ALL_LSDB(area->temp_router_lsa_lsdb, lsa)) {
if (IS_OSPF6_DEBUG_SPF(PROCESS))
- zlog_debug("%s Remove LSA %s lsa->lock %u lsdb count %u",
- __PRETTY_FUNCTION__,
- lsa->name, lsa->lock,
- area->temp_router_lsa_lsdb->count);
+ zlog_debug(
+ "%s Remove LSA %s lsa->lock %u lsdb count %u",
+ __PRETTY_FUNCTION__, lsa->name, lsa->lock,
+ area->temp_router_lsa_lsdb->count);
ospf6_lsdb_remove(lsa, area->temp_router_lsa_lsdb);
}
}