summaryrefslogtreecommitdiffstats
path: root/ospfd
diff options
context:
space:
mode:
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_abr.c25
-rw-r--r--ospfd/ospf_api.c72
-rw-r--r--ospfd/ospf_apiserver.c8
-rw-r--r--ospfd/ospf_flood.c4
-rw-r--r--ospfd/ospf_ia.c8
-rw-r--r--ospfd/ospf_interface.c5
-rw-r--r--ospfd/ospf_lsa.c11
-rw-r--r--ospfd/ospf_main.c4
-rw-r--r--ospfd/ospf_neighbor.c5
-rw-r--r--ospfd/ospf_opaque.c33
-rw-r--r--ospfd/ospf_packet.c37
-rw-r--r--ospfd/ospf_route.c10
-rw-r--r--ospfd/ospf_routemap.c16
-rw-r--r--ospfd/ospf_snmp.c7
-rw-r--r--ospfd/ospf_vty.c69
15 files changed, 178 insertions, 136 deletions
diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c
index c6d4364fa..41c21ee9b 100644
--- a/ospfd/ospf_abr.c
+++ b/ospfd/ospf_abr.c
@@ -1034,22 +1034,20 @@ static void ospf_abr_process_network_rt(struct ospf *ospf,
continue;
}
- if (
- or->path_type == OSPF_PATH_INTRA_AREA
- && !ospf_abr_should_announce(
- ospf, (struct prefix_ipv4 *)&rn->p,
- or)) {
+ if (or->path_type == OSPF_PATH_INTRA_AREA
+ && !ospf_abr_should_announce(
+ ospf, (struct prefix_ipv4 *)&rn->p,
+ or)) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_abr_process_network_rt(): denied by export-list");
continue;
}
- if (
- or->path_type == OSPF_PATH_INTRA_AREA
- && !ospf_abr_plist_out_check(
- area, or,
- (struct prefix_ipv4 *)&rn->p)) {
+ if (or->path_type == OSPF_PATH_INTRA_AREA
+ && !ospf_abr_plist_out_check(
+ area, or,
+ (struct prefix_ipv4 *)&rn->p)) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_abr_process_network_rt(): denied by prefix-list");
@@ -1271,10 +1269,9 @@ static void ospf_abr_process_router_rt(struct ospf *ospf,
continue;
}
- if (
- or->path_type == OSPF_PATH_INTER_AREA
- && !OSPF_IS_AREA_ID_BACKBONE(
- or->u.std.area_id)) {
+ if (or->path_type == OSPF_PATH_INTER_AREA
+ && !OSPF_IS_AREA_ID_BACKBONE(
+ or->u.std.area_id)) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_abr_process_router_rt(): "
diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c
index f1a743376..10570f4e6 100644
--- a/ospfd/ospf_api.c
+++ b/ospfd/ospf_api.c
@@ -131,46 +131,60 @@ const char *ospf_api_typename(int msgtype)
{
struct nametab NameTab[] = {
{
- MSG_REGISTER_OPAQUETYPE, "Register opaque-type",
+ MSG_REGISTER_OPAQUETYPE,
+ "Register opaque-type",
},
{
- MSG_UNREGISTER_OPAQUETYPE, "Unregister opaque-type",
+ MSG_UNREGISTER_OPAQUETYPE,
+ "Unregister opaque-type",
},
{
- MSG_REGISTER_EVENT, "Register event",
+ MSG_REGISTER_EVENT,
+ "Register event",
},
{
- MSG_SYNC_LSDB, "Sync LSDB",
+ MSG_SYNC_LSDB,
+ "Sync LSDB",
},
{
- MSG_ORIGINATE_REQUEST, "Originate request",
+ MSG_ORIGINATE_REQUEST,
+ "Originate request",
},
{
- MSG_DELETE_REQUEST, "Delete request",
+ MSG_DELETE_REQUEST,
+ "Delete request",
},
{
- MSG_REPLY, "Reply",
+ MSG_REPLY,
+ "Reply",
},
{
- MSG_READY_NOTIFY, "Ready notify",
+ MSG_READY_NOTIFY,
+ "Ready notify",
},
{
- MSG_LSA_UPDATE_NOTIFY, "LSA update notify",
+ MSG_LSA_UPDATE_NOTIFY,
+ "LSA update notify",
},
{
- MSG_LSA_DELETE_NOTIFY, "LSA delete notify",
+ MSG_LSA_DELETE_NOTIFY,
+ "LSA delete notify",
},
{
- MSG_NEW_IF, "New interface",
+ MSG_NEW_IF,
+ "New interface",
},
{
- MSG_DEL_IF, "Del interface",
+ MSG_DEL_IF,
+ "Del interface",
},
{
- MSG_ISM_CHANGE, "ISM change",
+ MSG_ISM_CHANGE,
+ "ISM change",
},
{
- MSG_NSM_CHANGE, "NSM change",
+ MSG_NSM_CHANGE,
+ "NSM change",
},
};
@@ -191,38 +205,48 @@ const char *ospf_api_errname(int errcode)
{
struct nametab NameTab[] = {
{
- OSPF_API_OK, "OK",
+ OSPF_API_OK,
+ "OK",
},
{
- OSPF_API_NOSUCHINTERFACE, "No such interface",
+ OSPF_API_NOSUCHINTERFACE,
+ "No such interface",
},
{
- OSPF_API_NOSUCHAREA, "No such area",
+ OSPF_API_NOSUCHAREA,
+ "No such area",
},
{
- OSPF_API_NOSUCHLSA, "No such LSA",
+ OSPF_API_NOSUCHLSA,
+ "No such LSA",
},
{
- OSPF_API_ILLEGALLSATYPE, "Illegal LSA type",
+ OSPF_API_ILLEGALLSATYPE,
+ "Illegal LSA type",
},
{
- OSPF_API_OPAQUETYPEINUSE, "Opaque type in use",
+ OSPF_API_OPAQUETYPEINUSE,
+ "Opaque type in use",
},
{
OSPF_API_OPAQUETYPENOTREGISTERED,
"Opaque type not registered",
},
{
- OSPF_API_NOTREADY, "Not ready",
+ OSPF_API_NOTREADY,
+ "Not ready",
},
{
- OSPF_API_NOMEMORY, "No memory",
+ OSPF_API_NOMEMORY,
+ "No memory",
},
{
- OSPF_API_ERROR, "Other error",
+ OSPF_API_ERROR,
+ "Other error",
},
{
- OSPF_API_UNDEF, "Undefined",
+ OSPF_API_UNDEF,
+ "Undefined",
},
};
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index a5f5971ac..2a178a684 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -1236,10 +1236,10 @@ static int apiserver_sync_callback(struct ospf_lsa *lsa, void *p_arg,
zlog_warn(
"apiserver_sync_callback: new_msg_update failed");
#ifdef NOTYET
- /* Cannot allocate new message. What should we do? */
- /* ospf_apiserver_free (apiserv);*/ /* Do nothing
- here XXX
- */
+/* Cannot allocate new message. What should we do? */
+/* ospf_apiserver_free (apiserv);*/ /* Do nothing
+ here XXX
+ */
#endif
goto out;
}
diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index c775f2ea2..f00973d64 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -217,7 +217,7 @@ static void ospf_process_self_originated_lsa(struct ospf *ospf,
break;
case OSPF_OPAQUE_AS_LSA:
ospf_opaque_lsa_refresh(new);
- /* Reconsideration may needed. */ /* XXX */
+ /* Reconsideration may needed. */ /* XXX */
break;
default:
break;
@@ -281,7 +281,7 @@ int ospf_flood(struct ospf *ospf, struct ospf_neighbor *nbr,
"LSA[Flooding]: Got a self-originated LSA, "
"while local one is initial instance.");
; /* Accept this LSA for quick LSDB resynchronization.
- */
+ */
} else if (monotime_since(&current->tv_recv, NULL)
< ospf->min_ls_arrival * 1000LL) {
if (IS_DEBUG_OSPF_EVENT)
diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c
index c65d8b874..38ce71293 100644
--- a/ospfd/ospf_ia.c
+++ b/ospfd/ospf_ia.c
@@ -361,10 +361,8 @@ static void ospf_update_network_route(struct ospf *ospf, struct route_table *rt,
}
if (ospf->abr_type == OSPF_ABR_SHORTCUT) {
- if (
- or->path_type == OSPF_PATH_INTRA_AREA
- && !OSPF_IS_AREA_ID_BACKBONE(
- or->u.std.area_id)) {
+ if (or->path_type == OSPF_PATH_INTRA_AREA
+ && !OSPF_IS_AREA_ID_BACKBONE(or->u.std.area_id)) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_update_network_route(): Shortcut: "
@@ -650,7 +648,7 @@ void ospf_ia_routing(struct ospf *ospf, struct route_table *rt,
OSPF_EXAMINE_TRANSIT_SUMMARIES_ALL(
area, rt, rtrs);
} else { /* No active BB connection--consider all areas
- */
+ */
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"ospf_ia_routing(): "
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 4ea8ec26f..b4624f400 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -428,8 +428,9 @@ struct ospf_interface *ospf_if_lookup_recv_if(struct ospf *ospf,
match = oi;
else if (prefix_match(CONNECTED_PREFIX(oi->connected),
(struct prefix *)&addr)) {
- if ((match == NULL) || (match->address->prefixlen
- < oi->address->prefixlen))
+ if ((match == NULL)
+ || (match->address->prefixlen
+ < oi->address->prefixlen))
match = oi;
}
}
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 68adf2e10..38a17710c 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -429,8 +429,8 @@ static char link_info_set(struct stream *s, struct in_addr id,
*
* Simpler just to subtract OSPF_MAX_LSA_SIZE though.
*/
- ret = stream_resize(
- s, OSPF_MAX_PACKET_SIZE - OSPF_MAX_LSA_SIZE);
+ ret = stream_resize(s, OSPF_MAX_PACKET_SIZE
+ - OSPF_MAX_LSA_SIZE);
}
if (ret == OSPF_MAX_LSA_SIZE) {
@@ -519,8 +519,9 @@ static int lsa_link_broadcast_set(struct stream *s, struct ospf_interface *oi)
dr = ospf_nbr_lookup_by_addr(oi->nbrs, &DR(oi));
/* Describe Type 2 link. */
- if (dr && (dr->state == NSM_Full
- || IPV4_ADDR_SAME(&oi->address->u.prefix4, &DR(oi)))
+ if (dr
+ && (dr->state == NSM_Full
+ || IPV4_ADDR_SAME(&oi->address->u.prefix4, &DR(oi)))
&& ospf_nbr_count(oi, NSM_Full) > 0) {
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
zlog_debug(
@@ -3417,7 +3418,7 @@ struct in_addr ospf_lsa_unique_id(struct ospf *ospf, struct ospf_lsdb *lsdb,
return id;
}
/* Masklen differs, then apply wildcard mask to Link State ID.
- */
+ */
else {
masklen2ip(p->prefixlen, &mask);
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index f284a04cb..d1cc00b91 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -55,7 +55,9 @@
/* ospfd privileges */
zebra_capabilities_t _caps_p[] = {
- ZCAP_NET_RAW, ZCAP_BIND, ZCAP_NET_ADMIN,
+ ZCAP_NET_RAW,
+ ZCAP_BIND,
+ ZCAP_NET_ADMIN,
};
struct zebra_privs_t ospfd_privs = {
diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c
index 33492cf7c..a1e9533db 100644
--- a/ospfd/ospf_neighbor.c
+++ b/ospfd/ospf_neighbor.c
@@ -460,9 +460,8 @@ struct ospf_neighbor *ospf_nbr_get(struct ospf_interface *oi,
if (oi->type == OSPF_IFTYPE_VIRTUALLINK
|| oi->type == OSPF_IFTYPE_POINTOPOINT)
- key.u.prefix4 =
- ospfh->router_id; /* index vlink and ptp nbrs by
- router-id */
+ key.u.prefix4 = ospfh->router_id; /* index vlink and ptp nbrs by
+ router-id */
else
key.u.prefix4 = iph->ip_src;
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index a2c40923b..97f06afd6 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -1358,12 +1358,11 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0)
* list_isempty (oipt->id_list)
* not being empty.
*/
- if (
- oipt->t_opaque_lsa_self
- != NULL /* Waiting for a thread call. */
- || oipt->status == PROC_SUSPEND) /* Cannot
- originate
- now. */
+ if (oipt->t_opaque_lsa_self
+ != NULL /* Waiting for a thread call. */
+ || oipt->status == PROC_SUSPEND) /* Cannot
+ originate
+ now. */
continue;
ospf_opaque_lsa_reoriginate_schedule(
@@ -1384,12 +1383,11 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0)
* list_isempty (oipt->id_list)
* not being empty.
*/
- if (
- oipt->t_opaque_lsa_self
- != NULL /* Waiting for a thread call. */
- || oipt->status == PROC_SUSPEND) /* Cannot
- originate
- now. */
+ if (oipt->t_opaque_lsa_self
+ != NULL /* Waiting for a thread call. */
+ || oipt->status == PROC_SUSPEND) /* Cannot
+ originate
+ now. */
continue;
ospf_opaque_lsa_reoriginate_schedule(
@@ -1410,12 +1408,11 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0)
* list_isempty (oipt->id_list)
* not being empty.
*/
- if (
- oipt->t_opaque_lsa_self
- != NULL /* Waiting for a thread call. */
- || oipt->status == PROC_SUSPEND) /* Cannot
- originate
- now. */
+ if (oipt->t_opaque_lsa_self
+ != NULL /* Waiting for a thread call. */
+ || oipt->status == PROC_SUSPEND) /* Cannot
+ originate
+ now. */
continue;
ospf_opaque_lsa_reoriginate_schedule((void *)top,
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index ac2406ec2..ee6623a05 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -643,9 +643,9 @@ static int ospf_write(struct thread *thread)
#ifdef WANT_OSPF_WRITE_FRAGMENT
static u_int16_t ipid = 0;
u_int16_t maxdatasize;
-#endif /* WANT_OSPF_WRITE_FRAGMENT */
- /* $FRR indent$ */
- /* clang-format off */
+#endif /* WANT_OSPF_WRITE_FRAGMENT */
+ /* $FRR indent$ */
+ /* clang-format off */
#define OSPF_WRITE_IPHL_SHIFT 2
int pkt_count = 0;
@@ -2436,15 +2436,15 @@ static int ospf_check_auth(struct ospf_interface *oi, struct ospf_header *ospfh)
return 0;
}
/* only MD5 crypto method can pass ospf_packet_examin() */
- if (
- NULL == (ck = listgetdata(listtail(
- OSPF_IF_PARAM(oi, auth_crypt))))
- || ospfh->u.crypt.key_id != ck->key_id ||
- /* Condition above uses the last key ID on the list,
- which is
- different from what ospf_crypt_key_lookup() does. A
- bug? */
- !ospf_check_md5_digest(oi, ospfh)) {
+ if (NULL
+ == (ck = listgetdata(listtail(
+ OSPF_IF_PARAM(oi, auth_crypt))))
+ || ospfh->u.crypt.key_id != ck->key_id ||
+ /* Condition above uses the last key ID on the list,
+ which is
+ different from what ospf_crypt_key_lookup() does. A
+ bug? */
+ !ospf_check_md5_digest(oi, ospfh)) {
if (IS_DEBUG_OSPF_PACKET(ospfh->type - 1, RECV))
zlog_warn("interface %s: MD5 auth failed",
IF_NAME(oi));
@@ -2548,7 +2548,7 @@ static unsigned ospf_lsa_examin(struct lsa_header *lsah, const u_int16_t lsalen,
header, "flags",
0, "# links" */
ntohs(rlsa->links) /* 16 bits */
- );
+ );
break;
case OSPF_AS_EXTERNAL_LSA:
/* RFC2328 A.4.5, LSA header + 4 bytes followed by N>=1 12-bytes long
@@ -2772,7 +2772,7 @@ static unsigned ospf_packet_examin(struct ospf_header *oh,
bytesdeclared - OSPF_HEADER_SIZE - OSPF_LS_UPD_MIN_SIZE,
0, /* full LSAs */
ntohl(lsupd->num_lsas) /* 32 bits */
- );
+ );
break;
case OSPF_MSG_LS_ACK:
/* RFC2328 A.3.6, packet header followed by N>=0 header-only
@@ -2888,8 +2888,8 @@ int ospf_read(struct thread *thread)
ospfh = (struct ospf_header *)STREAM_PNT(ibuf);
if (MSG_OK
- != ospf_packet_examin(
- ospfh, stream_get_endp(ibuf) - stream_get_getp(ibuf)))
+ != ospf_packet_examin(ospfh, stream_get_endp(ibuf)
+ - stream_get_getp(ibuf)))
return -1;
/* Now it is safe to access all fields of OSPF packet header. */
@@ -2935,8 +2935,9 @@ int ospf_read(struct thread *thread)
* or header area is backbone but ospf_interface is not
* check for VLINK interface
*/
- if ((oi == NULL) || (OSPF_IS_AREA_ID_BACKBONE(ospfh->area_id)
- && !OSPF_IS_AREA_ID_BACKBONE(oi->area->area_id))) {
+ if ((oi == NULL)
+ || (OSPF_IS_AREA_ID_BACKBONE(ospfh->area_id)
+ && !OSPF_IS_AREA_ID_BACKBONE(oi->area->area_id))) {
if ((oi = ospf_associate_packet_vl(ospf, ifp, iph, ospfh))
== NULL) {
if (!ospf->instance && IS_DEBUG_OSPF_EVENT)
diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c
index 9c4dca2e2..020dfe9d4 100644
--- a/ospfd/ospf_route.c
+++ b/ospfd/ospf_route.c
@@ -229,18 +229,16 @@ static void ospf_route_delete_uniq(struct route_table *rt,
or->path_type == OSPF_PATH_INTER_AREA) {
if (or->type == OSPF_DESTINATION_NETWORK) {
if (!ospf_route_exist_new_table(
- cmprt,
- (struct prefix_ipv4 *)&rn
- ->p))
+ cmprt, (struct prefix_ipv4
+ *)&rn->p))
ospf_zebra_delete(
(struct prefix_ipv4
*)&rn->p,
or);
} else if (or->type == OSPF_DESTINATION_DISCARD)
if (!ospf_route_exist_new_table(
- cmprt,
- (struct prefix_ipv4 *)&rn
- ->p))
+ cmprt, (struct prefix_ipv4
+ *)&rn->p))
ospf_zebra_delete_discard(
(struct prefix_ipv4
*)&rn->p);
diff --git a/ospfd/ospf_routemap.c b/ospfd/ospf_routemap.c
index 547e1e8f5..80fdbf215 100644
--- a/ospfd/ospf_routemap.c
+++ b/ospfd/ospf_routemap.c
@@ -332,7 +332,9 @@ static route_map_result_t route_match_tag(void *rule, struct prefix *prefix,
/* Route map commands for tag matching. */
static struct route_map_rule_cmd route_match_tag_cmd = {
- "tag", route_match_tag, route_map_rule_tag_compile,
+ "tag",
+ route_match_tag,
+ route_map_rule_tag_compile,
route_map_rule_tag_free,
};
@@ -390,7 +392,9 @@ static void route_set_metric_free(void *rule)
/* Set metric rule structure. */
struct route_map_rule_cmd route_set_metric_cmd = {
- "metric", route_set_metric, route_set_metric_compile,
+ "metric",
+ route_set_metric,
+ route_set_metric_compile,
route_set_metric_free,
};
@@ -442,7 +446,9 @@ static void route_set_metric_type_free(void *rule)
/* Set metric rule structure. */
struct route_map_rule_cmd route_set_metric_type_cmd = {
- "metric-type", route_set_metric_type, route_set_metric_type_compile,
+ "metric-type",
+ route_set_metric_type,
+ route_set_metric_type_compile,
route_set_metric_type_free,
};
@@ -465,7 +471,9 @@ static route_map_result_t route_set_tag(void *rule, struct prefix *prefix,
/* Route map commands for tag set. */
static struct route_map_rule_cmd route_set_tag_cmd = {
- "tag", route_set_tag, route_map_rule_tag_compile,
+ "tag",
+ route_set_tag,
+ route_map_rule_tag_compile,
route_map_rule_tag_free,
};
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 6a352380b..a8b702719 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -872,7 +872,9 @@ static u_char *ospfStubAreaEntry(struct variable *v, oid *name, size_t *length,
return SNMP_INTEGER(SNMP_VALID);
break;
case OSPFSTUBMETRICTYPE: /* 5 */
-/* OSPF Metric type. */
+ /* OSPF Metric type. */
+ /* $FRR indent$ */
+ /* clang-format off */
#define OSPF_ospfMetric 1
#define OSPF_comparableCost 2
#define OSPF_nonComparable 3
@@ -2100,7 +2102,8 @@ static struct ospf_neighbor *ospf_snmp_nbr_lookup(struct ospf *ospf,
for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi)) {
for (rn = route_top(oi->nbrs); rn; rn = route_next(rn))
- if ((nbr = rn->info) != NULL && nbr != oi->nbr_self
+ if ((nbr = rn->info) != NULL
+ && nbr != oi->nbr_self
/* If EXACT match is needed, provide ALL entry found
&& nbr->state != NSM_Down
*/
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 55d6c27e8..b644c94ca 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -290,8 +290,9 @@ static void ospf_passive_interface_default(struct ospf *ospf, u_char newval)
ospf->passive_interface_default = newval;
for (ALL_LIST_ELEMENTS_RO(om->iflist, ln, ifp)) {
- if (ifp && OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS(ifp),
- passive_interface))
+ if (ifp
+ && OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS(ifp),
+ passive_interface))
UNSET_IF_PARAM(IF_DEF_PARAMS(ifp), passive_interface);
}
for (ALL_LIST_ELEMENTS_RO(ospf->oiflist, ln, oi)) {
@@ -394,8 +395,9 @@ DEFUN (ospf_passive_interface,
for (rn = route_top(IF_OIFS(ifp)); rn; rn = route_next(rn)) {
struct ospf_interface *oi = rn->info;
- if (oi && (OSPF_IF_PARAM(oi, passive_interface)
- == OSPF_IF_PASSIVE))
+ if (oi
+ && (OSPF_IF_PARAM(oi, passive_interface)
+ == OSPF_IF_PASSIVE))
ospf_if_set_multicast(oi);
}
/*
@@ -2125,7 +2127,8 @@ ALIAS(ospf_compatible_rfc1583, ospf_rfc1583_flag_cmd,
"Enable the RFC1583Compatibility flag\n")
ALIAS(no_ospf_compatible_rfc1583, no_ospf_rfc1583_flag_cmd,
- "no ospf rfc1583compatibility", NO_STR
+ "no ospf rfc1583compatibility",
+ NO_STR
"OSPF specific commands\n"
"Disable the RFC1583Compatibility flag\n")
@@ -2579,7 +2582,8 @@ DEFUN (no_ospf_write_multiplier,
}
ALIAS(no_ospf_write_multiplier, no_write_multiplier_cmd,
- "no write-multiplier (1-100)", NO_STR
+ "no write-multiplier (1-100)",
+ NO_STR
"Write multiplier\n"
"Maximum number of interface serviced per write\n")
@@ -3177,8 +3181,9 @@ static int show_ip_ospf_common(struct vty *vty, struct ospf *ospf,
if (use_json) {
json_object_object_add(json, "areas", json_areas);
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -3322,10 +3327,10 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf,
dstr = "Broadcast";
/* For Vlinks, showing the peer address is
- * probably more
- * * * * * informative than the local
- * interface that is being used
- * * * * */
+ * probably more
+ * * * * * informative than
+ * the local interface that is being used
+ * * * * */
if (oi->type == OSPF_IFTYPE_VIRTUALLINK)
dest = &oi->vl_data->peer_addr;
else
@@ -3606,8 +3611,9 @@ static int show_ip_ospf_interface_common(struct vty *vty, struct ospf *ospf,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -3817,8 +3823,9 @@ static int show_ip_ospf_neighbor_common(struct vty *vty, struct ospf *ospf,
show_ip_ospf_neighbor_sub(vty, oi, json, use_json);
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -3937,8 +3944,9 @@ static int show_ip_ospf_neighbor_all_common(struct vty *vty, struct ospf *ospf,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -4030,8 +4038,9 @@ static int show_ip_ospf_neighbor_int_common(struct vty *vty, struct ospf *ospf,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -4413,8 +4422,9 @@ static int show_ip_ospf_neighbor_id_common(struct vty *vty, struct ospf *ospf,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -4502,8 +4512,9 @@ static int show_ip_ospf_neighbor_detail_common(struct vty *vty,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
@@ -4600,8 +4611,9 @@ static int show_ip_ospf_neighbor_detail_all_common(struct vty *vty,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else {
vty_out(vty, "\n");
@@ -4702,8 +4714,9 @@ static int show_ip_ospf_neighbor_int_detail_common(struct vty *vty,
}
if (use_json) {
- vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ vty_out(vty, "%s\n",
+ json_object_to_json_string_ext(
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
} else
vty_out(vty, "\n");
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 18:27:10 +0100