X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-reass%2Fmain.go;h=e92a2e59307f1d5f2c5580d5d8992053106cb0a6;hb=523ac7e7dd5a2f97711fa369f7a73e43ff7b49bc;hp=827870072e1638e965f253f6f24c71fe32b29aa0;hpb=1c773d7a2acd7fef4b7b1567b59e1601a79d55fe;p=nncp.git

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index 8278700..e92a2e5 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-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 (
 	"fmt"
 	"hash"
 	"io"
+	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -35,13 +36,12 @@ import (
 
 	xdr "github.com/davecgh/go-xdr/xdr2"
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v5"
-	"golang.org/x/crypto/blake2b"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintf(os.Stderr, "nncp-reass -- reassemble chunked files\n\n")
+	fmt.Fprint(os.Stderr, nncp.UsageHeader())
+	fmt.Fprint(os.Stderr, "nncp-reass -- reassemble chunked files\n\n")
 	fmt.Fprintf(os.Stderr, "Usage: %s [options] [FILE.nncp.meta]\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
 	fmt.Fprint(os.Stderr, `
@@ -52,24 +52,34 @@ but at least one of them must be specified.
 
 func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bool {
 	fd, err := os.Open(path)
-	defer fd.Close()
 	if err != nil {
 		log.Fatalln("Can not open file:", err)
 	}
+	defer fd.Close()
 	var metaPkt nncp.ChunkedMeta
+	les := nncp.LEs{{K: "Path", V: path}}
+	logMsg := func(les nncp.LEs) string {
+		return fmt.Sprintf("Reassembling chunked file \"%s\"", path)
+	}
 	if _, err = xdr.Unmarshal(fd, &metaPkt); err != nil {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": path}, err, "bad meta file")
+		ctx.LogE("reass-bad-meta", les, err, func(les nncp.LEs) string {
+			return logMsg(les) + ": bad meta"
+		})
 		return false
 	}
-	fd.Close() // #nosec G104
-	if metaPkt.Magic != nncp.MagicNNCPMv1 {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": path}, nncp.BadMagic, "")
+	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
 	}
 
 	metaName := filepath.Base(path)
 	if !strings.HasSuffix(metaName, nncp.ChunkedSuffixMeta) {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": path}, errors.New("invalid filename suffix"), "")
+		ctx.LogE("reass", les, errors.New("invalid filename suffix"), logMsg)
 		return false
 	}
 	mainName := strings.TrimSuffix(metaName, nncp.ChunkedSuffixMeta)
@@ -105,22 +115,29 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 	allChunksExist := true
 	for chunkNum, chunkPath := range chunksPaths {
 		fi, err := os.Stat(chunkPath)
-		if err != nil && os.IsNotExist(err) {
-			ctx.LogI("nncp-reass", nncp.SDS{"path": path, "chunk": chunkNum}, "missing")
+		lesChunk := append(les, nncp.LE{K: "Chunk", V: chunkNum})
+		if err != nil && errors.Is(err, fs.ErrNotExist) {
+			ctx.LogI("reass-chunk-miss", lesChunk, func(les nncp.LEs) string {
+				return fmt.Sprintf("%s: chunk %d missing", logMsg(les), chunkNum)
+			})
 			allChunksExist = false
 			continue
 		}
 		var badSize bool
 		if chunkNum+1 == len(chunksPaths) {
-			badSize = uint64(fi.Size()) != metaPkt.FileSize%metaPkt.ChunkSize
+			left := metaPkt.FileSize % metaPkt.ChunkSize
+			badSize = left != 0 && uint64(fi.Size()) != left
 		} else {
 			badSize = uint64(fi.Size()) != metaPkt.ChunkSize
 		}
 		if badSize {
 			ctx.LogE(
-				"nncp-reass",
-				nncp.SDS{"path": path, "chunk": chunkNum},
-				errors.New("invalid size"), "",
+				"reass-chunk",
+				lesChunk,
+				errors.New("invalid size"),
+				func(les nncp.LEs) string {
+					return fmt.Sprintf("%s: chunk %d", logMsg(les), chunkNum)
+				},
 			)
 			allChunksExist = false
 		}
@@ -140,26 +157,23 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		if err != nil {
 			log.Fatalln("Can not stat file:", err)
 		}
-		hsh, err = blake2b.New256(nil)
-		if err != nil {
-			log.Fatalln(err)
-		}
+		hsh = nncp.MTHNew(fi.Size(), 0)
 		if _, err = nncp.CopyProgressed(
-			hsh, bufio.NewReader(fd), "check",
-			nncp.SDS{
-				"pkt":      chunkPath,
-				"fullsize": fi.Size(),
-			},
+			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
-		if bytes.Compare(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) != 0 {
+		fd.Close()
+		if !bytes.Equal(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) {
 			ctx.LogE(
-				"nncp-reass",
-				nncp.SDS{"path": path, "chunk": chunkNum},
-				errors.New("checksum is bad"), "",
+				"reass-chunk",
+				nncp.LEs{{K: "Path", V: path}, {K: "Chunk", V: chunkNum}},
+				errors.New("checksum is bad"),
+				func(les nncp.LEs) string {
+					return fmt.Sprintf("%s: chunk %d", logMsg(les), chunkNum)
+				},
 			)
 			allChecksumsGood = false
 		}
@@ -168,23 +182,24 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 		return false
 	}
 	if dryRun {
-		ctx.LogI("nncp-reass", nncp.SDS{"path": path}, "ready")
+		ctx.LogI("reass", nncp.LEs{{K: "path", V: path}}, logMsg)
 		return true
 	}
 
 	var dst io.Writer
 	var tmp *os.File
-	var sds nncp.SDS
 	if stdout {
 		dst = os.Stdout
-		sds = nncp.SDS{"path": path}
+		les = nncp.LEs{{K: "path", V: path}}
 	} else {
 		tmp, err = nncp.TempFile(mainDir, "reass")
 		if err != nil {
 			log.Fatalln(err)
 		}
-		sds = nncp.SDS{"path": path, "tmp": tmp.Name()}
-		ctx.LogD("nncp-reass", sds, "created")
+		les = nncp.LEs{{K: "path", V: path}, {K: "Tmp", V: tmp.Name()}}
+		ctx.LogD("reass-tmp-created", les, func(les nncp.LEs) string {
+			return fmt.Sprintf("%s: temporary %s created", logMsg(les), tmp.Name())
+		})
 		dst = tmp
 	}
 	dstW := bufio.NewWriter(dst)
@@ -200,19 +215,22 @@ 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",
-			nncp.SDS{
-				"pkt":      chunkPath,
-				"fullsize": fi.Size(),
-			},
+			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("nncp-reass", nncp.SdsAdd(sds, nncp.SDS{"chunk": chunkNum}), err, "")
+				ctx.LogE(
+					"reass-chunk",
+					append(les, nncp.LE{K: "Chunk", V: chunkNum}), err,
+					func(les nncp.LEs) string {
+						return fmt.Sprintf("%s: chunk %d", logMsg(les), chunkNum)
+					},
+				)
 				hasErrors = true
 			}
 		}
@@ -221,22 +239,30 @@ 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)
 		}
 	}
-	ctx.LogD("nncp-reass", sds, "written")
+	ctx.LogD("reass-written", les, func(les nncp.LEs) string {
+		return logMsg(les) + ": written"
+	})
 	if !keep {
 		if err = os.Remove(path); err != nil {
-			ctx.LogE("nncp-reass", sds, err, "")
+			ctx.LogE("reass-removing", les, err, func(les nncp.LEs) string {
+				return logMsg(les) + ": removing"
+			})
 			hasErrors = true
 		}
 	}
 	if stdout {
-		ctx.LogI("nncp-reass", nncp.SDS{"path": path}, "done")
+		ctx.LogI("reass", nncp.LEs{{K: "Path", V: path}}, func(les nncp.LEs) string {
+			return logMsg(les) + ": done"
+		})
 		return !hasErrors
 	}
 
@@ -245,7 +271,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 	dstPathCtr := 0
 	for {
 		if _, err = os.Stat(dstPath); err != nil {
-			if os.IsNotExist(err) {
+			if errors.Is(err, fs.ErrNotExist) {
 				break
 			}
 			log.Fatalln(err)
@@ -259,21 +285,26 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
 	if err = nncp.DirSync(mainDir); err != nil {
 		log.Fatalln(err)
 	}
-	ctx.LogI("nncp-reass", nncp.SDS{"path": path}, "done")
+	ctx.LogI("reass", nncp.LEs{{K: "Path", V: path}}, func(les nncp.LEs) string {
+		return logMsg(les) + ": done"
+	})
 	return !hasErrors
 }
 
 func findMetas(ctx *nncp.Ctx, dirPath string) []string {
 	dir, err := os.Open(dirPath)
-	defer dir.Close()
+	logMsg := func(les nncp.LEs) string {
+		return "Finding .meta in " + dirPath
+	}
 	if err != nil {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": dirPath}, err, "")
+		ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
 		return nil
 	}
+	defer dir.Close()
 	fis, err := dir.Readdir(0)
-	dir.Close() // #nosec G104
+	dir.Close()
 	if err != nil {
-		ctx.LogE("nncp-reass", nncp.SDS{"path": dirPath}, err, "")
+		ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
 		return nil
 	}
 	metaPaths := make([]string, 0)
@@ -303,6 +334,7 @@ func main() {
 		version   = flag.Bool("version", false, "Print version information")
 		warranty  = flag.Bool("warranty", false, "Print warranty information")
 	)
+	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
 	flag.Parse()
 	if *warranty {