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

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

1 files changed, 87 insertions, 52 deletions

diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c
index 6fbd6ca22..a7a8c2019 100644
--- a/nhrpd/nhrp_nhs.c
+++ b/nhrpd/nhrp_nhs.c
@@ -23,7 +23,8 @@ static int nhrp_reg_send_req(struct thread *t);
 static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg)
 {
 	struct nhrp_packet_parser *p = arg;
-	struct nhrp_registration *r = container_of(reqid, struct nhrp_registration, reqid);
+	struct nhrp_registration *r =
+		container_of(reqid, struct nhrp_registration, reqid);
 	struct nhrp_nhs *nhs = r->nhs;
 	struct interface *ifp = nhs->ifp;
 	struct nhrp_interface *nifp = ifp->info;
@@ -45,13 +46,16 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg)
 	debugf(NHRP_DEBUG_COMMON, "NHS: Reg.reply received");
 
 	ok = 1;
-	while ((cie = nhrp_cie_pull(&p->payload, p->hdr, &cie_nbma, &cie_proto)) != NULL) {
-		proto = sockunion_family(&cie_proto) != AF_UNSPEC ? &cie_proto : &p->src_proto;
+	while ((cie = nhrp_cie_pull(&p->payload, p->hdr, &cie_nbma, &cie_proto))
+	       != NULL) {
+		proto = sockunion_family(&cie_proto) != AF_UNSPEC
+				? &cie_proto
+				: &p->src_proto;
 		debugf(NHRP_DEBUG_COMMON, "NHS: CIE registration: %s: %d",
-			sockunion2str(proto, buf, sizeof(buf)),
-			cie->code);
-		if (!((cie->code == NHRP_CODE_SUCCESS) ||
-                      (cie->code == NHRP_CODE_ADMINISTRATIVELY_PROHIBITED && nhs->hub)))
+		       sockunion2str(proto, buf, sizeof(buf)), cie->code);
+		if (!((cie->code == NHRP_CODE_SUCCESS)
+		      || (cie->code == NHRP_CODE_ADMINISTRATIVELY_PROHIBITED
+			  && nhs->hub)))
 			ok = 0;
 	}
 
@@ -64,11 +68,15 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg)
 		switch (htons(ext->type) & ~NHRP_EXTENSION_FLAG_COMPULSORY) {
 		case NHRP_EXTENSION_NAT_ADDRESS:
 			/* NHS adds second CIE if NAT is detected */
-			if (nhrp_cie_pull(&extpl, p->hdr, &cie_nbma, &cie_proto) &&
-			    nhrp_cie_pull(&extpl, p->hdr, &cie_nbma, &cie_proto)) {
+			if (nhrp_cie_pull(&extpl, p->hdr, &cie_nbma, &cie_proto)
+			    && nhrp_cie_pull(&extpl, p->hdr, &cie_nbma,
+					     &cie_proto)) {
 				nifp->nat_nbma = cie_nbma;
-				debugf(NHRP_DEBUG_IF, "%s: NAT detected, real NBMA address: %s",
-					ifp->name, sockunion2str(&nifp->nbma, buf, sizeof(buf)));
+				debugf(NHRP_DEBUG_IF,
+				       "%s: NAT detected, real NBMA address: %s",
+				       ifp->name,
+				       sockunion2str(&nifp->nbma, buf,
+						     sizeof(buf)));
 			}
 			break;
 		}
@@ -86,7 +94,9 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg)
 
 	r->proto_addr = p->dst_proto;
 	c = nhrp_cache_get(ifp, &p->dst_proto, 1);
-	if (c) nhrp_cache_update_binding(c, NHRP_CACHE_NHS, holdtime, nhrp_peer_ref(r->peer), 0, NULL);
+	if (c)
+		nhrp_cache_update_binding(c, NHRP_CACHE_NHS, holdtime,
+					  nhrp_peer_ref(r->peer), 0, NULL);
 }
 
 static int nhrp_reg_timeout(struct thread *t)
@@ -99,21 +109,24 @@ static int nhrp_reg_timeout(struct thread *t)
 	if (r->timeout >= 16 && sockunion_family(&r->proto_addr) != AF_UNSPEC) {
 		nhrp_reqid_free(&nhrp_packet_reqid, &r->reqid);
 		c = nhrp_cache_get(r->nhs->ifp, &r->proto_addr, 0);
-		if (c) nhrp_cache_update_binding(c, NHRP_CACHE_NHS, -1, NULL, 0, NULL);
+		if (c)
+			nhrp_cache_update_binding(c, NHRP_CACHE_NHS, -1, NULL,
+						  0, NULL);
 		sockunion_family(&r->proto_addr) = AF_UNSPEC;
 	}
 
 	r->timeout <<= 1;
