dht_net: more consistent handling of retry resets; check for streamRe…

…useTries after increment
libp2p · Sep 17, 2017 · c4f4864 · c4f4864
1 parent 9959ee5
commit c4f4864
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/dht_net.go b/dht_net.go
@@ -203,10 +203,11 @@ func (ms *messageSender) SendMessage(ctx context.Context, pmes *pb.Message) erro
 
 		log.Event(ctx, "dhtSentMessage", ms.dht.self, ms.p, pmes)
 
-		if ms.singleMes > streamReuseTries {
-			ms.resetHard()
-		} else if retry {
+		if retry {
 			ms.singleMes++
+			if ms.singleMes > streamReuseTries {
+				ms.resetHard()
+			}
 		}
 
 		return nil
@@ -303,10 +304,9 @@ func (ms *messageSender) SendRequest(ctx context.Context, pmes *pb.Message) (*pb
 
 		if retry {
 			ms.lk.Lock()
+			ms.singleMes++
 			if ms.singleMes > streamReuseTries {
 				ms.resetSoft(rcount)
-			} else {
-				ms.singleMes++
 			}
 			ms.lk.Unlock()
 		}