Review feedback

nameserver/entry.go

@@ -108,7 +108,7 @@ func (e1 *Entry) addLowercase() {
 	e1.lHostname = strings.ToLower(e1.Hostname)
 }
 
-func (e *Entry) makeTombstone() {
+func (e *Entry) tombstone() {
 	e.Version++
 	e.Tombstone = now()
 }
@@ -190,7 +190,7 @@ func (es *Entries) tombstone(ourname mesh.PeerName, f func(*Entry) bool) Entries
 	tombstoned := Entries{}
 	for i, e := range *es {
 		if f(&e) && e.Origin == ourname {
-			e.makeTombstone()
+			e.tombstone()
 			(*es)[i] = e
 			tombstoned = append(tombstoned, e)
 		}

nameserver/nameserver.go

@@ -203,11 +203,8 @@ func (n *Nameserver) receiveGossip(msg []byte) (mesh.GossipData, mesh.GossipData
 		return nil, nil, fmt.Errorf("clock skew of %d detected", delta)
 	}
 
-	n.Lock()
-	isKnownPeer := n.isKnownPeer
-	n.Unlock() // Don't hold the lock over call out to code elsewhere
 	gossip.Entries.filter(func(e *Entry) bool {
-		return isKnownPeer(e.Origin)
+		return n.isKnownPeer(e.Origin)
 	})
 
 	n.Lock()
@@ -216,6 +213,7 @@ func (n *Nameserver) receiveGossip(msg []byte) (mesh.GossipData, mesh.GossipData
 	// Check entries claiming to originate from us against our current data
 	gossip.Entries.filter(func(e *Entry) bool {
 		if e.Origin == n.ourName {
+			n.infof("Received entry like mine: %v", e)
 			if ourEntry, ok := n.entries.findEqual(e); ok {
 				if ourEntry.Version < e.Version ||
 					(ourEntry.Version == e.Version && ourEntry.Tombstone != e.Tombstone) {
@@ -225,7 +223,7 @@ func (n *Nameserver) receiveGossip(msg []byte) (mesh.GossipData, mesh.GossipData
 					e.Version = higherVersion + 1
 				}
 			} else { // We have no entry matching the one that came in with us as Origin
-				e.makeTombstone()
+				e.tombstone()
 			}
 		}
 		return true
@@ -241,13 +239,15 @@ func (n *Nameserver) receiveGossip(msg []byte) (mesh.GossipData, mesh.GossipData
 // merge received data into state and return "everything new I've
 // just learnt", or nil if nothing in the received data was new
 func (n *Nameserver) OnGossip(msg []byte) (mesh.GossipData, error) {
+	n.infof("Received gossip")
 	newEntries, _, err := n.receiveGossip(msg)
 	return newEntries, err
 }
 
 // merge received data into state and return a representation of
 // the received data, for further propagation
 func (n *Nameserver) OnGossipBroadcast(s mesh.PeerName, msg []byte) (mesh.GossipData, error) {
+	n.infof("Received gossip broadcast from %s", s)
 	_, entries, err := n.receiveGossip(msg)
 	return entries, err
 }