-	if (r->timeout > 64) r->timeout = 2;
-	thread_add_timer_msec(master, nhrp_reg_send_req, r, 10,
-			      &r->t_register);
+	if (r->timeout > 64)
+		r->timeout = 2;
+	thread_add_timer_msec(master, nhrp_reg_send_req, r, 10, &r->t_register);
 
 	return 0;
 }
 
 static void nhrp_reg_peer_notify(struct notifier_block *n, unsigned long cmd)
 {
-	struct nhrp_registration *r = container_of(n, struct nhrp_registration, peer_notifier);
+	struct nhrp_registration *r =
+		container_of(n, struct nhrp_registration, peer_notifier);
 	char buf[SU_ADDRSTRLEN];
 
 	switch (cmd) {
@@ -122,7 +135,8 @@ static void nhrp_reg_peer_notify(struct notifier_block *n, unsigned long cmd)
 	case NOTIFY_PEER_IFCONFIG_CHANGED:
 	case NOTIFY_PEER_MTU_CHANGED:
 		debugf(NHRP_DEBUG_COMMON, "NHS: Flush timer for %s",
-			sockunion2str(&r->peer->vc->remote.nbma, buf, sizeof buf));
+		       sockunion2str(&r->peer->vc->remote.nbma, buf,
+				     sizeof buf));
 		THREAD_TIMER_OFF(r->t_register);
 		thread_add_timer_msec(master, nhrp_reg_send_req, r, 10,
 				      &r->t_register);
@@ -147,7 +161,8 @@ static int nhrp_reg_send_req(struct thread *t)
 	r->t_register = NULL;
 	if (!nhrp_peer_check(r->peer, 2)) {
 		debugf(NHRP_DEBUG_COMMON, "NHS: Waiting link for %s",
-			sockunion2str(&r->peer->vc->remote.nbma, buf1, sizeof buf1));
+		       sockunion2str(&r->peer->vc->remote.nbma, buf1,
+				     sizeof buf1));
 		thread_add_timer(master, nhrp_reg_send_req, r, 120,
 				 &r->t_register);
 		return 0;
@@ -163,19 +178,22 @@ static int nhrp_reg_send_req(struct thread *t)
 
 	sockunion2str(&if_ad->addr, buf1, sizeof(buf1));
 	sockunion2str(dst_proto, buf2, sizeof(buf2));
-	debugf(NHRP_DEBUG_COMMON, "NHS: Register %s -> %s (timeout %d)", buf1, buf2, r->timeout);
+	debugf(NHRP_DEBUG_COMMON, "NHS: Register %s -> %s (timeout %d)", buf1,
+	       buf2, r->timeout);
 
 	/* No protocol address configured for tunnel interface */
 	if (sockunion_family(&if_ad->addr) == AF_UNSPEC)
 		return 0;
 
 	zb = zbuf_alloc(1400);
-	hdr = nhrp_packet_push(zb, NHRP_PACKET_REGISTRATION_REQUEST, &nifp->nbma, &if_ad->addr, dst_proto);
+	hdr = nhrp_packet_push(zb, NHRP_PACKET_REGISTRATION_REQUEST,
+			       &nifp->nbma, &if_ad->addr, dst_proto);
 	hdr->hop_count = 1;
 	if (!(if_ad->flags & NHRP_IFF_REG_NO_UNIQUE))
 		hdr->flags |= htons(NHRP_FLAG_REGISTRATION_UNIQUE);
 
-	hdr->u.request_id = htonl(nhrp_reqid_alloc(&nhrp_packet_reqid, &r->reqid, nhrp_reg_reply));
+	hdr->u.request_id = htonl(nhrp_reqid_alloc(&nhrp_packet_reqid,
+						   &r->reqid, nhrp_reg_reply));
 
 	/* FIXME: push CIE for each local protocol address */
 	cie = nhrp_cie_push(zb, NHRP_CODE_SUCCESS, NULL, NULL);
@@ -208,17 +226,20 @@ static void nhrp_reg_delete(struct nhrp_registration *r)
 	XFREE(MTYPE_NHRP_REGISTRATION, r);
 }
 
