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, 179 insertions, 189 deletions

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index b0b33c0b5..b9acbbed0 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -18,7 +18,6 @@ along with Free Range Routing; see the file COPYING.  If not, write to the Free
 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-
 #include <zebra.h>
 
 #include "command.h"
@@ -37,199 +36,190 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_evpn.h"
 
 int
-bgp_nlri_parse_evpn (struct peer *peer, struct attr *attr,
-                     struct bgp_nlri *packet, int withdraw)
+bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
+		    struct bgp_nlri *packet, int withdraw)
 {
-  u_char *pnt;
-  u_char *lim;
-  struct prefix p;
-  struct prefix_rd prd;
-  struct evpn_addr *p_evpn_p;
-  struct bgp_route_evpn evpn;
-  uint8_t route_type, route_length;
-  u_char *pnt_label;
-  u_int32_t addpath_id = 0;
-
-  /* Check peer status. */
-  if (peer->status != Established)
-    return 0;
-  
-  /* Make prefix_rd */
-  prd.family = AF_UNSPEC;
-  prd.prefixlen = 64;
-
-  p_evpn_p = &p.u.prefix_evpn;
-  pnt = packet->nlri;
-  lim = pnt + packet->length;
-  while (pnt < lim)
-    {
-      /* clear evpn structure */
-      memset (&evpn, 0, sizeof (evpn));
-
-      /* Clear prefix structure. */
-      memset (&p, 0, sizeof (struct prefix));
-      memset(&evpn.gw_ip, 0, sizeof(union gw_addr));
-      memset(&evpn.eth_s_id, 0, sizeof(struct eth_segment_id));
-
-      /* Fetch Route Type */ 
-      route_type = *pnt++;
-      route_length = *pnt++;
-      /* simply ignore. goto next route type if any */
-      if(route_type != EVPN_IP_PREFIX)
-	{
-	  if (pnt + route_length > lim)
-	    {
-	      zlog_err ("not enough bytes for New Route Type left in NLRI?");
-	      return -1;
-	    }
-	  pnt += route_length;
-	  continue;
+	u_char *pnt;
+	u_char *lim;
+	struct prefix p;
+	struct prefix_rd prd;
+	struct evpn_addr *p_evpn_p;
+	struct bgp_route_evpn evpn;
+	uint8_t route_type, route_length;
+	u_char *pnt_label;
+	u_int32_t addpath_id = 0;
+
+	/* Check peer status. */
+	if (peer->status != Established)
+		return 0;
+
+	/* Make prefix_rd */
+	prd.family = AF_UNSPEC;
+	prd.prefixlen = 64;
+
+	p_evpn_p = &p.u.prefix_evpn;
+	pnt = packet->nlri;
+	lim = pnt + packet->length;
+	while (pnt < lim) {
+		/* clear evpn structure */
+		memset(&evpn, 0, sizeof(evpn));
+
+		/* Clear prefix structure. */
+		memset(&p, 0, sizeof(struct prefix));
+		memset(&evpn.gw_ip, 0, sizeof(union gw_addr));
+		memset(&evpn.eth_s_id, 0, sizeof(struct eth_segment_id));
+
+		/* Fetch Route Type */
+		route_type = *pnt++;
+		route_length = *pnt++;
+		/* simply ignore. goto next route type if any */
+		if (route_type != EVPN_IP_PREFIX) {
+			if (pnt + route_length > lim) {
+				zlog_err
+				    ("not enough bytes for New Route Type left in NLRI?");
+				return -1;
+			}
+			pnt += route_length;
+			continue;
+		}
+
+		/* Fetch RD */
+		if (pnt + 8 > lim) {
+			zlog_err("not enough bytes for RD left in NLRI?");
+			return -1;
+		}
+
+		/* Copy routing distinguisher to rd. */
+		memcpy(&prd.val, pnt, 8);
+		pnt += 8;
+
+		/* Fetch ESI */
+		if (pnt + 10 > lim) {
+			zlog_err("not enough bytes for ESI left in NLRI?");
+			return -1;
+		}
+		memcpy(&evpn.eth_s_id.val, pnt, 10);
+		pnt += 10;
+
+		/* Fetch Ethernet Tag */
+		if (pnt + 4 > lim) {
+			zlog_err("not enough bytes for Eth Tag left in NLRI?");
+			return -1;
+		}
+
+		if (route_type == EVPN_IP_PREFIX) {
+			p_evpn_p->route_type = route_type;
+			memcpy(&(p_evpn_p->eth_tag), pnt, 4);
+			p_evpn_p->eth_tag = ntohl(p_evpn_p->eth_tag);
+			pnt += 4;
+
+			/* Fetch IP prefix length. */
+			p_evpn_p->ip_prefix_length = *pnt++;
+
+			if (p_evpn_p->ip_prefix_length > 128) {
+				zlog_err("invalid prefixlen %d in EVPN NLRI?",
+					 p.prefixlen);
+				return -1;
+			}
+			/* determine IPv4 or IPv6 prefix */
+			if (route_length - 4 - 10 - 8 -
+			    3 /* label to be read */  >= 32) {
+				p_evpn_p->flags = IP_PREFIX_V6;
+				memcpy(&(p_evpn_p->ip.v4_addr), pnt, 16);
+				pnt += 16;
+				memcpy(&evpn.gw_ip.ipv6, pnt, 16);
+				pnt += 16;
+			} else {
+				p_evpn_p->flags = IP_PREFIX_V4;
+				memcpy(&(p_evpn_p->ip.v4_addr), pnt, 4);
+				pnt += 4;
+				memcpy(&evpn.gw_ip.ipv4, pnt, 4);
+				pnt += 4;
+			}
+			p.family = AFI_L2VPN;
+			if (p_evpn_p->flags == IP_PREFIX_V4)
+				p.prefixlen =
+				    (u_char) PREFIX_LEN_ROUTE_TYPE_5_IPV4;
+			else
+				p.prefixlen = PREFIX_LEN_ROUTE_TYPE_5_IPV6;
+			p.family = AF_ETHERNET;
+		}
+
+		/* Fetch Label */
+		if (pnt + 3 > lim) {
+			zlog_err("not enough bytes for Label left in NLRI?");
+			return -1;
+		}
+		pnt_label = pnt;
+
+		pnt += 3;
+
+		if (!withdraw) {
+			bgp_update(peer, &p, addpath_id, attr, AFI_L2VPN,
+				   SAFI_EVPN, ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL,
+				   &prd, pnt_label, 0, &evpn);
+		} else {
+			bgp_withdraw(peer, &p, addpath_id, attr, AFI_L2VPN,
+				     SAFI_EVPN, ZEBRA_ROUTE_BGP,
+				     BGP_ROUTE_NORMAL, &prd, pnt_label, &evpn);
+		}
 	}
 
-      /* Fetch RD */
-      if (pnt + 8 > lim)
-        {
-          zlog_err ("not enough bytes for RD left in NLRI?");
-          return -1;
-        }
-
-      /* Copy routing distinguisher to rd. */
-      memcpy (&prd.val, pnt, 8);
-      pnt += 8;
-
-      /* Fetch ESI */
-      if (pnt + 10 > lim)
-        {
-          zlog_err ("not enough bytes for ESI left in NLRI?");
-          return -1;
-        }
-      memcpy(&evpn.eth_s_id.val, pnt, 10);
-      pnt += 10;
-
-      /* Fetch Ethernet Tag */
-      if (pnt + 4 > lim)
-        {
-          zlog_err ("not enough bytes for Eth Tag left in NLRI?");
-          return -1;
-        }
-
-      if (route_type == EVPN_IP_PREFIX)
-        {
-          p_evpn_p->route_type = route_type;
-          memcpy (&(p_evpn_p->eth_tag), pnt, 4);
-          p_evpn_p->eth_tag = ntohl(p_evpn_p->eth_tag);
-          pnt += 4;
-
-           /* Fetch IP prefix length. */
-          p_evpn_p->ip_prefix_length = *pnt++;
-
-          if (p_evpn_p->ip_prefix_length > 128)
-            {
-              zlog_err ("invalid prefixlen %d in EVPN NLRI?", p.prefixlen);
-              return -1;
-            }
-          /* determine IPv4 or IPv6 prefix */
-          if(route_length - 4 - 10 - 8 - 3 /* label to be read */ >= 32)
-            {
-              p_evpn_p->flags = IP_PREFIX_V6;
-              memcpy (&(p_evpn_p->ip.v4_addr), pnt, 16);
-              pnt += 16;
-              memcpy(&evpn.gw_ip.ipv6, pnt, 16);
-              pnt += 16;
-            }
-          else
-            {
-              p_evpn_p->flags = IP_PREFIX_V4;
-              memcpy (&(p_evpn_p->ip.v4_addr), pnt, 4);
-              pnt += 4;
-              memcpy(&evpn.gw_ip.ipv4, pnt, 4);
-              pnt += 4;
-            }
-          p.family = AFI_L2VPN;
-          if (p_evpn_p->flags == IP_PREFIX_V4)
-            p.prefixlen = (u_char)PREFIX_LEN_ROUTE_TYPE_5_IPV4;
-          else
-            p.prefixlen = PREFIX_LEN_ROUTE_TYPE_5_IPV6;
-          p.family = AF_ETHERNET;
-        }
-
-      /* Fetch Label */
-      if (pnt + 3 > lim)
-        {
-          zlog_err ("not enough bytes for Label left in NLRI?");
-          return -1;
-        }
-      pnt_label = pnt;
-      
-      pnt += 3;
-
-      if (!withdraw)
-        {
-          bgp_update (peer, &p, addpath_id, attr, AFI_L2VPN, SAFI_EVPN,
-                      ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL, &prd,
-                      pnt_label, 0, &evpn);
-        }
-      else
-        {
-          bgp_withdraw (peer, &p, addpath_id, attr, AFI_L2VPN, SAFI_EVPN,
-                        ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL,
-                        &prd, pnt_label, &evpn);
-        }
-    }
-
-  /* Packet length consistency check. */
-  if (pnt != lim)
-    return -1;
-  return 0;
+	/* Packet length consistency check. */
+	if (pnt != lim)
+		return -1;
+	return 0;
 }
 
 void
-bgp_packet_mpattr_route_type_5 (struct stream *s,
-                                struct prefix *p, struct prefix_rd *prd,
-                                u_char *label, struct attr *attr)
+bgp_packet_mpattr_route_type_5(struct stream *s,
+			       struct prefix *p, struct prefix_rd *prd,
+			       u_char * label, struct attr *attr)
 {
-  int len;
-  char temp[16];
-  struct evpn_addr *p_evpn_p;
-
-  memset(&temp, 0, 16);
-  if(p->family != AF_ETHERNET)
-    return;
-  p_evpn_p = &(p->u.prefix_evpn);
-  if (p_evpn_p->flags & IP_PREFIX_V4)
-    len = 8; /* ipv4 */
-  else
-    len = 32; /* ipv6 */
-  stream_putc (s, EVPN_IP_PREFIX);
-  stream_putc (s, 8 /* RD */ + 10 /* ESI */  + 4 /* EthTag */ + 1 + len + 3 /* label */);
-  stream_put (s, prd->val, 8);
-  if(attr && attr->extra)
-    stream_put (s, &(attr->extra->evpn_overlay.eth_s_id), 10);
-  else
-    stream_put (s, &temp, 10);
-  stream_putl (s, p_evpn_p->eth_tag);
-  stream_putc (s, p_evpn_p->ip_prefix_length);
-  if (p_evpn_p->flags & IP_PREFIX_V4)
-    stream_put_ipv4(s, p_evpn_p->ip.v4_addr.s_addr);
-  else
-    stream_put(s, &p_evpn_p->ip.v6_addr, 16);
-  if(attr && attr->extra)
-    {
-      if (p_evpn_p->flags & IP_PREFIX_V4)
-        stream_put_ipv4(s, attr->extra->evpn_overlay.gw_ip.ipv4.s_addr);
-      else
-        stream_put(s, &(attr->extra->evpn_overlay.gw_ip.ipv6), 16);
-    }
-  else
-    {
-      if (p_evpn_p->flags & IP_PREFIX_V4)
-        stream_put_ipv4(s, 0);
-      else
-        stream_put(s, &temp, 16);
-    }
-  if(label)
-    stream_put (s, label, 3);
-  else
-    stream_put3 (s, 0);
-  return;
+	int len;
+	char temp[16];
+	struct evpn_addr *p_evpn_p;
+
+	memset(&temp, 0, 16);
+	if (p->family != AF_ETHERNET)
+		return;
+	p_evpn_p = &(p->u.prefix_evpn);
+	if (p_evpn_p->flags & IP_PREFIX_V4)
+		len = 8;	/* ipv4 */
+	else
+		len = 32;	/* ipv6 */
+	stream_putc(s, EVPN_IP_PREFIX);
+	stream_putc(s,
+		    8 /* RD */  + 10 /* ESI */  + 4 /* EthTag */  + 1 + len +
+		    3 /* label */ );
+	stream_put(s, prd->val, 8);
+	if (attr && attr->extra)
+		stream_put(s, &(attr->extra->evpn_overlay.eth_s_id), 10);
+	else
+		stream_put(s, &temp, 10);
+	stream_putl(s, p_evpn_p->eth_tag);
+	stream_putc(s, p_evpn_p->ip_prefix_length);
+	if (p_evpn_p->flags & IP_PREFIX_V4)
+		stream_put_ipv4(s, p_evpn_p->ip.v4_addr.s_addr);
+	else
+		stream_put(s, &p_evpn_p->ip.v6_addr, 16);
+	if (attr && attr->extra) {
+		if (p_evpn_p->flags & IP_PREFIX_V4)
+			stream_put_ipv4(s,
+					attr->extra->evpn_overlay.gw_ip.ipv4.
+					s_addr);
+		else
+			stream_put(s, &(attr->extra->evpn_overlay.gw_ip.ipv6),
+				   16);
+	} else {
+		if (p_evpn_p->flags & IP_PREFIX_V4)
+			stream_put_ipv4(s, 0);
+		else
+			stream_put(s, &temp, 16);
+	}
+	if (label)
+		stream_put(s, label, 3);
+	else
+		stream_put3(s, 0);
+	return;
 }