X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-bundle%2Fmain.go;h=28423b42fd031740507a677534c895162ddfc96a;hb=c2b17fd0fc439e420710f53602604e8823c2fb1d;hp=52ce4f61fe0eb1016d8effa4118d68718033eff4;hpb=0639e0c1eb295d1a8e2be31c906ee22394a51d20;p=nncp.git

diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index 52ce4f6..28423b4 100644
--- a/src/cmd/nncp-bundle/main.go
+++ b/src/cmd/nncp-bundle/main.go
@@ -1,6 +1,6 @@
 /*
 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
@@ -34,11 +34,7 @@ import (
 
 	xdr "github.com/davecgh/go-xdr/xdr2"
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v7"
-)
-
-const (
-	CopyBufSize = 1 << 17
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -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)