ping should not expect a message if it's not sent

synced-pool.go

@@ -383,10 +383,13 @@ func (p *SyncedPool) OwnerChanged(id CartId, host string) error {
 
 func DoPing(host *RemoteHost) error {
 	log.Printf("Pinging remote %s\n", host.Host)
-	SendPacket(host, Ping, func(w io.Writer) error {
+	err := SendPacket(host, Ping, func(w io.Writer) error {
 		return nil
 	})
-	_, err := host.Expect(Pong, time.Second)
+	if err != nil {
+		return err
+	}
+	_, err = host.Expect(Pong, time.Second)
 
 	if err != nil {
 		return err