zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 01:07:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed egress to use id

Browse Source
This commit is contained in:
0xdcarns
2022-01-11 10:58:20 -05:00
parent e2ffcd4b3c
commit 9af3688b24
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/gateway.go
View File

@@ -44,10 +44,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
postDownCmd = node.PostDown + "; " + postDownCmd postDownCmd = node.PostDown + "; " + postDownCmd
} }
} }
key, err := GetRecordKey(gateway.NodeID, gateway.NetID)
if err != nil {
return node, err
}
node.PostUp = postUpCmd node.PostUp = postUpCmd
node.PostDown = postDownCmd node.PostDown = postDownCmd
node.SetLastModified() node.SetLastModified()
@@ -56,7 +53,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
if err != nil { if err != nil {
return node, err return node, err
} }
if err = database.Insert(key, string(nodeData), database.NODES_TABLE_NAME); err != nil { if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil {
return models.Node{}, err return models.Node{}, err
} }
if err = NetworkNodesUpdatePullChanges(node.Network); err != nil { if err = NetworkNodesUpdatePullChanges(node.Network); err != nil {
@@ -65,6 +62,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
return node, nil return node, nil
} }
// ValidateEgressGateway - validates the egress gateway model
func ValidateEgressGateway(gateway models.EgressGatewayRequest) error { func ValidateEgressGateway(gateway models.EgressGatewayRequest) error {
var err error var err error

2
netclient/auth/auth.go
View File

@@ -55,6 +55,7 @@ func AutoLogin(client nodepb.NodeServiceClient, network string) error {
node := models.Node{ node := models.Node{
Password: pass, Password: pass,
MacAddress: cfg.Node.MacAddress, MacAddress: cfg.Node.MacAddress,
ID: cfg.Node.ID,
Network: network, Network: network,
} }
data, err := json.Marshal(&node) data, err := json.Marshal(&node)
@@ -64,6 +65,7 @@ func AutoLogin(client nodepb.NodeServiceClient, network string) error {
login := &nodepb.Object{ login := &nodepb.Object{
Data: string(data), Data: string(data),
Type: nodepb.NODE_TYPE,
} }
// RPC call // RPC call
res, err := client.Login(context.TODO(), login) res, err := client.Login(context.TODO(), login)