X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fnncp%2Fcfg.go;h=203752bf8d8d0e2111e94a474500e8c8c530ab09;hb=dd92823db3d72fb21a4c712a7fb052dce16443dd;hp=79ad5cadcc502488892e3bae94764857dfaafaee;hpb=a46ffb69cbf3501ad02386eb9d3dabd1f3ebc90e;p=nncp.git

diff --git a/src/cypherpunks.ru/nncp/cfg.go b/src/cypherpunks.ru/nncp/cfg.go
index 79ad5ca..203752b 100644
--- a/src/cypherpunks.ru/nncp/cfg.go
+++ b/src/cypherpunks.ru/nncp/cfg.go
@@ -4,8 +4,7 @@ Copyright (C) 2016-2019 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -214,12 +213,12 @@ func NewNode(name string, yml NodeYAML) (*Node, error) {
 			return nil, errors.New("xx field must be either \"rx\" or \"tx\"")
 		}
 
-		rxRate := 0
-		if callYml.RxRate != nil && *callYml.RxRate > 0 {
+		rxRate := defRxRate
+		if callYml.RxRate != nil {
 			rxRate = *callYml.RxRate
 		}
-		txRate := 0
-		if callYml.TxRate != nil && *callYml.TxRate > 0 {
+		txRate := defTxRate
+		if callYml.TxRate != nil {
 			txRate = *callYml.TxRate
 		}
 
@@ -371,7 +370,7 @@ func (nodeOur *NodeOur) ToYAML() string {
 
 func CfgParse(data []byte) (*Ctx, error) {
 	var err error
-	if bytes.Compare(data[:8], MagicNNCPBv2[:]) == 0 {
+	if bytes.Compare(data[:8], MagicNNCPBv3[:]) == 0 {
 		os.Stderr.WriteString("Passphrase:")
 		password, err := terminal.ReadPassword(0)
 		if err != nil {