bgpd: indent new evpn code to the frr standards

Using intent tool, and apply to all bgp_evpn files.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

1 files changed, 210 insertions, 231 deletions

diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index 26fc08f658..31f75baa20 100644
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -34,43 +34,42 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_ecommunity.h"
 #include "bgpd/bgp_evpn.h"
 
-void bgp_add_routermac_ecom (struct attr* attr, char * routermac)
+void bgp_add_routermac_ecom(struct attr *attr, char *routermac)
 {
-  struct ecommunity_val routermac_ecom;
+	struct ecommunity_val routermac_ecom;
 
-  if(attr->extra)
-    {
-      memset(&routermac_ecom, 0, sizeof(struct ecommunity_val));
-      routermac_ecom.val[0] = ECOMMUNITY_ENCODE_EVPN;
-      routermac_ecom.val[1] = ECOMMUNITY_EVPN_SUBTYPE_ROUTERMAC;
-      memcpy(&routermac_ecom.val[2], routermac, MAC_LEN);
-      if(!attr->extra->ecommunity)
-        attr->extra->ecommunity = ecommunity_new ();
-      ecommunity_add_val(attr->extra->ecommunity, &routermac_ecom);
-    }
+	if (attr->extra) {
+		memset(&routermac_ecom, 0, sizeof(struct ecommunity_val));
+		routermac_ecom.val[0] = ECOMMUNITY_ENCODE_EVPN;
+		routermac_ecom.val[1] = ECOMMUNITY_EVPN_SUBTYPE_ROUTERMAC;
+		memcpy(&routermac_ecom.val[2], routermac, MAC_LEN);
+		if (!attr->extra->ecommunity)
+			attr->extra->ecommunity = ecommunity_new();
+		ecommunity_add_val(attr->extra->ecommunity, &routermac_ecom);
+	}
 }
 
-static uint8_t convertchartohexa (uint8_t *hexa, int *error)
+static uint8_t convertchartohexa(uint8_t * hexa, int *error)
 {
-  if( (*hexa == '0') || (*hexa == '1') || (*hexa == '2') ||
-      (*hexa == '3') || (*hexa == '4') || (*hexa == '5') ||
-      (*hexa == '6') || (*hexa == '7') || (*hexa == '8') ||
-      (*hexa == '9'))
-    return (uint8_t)(*hexa)-'0';
-  if((*hexa == 'a') || (*hexa == 'A'))
-    return 0xa;
-  if((*hexa == 'b') || (*hexa == 'B'))
-    return 0xb;
-  if((*hexa == 'c') || (*hexa == 'C'))
-    return 0xc;
-  if((*hexa == 'd') || (*hexa == 'D'))
-    return 0xd;
-  if((*hexa == 'e') || (*hexa == 'E'))
-    return 0xe;
-  if((*hexa == 'f') || (*hexa == 'F'))
-    return 0xf;
-  *error = -1;
-  return 0;
+	if ((*hexa == '0') || (*hexa == '1') || (*hexa == '2') ||
+	    (*hexa == '3') || (*hexa == '4') || (*hexa == '5') ||
+	    (*hexa == '6') || (*hexa == '7') || (*hexa == '8')
+	    || (*hexa == '9'))
+		return (uint8_t) (*hexa) - '0';
+	if ((*hexa == 'a') || (*hexa == 'A'))
+		return 0xa;
+	if ((*hexa == 'b') || (*hexa == 'B'))
+		return 0xb;
+	if ((*hexa == 'c') || (*hexa == 'C'))
+		return 0xc;
+	if ((*hexa == 'd') || (*hexa == 'D'))
+		return 0xd;
+	if ((*hexa == 'e') || (*hexa == 'E'))
+		return 0xe;
+	if ((*hexa == 'f') || (*hexa == 'F'))
+		return 0xf;
+	*error = -1;
+	return 0;
 }
 
 /* converts to internal representation of mac address
@@ -78,81 +77,72 @@ static uint8_t convertchartohexa (uint8_t *hexa, int *error)
  * format accepted: AA:BB:CC:DD:EE:FF
  * if mac parameter is null, then check only
  */
