/*
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
"path/filepath"
"github.com/dustin/go-humanize"
- "go.cypherpunks.ru/nncp/v7"
+ "go.cypherpunks.ru/nncp/v8"
)
func usage() {
continue
}
pktEnc, pktEncRaw, err := ctx.HdrRead(fd)
- if err != nil {
+ if err == nil {
switch pktEnc.Magic {
case nncp.MagicNNCPEv1.B:
err = nncp.MagicNNCPEv1.TooOld()
case nncp.MagicNNCPEv4.B:
err = nncp.MagicNNCPEv4.TooOld()
case nncp.MagicNNCPEv5.B:
+ err = nncp.MagicNNCPEv5.TooOld()
+ case nncp.MagicNNCPEv6.B:
default:
err = errors.New("is not an encrypted packet")
}
fd.Close()
continue
}
- if _, err = fd.Seek(0, 0); err != nil {
+ if _, err = fd.Seek(0, io.SeekStart); err != nil {
log.Fatalln(err)
}
tmp, err := ctx.NewTmpFileWHash()
w.CloseWithError(err)
}
}()
- if _, err = nncp.CopyProgressed(
+ _, err = nncp.CopyProgressed(
tmp.W, r, "Rx",
append(
les,
nncp.LE{K: "FullSize", V: fiInt.Size()},
),
ctx.ShowPrgrs,
- ); err != nil {
+ )
+ fd.Close()
+ if err != nil {
ctx.LogE("xfer-rx", les, err, logMsg)
+ tmp.Cancel()
isBad = true
+ continue
}
- fd.Close()
- if isBad {
+ if err = tmp.W.Flush(); err != nil {
+ ctx.LogE("xfer-rx", les, err, logMsg)
tmp.Cancel()
+ isBad = true
+ continue
+ }
+ if tmp.Checksum() != fiInt.Name() {
+ ctx.LogE("xfer-rx", les, errors.New("checksum mismatch"), logMsg)
+ tmp.Cancel()
+ isBad = true
continue
}
if err = tmp.Commit(filepath.Join(
isBad = true
continue
}
- if err = tmp.Sync(); err != nil {
- tmp.Close()
- ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string {
- return logMsg(les) + ": syncing"
- })
- isBad = true
- continue
+ if !nncp.NoSync {
+ if err = tmp.Sync(); err != nil {
+ tmp.Close()
+ ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string {
+ return logMsg(les) + ": syncing"
+ })
+ isBad = true
+ continue
+ }
}
if err = tmp.Close(); err != nil {
ctx.LogE("xfer-tx-close", les, err, func(les nncp.LEs) string {