-static struct nhrp_registration *nhrp_reg_by_nbma(struct nhrp_nhs *nhs, const union sockunion *nbma_addr)
+static struct nhrp_registration *
+nhrp_reg_by_nbma(struct nhrp_nhs *nhs, const union sockunion *nbma_addr)
 {
 	struct nhrp_registration *r;
 
-	list_for_each_entry(r, &nhs->reglist_head, reglist_entry)
-		if (sockunion_same(&r->peer->vc->remote.nbma, nbma_addr))
-			return r;
+	list_for_each_entry(
+		r, &nhs->reglist_head,
+		reglist_entry) if (sockunion_same(&r->peer->vc->remote.nbma,
+						  nbma_addr)) return r;
 	return NULL;
 }
 
-static void nhrp_nhs_resolve_cb(struct resolver_query *q, int n, union sockunion *addrs)
+static void nhrp_nhs_resolve_cb(struct resolver_query *q, int n,
+				union sockunion *addrs)
 {
 	struct nhrp_nhs *nhs = container_of(q, struct nhrp_nhs, dns_resolve);
 	struct nhrp_interface *nifp = nhs->ifp->info;
@@ -236,8 +257,8 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, int n, union sockunion
 	thread_add_timer(master, nhrp_nhs_resolve, nhs, 2 * 60 * 60,
 			 &nhs->t_resolve);
 
-	list_for_each_entry(reg, &nhs->reglist_head, reglist_entry)
-		reg->mark = 1;
+	list_for_each_entry(reg, &nhs->reglist_head, reglist_entry) reg->mark =
+		1;
 
 	nhs->hub = 0;
 	for (i = 0; i < n; i++) {
@@ -258,12 +279,14 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, int n, union sockunion
 		reg->timeout = 1;
 		list_init(&reg->reglist_entry);
 		list_add_tail(&reg->reglist_entry, &nhs->reglist_head);
-		nhrp_peer_notify_add(reg->peer, &reg->peer_notifier, nhrp_reg_peer_notify);
+		nhrp_peer_notify_add(reg->peer, &reg->peer_notifier,
+				     nhrp_reg_peer_notify);
 		thread_add_timer_msec(master, nhrp_reg_send_req, reg, 50,
 				      &reg->t_register);
 	}
 
-	list_for_each_entry_safe(reg, regn, &nhs->reglist_head, reglist_entry) {
+	list_for_each_entry_safe(reg, regn, &nhs->reglist_head, reglist_entry)
+	{
 		if (reg->mark)
 			nhrp_reg_delete(reg);
 	}
@@ -273,24 +296,27 @@ static int nhrp_nhs_resolve(struct thread *t)
 {
 	struct nhrp_nhs *nhs = THREAD_ARG(t);
 
-	resolver_resolve(&nhs->dns_resolve, AF_INET, nhs->nbma_fqdn, nhrp_nhs_resolve_cb);
+	resolver_resolve(&nhs->dns_resolve, AF_INET, nhs->nbma_fqdn,
+			 nhrp_nhs_resolve_cb);
 
 	return 0;
 }
 
-int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr, const char *nbma_fqdn)
+int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr,
+		 const char *nbma_fqdn)
 {
 	struct nhrp_interface *nifp = ifp->info;
 	struct nhrp_nhs *nhs;
 
-	if (sockunion_family(proto_addr) != AF_UNSPEC &&
-	    sockunion_family(proto_addr) != afi2family(afi))
+	if (sockunion_family(proto_addr) != AF_UNSPEC
+	    && sockunion_family(proto_addr) != afi2family(afi))
 		return NHRP_ERR_PROTOCOL_ADDRESS_MISMATCH;
 
-	list_for_each_entry(nhs, &nifp->afi[afi].nhslist_head, nhslist_entry) {
-		if (sockunion_family(&nhs->proto_addr) != AF_UNSPEC &&
-		    sockunion_family(proto_addr) != AF_UNSPEC &&
-		    sockunion_same(&nhs->proto_addr, proto_addr))
+	list_for_each_entry(nhs, &nifp->afi[afi].nhslist_head, nhslist_entry)
+	{
+		if (sockunion_family(&nhs->proto_addr) != AF_UNSPEC
+		    && sockunion_family(proto_addr) != AF_UNSPEC
+		    && sockunion_same(&nhs->proto_addr, proto_addr))
 			return NHRP_ERR_ENTRY_EXISTS;
 
 		if (strcmp(nhs->nbma_fqdn, nbma_fqdn) == 0)
@@ -298,9 +324,10 @@ int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr,
 	}
 
 	nhs = XMALLOC(MTYPE_NHRP_NHS, sizeof(struct nhrp_nhs));
-	if (!nhs) return NHRP_ERR_NO_MEMORY;
+	if (!nhs)
+		return NHRP_ERR_NO_MEMORY;
 
-	*nhs = (struct nhrp_nhs) {
+	*nhs = (struct nhrp_nhs){
 		.afi = afi,
 		.ifp = ifp,
 		.proto_addr = *proto_addr,
@@ -314,17 +341,20 @@ int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr,
 	return NHRP_OK;
 }
 
-int nhrp_nhs_del(struct interface *ifp, afi_t afi, union sockunion *proto_addr, const char *nbma_fqdn)
+int nhrp_nhs_del(struct interface *ifp, afi_t afi, union sockunion *proto_addr,
+		 const char *nbma_fqdn)
 {
 	struct nhrp_interface *nifp = ifp->info;
 	struct nhrp_nhs *nhs, *nnhs;
 	int ret = NHRP_ERR_ENTRY_NOT_FOUND;
 
-	if (sockunion_family(proto_addr) != AF_UNSPEC &&
-	    sockunion_family(proto_addr) != afi2family(afi))
+	if (sockunion_family(proto_addr) != AF_UNSPEC
+	    && sockunion_family(proto_addr) != afi2family(afi))
 		return NHRP_ERR_PROTOCOL_ADDRESS_MISMATCH;
 
-	list_for_each_entry_safe(nhs, nnhs, &nifp->afi[afi].nhslist_head, nhslist_entry) {
+	list_for_each_entry_safe(nhs, nnhs, &nifp->afi[afi].nhslist_head,
+				 nhslist_entry)
+	{
 		if (!sockunion_same(&nhs->proto_addr, proto_addr))
 			continue;
 		if (strcmp(nhs->nbma_fqdn, nbma_fqdn) != 0)
@@ -345,7 +375,7 @@ int nhrp_nhs_free(struct nhrp_nhs *nhs)
 		nhrp_reg_delete(r);
 	THREAD_OFF(nhs->t_resolve);
 	list_del(&nhs->nhslist_entry);
-	free((void*) nhs->nbma_fqdn);
+	free((void *)nhs->nbma_fqdn);
 	XFREE(MTYPE_NHRP_NHS, nhs);
 	return 0;
 }
@@ -361,22 +391,27 @@ void nhrp_nhs_terminate(void)
 	FOR_ALL_INTERFACES (vrf, ifp) {
 		nifp = ifp->info;
 		for (afi = 0; afi < AFI_MAX; afi++) {
-			list_for_each_entry_safe(nhs, tmp, &nifp->afi[afi].nhslist_head, nhslist_entry)
-				nhrp_nhs_free(nhs);
+			list_for_each_entry_safe(
+				nhs, tmp, &nifp->afi[afi].nhslist_head,
+				nhslist_entry) nhrp_nhs_free(nhs);
 		}
 	}
 }
 
-void nhrp_nhs_foreach(struct interface *ifp, afi_t afi, void (*cb)(struct nhrp_nhs *, struct nhrp_registration *, void *), void *ctx)
+void nhrp_nhs_foreach(struct interface *ifp, afi_t afi,
+		      void (*cb)(struct nhrp_nhs *, struct nhrp_registration *,
+				 void *),
+		      void *ctx)
 {
 	struct nhrp_interface *nifp = ifp->info;
 	struct nhrp_nhs *nhs;
 	struct nhrp_registration *reg;
 
-	list_for_each_entry(nhs, &nifp->afi[afi].nhslist_head, nhslist_entry) {
+	list_for_each_entry(nhs, &nifp->afi[afi].nhslist_head, nhslist_entry)
+	{
 		if (!list_empty(&nhs->reglist_head)) {
-			list_for_each_entry(reg, &nhs->reglist_head, reglist_entry)
-				cb(nhs, reg, ctx);
+			list_for_each_entry(reg, &nhs->reglist_head,
+					    reglist_entry) cb(nhs, reg, ctx);
 		} else
 			cb(nhs, 0, ctx);
 	}