refactor: rename
Conceptually, an OverlaySwitch is just a single Overlay.
This commit is contained in:
1 parent
aa44b66a31
commit
9f79e5be54
1 file changed
+7
-7
+7
-7
@@ -130,7 +130,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
config.ProtocolMinVersion = byte(protocolMinVersion)
|
config.ProtocolMinVersion = byte(protocolMinVersion)
|
||||||
|
|
||||||
overlays, bridge := createOverlay(datapathName, ifaceName, config.Port, bufSzMB)
|
overlay, bridge := createOverlay(datapathName, ifaceName, config.Port, bufSzMB)
|
||||||
networkConfig.Bridge = bridge
|
networkConfig.Bridge = bridge
|
||||||
|
|
||||||
if password == "" {
|
if password == "" {
|
||||||
@@ -178,7 +178,7 @@ func main() {
|
|||||||
Log.Fatal("Unable to parse trusted subnets: ", err)
|
Log.Fatal("Unable to parse trusted subnets: ", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
router := weave.NewNetworkRouter(config, networkConfig, name, nickName, overlays)
|
router := weave.NewNetworkRouter(config, networkConfig, name, nickName, overlay)
|
||||||
Log.Println("Our name is", router.Ourself)
|
Log.Println("Our name is", router.Ourself)
|
||||||
|
|
||||||
var dockerCli *docker.Client
|
var dockerCli *docker.Client
|
||||||
@@ -293,7 +293,7 @@ func (nopPacketLogging) LogForwardPacket(string, weave.ForwardPacketKey) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func createOverlay(datapathName string, ifaceName string, port int, bufSzMB int) (weave.NetworkOverlay, weave.Bridge) {
|
func createOverlay(datapathName string, ifaceName string, port int, bufSzMB int) (weave.NetworkOverlay, weave.Bridge) {
|
||||||
overlays := weave.NewOverlaySwitch()
|
overlay := weave.NewOverlaySwitch()
|
||||||
var bridge weave.Bridge
|
var bridge weave.Bridge
|
||||||
switch {
|
switch {
|
||||||
case datapathName != "" && ifaceName != "":
|
case datapathName != "" && ifaceName != "":
|
||||||
@@ -302,7 +302,7 @@ func createOverlay(datapathName string, ifaceName string, port int, bufSzMB int)
|
|||||||
fastdp, err := weave.NewFastDatapath(datapathName, port)
|
fastdp, err := weave.NewFastDatapath(datapathName, port)
|
||||||
checkFatal(err)
|
checkFatal(err)
|
||||||
bridge = fastdp.Bridge()
|
bridge = fastdp.Bridge()
|
||||||
overlays.Add("fastdp", fastdp.Overlay())
|
overlay.Add("fastdp", fastdp.Overlay())
|
||||||
case ifaceName != "":
|
case ifaceName != "":
|
||||||
iface, err := weavenet.EnsureInterface(ifaceName)
|
iface, err := weavenet.EnsureInterface(ifaceName)
|
||||||
checkFatal(err)
|
checkFatal(err)
|
||||||
@@ -312,9 +312,9 @@ func createOverlay(datapathName string, ifaceName string, port int, bufSzMB int)
|
|||||||
bridge = weave.NullBridge{}
|
bridge = weave.NullBridge{}
|
||||||
}
|
}
|
||||||
sleeve := weave.NewSleeveOverlay(port)
|
sleeve := weave.NewSleeveOverlay(port)
|
||||||
overlays.Add("sleeve", sleeve)
|
overlay.Add("sleeve", sleeve)
|
||||||
overlays.SetCompatOverlay(sleeve)
|
overlay.SetCompatOverlay(sleeve)
|
||||||
return overlays, bridge
|
return overlay, bridge
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseAndCheckCIDR(cidrStr string) address.CIDR {
|
func parseAndCheckCIDR(cidrStr string) address.CIDR {
|
||||||
|
|||||||
Reference in new issue
Block a user