Forbid any later GNU GPL versions autousage

[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 a86f37e2d9eb45add56266860d5d79cd4555d1fe..ac78301f802464dae9c763de4de93495c259f748 100644 (file)
--- a/src/cypherpunks.ru/nncp/node.go
+++ b/src/cypherpunks.ru/nncp/node.go
@@ -1,11 +1,10 @@
 /*
-NNCP -- Node-to-Node CoPy
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+NNCP -- Node to Node copy, utilities for store-and-forward data exchange
+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
@@ -21,6 +20,7 @@ package nncp
 import (
        "crypto/rand"
        "errors"
+       "sync"
 
        "github.com/flynn/noise"
        "golang.org/x/crypto/blake2b"
@@ -35,14 +35,26 @@ func (id NodeId) String() string {
 }
 
 type Node struct {
-       Name     string
-       Id       *NodeId
-       ExchPub  *[32]byte
-       SignPub  ed25519.PublicKey
-       NoisePub *[32]byte
-       Incoming *string
-       Freq     *string
-       Via      []*NodeId
+       Name           string
+       Id             *NodeId
+       ExchPub        *[32]byte
+       SignPub        ed25519.PublicKey
+       NoisePub       *[32]byte
+       Exec           map[string][]string
+       Incoming       *string
+       Freq           *string
+       FreqChunked    int64
+       FreqMinSize    int64
+       Via            []*NodeId
+       Addrs          map[string]string
+       RxRate         int
+       TxRate         int
+       OnlineDeadline uint
+       MaxOnlineTime  uint
+       Calls          []*Call
+
+       Busy bool
+       sync.Mutex
 }
 
 type NodeOur struct {
@@ -64,7 +76,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)