X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-xfer%2Fmain.go;h=6790e6ca96494c6b68ad075b522b3ad4feed4811;hb=cf9363f956cb2d93a581c11ed65c5b02910d10d5;hp=a1ef5fa5d51c438179b33450f7876352d62d5242;hpb=2cad23b498bbb9fc1e929b4900b40e520017c614;p=nncp.git

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index a1ef5fa..6790e6c 100644
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.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
@@ -209,6 +209,24 @@ func main() {
 					ctx.NodeName(nodeId), filename,
 				)
 			}
+			if _, err = os.Stat(filepath.Join(
+				ctx.Spool,
+				nodeId.String(),
+				string(nncp.TRx),
+				nncp.SeenDir,
+				fiInt.Name(),
+			)); err == nil || !os.IsNotExist(err) {
+				ctx.LogI("xfer-rx-seen", les, func(les nncp.LEs) string {
+					return logMsg(les) + ": packet already seen"
+				})
+				if !*keep {
+					if err = os.Remove(filename); err != nil {
+						ctx.LogE("xfer-rx-remove", les, err, logMsg)
+						isBad = true
+					}
+				}
+				continue
+			}
 			fd, err := os.Open(filename)
 			if err != nil {
 				ctx.LogE("xfer-rx-open", les, err, func(les nncp.LEs) string {
@@ -275,7 +293,9 @@ func main() {
 			}
 			r, w := io.Pipe()
 			go func() {
-				_, err := io.CopyN(w, bufio.NewReader(fd), fiInt.Size())
+				_, err := io.CopyN(
+					w, bufio.NewReaderSize(fd, nncp.MTHBlockSize), fiInt.Size(),
+				)
 				if err == nil {
 					err = w.Close()
 				}
@@ -436,14 +456,6 @@ Tx:
 				})
 				continue
 			}
-			if _, err = os.Stat(filepath.Join(
-				dstPath, nncp.SeenDir, pktName,
-			)); err == nil || !os.IsNotExist(err) {
-				ctx.LogD("xfer-tx-seen", les, func(les nncp.LEs) string {
-					return logMsg(les) + ": already seen"
-				})
-				continue
-			}
 			tmp, err := nncp.TempFile(dstPath, "xfer")
 			if err != nil {
 				ctx.LogE("xfer-tx-mktemp", les, err, func(les nncp.LEs) string {
@@ -467,7 +479,7 @@ Tx:
 			}
 			bufW := bufio.NewWriter(tmp)
 			copied, err := nncp.CopyProgressed(
-				bufW, bufio.NewReader(fd), "Tx",
+				bufW, bufio.NewReaderSize(fd, nncp.MTHBlockSize), "Tx",
 				append(les, nncp.LE{K: "FullSize", V: job.Size}),
 				ctx.ShowPrgrs,
 			)