X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-reass%2Fmain.go;h=77d1c7ee600c1c34f38424bb507ac917c951288d;hb=c2b17fd0fc439e420710f53602604e8823c2fb1d;hp=56ea4ca7c473e0acf9c920ab32e5a6afb4b6f633;hpb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;p=nncp.git

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index 56ea4ca..77d1c7e 100644
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
@@ -35,7 +35,7 @@ import (
 
 	xdr "github.com/davecgh/go-xdr/xdr2"
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -66,8 +66,12 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		})
 		return false
 	}
-	fd.Close() // #nosec G104
-	if metaPkt.Magic != nncp.MagicNNCPMv2 {
+	fd.Close()
+	if metaPkt.Magic == nncp.MagicNNCPMv1.B {
+		ctx.LogE("reass", les, nncp.MagicNNCPMv1.TooOld(), logMsg)
+		return false
+	}
+	if metaPkt.Magic != nncp.MagicNNCPMv2.B {
 		ctx.LogE("reass", les, nncp.BadMagic, logMsg)
 		return false
 	}
@@ -153,13 +157,13 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		}
 		hsh = nncp.MTHNew(fi.Size(), 0)
 		if _, err = nncp.CopyProgressed(
-			hsh, bufio.NewReader(fd), "check",
+			hsh, bufio.NewReaderSize(fd, nncp.MTHBlockSize), "check",
 			nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},
 			ctx.ShowPrgrs,
 		); err != nil {
 			log.Fatalln(err)
 		}
-		fd.Close() // #nosec G104
+		fd.Close()
 		if bytes.Compare(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) != 0 {
 			ctx.LogE(
 				"reass-chunk",
@@ -209,13 +213,13 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 			log.Fatalln("Can not stat file:", err)
 		}
 		if _, err = nncp.CopyProgressed(
-			dstW, bufio.NewReader(fd), "reass",
+			dstW, bufio.NewReaderSize(fd, nncp.MTHBlockSize), "reass",
 			nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},
 			ctx.ShowPrgrs,
 		); err != nil {
 			log.Fatalln(err)
 		}
-		fd.Close() // #nosec G104
+		fd.Close()
 		if !keep {
 			if err = os.Remove(chunkPath); err != nil {
 				ctx.LogE(
@@ -233,8 +237,10 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		log.Fatalln("Can not flush:", err)
 	}
 	if tmp != nil {
-		if err = tmp.Sync(); err != nil {
-			log.Fatalln("Can not sync:", err)
+		if !nncp.NoSync {
+			if err = tmp.Sync(); err != nil {
+				log.Fatalln("Can not sync:", err)
+			}
 		}
 		if err = tmp.Close(); err != nil {
 			log.Fatalln("Can not close:", err)
@@ -294,7 +300,7 @@ func findMetas(ctx *nncp.Ctx, dirPath string) []string {
 		return nil
 	}
 	fis, err := dir.Readdir(0)
-	dir.Close() // #nosec G104
+	dir.Close()
 	if err != nil {
 		ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
 		return nil