*: conform with COMMUNITY.md formatting rules, via 'make indent'

Signed-off-by: Lou Berger <lberger@labn.net>

1 files changed, 72 insertions, 95 deletions

diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c
index 95835cfd0..10dd2f92c 100644
--- a/ospfd/ospf_ext.c
+++ b/ospfd/ospf_ext.c
@@ -122,8 +122,8 @@ int ospf_ext_init(void)
 	zlog_info("EXT (%s): Register Extended Link Opaque LSA", __func__);
 	rc = ospf_register_opaque_functab(
 		OSPF_OPAQUE_AREA_LSA, OPAQUE_TYPE_EXTENDED_LINK_LSA,
-		ospf_ext_link_new_if,        /* new if */
-		ospf_ext_link_del_if,        /* del if */
+		ospf_ext_link_new_if,	/* new if */
+		ospf_ext_link_del_if,	/* del if */
 		ospf_ext_link_ism_change,    /* ism change */
 		ospf_ext_link_nsm_change,    /* nsm change */
 		NULL,			     /* Write router config. */
@@ -316,9 +316,8 @@ static void set_prefix_sid(struct ext_itf *exti, uint8_t algorithm,
 
 	if ((algorithm != SR_ALGORITHM_SPF)
 	    && (algorithm != SR_ALGORITHM_STRICT_SPF)) {
-		zlog_warn(
-			"EXT (%s): unrecognized algorithm, not SPF or S-SPF",
-			__func__);
+		zlog_warn("EXT (%s): unrecognized algorithm, not SPF or S-SPF",
+			  __func__);
 		return;
 	}
 
@@ -342,7 +341,6 @@ static void set_prefix_sid(struct ext_itf *exti, uint8_t algorithm,
 			htons(SID_INDEX_SIZE(EXT_SUBTLV_PREFIX_SID_SIZE));
 		exti->node_sid.value = htonl(value);
 	}
-
 }
 
 /* Adjacency SID SubTLV - section 6.1 */
@@ -385,7 +383,6 @@ static void set_adj_sid(struct ext_itf *exti, bool backup, uint32_t value,
 	exti->adj_sid[index].flags = flags; /* Set computed flags */
 	exti->adj_sid[index].mtid = 0;   /* Multi-Topology is not supported */
 	exti->adj_sid[index].weight = 0; /* Load-Balancing is not supported */
-
 }
 
 /* LAN Adjacency SID SubTLV - section 6.2 */
@@ -428,7 +425,6 @@ static void set_lan_adj_sid(struct ext_itf *exti, bool backup, uint32_t value,
 	exti->lan_sid[index].mtid = 0;   /* Multi-Topology is not supported */
 	exti->lan_sid[index].weight = 0; /* Load-Balancing is not supported */
 	exti->lan_sid[index].neighbor_id = neighbor_id;
-
 }
 
 /* Experimental SubTLV from Cisco */
@@ -438,7 +434,6 @@ static void set_rmt_itf_addr(struct ext_itf *exti, struct in_addr rmtif)
 	TLV_TYPE(exti->rmt_itf_addr) = htons(EXT_SUBTLV_RMT_ITF_ADDR);
 	TLV_LEN(exti->rmt_itf_addr) = htons(sizeof(struct in_addr));
 	exti->rmt_itf_addr.value = rmtif;
-
 }
 
 /*
@@ -452,7 +447,7 @@ static void set_rmt_itf_addr(struct ext_itf *exti, struct in_addr rmtif)
  * @return instance number if update is OK, 0 otherwise
  */
 uint32_t ospf_ext_schedule_prefix_index(struct interface *ifp, uint32_t index,
-				   	struct prefix_ipv4 *p, uint8_t flags)
+					struct prefix_ipv4 *p, uint8_t flags)
 {
 	int rc = 0;
 	struct ext_itf *exti;
@@ -483,9 +478,8 @@ uint32_t ospf_ext_schedule_prefix_index(struct interface *ifp, uint32_t index,
 			ospf_ext_pref_lsa_schedule(exti, REORIGINATE_THIS_LSA);
 	} else {
 		if (IS_DEBUG_OSPF_SR)
-			zlog_debug(
-				"EXT (%s): Remove prefix for interface %s",
-				__func__, ifp->name);
+			zlog_debug("EXT (%s): Remove prefix for interface %s",
+				   __func__, ifp->name);
 
 		if (CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ENGAGED)) {
 			ospf_ext_pref_lsa_schedule(exti, FLUSH_THIS_LSA);
@@ -510,9 +504,8 @@ void ospf_ext_update_sr(bool enable)
 	struct ext_itf *exti;
 
 	if (IS_DEBUG_OSPF_SR)
-		zlog_debug(
-			"EXT (%s): %s Extended LSAs for Segment Routing ",
-			__func__, enable ? "Enable" : "Disable");
+		zlog_debug("EXT (%s): %s Extended LSAs for Segment Routing ",
+			   __func__, enable ? "Enable" : "Disable");
 
 	if (enable) {
 		OspfEXT.enabled = true;
@@ -545,9 +538,8 @@ static int ospf_ext_link_new_if(struct interface *ifp)
 	int rc = -1;
 
 	if (lookup_ext_by_ifp(ifp) != NULL) {
-		zlog_warn(
-			"EXT (%s): interface %s is already in use",
-			__func__, ifp ? ifp->name : "-");
+		zlog_warn("EXT (%s): interface %s is already in use", __func__,
+			  ifp ? ifp->name : "-");
 		rc = 0; /* Do nothing here. */
 		return rc;
 	}
@@ -586,9 +578,8 @@ static int ospf_ext_link_del_if(struct interface *ifp)
 
 		rc = 0;
 	} else {
-		zlog_warn(
-			"EXT (%s): interface %s is not found",
-			__func__, ifp ? ifp->name : "-");
+		zlog_warn("EXT (%s): interface %s is not found", __func__,
+			  ifp ? ifp->name : "-");
 	}
 
 	return rc;
@@ -605,9 +596,8 @@ static void ospf_ext_link_ism_change(struct ospf_interface *oi, int old_status)
 	/* Get interface information for Segment Routing */
 	exti = lookup_ext_by_ifp(oi->ifp);
 	if (exti == NULL) {
-		zlog_warn(
-			"EXT (%s): Cannot get Extended info. from OI(%s)",
-			__func__, IF_NAME(oi));
+		zlog_warn("EXT (%s): Cannot get Extended info. from OI(%s)",
+			  __func__, IF_NAME(oi));
 		return;
 	}
 
@@ -621,10 +611,9 @@ static void ospf_ext_link_ism_change(struct ospf_interface *oi, int old_status)
 		exti->instance = get_ext_link_instance_value();
 		exti->type = OPAQUE_TYPE_EXTENDED_LINK_LSA;
 
-		zlog_debug(
-			"EXT (%s): Set %s SID to interface %s ", __func__,
-			exti->stype == ADJ_SID ? "Adj." : "LAN Adj.",
-			oi->ifp->name);
+		zlog_debug("EXT (%s): Set %s SID to interface %s ", __func__,
+			   exti->stype == ADJ_SID ? "Adj." : "LAN Adj.",
+			   oi->ifp->name);
 	}
 }
 
