X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-bundle%2Fmain.go;h=28423b42fd031740507a677534c895162ddfc96a;hb=c2b17fd0fc439e420710f53602604e8823c2fb1d;hp=42a9417be18d53f94c2e24d8605ef264763d3ede;hpb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;p=nncp.git diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go index 42a9417..28423b4 100644 --- a/src/cmd/nncp-bundle/main.go +++ b/src/cmd/nncp-bundle/main.go @@ -37,10 +37,6 @@ import ( "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") @@ -165,7 +161,7 @@ func main() { 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}, @@ -208,11 +204,11 @@ func main() { 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) } @@ -316,6 +312,8 @@ func main() { 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") } @@ -471,7 +469,7 @@ func main() { 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) } @@ -481,8 +479,10 @@ func main() { 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)