send record fixes to peers who send outdated records

whyrusleeping · whyrusleeping · commit 81645b981e7f · 2015-11-19T11:24:59.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/routing/dht/dht.go b/routing/dht/dht.go
@@ -173,7 +173,9 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.ID,
 		err = dht.verifyRecordOnline(ctx, record)
 		if err != nil {
 			log.Info("Received invalid record! (discarded)")
-			return nil, nil, err
+			// still return a non-nil record to signify that we received
+			// a bad record from this peer
+			record = new(pb.Record)
 		}
 		return record, peers, nil
 	}
diff --git a/routing/dht/routing.go b/routing/dht/routing.go
@@ -91,7 +91,9 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key key.Key) ([]byte, error) {
 
 	var recs [][]byte
 	for _, v := range vals {
-		recs = append(recs, v.Val)
+		if v.Val != nil {
+			recs = append(recs, v.Val)
+		}
 	}
 
 	i, err := dht.Selector.BestRecord(key, recs)
@@ -170,6 +172,14 @@ func (dht *IpfsDHT) GetValues(ctx context.Context, key key.Key, nvals int) ([]ro
 
 		rec, peers, err := dht.getValueOrPeers(ctx, p, key)
 		if err != nil {
+			if err == routing.ErrNotFound {
+				// in this case, they responded with nothing,
+				// still send a notification
+				notif.PublishQueryEvent(parent, &notif.QueryEvent{
+					Type: notif.PeerResponse,
+					ID:   p,
+				})
+			}
 			return nil, err
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,9 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.ID,`
`173`	`173`	`err = dht.verifyRecordOnline(ctx, record)`
`174`	`174`	`if err != nil {`
`175`	`175`	`log.Info("Received invalid record! (discarded)")`
`176`		`- return nil, nil, err`
	`176`	`+ // still return a non-nil record to signify that we received`
	`177`	`+ // a bad record from this peer`
	`178`	`+ record = new(pb.Record)`
`177`	`179`	`}`
`178`	`180`	`return record, peers, nil`
`179`	`181`	`}`