@@ -639,9 +628,8 @@ static void ospf_ext_pref_ism_change(struct ospf_interface *oi, int old_status)
 	/* Get interface information for Segment Routing */
 	exti = lookup_ext_by_ifp(oi->ifp);
 	if (exti == NULL) {
-		zlog_warn(
-			"EXT (%s): Cannot get Extended info. from OI(%s)",
-			__func__, IF_NAME(oi));
+		zlog_warn("EXT (%s): Cannot get Extended info. from OI(%s)",
+			  __func__, IF_NAME(oi));
 		return;
 	}
 
@@ -651,9 +639,8 @@ static void ospf_ext_pref_ism_change(struct ospf_interface *oi, int old_status)
 		exti->instance = get_ext_pref_instance_value();
 		exti->type = OPAQUE_TYPE_EXTENDED_PREFIX_LSA;
 
-		zlog_debug(
-			"EXT (%s): Set Node SID to interface %s ", __func__,
-			oi->ifp->name);
+		zlog_debug("EXT (%s): Set Node SID to interface %s ", __func__,
+			   oi->ifp->name);
 
 		/* Complete SRDB if the interface belongs to a Prefix */
 		if (OspfEXT.enabled)
@@ -678,16 +665,14 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
 	/* Get interface information for Segment Routing */
 	exti = lookup_ext_by_ifp(oi->ifp);
 	if (exti == NULL) {
-		zlog_warn(
-			"EXT (%s): Cannot get Extended info. from OI(%s)",
-			__func__, IF_NAME(oi));
+		zlog_warn("EXT (%s): Cannot get Extended info. from OI(%s)",
+			  __func__, IF_NAME(oi));
 		return;
 	}
 
 	if (oi->area == NULL || oi->area->ospf == NULL) {
-		zlog_warn(
-			"EXT (%s): Cannot refer to OSPF from OI(%s)",
-			__func__, IF_NAME(oi));
+		zlog_warn("EXT (%s): Cannot refer to OSPF from OI(%s)",
+			  __func__, IF_NAME(oi));
 		return;
 	}
 
