X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-bundle%2Fmain.go;h=d5603a99b1ab8cc2082cc219f46a3fb065321c14;hb=736537b32863e22660c8c4246c71bb4c320d2086;hp=da2aafdbc568996b243b52d419042c44dba6f411;hpb=acb393c45ae15e4d7c45a157e16851f7cb52ca48;p=nncp.git

diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index da2aafd..d5603a9 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,7 +34,7 @@ import (
 
 	xdr "github.com/davecgh/go-xdr/xdr2"
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 const (
@@ -187,7 +187,7 @@ func main() {
 					if err = os.Remove(job.Path); err != nil {
 						log.Fatalln("Error during deletion:", err)
 					} else if ctx.HdrUsage {
-						os.Remove(job.Path + nncp.HdrSuffix)
+						os.Remove(nncp.JobPath2Hdr(job.Path))
 					}
 				}
 				ctx.LogI(
@@ -221,7 +221,7 @@ func main() {
 				if err == io.EOF {
 					break
 				}
-				bufStdin.Discard(bufStdin.Buffered() - (len(nncp.NNCPBundlePrefix) - 1)) // #nosec G104
+				bufStdin.Discard(bufStdin.Buffered() - (len(nncp.NNCPBundlePrefix) - 1))
 				continue
 			}
 			if _, err = bufStdin.Discard(prefixIdx); err != nil {
@@ -316,6 +316,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")
 			}
@@ -376,7 +378,7 @@ func main() {
 					if !*dryRun {
 						os.Remove(dstPath)
 						if ctx.HdrUsage {
-							os.Remove(dstPath + nncp.HdrSuffix)
+							os.Remove(nncp.JobPath2Hdr(dstPath))
 						}
 					}
 				} else {
@@ -416,7 +418,9 @@ func main() {
 				})
 				continue
 			}
-			if _, err = os.Stat(dstPath + nncp.SeenSuffix); err == nil || !os.IsNotExist(err) {
+			if _, err = os.Stat(filepath.Join(
+				dstDirPath, nncp.SeenDir, pktName,
+			)); err == nil || !os.IsNotExist(err) {
 				ctx.LogD("bundle-rx-seen", les, func(les nncp.LEs) string {
 					return logMsg(les) + ": packet already seen"
 				})