X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcheck.go;h=6a1b18ab846b19fe87cb5ec588fbf5aa96089b62;hb=cf9363f956cb2d93a581c11ed65c5b02910d10d5;hp=d6a98fac805f3bcbff2b84af5da4ef804424d56c;hpb=f458bb8a2be143e8f7933956e890c082ba4a4b92;p=nncp.git diff --git a/src/check.go b/src/check.go index d6a98fa..6a1b18a 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 +Copyright (C) 2016-2023 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 @@ -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 @@ -104,7 +108,7 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[MTHSize]byte, mth MTH) (int gut, err = Check(fd, size, hshValue[:], les, ctx.ShowPrgrs) } else { if _, err = mth.PreaddFrom( - bufio.NewReaderSize(fd, MTHSize), + bufio.NewReaderSize(fd, MTHBlockSize), pktName, ctx.ShowPrgrs, ); err != nil { return 0, err