From: Patrick Ruddy <pat@voltanet.io>
Date: Tue, 15 Dec 2020 17:33:46 +0000 (+0000)
Subject: Merge pull request #7636 from AnuradhaKaruppiah/type-0-esi
X-Git-Tag: base_7.6~119
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bedf36e32721335054e0c28291e6105c0946b06f;p=mirror%2Ffrr.git

Merge pull request #7636 from AnuradhaKaruppiah/type-0-esi

zebra: support for type-0 ESI
---

bedf36e32721335054e0c28291e6105c0946b06f
diff --cc zebra/zebra_evpn_mh.c
index bda2708f9f,0da25b4a74..a79e0e9695
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@@ -2427,9 -2184,11 +2458,10 @@@ void zebra_evpn_if_es_print(struct vty 
  	char buf[ETHER_ADDR_STRLEN];
  	char mh_buf[80];
  	bool vty_print = false;
+ 	char esi_buf[ESI_STR_LEN];
  
  	mh_buf[0] = '\0';
 -	snprintf(mh_buf + strlen(mh_buf), sizeof(mh_buf) - strlen(mh_buf),
 -		 "  EVPN-MH:");
 +	strlcat(mh_buf, "  EVPN-MH:", sizeof(mh_buf));
  	if (zif->es_info.lid || !is_zero_mac(&zif->es_info.sysmac)) {
  		vty_print = true;
  		snprintf(