From 0a1332755146314b71c98e5d661a7b54a4d5abb0 Mon Sep 17 00:00:00 2001
From: Akilan <me@akilan.io>
Date: Fri, 23 Aug 2024 04:32:59 +0100
Subject: [PATCH] enabled TLS

---
 p2p/frp/client.go | 11 ++++++++++-
 server/server.go  |  2 --
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/p2p/frp/client.go b/p2p/frp/client.go
index 75ae6f7..54aa07b 100644
--- a/p2p/frp/client.go
+++ b/p2p/frp/client.go
@@ -1,13 +1,14 @@
 package frp
 
 import (
+    defaultConfig "github.com/Akilan1999/p2p-rendering-computation/config"
     "github.com/Akilan1999/p2p-rendering-computation/server/docker"
     "github.com/fatedier/frp/client"
     "github.com/fatedier/frp/pkg/config"
+    "github.com/phayes/freeport"
     "math/rand"
     "strconv"
     "time"
-    "github.com/phayes/freeport"
 )
 
 // Client This struct stores
@@ -144,6 +145,11 @@ func (c *Client) StartFRPClient() error {
 
     cfg := config.GetDefaultClientConf()
 
+    Config, err := defaultConfig.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
+
     var proxyConfs map[string]config.ProxyConf
     var visitorCfgs map[string]config.VisitorConf
 
@@ -151,6 +157,9 @@ func (c *Client) StartFRPClient() error {
 
     cfg.ServerAddr = c.Server.address
     cfg.ServerPort = c.Server.port
+    cfg.TLSEnable = true
+    cfg.TLSKeyFile = Config.KeyFile
+    cfg.TLSCertFile = Config.PemFile
 
     for i, _ := range c.ClientMappings {
         var tcpcnf config.TCPProxyConf
diff --git a/server/server.go b/server/server.go
index f2eea43..8140e48 100644
--- a/server/server.go
+++ b/server/server.go
@@ -377,8 +377,6 @@ func MapPort(port string, domainName string) (string, string, error) {
 	// random large number
 	lowestLatency = 10000000
 
-	fmt.Println("here --------------------------------")
-
 	for i, _ := range table.IpAddress {
 		// Checks if the ping is the lowest and if the following node is acting as a proxy
 		//if table.IpAddress[i].Latency.Milliseconds() < lowestLatency && table.IpAddress[i].ProxyPort != "" {