squash: feedback

go/beacon_srv/main.go

@@ -292,13 +292,14 @@ func (t *periodicTasks) Start() error {
 	t.running = true
 	topo := t.topoProvider.Get()
 	topoAddress := topo.PublicAddress(addr.SvcBS, cfg.General.ID)
+	if topoAddress == nil {
+		return serrors.New("Unable to find topo address")
+	}
 	bs := &net.UDPAddr{
 		IP:   topoAddress.L3.IP(),
 		Port: int(topoAddress.L4),
 	}
-	if topoAddress == nil {
-		return serrors.New("Unable to find topo address")
-	}
+
 	var err error
 	if t.registrars, err = t.startSegRegRunners(); err != nil {
 		return err

go/examples/discovery_client/client.go

@@ -22,7 +22,6 @@ import (
 	"net"
 	"net/url"
 	"os"
-	"strconv"
 	"sync"
 	"time"
 
@@ -128,11 +127,7 @@ func getTopo() (*topology.Topo, error) {
 		ctx, cancelF := context.WithTimeout(context.Background(), *timeout)
 		defer cancelF()
 
-		ip, sport, err := net.SplitHostPort(*ds)
-		if err != nil {
-			return nil, err
-		}
-		port, err := strconv.Atoi(sport)
+		a, err := net.ResolveUDPAddr("udp", *ds)
 		if err != nil {
 			return nil, err
 		}
@@ -141,10 +136,8 @@ func getTopo() (*topology.Topo, error) {
 			File:  file(),
 			Mode:  mode(),
 			Https: *https,
-		}, &net.UDPAddr{
-			IP:   net.ParseIP(ip),
-			Port: port,
-		}, nil)
+		}, a,
+			nil)
 		return ret, err
 	}
 	log.Info("Load initial topology from disk", "topo", topoPath)

go/lib/discovery/discoveryinfo/info.go

@@ -57,8 +57,9 @@ func New(key string, addr *net.UDPAddr) *Info {
 func (h *Info) Update(a *net.UDPAddr) {
 	h.mu.Lock()
 	defer h.mu.Unlock()
-	if !h.addr.IP.Equal(a.IP) {
-		h.addr = a
+	if !h.addr.IP.Equal(a.IP) || h.addr.Port != a.Port {
+		h.addr.Port = a.Port
+		copy(h.addr.IP, a.IP)
 		h.failCount = 0
 		h.lastFail = time.Now()
 		h.lastExp = time.Now()
@@ -74,6 +75,9 @@ func (h *Info) Key() string {
 func (h *Info) Addr() *net.UDPAddr {
 	h.mu.Lock()
 	defer h.mu.Unlock()
+	ret := &net.UDPAddr{}
+	ret.Port = h.addr.Port
+	copy(ret.IP, h.addr.IP)
 	return h.addr
 }
 

go/lib/discovery/discoverypool/pool.go

@@ -64,7 +64,6 @@ func (p *Pool) Update(svcInfo topology.IDAddrMap) error {
 		} else {
 			info.Update(y)
 		}
-
 	}
 	// Get list of outdated DS servers.
 	var del []string