Merge pull request FRRouting#4234 from donaldsharp/flood_the_vtep

zebra: Fix incorrect reading of REMOTE_VTEP_[ADD|DEL]
idryzhov · May 6, 2019 · e8ca10f · e8ca10f
2 parents 9a968a1 + 694bd4c
commit e8ca10f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
@@ -7858,12 +7858,18 @@ void zebra_vxlan_remote_vtep_del(ZAPI_HANDLER_ARGS)
 	s = msg;
 
 	while (l < hdr->length) {
+		int flood_control __attribute__((unused));
+
 		/* Obtain each remote VTEP and process. */
 		STREAM_GETL(s, vni);
 		l += 4;
 		STREAM_GET(&vtep_ip.s_addr, s, IPV4_MAX_BYTELEN);
 		l += IPV4_MAX_BYTELEN;
 
+		/* Flood control is intentionally ignored right now */
+		STREAM_GETL(s, flood_control);
+		l += 4;
+
 		if (IS_ZEBRA_DEBUG_VXLAN)
 			zlog_debug("Recv VTEP_DEL %s VNI %u from %s",
 				   inet_ntoa(vtep_ip), vni,
@@ -7949,7 +7955,7 @@ void zebra_vxlan_remote_vtep_add(ZAPI_HANDLER_ARGS)
 		l += 4;
 		STREAM_GET(&vtep_ip.s_addr, s, IPV4_MAX_BYTELEN);
 		STREAM_GETL(s, flood_control);
-		l += IPV4_MAX_BYTELEN;
+		l += IPV4_MAX_BYTELEN + 4;
 
 		if (IS_ZEBRA_DEBUG_VXLAN)
 			zlog_debug("Recv VTEP_ADD %s VNI %u flood %d from %s",