/*
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
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
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
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)
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, MTHBlockSize),
+ pktName, ctx.ShowPrgrs,
+ ); err != nil {
return 0, err
}
if bytes.Compare(mth.Sum(nil), hshValue[:]) == 0 {