@@ -761,10 +746,10 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
 	}
 
 	if (IS_DEBUG_OSPF_SR)
-		zlog_debug(
-			"EXT (%s): Complete %s SID to interface %s ", __func__,
-			exti->stype == ADJ_SID ? "Adj." : "LAN Adj.",
-			oi->ifp->name);
+		zlog_debug("EXT (%s): Complete %s SID to interface %s ",
+			   __func__,
+			   exti->stype == ADJ_SID ? "Adj." : "LAN Adj.",
+			   oi->ifp->name);
 
 	/* flood this links params if everything is ok */
 	SET_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE);
@@ -774,7 +759,6 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
 		else
 			ospf_ext_link_lsa_schedule(exti, REORIGINATE_THIS_LSA);
 	}
-
 }
 
 /* Callbacks to handle Extended Link Segment Routing LSA information */
@@ -856,7 +840,6 @@ static int ospf_ext_pref_lsa_update(struct ospf_lsa *lsa)
 static void build_tlv_header(struct stream *s, struct tlv_header *tlvh)
 {
 	stream_put(s, tlvh, sizeof(struct tlv_header));
-
 }
 
 static void build_tlv(struct stream *s, struct tlv_header *tlvh)
@@ -866,7 +849,6 @@ static void build_tlv(struct stream *s, struct tlv_header *tlvh)
 		build_tlv_header(s, tlvh);
 		stream_put(s, TLV_DATA(tlvh), TLV_BODY_SIZE(tlvh));
 	}
-
 }
 
 /* Build an Extended Prefix Opaque LSA body for extended prefix TLV */
@@ -878,16 +860,14 @@ static void ospf_ext_pref_lsa_body_set(struct stream *s, struct ext_itf *exti)
 		return;
 
 	/* Adjust Extended Prefix TLV size */
-	TLV_LEN(exti->prefix) =
-		htons(ntohs(TLV_LEN(exti->node_sid)) + EXT_TLV_PREFIX_SIZE
-			    + TLV_HDR_SIZE);
+	TLV_LEN(exti->prefix) = htons(ntohs(TLV_LEN(exti->node_sid))
+				      + EXT_TLV_PREFIX_SIZE + TLV_HDR_SIZE);
 
 	/* Build LSA body for an Extended Prefix TLV */
 	build_tlv_header(s, &exti->prefix.header);
 	stream_put(s, TLV_DATA(&exti->prefix.header), EXT_TLV_PREFIX_SIZE);
 	/* Then add Prefix SID SubTLV */
 	build_tlv(s, &exti->node_sid.header);
