X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-cfgmin%2Fmain.go;h=f0ddb940dda1c7a8e2c0dd75ce98c6aaa19865fc;hb=b47dbfe6687569650fa544a4ecf3e4ea388390cb;hp=7214079040daacfb0ad7f85c190130caa60ddedb;hpb=dd887c15fa21071a2f4931f7248e10c4ab1029d2;p=nncp.git

diff --git a/src/cmd/nncp-cfgmin/main.go b/src/cmd/nncp-cfgmin/main.go
index 7214079..f0ddb94 100644
--- a/src/cmd/nncp-cfgmin/main.go
+++ b/src/cmd/nncp-cfgmin/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
@@ -25,7 +25,7 @@ import (
 	"os"
 
 	"github.com/hjson/hjson-go"
-	"go.cypherpunks.ru/nncp/v5"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -41,6 +41,7 @@ func main() {
 		version  = flag.Bool("version", false, "Print version information")
 		warranty = flag.Bool("warranty", false, "Print warranty information")
 	)
+	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
 	flag.Parse()
 	if *warranty {
@@ -52,7 +53,7 @@ func main() {
 		return
 	}
 
-	ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false)
+	ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false, false, false)
 	if err != nil {
 		log.Fatalln("Error during initialization:", err)
 	}
@@ -65,13 +66,13 @@ func main() {
 	for _, node := range ctx.Neigh {
 		var noisePub *string
 		if node.NoisePub != nil {
-			np := nncp.ToBase32(node.NoisePub[:])
+			np := nncp.Base32Codec.EncodeToString(node.NoisePub[:])
 			noisePub = &np
 		}
 		cfg.Neigh[node.Name] = nncp.NodeJSON{
 			Id:       node.Id.String(),
-			ExchPub:  nncp.ToBase32(node.ExchPub[:]),
-			SignPub:  nncp.ToBase32(node.SignPub[:]),
+			ExchPub:  nncp.Base32Codec.EncodeToString(node.ExchPub[:]),
+			SignPub:  nncp.Base32Codec.EncodeToString(node.SignPub[:]),
 			NoisePub: noisePub,
 		}
 	}