Merge branch 'develop'

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

diff --git a/src/cypherpunks.ru/nncp/node.go b/src/cypherpunks.ru/nncp/node.go
index 7992f4bc8f1ce19d4c6a2b3e7d13f7cd937f1b78..f1fb79ff5bdf8df4b7bca8f44bdc1eb08e3b4802 100644 (file)
--- a/src/cypherpunks.ru/nncp/node.go
+++ b/src/cypherpunks.ru/nncp/node.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2018 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
@@ -42,9 +42,11 @@ type Node struct {
        ExchPub        *[32]byte
        SignPub        ed25519.PublicKey
        NoisePub       *[32]byte
-       Sendmail       []string
+       Exec           map[string][]string
        Incoming       *string
        Freq           *string
+       FreqChunked    int64
+       FreqMinSize    int64
        Via            []*NodeId
        Addrs          map[string]string
        OnlineDeadline uint
@@ -68,7 +70,7 @@ type NodeOur struct {
 type Call struct {
        Cron           *cronexpr.Expression
        Nice           uint8
-       Xx             *TRxTx
+       Xx             TRxTx
        Addr           *string
        OnlineDeadline uint
        MaxOnlineTime  uint
@@ -83,7 +85,10 @@ func NewNodeGenerate() (*NodeOur, error) {
        if err != nil {
                return nil, err
        }
-       noiseKey := noise.DH25519.GenerateKeypair(rand.Reader)
+       noiseKey, err := noise.DH25519.GenerateKeypair(rand.Reader)
+       if err != nil {
+               return nil, err
+       }
        noisePub := new([32]byte)
        noisePrv := new([32]byte)
        copy(noisePrv[:], noiseKey.Private)