libnetwork/d/overlay: drop miss flags from peerAdd

corhere · corhere · commit 6ee58c2d29d7 · 2024-01-26T15:38:13.000-05:00
as all callers unconditionally set them to false.

Signed-off-by: Cory Snider &lt;csnider@mirantis.com&gt;
diff --git a/libnetwork/drivers/overlay/joinleave.go b/libnetwork/drivers/overlay/joinleave.go
@@ -107,7 +107,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
 		}
 	}
 
-	d.peerAdd(nid, eid, ep.addr.IP, ep.addr.Mask, ep.mac, d.advertiseAddress, false, false, true)
+	d.peerAdd(nid, eid, ep.addr.IP, ep.addr.Mask, ep.mac, d.advertiseAddress, true)
 
 	if err = d.checkEncryption(nid, nil, true, true); err != nil {
 		log.G(context.TODO()).Warn(err)
@@ -189,7 +189,7 @@ func (d *driver) EventNotify(etype driverapi.EventType, nid, tableName, key stri
 		return
 	}
 
-	d.peerAdd(nid, eid, addr.IP, addr.Mask, mac, vtep, false, false, false)
+	d.peerAdd(nid, eid, addr.IP, addr.Mask, mac, vtep, false)
 }
 
 // Leave method is invoked when a Sandbox detaches from an endpoint.
diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go
@@ -262,10 +262,10 @@ func (d *driver) peerInitOp(nid string) error {
 	})
 }
 
-func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, l2Miss, l3Miss, localPeer bool) {
+func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, localPeer bool) {
 	d.peerOpMu.Lock()
 	defer d.peerOpMu.Unlock()
-	err := d.peerAddOp(nid, eid, peerIP, peerIPMask, peerMac, vtep, l2Miss, l3Miss, true, localPeer)
+	err := d.peerAddOp(nid, eid, peerIP, peerIPMask, peerMac, vtep, false, false, true, localPeer)
 	if err != nil {
 		log.G(context.TODO()).WithError(err).Warn("Peer add operation failed")
 	}

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- d.peerAdd(nid, eid, ep.addr.IP, ep.addr.Mask, ep.mac, d.advertiseAddress, false, false, true)`
	`110`	`+ d.peerAdd(nid, eid, ep.addr.IP, ep.addr.Mask, ep.mac, d.advertiseAddress, true)`
`111`	`111`
`112`	`112`	`if err = d.checkEncryption(nid, nil, true, true); err != nil {`
`113`	`113`	`log.G(context.TODO()).Warn(err)`
`@@ -189,7 +189,7 @@ func (d *driver) EventNotify(etype driverapi.EventType, nid, tableName, key stri`
`189`	`189`	`return`
`190`	`190`	`}`
`191`	`191`
`192`		`- d.peerAdd(nid, eid, addr.IP, addr.Mask, mac, vtep, false, false, false)`
	`192`	`+ d.peerAdd(nid, eid, addr.IP, addr.Mask, mac, vtep, false)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`// Leave method is invoked when a Sandbox detaches from an endpoint.`
Original file line number	Diff line number	Diff line change
`@@ -262,10 +262,10 @@ func (d *driver) peerInitOp(nid string) error {`
`262`	`262`	`})`
`263`	`263`	`}`
`264`	`264`
`265`		`-func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, l2Miss, l3Miss, localPeer bool) {`
	`265`	`+func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, localPeer bool) {`
`266`	`266`	`d.peerOpMu.Lock()`
`267`	`267`	`defer d.peerOpMu.Unlock()`
`268`		`- err := d.peerAddOp(nid, eid, peerIP, peerIPMask, peerMac, vtep, l2Miss, l3Miss, true, localPeer)`
	`268`	`+ err := d.peerAddOp(nid, eid, peerIP, peerIPMask, peerMac, vtep, false, false, true, localPeer)`
`269`	`269`	`if err != nil {`
`270`	`270`	`log.G(context.TODO()).WithError(err).Warn("Peer add operation failed")`
`271`	`271`	`}`