-
 }
 
 /* Build an Extended Link Opaque LSA body for extended link TLV */
@@ -903,10 +883,10 @@ static void ospf_ext_link_lsa_body_set(struct stream *s, struct ext_itf *exti)
 	if (exti->stype == ADJ_SID) {
 		/* Adjust Extended Link TLV size for Adj. SID */
 		size = EXT_TLV_LINK_SIZE + 2 * EXT_SUBTLV_ADJ_SID_SIZE
-			+ 2 * TLV_HDR_SIZE;
+		       + 2 * TLV_HDR_SIZE;
 		if (ntohs(TLV_TYPE(exti->rmt_itf_addr)) != 0)
 			size = size + EXT_SUBTLV_RMT_ITF_ADDR_SIZE
-				    + TLV_HDR_SIZE;
+			       + TLV_HDR_SIZE;
 		TLV_LEN(exti->link) = htons(size);
 
 		/* Build LSA body for an Extended Link TLV with Adj. SID */
@@ -922,7 +902,7 @@ static void ospf_ext_link_lsa_body_set(struct stream *s, struct ext_itf *exti)
 	} else {
 		/* Adjust Extended Link TLV size for LAN SID */
 		size = EXT_TLV_LINK_SIZE
-			+ 2 * (EXT_SUBTLV_LAN_ADJ_SID_SIZE + TLV_HDR_SIZE);
+		       + 2 * (EXT_SUBTLV_LAN_ADJ_SID_SIZE + TLV_HDR_SIZE);
 		TLV_LEN(exti->link) = htons(size);
 
 		/* Build LSA body for an Extended Link TLV with LAN SID */
@@ -932,7 +912,6 @@ static void ospf_ext_link_lsa_body_set(struct stream *s, struct ext_itf *exti)
 		build_tlv(s, &exti->lan_sid[1].header);
 		build_tlv(s, &exti->lan_sid[0].header);
 	}
-
 }
 
 /* Create new Extended Prefix opaque-LSA for every extended prefix */
@@ -1200,8 +1179,8 @@ static int ospf_ext_link_lsa_originate1(struct ospf_area *area,
 		zlog_debug(
 			"EXT (%s): LSA[Type%u:%s]: Originate Opaque-LSA "
 			"Extended Link Opaque LSA: Area(%s), Link(%s)",
-			 __func__, new->data->type, inet_ntoa(new->data->id),
-			 area_id, exti->ifp->name);
+			__func__, new->data->type, inet_ntoa(new->data->id),
+			area_id, exti->ifp->name);
 		ospf_lsa_header_dump(new->data);
 	}
 
@@ -1221,14 +1200,14 @@ static int ospf_ext_pref_lsa_originate(void *arg)
 	if (!OspfEXT.enabled) {
 		zlog_info(
 			"EXT (%s): Segment Routing "
-			"functionality is Disabled now", __func__);
+			"functionality is Disabled now",
+			__func__);
 		rc = 0; /* This is not an error case. */
 		return rc;
 	}
 	if (IS_DEBUG_OSPF_SR)
-		zlog_debug(
-			"EXT (%s): Start Originate Prefix LSA for area %s",
-			__func__, inet_ntoa(area->area_id));
+		zlog_debug("EXT (%s): Start Originate Prefix LSA for area %s",
+			   __func__, inet_ntoa(area->area_id));
 
 	/* Check if Extended Prefix Opaque LSA is already engaged */
 	for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti)) {
@@ -1247,7 +1226,8 @@ static int ospf_ext_pref_lsa_originate(void *arg)
 				       EXT_LPFLG_LSA_FORCED_REFRESH)) {
 				zlog_warn(
 					"EXT (%s): Refresh instead of "
-					"Originate", __func__);
+					"Originate",
+					__func__);
 				UNSET_FLAG(exti->flags,
 					   EXT_LPFLG_LSA_FORCED_REFRESH);
 				ospf_ext_pref_lsa_schedule(exti,
@@ -1281,7 +1261,8 @@ static int ospf_ext_link_lsa_originate(void *arg)
 	if (!OspfEXT.enabled) {
 		zlog_info(
 			"EXT (%s): Segment Routing "
-			"functionality is Disabled now", __func__);
+			"functionality is Disabled now",
+			__func__);
 		rc = 0; /* This is not an error case. */
 		return rc;
 	}
