X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcheck.go;h=5872a1ffd8282cf8639c7ec786590ea4e1fc41af;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=4f0a081479c9e12b3e6a56beae33028ac12c7155;hpb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;p=nncp.git

diff --git a/src/check.go b/src/check.go
index 4f0a081..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
@@ -62,7 +62,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
@@ -79,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 *[MTHSize]byte, mth *MTH) (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)
@@ -103,8 +103,10 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[MTHSize]byte, mth *MTH) (in
 	if mth == nil {
 		gut, err = Check(fd, size, hshValue[:], les, ctx.ShowPrgrs)
 	} else {
-		mth.PktName = pktName
-		if _, err = mth.PrependFrom(bufio.NewReaderSize(fd, MTHSize)); err != nil {
+		if _, err = mth.PreaddFrom(
+			bufio.NewReaderSize(fd, MTHSize),
+			pktName, ctx.ShowPrgrs,
+		); err != nil {
 			return 0, err
 		}
 		if bytes.Compare(mth.Sum(nil), hshValue[:]) == 0 {