From 58fa867235fd9905e49033e0cbfb4f944f3f029e Mon Sep 17 00:00:00 2001
From: Akilan <me@akilan.io>
Date: Wed, 12 Feb 2025 19:52:56 +0000
Subject: [PATCH] added changes to test p2prc

---
 .DS_Store          | Bin 8196 -> 8196 bytes
 core/escape-NAT.go | 109 +++++++++++++++++++++------------------------
 main.go            |  27 +++++------
 3 files changed, 66 insertions(+), 70 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index f707242e4491f91aef2b904f36e4ec7999d85052..bc227fd7d0b5f409dd6f4af20351bf84d4a7e331 100644
GIT binary patch
delta 46
zcmV+}0MY-1K!iY$PXQFMP`eKS6q5`Ple5(j`~j2w5;C)$6NLe@QVg{Nvj-UV1hIGr
E1C6o}xc~qF

delta 247
zcmZp1XmOa}&nU4mU^hRb#AF_U$?Dt;$qe}nc?@X`nGER+dJI_%#UQ?CPJVJyPJR*t
z1A_nq17r8*2?E?qvTO_m3^@#?K!ur@N+$ORIo9(r6fvYS<N}Q-0n+IVi9mKLSXUxL
zC90uJ=|F?|{(}L~8U_YVpx%5S%*Evl21lTdIwT!zKpmw($Lj$dodGg^^F5&w#*M{K
TnKrXad}EocE26rw_z@ETrQkuy

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()