@@ -1303,7 +1284,8 @@ static int ospf_ext_link_lsa_originate(void *arg)
 				       EXT_LPFLG_LSA_FORCED_REFRESH)) {
 				zlog_warn(
 					"EXT (%s): Refresh instead of "
-					"Originate", __func__);
+					"Originate",
+					__func__);
 				UNSET_FLAG(exti->flags,
 					   EXT_LPFLG_LSA_FORCED_REFRESH);
 				ospf_ext_link_lsa_schedule(exti,
@@ -1343,7 +1325,8 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
 		 */
 		zlog_info(
 			"EXT (%s): Segment Routing functionality is "
-			"Disabled", __func__);
+			"Disabled",
+			__func__);
 		/* Flush it anyway. */
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
 	}
@@ -1359,7 +1342,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
 	/* Check if Interface was not disable in the interval */
 	if ((exti != NULL) && !CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)) {
 		zlog_warn("EXT (%s): Interface was Disabled: Flush it!",
-			__func__);
+			  __func__);
 		/* Flush it anyway. */
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
 	}
@@ -1425,9 +1408,8 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
 		 * This LSA must have flushed before due to OSPF-SR status
 		 * change. It seems a slip among routers in the routing domain.
 		 */
-		zlog_info(
-			"EXT (%s): Segment Routing functionality is Disabled",
-			__func__);
+		zlog_info("EXT (%s): Segment Routing functionality is Disabled",
+			  __func__);
 		/* Flush it anyway. */
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
 	}
@@ -1442,9 +1424,8 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
 
 	/* Check if Interface was not disable in the interval */
 	if ((exti != NULL) && !CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)) {
-		zlog_warn(
-			"EXT (%s): Interface was Disabled: Flush it!",
-			__func__);
+		zlog_warn("EXT (%s): Interface was Disabled: Flush it!",
+			  __func__);
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
 	}
 
@@ -1506,18 +1487,18 @@ static void ospf_ext_pref_lsa_schedule(struct ext_itf *exti,
 	if (!(CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)))
 		return;
 
