me/p2p-rendering-computation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker port map fix

Browse Source
This commit is contained in:
Akilan Selvacoumar
2023-01-18 22:09:04 +00:00
parent 1fb248d12d
commit c5a7f85941
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
p2p/frp/client.go
View File

@@ -71,14 +71,14 @@ func StartFRPClientForServer(ipaddress string, port string, localport string) (s
}
func StartFRPCDockerContainer(ipaddress string, port string, docker *docker.DockerVM) error {
func StartFRPCDockerContainer(ipaddress string, port string, docker *docker.DockerVM) (*docker.DockerVM, error) {
// Setup server information
var s Server
s.address = ipaddress
// convert port to int
portInt, err := strconv.Atoi(port)
if err != nil {
return err
return nil, err
}
s.port = portInt
@@ -95,7 +95,12 @@ func StartFRPCDockerContainer(ipaddress string, port string, docker *docker.Dock
portMap := docker.Ports.PortSet[i].ExternalPort
clientMapping.LocalIP = "localhost"
clientMapping.LocalPort = portMap
clientMapping.RemotePort = portMap
OpenPorts, err := freeport.GetFreePorts(1)
if err != nil {
return nil, err
}
clientMapping.RemotePort = OpenPorts[0]
docker.Ports.PortSet[i].ExternalPort = OpenPorts[0]
// Append to array
clientMappings = append(clientMappings, clientMapping)
}
@@ -103,7 +108,7 @@ func StartFRPCDockerContainer(ipaddress string, port string, docker *docker.Dock
// Start client server
go c.StartFRPClient()
return nil
return docker, nil
}

2
server/server.go
View File

@@ -117,7 +117,7 @@ func Server() error {
}
if ProxyIpAddr.Ipv4 != "" {
err := frp.StartFRPCDockerContainer(ProxyIpAddr.Ipv4, ProxyIpAddr.ProxyPort, resp)
resp, err = frp.StartFRPCDockerContainer(ProxyIpAddr.Ipv4, ProxyIpAddr.ProxyPort, resp)
if err != nil {
c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
}