Fix invalid -rx/-tx arguments processing

[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 8b3a012732cdea009e647511faa0921eaa2caf2d..1ea490309ff45b2146d3e6b22b0317d6b222508e 100644 (file)
--- a/src/cypherpunks.ru/nncp/node.go
+++ b/src/cypherpunks.ru/nncp/node.go
@@ -21,8 +21,10 @@ package nncp
 import (
        "crypto/rand"
        "errors"
+       "sync"
 
        "github.com/flynn/noise"
+       "github.com/gorhill/cronexpr"
        "golang.org/x/crypto/blake2b"
        "golang.org/x/crypto/ed25519"
        "golang.org/x/crypto/nacl/box"
@@ -35,16 +37,24 @@ func (id NodeId) String() string {
 }
 
 type Node struct {
-       Name     string
-       Id       *NodeId
-       ExchPub  *[32]byte
-       SignPub  ed25519.PublicKey
-       NoisePub *[32]byte
-       Sendmail []string
-       Incoming *string
-       Freq     *string
-       Via      []*NodeId
-       Addrs    map[string]string
+       Name           string
+       Id             *NodeId
+       ExchPub        *[32]byte
+       SignPub        ed25519.PublicKey
+       NoisePub       *[32]byte
+       Sendmail       []string
+       Incoming       *string
+       Freq           *string
+       FreqChunked    int64
+       FreqMinSize    int64
+       Via            []*NodeId
+       Addrs          map[string]string
+       OnlineDeadline uint
+       MaxOnlineTime  uint
+       Calls          []*Call
+
+       Busy bool
+       sync.Mutex
 }
 
 type NodeOur struct {
@@ -57,6 +67,15 @@ type NodeOur struct {
        NoisePrv *[32]byte
 }
 
+type Call struct {
+       Cron           *cronexpr.Expression
+       Nice           uint8
+       Xx             TRxTx
+       Addr           *string
+       OnlineDeadline uint
+       MaxOnlineTime  uint
+}
+
 func NewNodeGenerate() (*NodeOur, error) {
        exchPub, exchPrv, err := box.GenerateKey(rand.Reader)
        if err != nil {