X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-reass%2Fmain.go;h=d095f95d041ba4b1c99cc2513828f2e2cce057b7;hb=891cee4997bb0a269d4b2f35311bab104bdc3283;hp=f39d5ace3475a3af79600fca91bcd0fd3fd34d46;hpb=510478b83a2808262f7167fffe5296b489a2bf03;p=nncp.git diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go index f39d5ac..d095f95 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-2020 Sergey Matveev +Copyright (C) 2016-2022 Sergey Matveev 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,8 +35,7 @@ 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() { @@ -57,19 +56,29 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo log.Fatalln("Can not open file:", err) } 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() - if metaPkt.Magic != nncp.MagicNNCPMv1 { - ctx.LogE("nncp-reass", nncp.SDS{"path": path}, nncp.BadMagic, "") + 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,8 +114,11 @@ 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) + lesChunk := append(les, nncp.LE{K: "Chunk", V: chunkNum}) if err != nil && os.IsNotExist(err) { - ctx.LogI("nncp-reass", nncp.SDS{"path": path, "chunk": chunkNum}, "missing") + ctx.LogI("reass-chunk-miss", lesChunk, func(les nncp.LEs) string { + return fmt.Sprintf("%s: chunk %d missing", logMsg(les), chunkNum) + }) allChunksExist = false continue } @@ -118,9 +130,12 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo } 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,16 +155,10 @@ 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(), - }, + nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}}, ctx.ShowPrgrs, ); err != nil { log.Fatalln(err) @@ -157,9 +166,12 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo fd.Close() if bytes.Compare(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) != 0 { 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 +180,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) @@ -201,10 +214,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo } if _, err = nncp.CopyProgressed( dstW, bufio.NewReader(fd), "reass", - nncp.SDS{ - "pkt": chunkPath, - "fullsize": fi.Size(), - }, + nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}}, ctx.ShowPrgrs, ); err != nil { log.Fatalln(err) @@ -212,7 +222,13 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo 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,20 +237,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) } - tmp.Close() } - 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 } @@ -257,21 +283,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 } fis, err := dir.Readdir(0) 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) @@ -301,6 +332,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 {