X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-cfgnew%2Fmain.go;h=798f31cdb534f0e893ba495211df0611c3d136b5;hb=561313b1994a8fadac5152bbdc7a980881fd93e0;hp=70bd1dcd4d190fb5bea47d8a59312748cb2fd372;hpb=11516a2bbce2b39bda71cf716eaeaf1ffb62314a;p=nncp.git

diff --git a/src/cmd/nncp-cfgnew/main.go b/src/cmd/nncp-cfgnew/main.go
index 70bd1dc..798f31c 100644
--- a/src/cmd/nncp-cfgnew/main.go
+++ b/src/cmd/nncp-cfgnew/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 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
@@ -82,16 +82,16 @@ func main() {
 			nncp.DefaultSpoolPath,
 			nncp.DefaultLogPath,
 			nodeOur.Id.String(),
-			nncp.ToBase32(nodeOur.ExchPub[:]),
-			nncp.ToBase32(nodeOur.ExchPrv[:]),
-			nncp.ToBase32(nodeOur.SignPub[:]),
-			nncp.ToBase32(nodeOur.SignPrv[:]),
-			nncp.ToBase32(nodeOur.NoisePrv[:]),
-			nncp.ToBase32(nodeOur.NoisePub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.ExchPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.ExchPrv[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.SignPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.SignPrv[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.NoisePrv[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.NoisePub[:]),
 			nodeOur.Id.String(),
-			nncp.ToBase32(nodeOur.ExchPub[:]),
-			nncp.ToBase32(nodeOur.SignPub[:]),
-			nncp.ToBase32(nodeOur.NoisePub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.ExchPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.SignPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.NoisePub[:]),
 			nncp.DefaultSendmailPath,
 		)
 	} else {
@@ -102,6 +102,8 @@ func main() {
   log: %s
   # Enforce specified umask usage
   # umask: "022"
+  # Omit progress showing by default
+  # noprogress: true
 
   # Enable notification email sending
   # notify: {
@@ -208,6 +210,14 @@ func main() {
     #   #     txrate: 20
     #   #     xx: rx
     #   #     addr: lan
+    #   #     when-tx-exists: true
+    #   #
+    #   #     autotoss: false
+    #   #     autotoss-doseen: true
+    #   #     autotoss-nofile: true
+    #   #     autotoss-nofreq: true
+    #   #     autotoss-noexec: true
+    #   #     autotoss-notrns: true
     #   #   },
     #   # ]
     # }
@@ -216,16 +226,16 @@ func main() {
 			nncp.DefaultSpoolPath,
 			nncp.DefaultLogPath,
 			nodeOur.Id.String(),
-			nncp.ToBase32(nodeOur.ExchPub[:]),
-			nncp.ToBase32(nodeOur.ExchPrv[:]),
-			nncp.ToBase32(nodeOur.SignPub[:]),
-			nncp.ToBase32(nodeOur.SignPrv[:]),
-			nncp.ToBase32(nodeOur.NoisePrv[:]),
-			nncp.ToBase32(nodeOur.NoisePub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.ExchPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.ExchPrv[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.SignPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.SignPrv[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.NoisePrv[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.NoisePub[:]),
 			nodeOur.Id.String(),
-			nncp.ToBase32(nodeOur.ExchPub[:]),
-			nncp.ToBase32(nodeOur.SignPub[:]),
-			nncp.ToBase32(nodeOur.NoisePub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.ExchPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.SignPub[:]),
+			nncp.Base32Codec.EncodeToString(nodeOur.NoisePub[:]),
 			nncp.DefaultSendmailPath,
 			nncp.DefaultSendmailPath,
 		)