zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-18 22:55:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

added conn closes

Browse Source
This commit is contained in:
worker-9
2021-09-23 09:04:33 -04:00
parent 0551e54dd6
commit 5cf69ebe5b
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netclient/functions/checkin.go
View File

@@ -171,6 +171,7 @@ func Pull(network string, manual bool) (*models.Node, error) {
ncutils.PrintLog("Cant dial GRPC server: "+err.Error(), 1) ncutils.PrintLog("Cant dial GRPC server: "+err.Error(), 1)
return nil, err return nil, err
} }
defer conn.Close()
wcclient := nodepb.NewNodeServiceClient(conn) wcclient := nodepb.NewNodeServiceClient(conn)
ctx, err := auth.SetJWT(wcclient, network) ctx, err := auth.SetJWT(wcclient, network)
@@ -253,6 +254,7 @@ func Push(network string) error {
ncutils.PrintLog("Cant dial GRPC server: "+err.Error(), 1) ncutils.PrintLog("Cant dial GRPC server: "+err.Error(), 1)
return err return err
} }
defer conn.Close()
wcclient = nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)
ctx, err := auth.SetJWT(wcclient, network) ctx, err := auth.SetJWT(wcclient, network)

3
netclient/functions/common.go
View File

@@ -156,7 +156,7 @@ func Uninstall() error {
} else if ncutils.IsMac() { } else if ncutils.IsMac() {
daemon.CleanupMac() daemon.CleanupMac()
} else if !ncutils.IsKernel() { } else if !ncutils.IsKernel() {
ncutils.PrintLog("manual cleanup required",1) ncutils.PrintLog("manual cleanup required", 1)
} }
return err return err
@@ -177,6 +177,7 @@ func LeaveNetwork(network string) error {
if err != nil { if err != nil {
log.Printf("Unable to establish client connection to "+servercfg.GRPCAddress+": %v", err) log.Printf("Unable to establish client connection to "+servercfg.GRPCAddress+": %v", err)
} else { } else {
defer conn.Close()
wcclient = nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)
ctx, err := auth.SetJWT(wcclient, network) ctx, err := auth.SetJWT(wcclient, network)

2
netclient/functions/join.go
View File

@@ -90,7 +90,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
if err != nil { if err != nil {
log.Fatalf("Unable to establish client connection to "+cfg.Server.GRPCAddress+": %v", err) log.Fatalf("Unable to establish client connection to "+cfg.Server.GRPCAddress+": %v", err)
} }
defer conn.Close()
wcclient = nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)
postnode := &models.Node{ postnode := &models.Node{

7
netclient/server/grpc.go
View File

@@ -29,6 +29,7 @@ func getGrpcClient(cfg *config.ClientConfig) (nodepb.NodeServiceClient, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer conn.Close()
wcclient = nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)
return wcclient, nil return wcclient, nil
} }
@@ -138,6 +139,7 @@ func GetPeers(macaddress string, network string, server string, dualstack bool,
if err != nil { if err != nil {
log.Fatalf("Unable to establish client connection to localhost:50051: %v", err) log.Fatalf("Unable to establish client connection to localhost:50051: %v", err)
} }
defer conn.Close()
// Instantiate the BlogServiceClient with our client connection to the server // Instantiate the BlogServiceClient with our client connection to the server
wcclient = nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)
@@ -215,11 +217,11 @@ func GetPeers(macaddress string, network string, server string, dualstack bool,
continue // if can't parse CIDR continue // if can't parse CIDR
} }
nodeEndpointArr := strings.Split(node.Endpoint, ":") // getting the public ip of node nodeEndpointArr := strings.Split(node.Endpoint, ":") // getting the public ip of node
if ipnet.Contains(net.ParseIP(nodeEndpointArr[0])) { // ensuring egress gateway range does not contain public ip of node if ipnet.Contains(net.ParseIP(nodeEndpointArr[0])) { // ensuring egress gateway range does not contain public ip of node
ncutils.PrintLog("egress IP range of "+iprange+" overlaps with "+node.Endpoint+", omitting", 2) ncutils.PrintLog("egress IP range of "+iprange+" overlaps with "+node.Endpoint+", omitting", 2)
continue // skip adding egress range if overlaps with node's ip continue // skip adding egress range if overlaps with node's ip
} }
if ipnet.Contains(net.ParseIP(nodecfg.LocalAddress)) { // ensuring egress gateway range does not contain public ip of node if ipnet.Contains(net.ParseIP(nodecfg.LocalAddress)) { // ensuring egress gateway range does not contain public ip of node
ncutils.PrintLog("egress IP range of "+iprange+" overlaps with "+nodecfg.LocalAddress+", omitting", 2) ncutils.PrintLog("egress IP range of "+iprange+" overlaps with "+nodecfg.LocalAddress+", omitting", 2)
continue // skip adding egress range if overlaps with node's local ip continue // skip adding egress range if overlaps with node's local ip
} }
@@ -293,6 +295,7 @@ func GetExtPeers(macaddress string, network string, server string, dualstack boo
if err != nil { if err != nil {
log.Fatalf("Unable to establish client connection to localhost:50051: %v", err) log.Fatalf("Unable to establish client connection to localhost:50051: %v", err)
} }
defer conn.Close()
// Instantiate the BlogServiceClient with our client connection to the server // Instantiate the BlogServiceClient with our client connection to the server
wcclient = nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)