diff --git a/.DS_Store b/.DS_Store index f707242..bc227fd 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/core/escape-NAT.go b/core/escape-NAT.go index b96d547..5bdb6bd 100644 --- a/core/escape-NAT.go +++ b/core/escape-NAT.go @@ -1,62 +1,57 @@ package core -import ( - "github.com/Akilan1999/p2p-rendering-computation/p2p/frp" - "time" -) - // EscapeNAT Func to escape NAT // - 1 port for server // - 2 port for barrierKVM -func EscapeNAT(ScreenSharePort, GameplayServerPort string) (ServerPort string, ScreensharePort string, err error) { - // Get free port from P2PRC server node - serverPort, err := frp.GetFRPServerPort("http://64.227.168.102:8088") - - if err != nil { - return - } - - time.Sleep(1 * time.Second) - - // port for the remote gameplay server - ServerPort, err = frp.StartFRPClientForServer("64.227.168.102", serverPort, GameplayServerPort) - if err != nil { - return - } - - // Get free port from P2PRC server node - ScreensharePortFRP, err := frp.GetFRPServerPort("http://64.227.168.102:8088") - - if err != nil { - return - } - - time.Sleep(1 * time.Second) - - // port for the screenshare port - ScreensharePort, err = frp.StartFRPClientForServer("64.227.168.102", ScreensharePortFRP, ScreenSharePort) - if err != nil { - return - } - - return -} - -func EscapeNATBarrier() (barrierKVMport string, err error) { - // Get free port from P2PRC server node - serverPort, err := frp.GetFRPServerPort("http://64.227.168.102:8088") - - if err != nil { - return - } - - time.Sleep(1 * time.Second) - - //port for the barrierKVM server - barrierKVMport, err = frp.StartFRPClientForServer("64.227.168.102", serverPort, "24798") - if err != nil { - return - } - - return -} +//func EscapeNAT(ScreenSharePort, GameplayServerPort string) (ServerPort string, ScreensharePort string, err error) { +// // Get free port from P2PRC server node +// serverPort, err := frp.GetFRPServerPort("http://64.227.168.102:8088") +// +// if err != nil { +// return +// } +// +// time.Sleep(1 * time.Second) +// +// // port for the remote gameplay server +// ServerPort, err = frp.StartFRPClientForServer("64.227.168.102", serverPort, GameplayServerPort) +// if err != nil { +// return +// } +// +// // Get free port from P2PRC server node +// ScreensharePortFRP, err := frp.GetFRPServerPort("http://64.227.168.102:8088") +// +// if err != nil { +// return +// } +// +// time.Sleep(1 * time.Second) +// +// // port for the screenshare port +// ScreensharePort, err = frp.StartFRPClientForServer("64.227.168.102", ScreensharePortFRP, ScreenSharePort) +// if err != nil { +// return +// } +// +// return +//} +// +//func EscapeNATBarrier() (barrierKVMport string, err error) { +// // Get free port from P2PRC server node +// serverPort, err := frp.GetFRPServerPort("http://64.227.168.102:8088") +// +// if err != nil { +// return +// } +// +// time.Sleep(1 * time.Second) +// +// //port for the barrierKVM server +// barrierKVMport, err = frp.StartFRPClientForServer("64.227.168.102", serverPort, "24798") +// if err != nil { +// return +// } +// +// return +//} diff --git a/main.go b/main.go index 10fc751..bd626c5 100644 --- a/main.go +++ b/main.go @@ -51,12 +51,13 @@ func main() { // if barrier flag is provided if *barrier { - natBarrier, err := core.EscapeNATBarrier() - if err != nil { - fmt.Println(err) - return - } - Config.NATEscapeBarrierPort = natBarrier + //natBarrier, err := core.EscapeNATBarrier() + //if err != nil { + // fmt.Println(err) + // return + //} + //Config.NATEscapeBarrierPort = natBarrier + Config.NATEscapeBarrierPort = "0" err = Config.WriteConfig() if err != nil { return @@ -114,14 +115,14 @@ func main() { } // running implementation to escape NAT - GameServerPort, ScreenSharePort, err := core.EscapeNAT(Config.InternalScreenSharePort, Config.InternalGameServerPort) - if err != nil { - log.Fatalln(err) - } + //GameServerPort, ScreenSharePort, err := core.EscapeNAT(Config.InternalScreenSharePort, Config.InternalGameServerPort) + //if err != nil { + // log.Fatalln(err) + //} - Config.IPAddress = "64.227.168.102" - Config.NATEscapeGameServerPort = GameServerPort - Config.NATEscapeScreenSharePort = ScreenSharePort + //Config.IPAddress = "64.227.168.102" + //Config.NATEscapeGameServerPort = GameServerPort + //Config.NATEscapeScreenSharePort = ScreenSharePort Config.NATEscapeBarrierPort = "" err = Config.WriteConfig()