From 136243d6a56142b372b5e671d63661b18377fe82 Mon Sep 17 00:00:00 2001
From: Akilan <me@akilan.io>
Date: Fri, 14 Jul 2023 16:30:20 +0100
Subject: [PATCH] added new IPTable entries

---
 .DS_Store                        | Bin 8196 -> 10244 bytes
 Docs/.DS_Store                   | Bin 0 -> 6148 bytes
 abstractions/init.go             |  32 ++--
 config/generate/generateFiles.go | 250 +++++++++++++++----------------
 p2p/ip_table.json                |  27 ++--
 5 files changed, 156 insertions(+), 153 deletions(-)
 create mode 100644 Docs/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index f3f8a5dd319a12b265eac204c64a4446a02421f8..48af73fccd22dfc6d2e78552d3a86f8cebc58feb 100644
GIT binary patch
literal 10244
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
PKYio*yN_xA=l%a*HCG#t

delta 118
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7`UYH$S8FW*&i$jFW|g)F#JE
za%{Gi<YZ=K-0UiIiAj(ds2T_)xPgQ#NaM!B@640=RRTE}A;vLGj^~**SxCkRtm8Zr
E00cr7M*si-

diff --git a/Docs/.DS_Store b/Docs/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/abstractions/init.go b/abstractions/init.go
index 06a4d2c..81ac369 100644
--- a/abstractions/init.go
+++ b/abstractions/init.go
@@ -1,27 +1,27 @@
 package abstractions
 
 import (
-	"github.com/Akilan1999/p2p-rendering-computation/config"
-	"github.com/Akilan1999/p2p-rendering-computation/config/generate"
-	"github.com/Akilan1999/p2p-rendering-computation/server"
-	"github.com/gin-gonic/gin"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config/generate"
+    "github.com/Akilan1999/p2p-rendering-computation/server"
+    "github.com/gin-gonic/gin"
 )
 
 // Init Initialises p2prc
-func Init(name string, customConfig interface{}) (config *config.Config, err error) {
-	// set the config file with default paths
-	config, err = generate.SetDefaults(name, false, customConfig, false)
-	if err != nil {
-		return
-	}
-	return
+func Init(customConfig interface{}) (config *config.Config, err error) {
+    // set the config file with default paths
+    config, err = generate.SetDefaults("P2PRC", false, customConfig, false)
+    if err != nil {
+        return
+    }
+    return
 }
 
 // Start p2prc in a server mode
 func Start() (*gin.Engine, error) {
-	engine, err := server.Server()
-	if err != nil {
-		return nil, err
-	}
-	return engine, nil
+    engine, err := server.Server()
+    if err != nil {
+        return nil, err
+    }
+    return engine, nil
 }
diff --git a/config/generate/generateFiles.go b/config/generate/generateFiles.go
index c7f499f..64fe1ee 100644
--- a/config/generate/generateFiles.go
+++ b/config/generate/generateFiles.go
@@ -1,163 +1,163 @@
 package generate
 
 import (
-	"github.com/Akilan1999/p2p-rendering-computation/p2p"
-	"github.com/go-git/go-git/v5"
-	"os"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
+    "github.com/go-git/go-git/v5"
+    "os"
 )
 
 // GenerateFiles Generates all the files needed to setup P2PRC
 func GenerateFiles(rootNodes ...p2p.IpAddress) (err error) {
-	err = GenerateIPTableFile(rootNodes)
-	err = GenerateDockerFiles()
-	err = GeneratePluginDirectory()
-	err = GenerateClientTrackContainers()
-	return
+    err = GenerateIPTableFile(rootNodes)
+    err = GenerateDockerFiles()
+    err = GeneratePluginDirectory()
+    err = GenerateClientTrackContainers()
+    return
 }
 
 // GenerateIPTableFile Generates the IPTable file with the appropirate root node
 func GenerateIPTableFile(rootNodes []p2p.IpAddress) (err error) {
-	var rootnodes p2p.IpAddresses
-	var rootnode p2p.IpAddress
+    var rootnodes p2p.IpAddresses
+    var rootnode p2p.IpAddress
 
-	err = CreateIPTableFolderStructure()
-	if err != nil {
-		return err
-	}
+    err = CreateIPTableFolderStructure()
+    if err != nil {
+        return err
+    }
 
-	// If root node addresses are not provided as optional parameters
-	if len(rootNodes) <= 0 {
-		rootnode.Name = "Node1"
-		rootnode.ServerPort = "8088"
-		rootnode.NAT = "False"
-		rootnode.Ipv4 = "64.227.168.102"
+    // If root node addresses are not provided as optional parameters
+    if len(rootNodes) <= 0 {
+        rootnode.Name = "Node1"
+        rootnode.ServerPort = "8078"
+        rootnode.NAT = "False"
+        rootnode.Ipv4 = "139.59.162.154"
 
-		rootnodes.IpAddress = append(rootnodes.IpAddress, rootnode)
-	} else {
-		// if root nodes are provided then override them as the optional parameter
-		for i := range rootNodes {
-			rootnodes.IpAddress = append(rootnodes.IpAddress, rootNodes[i])
-		}
-	}
+        rootnodes.IpAddress = append(rootnodes.IpAddress, rootnode)
+    } else {
+        // if root nodes are provided then override them as the optional parameter
+        for i := range rootNodes {
+            rootnodes.IpAddress = append(rootnodes.IpAddress, rootNodes[i])
+        }
+    }
 
-	err = rootnodes.WriteIpTable()
-	return
+    err = rootnodes.WriteIpTable()
+    return
 }
 
 // CreateIPTableFolderStructure Create folder structure for IPTable
 func CreateIPTableFolderStructure() (err error) {
-	path, err := GetCurrentPath()
-	if err != nil {
-		return err
-	}
-	if _, err = os.Stat(path + "p2p"); os.IsNotExist(err) {
-		if err = os.Mkdir(path+"p2p", os.ModePerm); err != nil {
-			return err
-		}
-	}
-	if _, err = os.Stat(path + "p2p/iptable"); os.IsNotExist(err) {
-		if err = os.Mkdir(path+"p2p/iptable", os.ModePerm); err != nil {
-			return err
-		}
-	}
-	if _, err = os.Stat(path + "p2p/iptable/ip_table.json"); os.IsNotExist(err) {
-		_, err = os.Create(path + "p2p/iptable/ip_table.json")
-		if err != nil {
-			return err
-		}
-	}
+    path, err := GetCurrentPath()
+    if err != nil {
+        return err
+    }
+    if _, err = os.Stat(path + "p2p"); os.IsNotExist(err) {
+        if err = os.Mkdir(path+"p2p", os.ModePerm); err != nil {
+            return err
+        }
+    }
+    if _, err = os.Stat(path + "p2p/iptable"); os.IsNotExist(err) {
+        if err = os.Mkdir(path+"p2p/iptable", os.ModePerm); err != nil {
+            return err
+        }
+    }
+    if _, err = os.Stat(path + "p2p/iptable/ip_table.json"); os.IsNotExist(err) {
+        _, err = os.Create(path + "p2p/iptable/ip_table.json")
+        if err != nil {
+            return err
+        }
+    }
 
-	return
+    return
 }
 
 // GenerateDockerFiles Generate default docker files
 func GenerateDockerFiles() (err error) {
-	path, err := GetCurrentPath()
-	if err != nil {
-		return err
-	}
-	if _, err = os.Stat(path + "server"); os.IsNotExist(err) {
-		if err = os.Mkdir(path+"server", os.ModePerm); err != nil {
-			return err
-		}
-		if _, err = os.Stat(path + "server/docker"); os.IsNotExist(err) {
-			if err = os.Mkdir(path+"server/docker", os.ModePerm); err != nil {
-				return err
-			}
-		}
-		if _, err = os.Stat(path + "server/docker/containers"); os.IsNotExist(err) {
-			if err = os.Mkdir(path+"server/docker/containers", os.ModePerm); err != nil {
-				return err
-			}
-		}
-		if _, err = os.Stat(path + "server/docker/containers"); os.IsNotExist(err) {
-			if err = os.Mkdir(path+"server/docker/containers", os.ModePerm); err != nil {
-				return err
-			}
-		}
-		if _, err = os.Stat(path + "server/docker/containers/docker-ubuntu-sshd"); os.IsNotExist(err) {
-			if err = os.Mkdir(path+"server/docker/containers/docker-ubuntu-sshd", os.ModePerm); err != nil {
-				return err
-			}
-		}
+    path, err := GetCurrentPath()
+    if err != nil {
+        return err
+    }
+    if _, err = os.Stat(path + "server"); os.IsNotExist(err) {
+        if err = os.Mkdir(path+"server", os.ModePerm); err != nil {
+            return err
+        }
+        if _, err = os.Stat(path + "server/docker"); os.IsNotExist(err) {
+            if err = os.Mkdir(path+"server/docker", os.ModePerm); err != nil {
+                return err
+            }
+        }
+        if _, err = os.Stat(path + "server/docker/containers"); os.IsNotExist(err) {
+            if err = os.Mkdir(path+"server/docker/containers", os.ModePerm); err != nil {
+                return err
+            }
+        }
+        if _, err = os.Stat(path + "server/docker/containers"); os.IsNotExist(err) {
+            if err = os.Mkdir(path+"server/docker/containers", os.ModePerm); err != nil {
+                return err
+            }
+        }
+        if _, err = os.Stat(path + "server/docker/containers/docker-ubuntu-sshd"); os.IsNotExist(err) {
+            if err = os.Mkdir(path+"server/docker/containers/docker-ubuntu-sshd", os.ModePerm); err != nil {
+                return err
+            }
+        }
 
-	}
+    }
 
-	// Clone base docker image
-	_, err = git.PlainClone(path+"server/docker/containers/docker-ubuntu-sshd", false, &git.CloneOptions{
-		URL:      "https://github.com/Akilan1999/docker-ubuntu-sshd",
-		Progress: os.Stdout,
-	})
-	if err != nil {
-		return err
-	}
+    // Clone base docker image
+    _, err = git.PlainClone(path+"server/docker/containers/docker-ubuntu-sshd", false, &git.CloneOptions{
+        URL:      "https://github.com/Akilan1999/docker-ubuntu-sshd",
+        Progress: os.Stdout,
+    })
+    if err != nil {
+        return err
+    }
 
-	return
+    return
 }
 
 // GeneratePluginDirectory Generates plugin directory structure
 func GeneratePluginDirectory() (err error) {
-	path, err := GetCurrentPath()
-	if err != nil {
-		return err
-	}
-	if _, err = os.Stat(path + "plugin"); os.IsNotExist(err) {
-		if err = os.Mkdir(path+"plugin", os.ModePerm); err != nil {
-			return err
-		}
-		if _, err = os.Stat(path + "plugin/deploy"); os.IsNotExist(err) {
-			if err = os.Mkdir(path+"plugin/deploy", os.ModePerm); err != nil {
-				return err
-			}
-		}
-	}
-	return
+    path, err := GetCurrentPath()
+    if err != nil {
+        return err
+    }
+    if _, err = os.Stat(path + "plugin"); os.IsNotExist(err) {
+        if err = os.Mkdir(path+"plugin", os.ModePerm); err != nil {
+            return err
+        }
+        if _, err = os.Stat(path + "plugin/deploy"); os.IsNotExist(err) {
+            if err = os.Mkdir(path+"plugin/deploy", os.ModePerm); err != nil {
+                return err
+            }
+        }
+    }
+    return
 }
 
 func GenerateClientTrackContainers() (err error) {
-	path, err := GetCurrentPath()
-	if err != nil {
-		return err
-	}
-	if _, err = os.Stat(path + "client"); os.IsNotExist(err) {
-		if err = os.Mkdir(path+"client", os.ModePerm); err != nil {
-			return err
-		}
+    path, err := GetCurrentPath()
+    if err != nil {
+        return err
+    }
+    if _, err = os.Stat(path + "client"); os.IsNotExist(err) {
+        if err = os.Mkdir(path+"client", os.ModePerm); err != nil {
+            return err
+        }
 
-		if _, err = os.Stat(path + "client/trackcontainers.json"); os.IsNotExist(err) {
-			_, err = os.Create(path + "client/trackcontainers.json")
-			if err != nil {
-				return err
-			}
-		}
+        if _, err = os.Stat(path + "client/trackcontainers.json"); os.IsNotExist(err) {
+            _, err = os.Create(path + "client/trackcontainers.json")
+            if err != nil {
+                return err
+            }
+        }
 
-		if _, err = os.Stat(path + "client/grouptrackcontainers.json"); os.IsNotExist(err) {
-			_, err = os.Create(path + "client/grouptrackcontainers.json")
-			if err != nil {
-				return err
-			}
-		}
+        if _, err = os.Stat(path + "client/grouptrackcontainers.json"); os.IsNotExist(err) {
+            _, err = os.Create(path + "client/grouptrackcontainers.json")
+            if err != nil {
+                return err
+            }
+        }
 
-	}
-	return
+    }
+    return
 }
diff --git a/p2p/ip_table.json b/p2p/ip_table.json
index 60a10d4..f7ffebc 100644
--- a/p2p/ip_table.json
+++ b/p2p/ip_table.json
@@ -1,13 +1,16 @@
 {
- "ip_address": [
-  {
-   "Name": "Node1",
-   "IPV4": "64.227.168.102",
-   "IPV6": "",
-   "Latency": 0,
-   "ServerPort": "8088",
-   "NAT": "False",
-   "EscapeImplementation": "None"
-  }
- ]
-}
+  "ip_address": [
+    {
+      "Name": "Node1",
+      "IPV4": "139.59.162.154",
+      "IPV6": "",
+      "Latency": 0,
+      "Download": 0,
+      "Upload": 0,
+      "ServerPort": "8078",
+      "NAT": "False",
+      "EscapeImplementation": "",
+      "CustomInformation": null
+    }
+  ]
+}
\ No newline at end of file