/*
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
"go.cypherpunks.ru/nncp/v8"
)
-const (
- CopyBufSize = 1 << 17
-)
-
func usage() {
fmt.Fprintf(os.Stderr, nncp.UsageHeader())
fmt.Fprintf(os.Stderr, "nncp-bundle -- Create/digest stream of NNCP encrypted packets\n\n")
log.Fatalln("Error writing tar header:", err)
}
if _, err = nncp.CopyProgressed(
- tarWr, bufio.NewReader(fd), "Tx",
+ tarWr, bufio.NewReaderSize(fd, nncp.MTHBlockSize), "Tx",
append(les, nncp.LEs{
{K: "Pkt", V: nncp.Base32Codec.EncodeToString(job.HshValue[:])},
{K: "FullSize", V: job.Size},
log.Fatalln("Error during tar closing:", err)
}
} else {
- bufStdin := bufio.NewReaderSize(os.Stdin, CopyBufSize*2)
+ bufStdin := bufio.NewReaderSize(os.Stdin, nncp.MTHBlockSize*2)
pktEncBuf := make([]byte, nncp.PktEncOverhead)
var pktEnc *nncp.PktEnc
for {
- peeked, err := bufStdin.Peek(CopyBufSize)
+ peeked, err := bufStdin.Peek(nncp.MTHBlockSize)
if err != nil && err != io.EOF {
log.Fatalln("Error during reading:", err)
}
case nncp.MagicNNCPEv4.B:
err = nncp.MagicNNCPEv4.TooOld()
case nncp.MagicNNCPEv5.B:
+ err = nncp.MagicNNCPEv5.TooOld()
+ case nncp.MagicNNCPEv6.B:
default:
err = errors.New("Bad packet magic number")
}
if err != nil {
log.Fatalln("Error during temporary file creation:", err)
}
- bufTmp := bufio.NewWriterSize(tmp, CopyBufSize)
+ bufTmp := bufio.NewWriterSize(tmp, nncp.MTHBlockSize)
if _, err = bufTmp.Write(pktEncBuf); err != nil {
log.Fatalln("Error during writing:", err)
}
if err = bufTmp.Flush(); err != nil {
log.Fatalln("Error during flushing:", err)
}
- if err = tmp.Sync(); err != nil {
- log.Fatalln("Error during syncing:", err)
+ if !nncp.NoSync {
+ if err = tmp.Sync(); err != nil {
+ log.Fatalln("Error during syncing:", err)
+ }
}
if err = tmp.Close(); err != nil {
log.Fatalln("Error during closing:", err)