From b8820ff150d4596cfaa19c4c974c0cdf6a2325ca Mon Sep 17 00:00:00 2001 From: Akilan Date: Sat, 21 Jan 2023 03:53:43 +0000 Subject: [PATCH] added back FRPDocker --- p2p/frp/client.go | 5 ++--- server/server.go | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/p2p/frp/client.go b/p2p/frp/client.go index d1b4ac8..4eeecb6 100644 --- a/p2p/frp/client.go +++ b/p2p/frp/client.go @@ -1,7 +1,6 @@ package frp import ( - "fmt" "git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker" "github.com/fatedier/frp/client" "github.com/fatedier/frp/pkg/config" @@ -121,8 +120,8 @@ func StartFRPCDockerContainer(ipaddress string, port string, docker *docker.Dock return nil, err } - fmt.Println(portInt) - docker.Ports.PortSet[i].ExternalPort = portInt + PointerDocker := &docker.Ports.PortSet[i] + PointerDocker.ExternalPort = portInt // Append to array //clientMappings = append(clientMappings, clientMapping) diff --git a/server/server.go b/server/server.go index ae49312..fc8fbc3 100644 --- a/server/server.go +++ b/server/server.go @@ -116,12 +116,12 @@ func Server() error { c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err)) } - //if ProxyIpAddr.Ipv4 != "" { - // resp, err = frp.StartFRPCDockerContainer(ProxyIpAddr.Ipv4, ProxyIpAddr.ProxyPort, resp) - // if err != nil { - // c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err)) - // } - //} + if ProxyIpAddr.Ipv4 != "" { + resp, err = frp.StartFRPCDockerContainer(ProxyIpAddr.Ipv4, ProxyIpAddr.ProxyPort, resp) + if err != nil { + c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err)) + } + } c.JSON(http.StatusOK, resp) })