From 263275d80c45f740dc3b9baf72fbc87ae6ef208d Mon Sep 17 00:00:00 2001
From: Akilan <me@akilan.io>
Date: Sat, 15 Jul 2023 00:07:14 +0100
Subject: [PATCH] remove nodes not pingable

---
 .DS_Store                       | Bin 10244 -> 14340 bytes
 .goreleaser.yml                 |   3 ---
 client/clientIPTable/Iptable.go |   9 +++++++++
 server/server.go                |  19 ++++++++++++++++---
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 48af73fccd22dfc6d2e78552d3a86f8cebc58feb..4ed94e39fe5b509e7f30a9ad8878c4ac14bde8f9 100644
GIT binary patch
delta 1476
zcmdT^O>7%Q6rOKv$Fp>zOx!kd(ypAurl}wyP6<CvODPTsMM-E;Y!atw!R{`}P-mTZ
zH*Ql2oQhJ)3Bm#rC;ke@3S%Ka2({uuBoIg_Ck{O!@pFI+7b-O{>vg2w%Y~8Ny!qbD
zdo%mJPkZ6mg~d)n2vW<&03k`WWXe1*xSB2!(#h94d-Q+;P!?CF)`Ae5IOWNbRVZ3>
zYfEuAnF#9MfnePXB5ysQVsQ5gy;@F%Yhe~-*ja0i+-R<@hA5hATr|;SBc))Mhx3JE
zUR^VpUo1%5NhW^+4Fp3?VW!=&jW_F4)7cq5>ke(dJQhpr?c4Xj!NVhuPdvHNB3dJS
z2XC7yOIzj(X6B4EocV0dK4n^lwB}}{VOoxSR+=TP6}?*8$}N~1k!X9zuHCxsZf=iO
zrkC?_X<0feBF>m!uuG3?;!`$j<Q#LNXn5&HeMj%odl)<J#fM9#n*A`pOYhZ0j-_pR
z&h$(4^8roRTKcrK8mWW)ekKepQ^@7bf?sVvKfo$tOq(j3C0iCPKe~fI%(UrK#f1g+
zblZ=m^hcRkXD7Xz$8)xGbkVf7-jvdhFg9b)=St?$GnQG}${1(tY0*-TdnqG^bc&_=
zw?EOP>shbVBZkpu8tSt<qU{lVQqM5)qe>FeDoZEls3%P-w`{Zc)%EqtQun)VdgoZ>
zI{BIWLH;H;$W5||05~GpjRgA8k0b^#gadd8hcJdTGI$DkoJIi_ig55eUcf5O<04+g
zYj_<l-p2d*03YHbT)}7f9ADsTe2ee!J$}G-{DNQc8~(ygY~ml<N;_y`l-^1A(0-bv
z`{=!Nls-m}(Jal=IXbUIrv~*z>5UV<+nVW$S_Mf%b?(WwZp3Qm+gj0-QC%|6*5x3=
zo=(_?Cy}mh9upzeG#~EiQLst%%ZGRO#$tjho%k?05aS}CRG`&!@9R|%4X}TRa}iW}
z@b?bs3X%p$4XZL<bD76-$ftQQdLnxd1{H~;IHHIg$Alts8Z$VKS(uoE#B+*P2W6ba
z3eMq0yo8r=39l$p-@u!A3-91PMeJoo?G=2CDn7xN_zG8X&HX*vUpw6KO{lsG+8*-h
zNp4eq<ko*cb?MK5+mh(hJUXv=r`&^lm-|d29D1;h787fg+wSJ=HIw~cx;gQmcJp5|
CtWu!>

delta 143
zcmZoEXbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~3gIoZI3MH0vd3o-)585q(SG8xht
z^cX4`ayK4yW1n~-b~8H%3kRdZW*!ALrp<x^UwH+YL0W*CxPgQ#$h3_IzcWwfH_>He
cm~6tMJUPLHol^s(0%)Yc<Q$WUn}nH}0mGRYUjP6A

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 47dc55e..6f8696c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -20,9 +20,6 @@ archives:
       windows: Windows
       386: i386
       amd64: x86_64
-    files:
-      - install-binary.sh
-      - install-binary.bat
 checksum:
   name_template: 'checksums.txt'
 snapshot:
diff --git a/client/clientIPTable/Iptable.go b/client/clientIPTable/Iptable.go
index db885dc..d6da7e0 100644
--- a/client/clientIPTable/Iptable.go
+++ b/client/clientIPTable/Iptable.go
@@ -150,6 +150,15 @@ func UpdateIpTableListClient() error {
     return nil
 }
 
+func RemoveOfflineNodes() error {
+    // Ensure that the IP Table has Node pingable
+    err := p2p.LocalSpeedTestIpTable()
+    if err != nil {
+        return err
+    }
+    return nil
+}
+
 // SendPostRequest Sends a file as a
 //POST request.
 // Reference (https://stackoverflow.com/questions/51234464/upload-a-file-with-post-request-golang)
diff --git a/server/server.go b/server/server.go
index 950af2b..f665cde 100644
--- a/server/server.go
+++ b/server/server.go
@@ -170,6 +170,9 @@ func Server() (*gin.Engine, error) {
     // if not update current entry as proxy address
     // with appropriate port on IP Table
     if config.BehindNAT == "True" {
+        // Remove nodes currently not pingable
+        clientIPTable.RemoveOfflineNodes()
+
         table, err := p2p.ReadIpTable()
         if err != nil {
             return nil, err
@@ -182,7 +185,7 @@ func Server() (*gin.Engine, error) {
         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 != "" {
-            if table.IpAddress[i].Latency.Milliseconds() < lowestLatency {
+            if table.IpAddress[i].Latency.Milliseconds() < lowestLatency && table.IpAddress[i].NAT != "" {
                 lowestLatency = table.IpAddress[i].Latency.Milliseconds()
                 lowestLatencyIpAddress = table.IpAddress[i]
             }
@@ -212,9 +215,19 @@ func Server() (*gin.Engine, error) {
             // append the following to the ip table
             table.IpAddress = append(table.IpAddress, ProxyIpAddr)
             // write information back to the IP Table
-            table.WriteIpTable()
+            err = table.WriteIpTable()
+            if err != nil {
+                return nil, err
+            }
             // update ip table
-            go clientIPTable.UpdateIpTableListClient()
+            go func() error {
+                err := clientIPTable.UpdateIpTableListClient()
+                if err != nil {
+                    fmt.Println(err)
+                    return err
+                }
+                return nil
+            }()
         }
 
     }