diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2019-05-06 17:33:34 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 17:33:34 -0300 |
| commit | e8ca10f2e2198ef5b092671ccaa91e4b7016197c (patch) | |
| tree | 0b9aa15b42f22805aaa4aac095be6914fc0f8e9d | |
| parent | 9a968a1d40bfe5980b082c70675957db27ac2f30 (diff) | |
| parent | 694bd4ce201caa71fec4e82847cd90dcd5140c01 (diff) | |
Merge pull request #4234 from donaldsharp/flood_the_vtep
zebra: Fix incorrect reading of REMOTE_VTEP_[ADD|DEL]
| -rw-r--r-- | zebra/zebra_vxlan.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index a2e2171304..baa050c9b9 100644 --- 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", |