X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcheck.go;h=bd191034fe5191c5bf5136eabf377713792d7206;hb=ffe4b2fbf50c031e9c002f2395957859cb4787cc;hp=7a3d5b8041a42a11059b763a5a2ac3e285c54646;hpb=4859da5e7e24cb8ba262d8e5d793b9070c2d00b6;p=nncp.git

diff --git a/src/check.go b/src/check.go
index 7a3d5b8..bd19103 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
@@ -37,7 +37,11 @@ func Check(
 	showPrgrs bool,
 ) (bool, error) {
 	hsh := MTHNew(size, 0)
-	if _, err := CopyProgressed(hsh, bufio.NewReaderSize(src, MTHSize), "check", les, showPrgrs); err != nil {
+	if _, err := CopyProgressed(
+		hsh,
+		bufio.NewReaderSize(src, MTHBlockSize),
+		"check", les, showPrgrs,
+	); err != nil {
 		return false, err
 	}
 	return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil
@@ -62,7 +66,7 @@ func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool {
 			return true
 		}
 		gut, err := Check(fd, job.Size, job.HshValue[:], les, ctx.ShowPrgrs)
-		fd.Close() // #nosec G104
+		fd.Close()
 		if err != nil {
 			ctx.LogE("checking", les, err, logMsg)
 			return true
@@ -103,8 +107,10 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[MTHSize]byte, mth MTH) (int
 	if mth == nil {
 		gut, err = Check(fd, size, hshValue[:], les, ctx.ShowPrgrs)
 	} else {
-		mth.SetPktName(pktName)
-		if _, err = mth.PrependFrom(bufio.NewReaderSize(fd, MTHSize)); err != nil {
+		if _, err = mth.PreaddFrom(
+			bufio.NewReaderSize(fd, MTHBlockSize),
+			pktName, ctx.ShowPrgrs,
+		); err != nil {
 			return 0, err
 		}
 		if bytes.Compare(mth.Sum(nil), hshValue[:]) == 0 {