-int
-str2mac (const char *str, char *mac)
+int str2mac(const char *str, char *mac)
 {
-  unsigned int k=0, i, j;
-  uint8_t *ptr, *ptr2;
-  size_t len;
-  uint8_t car;
+	unsigned int k = 0, i, j;
+	uint8_t *ptr, *ptr2;
+	size_t len;
+	uint8_t car;
 
-  if (!str)
-    return 0;
+	if (!str)
+		return 0;
 
-  if (str[0] == ':' && str[1] == '\0')
-    return 1;
+	if (str[0] == ':' && str[1] == '\0')
+		return 1;
 
-  i = 0;
-  ptr = (uint8_t *)str;
-  while (i < 6)
-    {
-      uint8_t temp[5];
-      int error = 0;
-      ptr2 = (uint8_t *)strchr((const char *)ptr, ':');
-      if (ptr2 == NULL)
-	{
-	  /* if last occurence return ok */
-	  if(i != 5)
-            {
-              zlog_err("[%s]: format non recognized",mac);
-              return 0;
-            }
-          len = strlen((char *)ptr);
-	} 
-      else
-        {
-          len = ptr2 - ptr;
-        }
-      if(len > 5)
-        {
-          zlog_err("[%s]: format non recognized",mac);
-         return 0;
-        }
-      memcpy(temp, ptr, len);
-      for(j=0;j< len;j++)
-	{
-	  if (k >= MAC_LEN)
-	    return 0;
-          if(mac)
-            mac[k] = 0;
-          car = convertchartohexa (&temp[j], &error);
-	  if (error)
-	    return 0;
-	  if(mac)
-            mac[k] = car << 4;
-	  j++;
-          if(j == len)
-            return 0;
-          car = convertchartohexa (&temp[j], &error) & 0xf;
-	  if (error)
-	    return 0;
-	  if(mac)
-            mac[k] |= car & 0xf;
-	  k++;
-	  i++;
+	i = 0;
+	ptr = (uint8_t *) str;
+	while (i < 6) {
+		uint8_t temp[5];
+		int error = 0;
+		ptr2 = (uint8_t *) strchr((const char *)ptr, ':');
+		if (ptr2 == NULL) {
+			/* if last occurence return ok */
+			if (i != 5) {
+				zlog_err("[%s]: format non recognized", mac);
+				return 0;
+			}
+			len = strlen((char *)ptr);
+		} else {
+			len = ptr2 - ptr;
+		}
+		if (len > 5) {
+			zlog_err("[%s]: format non recognized", mac);
+			return 0;
+		}
+		memcpy(temp, ptr, len);
+		for (j = 0; j < len; j++) {
+			if (k >= MAC_LEN)
+				return 0;
+			if (mac)
+				mac[k] = 0;
+			car = convertchartohexa(&temp[j], &error);
+			if (error)
+				return 0;
+			if (mac)
+				mac[k] = car << 4;
+			j++;
+			if (j == len)
+				return 0;
+			car = convertchartohexa(&temp[j], &error) & 0xf;
+			if (error)
+				return 0;
+			if (mac)
+				mac[k] |= car & 0xf;
+			k++;
+			i++;
+		}
+		ptr = ptr2;
+		if (ptr == NULL)
+			break;
+		ptr++;
+	}
+	if (mac && 0) {
+		zlog_err("leave correct : %02x:%02x:%02x:%02x:%02x:%02x",
+			 mac[0] & 0xff, mac[1] & 0xff, mac[2] & 0xff,
+			 mac[3] & 0xff, mac[4] & 0xff, mac[5] & 0xff);
 	}
-      ptr = ptr2;
-      if(ptr == NULL)
-        break;
-      ptr++;
-    }
-  if(mac && 0)
-    {
-      zlog_err("leave correct : %02x:%02x:%02x:%02x:%02x:%02x",
-               mac[0] & 0xff, mac[1] & 0xff, mac[2] & 0xff,
-               mac[3] & 0xff, mac[4] & 0xff, mac[5] & 0xff);
-    }
-  return 1;
+	return 1;
 }
 
 /* converts to an esi
@@ -160,162 +150,151 @@ str2mac (const char *str, char *mac)
  * format accepted: AA:BB:CC:DD:EE:FF:GG:HH:II:JJ
  * if id is null, check only is done
  */
-int
-str2esi (const char *str, struct eth_segment_id *id)
+int str2esi(const char *str, struct eth_segment_id *id)
 {
-  unsigned int k=0, i, j;
-  uint8_t *ptr, *ptr2;
-  size_t len;
-  uint8_t car;
+	unsigned int k = 0, i, j;
+	uint8_t *ptr, *ptr2;
+	size_t len;
+	uint8_t car;
 
-  if (!str)
-    return 0;
-  if (str[0] == ':' && str[1] == '\0')
-    return 1;
+	if (!str)
+		return 0;
+	if (str[0] == ':' && str[1] == '\0')
+		return 1;
 
-  i = 0;
-  ptr = (uint8_t *)str;
-  while (i < 10)
-    {
-      uint8_t temp[5];
-      int error = 0;
-      ptr2 = (uint8_t *)strchr((const char *)ptr, ':');
-      if (ptr2 == NULL)
-	{
-	  /* if last occurence return ok */
-	  if(i != 9)
-            {
-              zlog_err("[%s]: format non recognized",str);
-              return 0;
-            }
-          len = strlen((char *)ptr);
+	i = 0;
+	ptr = (uint8_t *) str;
+	while (i < 10) {
+		uint8_t temp[5];
+		int error = 0;
+		ptr2 = (uint8_t *) strchr((const char *)ptr, ':');
+		if (ptr2 == NULL) {
+			/* if last occurence return ok */
+			if (i != 9) {
+				zlog_err("[%s]: format non recognized", str);
+				return 0;
+			}
+			len = strlen((char *)ptr);
+		} else {
+			len = ptr2 - ptr;
+		}
+		memcpy(temp, ptr, len);
+		if (len > 5) {
+			zlog_err("[%s]: format non recognized", str);
+			return 0;
+		}
+		for (j = 0; j < len; j++) {
+			if (k >= ESI_LEN)
+				return 0;
+			if (id)
+				id->val[k] = 0;
+			car = convertchartohexa(&temp[j], &error);
+			if (error)
+				return 0;
+			if (id)
+				id->val[k] = car << 4;
+			j++;
+			if (j == len)
+				return 0;
+			car = convertchartohexa(&temp[j], &error) & 0xf;
+			if (error)
+				return 0;
+			if (id)
+				id->val[k] |= car & 0xf;
+			k++;
+			i++;
+		}
+		ptr = ptr2;
+		if (ptr == NULL)
+			break;
+		ptr++;
 	}
-      else
-        {
-          len = ptr2 - ptr;
-        }
-      memcpy(temp, ptr, len);
-      if(len > 5)
-        {
-          zlog_err("[%s]: format non recognized",str);
-         return 0;
-        }
-      for(j=0;j< len;j++)
-	{
-	  if (k >= ESI_LEN)
-	    return 0;
-          if(id)
-            id->val[k] = 0;
-          car = convertchartohexa (&temp[j], &error);
-          if (error)
-            return 0;
-          if(id)
-            id->val[k] = car << 4;
-          j++;
-          if(j == len)
-            return 0;
-          car = convertchartohexa (&temp[j], &error) & 0xf;
-          if (error)
-            return 0;
-          if(id)
-            id->val[k] |= car & 0xf;
-         k++;
-         i++;
+	if (id && 0) {
+		zlog_err("leave correct : %02x:%02x:%02x:%02x:%02x",
+			 id->val[0], id->val[1], id->val[2], id->val[3],
+			 id->val[4]);
+		zlog_err("%02x:%02x:%02x:%02x:%02x", id->val[5], id->val[6],
+			 id->val[7], id->val[8], id->val[9]);
 	}
-      ptr = ptr2;
-      if(ptr == NULL)
-        break;
-      ptr++;
-    }
-  if(id && 0)
-    {
-      zlog_err("leave correct : %02x:%02x:%02x:%02x:%02x",
-               id->val[0], id->val[1], id->val[2], id->val[3], id->val[4]);
-      zlog_err("%02x:%02x:%02x:%02x:%02x",
-               id->val[5], id->val[6], id->val[7], id->val[8], id->val[9]);
-    }
-  return 1;
+	return 1;
 }
 
-char *
-esi2str (struct eth_segment_id *id)
+char *esi2str(struct eth_segment_id *id)
 {
-  char *ptr;
-  u_char *val;
+	char *ptr;
+	u_char *val;
 
-  if(!id)
-    return NULL;
+	if (!id)
+		return NULL;
 
-  val = id->val;
-  ptr = (char *) malloc ((ESI_LEN*2+ESI_LEN-1+1)*sizeof(char));
+	val = id->val;
+	ptr = (char *)malloc((ESI_LEN * 2 + ESI_LEN - 1 + 1) * sizeof(char));
 
-  snprintf (ptr, (ESI_LEN*2+ESI_LEN-1+1),
-            "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
-            val[0], val[1], val[2], val[3], val[4],
-            val[5], val[6], val[7], val[8], val[9]);
+	snprintf(ptr, (ESI_LEN * 2 + ESI_LEN - 1 + 1),
+		 "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
+		 val[0], val[1], val[2], val[3], val[4],
+		 val[5], val[6], val[7], val[8], val[9]);
 
-  return ptr;
+	return ptr;
 }
 
-char *
-mac2str (char *mac)
+char *mac2str(char *mac)
 {
-  char *ptr;
+	char *ptr;
 
-  if(!mac)
-    return NULL;
+	if (!mac)
+		return NULL;
 
-  ptr = (char *) malloc ((MAC_LEN*2+MAC_LEN-1+1)*sizeof(char));
+	ptr = (char *)malloc((MAC_LEN * 2 + MAC_LEN - 1 + 1) * sizeof(char));
 
-  snprintf (ptr, (MAC_LEN*2+MAC_LEN-1+1), "%02x:%02x:%02x:%02x:%02x:%02x",
-           (uint8_t) mac[0], (uint8_t)mac[1], (uint8_t)mac[2], (uint8_t)mac[3],
-           (uint8_t)mac[4], (uint8_t)mac[5]);
+	snprintf(ptr, (MAC_LEN * 2 + MAC_LEN - 1 + 1),
+		 "%02x:%02x:%02x:%02x:%02x:%02x", (uint8_t) mac[0],
+		 (uint8_t) mac[1], (uint8_t) mac[2], (uint8_t) mac[3],
+		 (uint8_t) mac[4], (uint8_t) mac[5]);
 
-  return ptr;
+	return ptr;
 }
 
 char *ecom_mac2str(char *ecom_mac)
 {
-  char *en;
+	char *en;
 
-  en = ecom_mac;
-  en+=2;
-  return mac2str(en);
+	en = ecom_mac;
+	en += 2;
+	return mac2str(en);
 }
 
 /* dst prefix must be AF_INET or AF_INET6 prefix, to forge EVPN prefix */
-extern int bgp_build_evpn_prefix (int evpn_type, uint32_t eth_tag, struct prefix *dst)
+extern int
+bgp_build_evpn_prefix(int evpn_type, uint32_t eth_tag, struct prefix *dst)
 {
-  struct evpn_addr *p_evpn_p;
-  struct prefix p2;
-  struct prefix *src = &p2;
+	struct evpn_addr *p_evpn_p;
+	struct prefix p2;
+	struct prefix *src = &p2;
 
-  if (!dst || dst->family == 0)
-    return -1;
-  /* store initial prefix in src */
-  prefix_copy (src, dst);
-  memset (dst, 0, sizeof (struct prefix));
-  p_evpn_p = &(dst->u.prefix_evpn);
-  dst->family = AF_ETHERNET;
-  p_evpn_p->route_type = evpn_type;
-  if (evpn_type == EVPN_IP_PREFIX)
-    {
-      p_evpn_p->eth_tag = eth_tag;
-      p_evpn_p->ip_prefix_length = p2.prefixlen;
-      if (src->family == AF_INET)
-        {
-          p_evpn_p->flags = IP_PREFIX_V4;
-          memcpy (&p_evpn_p->ip.v4_addr, &src->u.prefix4, sizeof(struct in_addr));
-          dst->prefixlen = (u_char)PREFIX_LEN_ROUTE_TYPE_5_IPV4;
-        }
-      else
-        {
-          p_evpn_p->flags = IP_PREFIX_V6;
-          memcpy (&p_evpn_p->ip.v6_addr, &src->u.prefix6, sizeof(struct in6_addr));
-          dst->prefixlen = (u_char)PREFIX_LEN_ROUTE_TYPE_5_IPV6;
-        }
-    }
-  else
-    return -1;
-  return 0;
+	if (!dst || dst->family == 0)
+		return -1;
+	/* store initial prefix in src */
+	prefix_copy(src, dst);
+	memset(dst, 0, sizeof(struct prefix));
+	p_evpn_p = &(dst->u.prefix_evpn);
+	dst->family = AF_ETHERNET;
+	p_evpn_p->route_type = evpn_type;
+	if (evpn_type == EVPN_IP_PREFIX) {
+		p_evpn_p->eth_tag = eth_tag;
+		p_evpn_p->ip_prefix_length = p2.prefixlen;
+		if (src->family == AF_INET) {
+			p_evpn_p->flags = IP_PREFIX_V4;
+			memcpy(&p_evpn_p->ip.v4_addr, &src->u.prefix4,
+			       sizeof(struct in_addr));
+			dst->prefixlen = (u_char) PREFIX_LEN_ROUTE_TYPE_5_IPV4;
+		} else {
+			p_evpn_p->flags = IP_PREFIX_V6;
+			memcpy(&p_evpn_p->ip.v6_addr, &src->u.prefix6,
+			       sizeof(struct in6_addr));
+			dst->prefixlen = (u_char) PREFIX_LEN_ROUTE_TYPE_5_IPV6;
+		}
+	} else
+		return -1;
+	return 0;
 }