/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 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
import (
"bufio"
"bytes"
+ "errors"
"io"
"log"
+ "os"
"golang.org/x/crypto/blake2b"
)
-func Check(src io.Reader, checksum []byte) (bool, error) {
+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 = io.Copy(hsh, bufio.NewReader(src)); err != nil {
+ if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", les, showPrgrs); err != nil {
return false, err
}
return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil
}
-func (ctx *Ctx) checkXx(nodeId *NodeId, xx TRxTx) bool {
+func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool {
isBad := false
for job := range ctx.Jobs(nodeId, xx) {
- sds := SDS{
- "xx": string(xx),
- "node": nodeId,
- "pkt": ToBase32(job.HshValue[:]),
+ les := LEs{
+ {"XX", string(xx)},
+ {"Node", nodeId},
+ {"Pkt", Base32Codec.EncodeToString(job.HshValue[:])},
+ {"FullSize", job.Size},
}
- ctx.LogP("check", sds, "")
- gut, err := Check(job.Fd, job.HshValue[:])
- job.Fd.Close()
+ fd, err := os.Open(job.Path)
if err != nil {
- ctx.LogE("check", SdsAdd(sds, SDS{"err": err}), "")
- return false
+ ctx.LogE("check", les, err, "")
+ return true
+ }
+ gut, err := Check(fd, job.HshValue[:], les, ctx.ShowPrgrs)
+ fd.Close() // #nosec G104
+ if err != nil {
+ ctx.LogE("check", les, err, "")
+ return true
}
if !gut {
isBad = true
- ctx.LogE("check", sds, "bad")
+ ctx.LogE("check", les, errors.New("bad"), "")
}
}
return isBad
}
func (ctx *Ctx) Check(nodeId *NodeId) bool {
- return ctx.checkXx(nodeId, TRx) || ctx.checkXx(nodeId, TTx)
+ return !(ctx.checkXxIsBad(nodeId, TRx) || ctx.checkXxIsBad(nodeId, TTx))
}