diff --git a/vendor/git.novox.be/novox/mesh-sdk/go/compose/network.go b/vendor/git.novox.be/novox/mesh-sdk/go/compose/network.go index afc8363c..1e66c516 100644 --- a/vendor/git.novox.be/novox/mesh-sdk/go/compose/network.go +++ b/vendor/git.novox.be/novox/mesh-sdk/go/compose/network.go @@ -74,10 +74,7 @@ func (c *composer) overlayRange() string { } // network builds the private network over the machines that resolved the module for it. A machine is on it because it -// was given the module, or because it is joining with a key and an address (novox/hq ADR 0169), or because its own set -// could not be resolved and it holds a place (a key and an address): that place is its last good one on the network, and -// it does not change because its modules failed, so every other machine keeps its path to it -- the hub above all -- and -// only its own declaration is refused (issue 1833). A machine refused with no place is left off. +// was given the module, or because it is joining with a key and an address (novox/hq ADR 0169). func (c *composer) network(on map[string]bool, refused map[string]string) (*overlay.Generator, error) { tunnels := c.in.Tunnels carried := c.in.CarriedPeers @@ -88,15 +85,9 @@ func (c *composer) network(on map[string]bool, refused map[string]string) (*over var nodes []overlay.Node for _, node := range c.in.sorted() { p := node.Place - placed := p.Key != "" && p.Address != "" - _, wasRefused := refused[node.Name] - if !on[node.Name] && !((isJoining[node.Name] || wasRefused) && placed) { + if !on[node.Name] && !(isJoining[node.Name] && p.Key != "" && p.Address != "") { continue } - if !on[node.Name] && wasRefused && !isJoining[node.Name] { - c.say("%s could not be resolved and keeps its place on the private network at %s, so the others keep their path to it", - node.Name, p.Address) - } n := overlay.Node{ Name: node.Name, Key: p.Key, Endpoint: p.Endpoint, Site: p.Site, Hub: p.Hub, Address: p.Address, @@ -242,9 +233,7 @@ func (c *composer) whereEveryoneIs() (map[string]string, error) { } // onTheNetwork is every placed machine that resolves the private network: has an address AND runs what puts it there -// (novox/hq issue 079). A machine that does not resolve keeps its place when it holds one (a key and an address), by the -// same rule as network(), so its name and its address stay where the tunnel to it does (issue 1833); one without is not -// counted, and said. +// (novox/hq issue 079). A machine that does not resolve is not counted, and said. func (c *composer) onTheNetwork() []Node { var out []Node for _, n := range c.in.sorted() { @@ -258,12 +247,6 @@ func (c *composer) onTheNetwork() []Node { catalogue.Node{Name: n.Name, Site: n.Place.Site, Capabilities: n.Capabilities}, catalogue.World{Unchecked: true, Holdings: c.in.Holdings}) if err != nil { - if n.Place.Key != "" { - c.say("%s could not be resolved and keeps its place on the private network at %s, so the others keep their path to it", - n.Name, n.Place.Address) - out = append(out, n) - continue - } c.say("%s is not counted as on the network: it does not resolve: %v", n.Name, err) continue }