squash: feedback from luke

scionproto · Nov 14, 2019 · 64b8436 · 64b8436
1 parent f5037fa
commit 64b8436
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/go/beacon_srv/main.go b/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

diff --git a/go/lib/discovery/discoveryinfo/info.go b/go/lib/discovery/discoveryinfo/info.go
@@ -57,7 +57,7 @@ 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) {
+	if !h.addr.IP.Equal(a.IP) || h.addr.Port != a.Port {
 		h.addr = a
 		h.failCount = 0
 		h.lastFail = time.Now()

diff --git a/go/lib/discovery/discoverypool/pool.go b/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