X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcheck.go;h=5872a1ffd8282cf8639c7ec786590ea4e1fc41af;hb=2cad23b498bbb9fc1e929b4900b40e520017c614;hp=2569e6af15c360d334e7e650d00cfacdae7679f1;hpb=97b64e04266a9abe0e468532d066bb9f36a5f0cf;p=nncp.git

diff --git a/src/check.go b/src/check.go
index 2569e6a..5872a1f 100644
--- a/src/check.go
+++ b/src/check.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
@@ -21,22 +21,23 @@ import (
 	"bufio"
 	"bytes"
 	"errors"
+	"fmt"
 	"io"
-	"log"
 	"os"
 	"path/filepath"
-
-	"golang.org/x/crypto/blake2b"
 )
 
 const NoCKSuffix = ".nock"
 
-func Check(src io.Reader, checksum []byte, les LEs, showPrgrs bool) (bool, error) {
-	hsh, err := blake2b.New256(nil)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", les, showPrgrs); err != nil {
+func Check(
+	src io.Reader,
+	size int64,
+	checksum []byte,
+	les LEs,
+	showPrgrs bool,
+) (bool, error) {
+	hsh := MTHNew(size, 0)
+	if _, err := CopyProgressed(hsh, bufio.NewReaderSize(src, MTHSize), "check", les, showPrgrs); err != nil {
 		return false, err
 	}
 	return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil
@@ -45,26 +46,30 @@ func Check(src io.Reader, checksum []byte, les LEs, showPrgrs bool) (bool, error
 func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool {
 	isBad := false
 	for job := range ctx.Jobs(nodeId, xx) {
+		pktName := Base32Codec.EncodeToString(job.HshValue[:])
 		les := LEs{
 			{"XX", string(xx)},
 			{"Node", nodeId},
-			{"Pkt", Base32Codec.EncodeToString(job.HshValue[:])},
+			{"Pkt", pktName},
 			{"FullSize", job.Size},
 		}
+		logMsg := func(les LEs) string {
+			return fmt.Sprintf("Checking: %s/%s/%s", nodeId, string(xx), pktName)
+		}
 		fd, err := os.Open(job.Path)
 		if err != nil {
-			ctx.LogE("check", les, err, "")
+			ctx.LogE("checking", les, err, logMsg)
 			return true
 		}
-		gut, err := Check(fd, job.HshValue[:], les, ctx.ShowPrgrs)
-		fd.Close() // #nosec G104
+		gut, err := Check(fd, job.Size, job.HshValue[:], les, ctx.ShowPrgrs)
+		fd.Close()
 		if err != nil {
-			ctx.LogE("check", les, err, "")
+			ctx.LogE("checking", les, err, logMsg)
 			return true
 		}
 		if !gut {
 			isBad = true
-			ctx.LogE("check", les, errors.New("bad"), "")
+			ctx.LogE("checking", les, errors.New("bad"), logMsg)
 		}
 	}
 	return isBad
@@ -74,7 +79,7 @@ func (ctx *Ctx) Check(nodeId *NodeId) bool {
 	return !(ctx.checkXxIsBad(nodeId, TRx) || ctx.checkXxIsBad(nodeId, TTx))
 }
 
-func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[32]byte) (int64, error) {
+func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[MTHSize]byte, mth MTH) (int64, error) {
 	dirToSync := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
 	pktName := Base32Codec.EncodeToString(hshValue[:])
 	pktPath := filepath.Join(dirToSync, pktName)
@@ -82,11 +87,11 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[32]byte) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+	defer fd.Close()
 	fi, err := fd.Stat()
 	if err != nil {
 		return 0, err
 	}
-	defer fd.Close()
 	size := fi.Size()
 	les := LEs{
 		{"XX", string(TRx)},
@@ -94,12 +99,38 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[32]byte) (int64, error) {
 		{"Pkt", pktName},
 		{"FullSize", size},
 	}
-	gut, err := Check(fd, hshValue[:], les, ctx.ShowPrgrs)
+	var gut bool
+	if mth == nil {
+		gut, err = Check(fd, size, hshValue[:], les, ctx.ShowPrgrs)
+	} else {
+		if _, err = mth.PreaddFrom(
+			bufio.NewReaderSize(fd, MTHSize),
+			pktName, ctx.ShowPrgrs,
+		); err != nil {
+			return 0, err
+		}
+		if bytes.Compare(mth.Sum(nil), hshValue[:]) == 0 {
+			gut = true
+		}
+	}
 	if err != nil || !gut {
 		return 0, errors.New("checksum mismatch")
 	}
 	if err = os.Rename(pktPath+NoCKSuffix, pktPath); err != nil {
 		return 0, err
 	}
-	return size, DirSync(dirToSync)
+	if err = DirSync(dirToSync); err != nil {
+		return size, err
+	}
+	if ctx.HdrUsage {
+		if _, err = fd.Seek(0, io.SeekStart); err != nil {
+			return size, err
+		}
+		_, pktEncRaw, err := ctx.HdrRead(fd)
+		if err != nil {
+			return size, err
+		}
+		ctx.HdrWrite(pktEncRaw, pktPath)
+	}
+	return size, err
 }