X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-xfer%2Fmain.go;h=68aa102aa68970c117444499bf51b90951f75b31;hb=891cee4997bb0a269d4b2f35311bab104bdc3283;hp=e565ece351e5eb72a525f2a682e5680104828629;hpb=712399b4547bd499528a20209d469b2eb1aaff28;p=nncp.git

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index e565ece..68aa102 100644
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/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
@@ -29,7 +29,7 @@ import (
 	"path/filepath"
 
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -218,7 +218,7 @@ func main() {
 				continue
 			}
 			pktEnc, pktEncRaw, err := ctx.HdrRead(fd)
-			if err != nil {
+			if err == nil {
 				switch pktEnc.Magic {
 				case nncp.MagicNNCPEv1.B:
 					err = nncp.MagicNNCPEv1.TooOld()
@@ -229,6 +229,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("is not an encrypted packet")
 				}
@@ -475,13 +477,15 @@ Tx:
 				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 {