Merge branch 'develop'

[nncp.git] / src / cypherpunks.ru / nncp / cfg.go

diff --git a/src/cypherpunks.ru/nncp/cfg.go b/src/cypherpunks.ru/nncp/cfg.go
index 79ad5cadcc502488892e3bae94764857dfaafaee..bcd547ec91c5e13cbc6052d69c6164e35e9c3f6f 100644 (file)
--- a/src/cypherpunks.ru/nncp/cfg.go
+++ b/src/cypherpunks.ru/nncp/cfg.go
@@ -214,12 +214,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 +371,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 {