gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-28 01:52:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #798 from gravitl/feature_v0.11.0_add_commid

Browse source 
added comms id field to nodes
This commit is contained in:
dcarns 2022-02-18 16:14:43 -05:00 committed by GitHub
commit 93bcdb225a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/node_grpc.go
View file

@ -92,6 +92,12 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object)
Server: key, Server: key,
} }
commID, err := logic.FetchCommsNetID()
if err != nil {
return nil, err
}
node.CommID = commID
err = logic.CreateNode(&node) err = logic.CreateNode(&node)
if err != nil { if err != nil {
return nil, err return nil, err

28
models/node.go
View file

@ -10,15 +10,23 @@ import (
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
const TEN_YEARS_IN_SECONDS = 300000000 const (
const MAX_NAME_LENGTH = 62 // NODE_SERVER_NAME - the default server name
NODE_SERVER_NAME = "netmaker"
// == ACTIONS == (can only be set by GRPC) // TEN_YEARS_IN_SECONDS - ten years in seconds
const NODE_UPDATE_KEY = "updatekey" TEN_YEARS_IN_SECONDS = 300000000
const NODE_SERVER_NAME = "netmaker" // MAX_NAME_LENGTH - max name length of node
const NODE_DELETE = "delete" MAX_NAME_LENGTH = 62
const NODE_IS_PENDING = "pending" // == ACTIONS == (can only be set by GRPC)
const NODE_NOOP = "noop" // NODE_UPDATE_KEY - action to update key
NODE_UPDATE_KEY = "updatekey"
// NODE_DELETE - delete node action
NODE_DELETE = "delete"
// NODE_IS_PENDING - node pending status
NODE_IS_PENDING = "pending"
// NODE_NOOP - node no op action
NODE_NOOP = "noop"
)
var seededRand *rand.Rand = rand.New( var seededRand *rand.Rand = rand.New(
rand.NewSource(time.Now().UnixNano())) rand.NewSource(time.Now().UnixNano()))
@ -46,7 +54,6 @@ type Node struct {
LastPeerUpdate int64 `json:"lastpeerupdate" bson:"lastpeerupdate" yaml:"lastpeerupdate"` LastPeerUpdate int64 `json:"lastpeerupdate" bson:"lastpeerupdate" yaml:"lastpeerupdate"`
LastCheckIn int64 `json:"lastcheckin" bson:"lastcheckin" yaml:"lastcheckin"` LastCheckIn int64 `json:"lastcheckin" bson:"lastcheckin" yaml:"lastcheckin"`
MacAddress string `json:"macaddress" bson:"macaddress" yaml:"macaddress" validate:"macaddress_unique"` MacAddress string `json:"macaddress" bson:"macaddress" yaml:"macaddress" validate:"macaddress_unique"`
// checkin interval is depreciated at the network level. Set on server with CHECKIN_INTERVAL
Password string `json:"password" bson:"password" yaml:"password" validate:"required,min=6"` Password string `json:"password" bson:"password" yaml:"password" validate:"required,min=6"`
Network string `json:"network" bson:"network" yaml:"network" validate:"network_exists"` Network string `json:"network" bson:"network" yaml:"network" validate:"network_exists"`
IsRelayed string `json:"isrelayed" bson:"isrelayed" yaml:"isrelayed"` IsRelayed string `json:"isrelayed" bson:"isrelayed" yaml:"isrelayed"`
@ -72,6 +79,7 @@ type Node struct {
OS string `json:"os" bson:"os" yaml:"os"` OS string `json:"os" bson:"os" yaml:"os"`
MTU int32 `json:"mtu" bson:"mtu" yaml:"mtu"` MTU int32 `json:"mtu" bson:"mtu" yaml:"mtu"`
Version string `json:"version" bson:"version" yaml:"version"` Version string `json:"version" bson:"version" yaml:"version"`
CommID string `json:"commid" bson:"commid" yaml:"comid"`
TrafficKeys TrafficKeys `json:"traffickeys" bson:"traffickeys" yaml:"traffickeys"` TrafficKeys TrafficKeys `json:"traffickeys" bson:"traffickeys" yaml:"traffickeys"`
} }