X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fsp.go;h=eca9544945b1e0d734d6b21d692cce85dc68f372;hb=HEAD;hp=4db358742a17b1f584aa102ac853a1c6386c6d13;hpb=128618d02d84d08164060f14e7fdd3b87e491fcb;p=nncp.git

diff --git a/src/sp.go b/src/sp.go
index 4db3587..3bef9c3 100644
--- a/src/sp.go
+++ b/src/sp.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strconv"
 	"sync"
 	"time"
 
@@ -39,6 +40,7 @@ const (
 	MaxSPSize      = 1<<16 - 256
 	PartSuffix     = ".part"
 	SPHeadOverhead = 4
+	CfgDeadline    = "NNCPDEADLINE"
 )
 
 type MTHAndOffset struct {
@@ -132,6 +134,14 @@ type ConnDeadlined interface {
 }
 
 func init() {
+	if v := os.Getenv(CfgDeadline); v != "" {
+		i, err := strconv.Atoi(v)
+		if err != nil {
+			log.Fatalln("Can not convert", CfgDeadline, "to integer:", err)
+		}
+		DefaultDeadline = time.Duration(i) * time.Second
+	}
+
 	var buf bytes.Buffer
 	spHead := SPHead{Type: SPTypeHalt}
 	if _, err := xdr.Marshal(&buf, spHead); err != nil {
@@ -277,21 +287,22 @@ func (state *SPState) dirUnlock() {
 
 func (state *SPState) WriteSP(dst io.Writer, payload []byte, ping bool) error {
 	state.writeSPBuf.Reset()
-	n, err := xdr.Marshal(&state.writeSPBuf, SPRaw{
+	if _, err := xdr.Marshal(&state.writeSPBuf, SPRaw{
 		Magic:   MagicNNCPSv1.B,
 		Payload: payload,
-	})
+	}); err != nil {
+		return err
+	}
+	n, err := dst.Write(state.writeSPBuf.Bytes())
 	if err != nil {
 		return err
 	}
-	if n, err = dst.Write(state.writeSPBuf.Bytes()); err == nil {
-		state.TxLastSeen = time.Now()
-		state.TxBytes += int64(n)
-		if !ping {
-			state.TxLastNonPing = state.TxLastSeen
-		}
+	state.TxLastSeen = time.Now()
+	state.TxBytes += int64(n)
+	if !ping {
+		state.TxLastNonPing = state.TxLastSeen
 	}
-	return err
+	return nil
 }
 
 func (state *SPState) ReadSP(src io.Reader) ([]byte, error) {
@@ -1104,11 +1115,11 @@ func (state *SPState) StartWorkers(
 	return nil
 }
 
-func (state *SPState) Wait() {
+func (state *SPState) Wait() bool {
 	state.wg.Wait()
 	close(state.payloads)
 	close(state.pings)
-	state.Duration = time.Now().Sub(state.started)
+	state.Duration = time.Since(state.started)
 	state.dirUnlock()
 	state.RxSpeed = state.RxBytes
 	state.TxSpeed = state.TxBytes
@@ -1120,12 +1131,15 @@ func (state *SPState) Wait() {
 	if txDuration > 0 {
 		state.TxSpeed = state.TxBytes / txDuration
 	}
+	nothingLeft := len(state.queueTheir) == 0
 	for _, s := range state.fds {
+		nothingLeft = false
 		s.fd.Close()
 	}
 	for pktName := range state.progressBars {
 		ProgressKill(pktName)
 	}
+	return nothingLeft
 }
 
 func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
@@ -1451,18 +1465,20 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
 					humanize.IBytes(uint64(fullsize)),
 				)
 			}
-			err = fd.Sync()
-			if err != nil {
-				state.Ctx.LogE("sp-file-sync", lesp, err, func(les LEs) string {
-					return logMsg(les) + ": syncing"
-				})
-				state.closeFd(filePathPart)
-				continue
+			if !NoSync {
+				err = fd.Sync()
+				if err != nil {
+					state.Ctx.LogE("sp-file-sync", lesp, err, func(les LEs) string {
+						return logMsg(les) + ": syncing"
+					})
+					state.closeFd(filePathPart)
+					continue
+				}
 			}
 			if hasherAndOffset != nil {
 				delete(state.fileHashers, filePath)
 				if hasherAndOffset.mth.PreaddSize() == 0 {
-					if bytes.Compare(hasherAndOffset.mth.Sum(nil), file.Hash[:]) != 0 {
+					if !bytes.Equal(hasherAndOffset.mth.Sum(nil), file.Hash[:]) {
 						state.Ctx.LogE(
 							"sp-file-bad-checksum", lesp,
 							errors.New("checksum mismatch"),