docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity

Vendoring libnetwork to remove stale xfrm states

Browse Source 
When using encrypted vxlan network, some of the xfrm states are left
stale. This fix also filters out self advertise-addr rules.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6a754a4eef4463ed7c712a1ebe5bc38e2a957c42
Component: engine
This commit is contained in:
Madhu Venugopal
2016-07-25 19:44:07 -07:00
parent fb8417c213
commit 3d4bb9ff3f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/vendor/src/github.com/docker/libnetwork/drivers/overlay/encryption.go vendored
View File

@@ -95,7 +95,7 @@ func (d *driver) checkEncryption(nid string, rIP net.IP, vxlanID uint32, isLocal
switch {
case isLocal:
if err := d.peerDbNetworkWalk(nid, func(pKey *peerKey, pEntry *peerEntry) bool {
if !lIP.Equal(pEntry.vtep) {
if !aIP.Equal(pEntry.vtep) {
nodes[pEntry.vtep.String()] = pEntry.vtep
}
return false
@@ -488,7 +488,7 @@ func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx,
if delIdx != -1 {
// -rSA0
programSA(rIP, lIP, spis[delIdx], nil, reverse, false)
programSA(lIP, rIP, spis[delIdx], nil, reverse, false)
}
if newIdx > -1 {