-	zlog_debug(
-		"EXT (%s): Schedule %s%s%s LSA for interface %s", __func__,
-		opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "",
-		opcode == REFRESH_THIS_LSA ? "Refresh" : "",
-		opcode == FLUSH_THIS_LSA ? "Flush" : "",
-		exti->ifp ? exti->ifp->name : "-");
+	zlog_debug("EXT (%s): Schedule %s%s%s LSA for interface %s", __func__,
+		   opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "",
+		   opcode == REFRESH_THIS_LSA ? "Refresh" : "",
+		   opcode == FLUSH_THIS_LSA ? "Flush" : "",
+		   exti->ifp ? exti->ifp->name : "-");
 
 	/* Set LSA header information */
 	if (exti->area == NULL) {
 		zlog_warn(
 			"EXT (%s): Flooding is Area scope but area is not yet "
-			"set", __func__);
+			"set",
+			__func__);
 		if (OspfEXT.area == NULL) {
 			top = ospf_lookup_by_vrf_id(VRF_DEFAULT);
 			OspfEXT.area = ospf_area_lookup_by_area_id(
@@ -1548,7 +1529,6 @@ static void ospf_ext_pref_lsa_schedule(struct ext_itf *exti,
 		zlog_warn("EXT (%s): Unknown opcode", __func__);
 		break;
 	}
-
 }
 
 /* Schedule Extended Link Opaque LSA origination/refreshment/flushing */
@@ -1571,18 +1551,18 @@ static void ospf_ext_link_lsa_schedule(struct ext_itf *exti,
 	if (!(CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)))
 		return;
 
-	zlog_debug(
-		"EXT (%s): Schedule %s%s%s LSA for interface %s", __func__,
-		opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "",
-		opcode == REFRESH_THIS_LSA ? "Refresh" : "",
-		opcode == FLUSH_THIS_LSA ? "Flush" : "",
-		exti->ifp ? exti->ifp->name : "-");
+	zlog_debug("EXT (%s): Schedule %s%s%s LSA for interface %s", __func__,
+		   opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "",
+		   opcode == REFRESH_THIS_LSA ? "Refresh" : "",
+		   opcode == FLUSH_THIS_LSA ? "Flush" : "",
+		   exti->ifp ? exti->ifp->name : "-");
 
 	/* Set LSA header information */
 	if (exti->area == NULL) {
 		zlog_warn(
 			"EXT (%s): Flooding is Area scope but area is not "
-			"yet set", __func__);
+			"yet set",
+			__func__);
 		if (OspfEXT.area == NULL) {
 			top = ospf_lookup_by_vrf_id(VRF_DEFAULT);
 			OspfEXT.area = ospf_area_lookup_by_area_id(
@@ -1613,7 +1593,6 @@ static void ospf_ext_link_lsa_schedule(struct ext_itf *exti,
 		zlog_warn("EXT (%s): Unknown opcode", __func__);
 		break;
 	}
-
 }
 
 /* Schedule Extended Link or Prefix depending of the Type of LSA */
@@ -1634,7 +1613,7 @@ static void ospf_ext_lsa_schedule(struct ext_itf *exti, enum lsa_opcode op)
 
 /* Cisco experimental SubTLV */
 static uint16_t show_vty_ext_link_rmt_itf_addr(struct vty *vty,
-						struct tlv_header *tlvh)
+					       struct tlv_header *tlvh)
 {
 	struct ext_subtlv_rmt_itf_addr *top;
 
@@ -1650,7 +1629,7 @@ static uint16_t show_vty_ext_link_rmt_itf_addr(struct vty *vty,
 
 /* Adjacency SID SubTLV */
 static uint16_t show_vty_ext_link_adj_sid(struct vty *vty,
-					   struct tlv_header *tlvh)
+					  struct tlv_header *tlvh)
 {
 	struct ext_subtlv_adj_sid *top = (struct ext_subtlv_adj_sid *)tlvh;
 
@@ -1669,7 +1648,7 @@ static uint16_t show_vty_ext_link_adj_sid(struct vty *vty,
 
 /* LAN Adjacency SubTLV */
 static uint16_t show_vty_ext_link_lan_adj_sid(struct vty *vty,
-					       struct tlv_header *tlvh)
+					      struct tlv_header *tlvh)
 {
 	struct ext_subtlv_lan_adj_sid *top =
 		(struct ext_subtlv_lan_adj_sid *)tlvh;
@@ -1755,12 +1734,11 @@ static void ospf_ext_link_show_info(struct vty *vty, struct ospf_lsa *lsa)
 			break;
 		}
 	}
-
 }
 
 /* Prefix SID SubTLV */
 static uint16_t show_vty_ext_pref_pref_sid(struct vty *vty,
-					    struct tlv_header *tlvh)
+					   struct tlv_header *tlvh)
 {
 	struct ext_subtlv_prefix_sid *top =
 		(struct ext_subtlv_prefix_sid *)tlvh;
@@ -1830,5 +1808,4 @@ static void ospf_ext_pref_show_info(struct vty *vty, struct ospf_lsa *lsa)
 			break;
 		}
 	}
-
 }