From f4e987c477e2bbdb716d588031ac735386833d77 Mon Sep 17 00:00:00 2001
From: Akilan <me@akilan.io>
Date: Wed, 14 Apr 2021 12:23:44 +0400
Subject: [PATCH] fixed certain bugs

---
 client/Iptable.go | 115 ++++++++++++++++++++++++++++++++++++++++++----
 p2p/ip_table.json |  12 +++--
 server/server.go  |   1 +
 3 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/client/Iptable.go b/client/Iptable.go
index c731baa..ced9cd3 100644
--- a/client/Iptable.go
+++ b/client/Iptable.go
@@ -3,6 +3,7 @@ package client
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
 	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
 	"io"
@@ -13,7 +14,11 @@ import (
 	"path/filepath"
 )
 
-// Does the following to update it's IP table
+type IP struct {
+	Query string
+}
+
+// UpdateIpTable Does the following to update it's IP table
 func UpdateIpTable(IpAddress string) error {
 
 	config, err := config.ConfigInit()
@@ -21,14 +26,22 @@ func UpdateIpTable(IpAddress string) error {
 		return err
 	}
 
-	resp, err := SendPostRequest("http://"+IpAddress+":8088/IpTable",
-		config.IPTable,
-		"json")
+	client := http.Client{}
+
+	resp, err := UploadMultipartFile(client,"http://"+IpAddress+":8088/IpTable","json",config.IPTable)
 
 	if err != nil {
 		return err
 	}
 
+	//resp, err := SendPostRequest("http://"+IpAddress+":8088/IpTable",
+	//	config.IPTable,
+	//	"json")
+	//
+	//if err != nil {
+	//	return err
+	//}
+
 	var ipStruct p2p.IpAddresses
 	json.Unmarshal(resp, &ipStruct)
 
@@ -55,7 +68,7 @@ func UpdateIpTableListClient() error {
 	// duplication
 
 	Addresses, err := p2p.ReadIpTable()
-	DoNotRead := Addresses
+	var DoNotRead p2p.IpAddresses
 
 	// Run loop 3 times
 	for i := 0; i < 3; i++ {
@@ -65,11 +78,25 @@ func UpdateIpTableListClient() error {
 			return err
 		}
 
+		// Appending current machine public IP address as should not be there in IP Table
+		var PublicIP p2p.IpAddress
+		ip, err := CurrentPublicIP()
+		if err != nil {
+			return err
+		}
+		PublicIP.Ipv4 = ip
+		DoNotRead.IpAddress = append(DoNotRead.IpAddress, PublicIP)
+
 		// Updates IP table based on server IP table
 		for j := range Addresses.IpAddress {
 
-			// Check if IP addresses is there in the struct DoNotRead
 			Exists := false
+
+			if PublicIP.Ipv4 == Addresses.IpAddress[j].Ipv4 {
+				Exists = true
+			}
+
+			// Check if IP addresses is there in the struct DoNotRead
 			for k := range DoNotRead.IpAddress {
 				if DoNotRead.IpAddress[k].Ipv4 == Addresses.IpAddress[j].Ipv4 {
 					Exists = true
@@ -81,7 +108,6 @@ func UpdateIpTableListClient() error {
 			if Exists {
 				continue
 			}
-
 			err = UpdateIpTable(Addresses.IpAddress[j].Ipv4)
 			if err != nil {
 				return err
@@ -95,7 +121,8 @@ func UpdateIpTableListClient() error {
 	return nil
 }
 
-// SendPostRequest Sends a file as a POST request.
+// SendPostRequest Sends a file as a
+//POST request.
 // Reference (https://stackoverflow.com/questions/51234464/upload-a-file-with-post-request-golang)
 func SendPostRequest (url string, filename string, filetype string) ([]byte,error) {
 	file, err := os.Open(filename)
@@ -138,4 +165,76 @@ func SendPostRequest (url string, filename string, filetype string) ([]byte,erro
 	}
 
 	return content, nil
+}
+
+func UploadMultipartFile(client http.Client, uri, key, path string) ([]byte, error) {
+	body, writer := io.Pipe()
+
+	req, err := http.NewRequest(http.MethodPost, uri, body)
+	if err != nil {
+		return nil, err
+	}
+
+	mwriter := multipart.NewWriter(writer)
+	req.Header.Add("Content-Type", mwriter.FormDataContentType())
+
+	errchan := make(chan error)
+
+	go func() {
+		defer close(errchan)
+		defer writer.Close()
+		defer mwriter.Close()
+
+		w, err := mwriter.CreateFormFile(key, path)
+		if err != nil {
+			errchan <- err
+			return
+		}
+
+		in, err := os.Open(path)
+		if err != nil {
+			errchan <- err
+			return
+		}
+		defer in.Close()
+
+		if written, err := io.Copy(w, in); err != nil {
+			errchan <- fmt.Errorf("error copying %s (%d bytes written): %v", path, written, err)
+			return
+		}
+
+		if err := mwriter.Close(); err != nil {
+			errchan <- err
+			return
+		}
+	}()
+
+	resp, err := client.Do(req)
+	content, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return content, nil
+
+}
+
+// CurrentPublicIP Get Current Public IP address
+func CurrentPublicIP() (string,error) {
+	req, err := http.Get("http://ip-api.com/json/")
+	if err != nil {
+		return "",err
+	}
+	defer req.Body.Close()
+
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return "",err
+	}
+
+	var ip IP
+	json.Unmarshal(body, &ip)
+
+	return ip.Query, nil
 }
\ No newline at end of file
diff --git a/p2p/ip_table.json b/p2p/ip_table.json
index e179960..27aa9a9 100644
--- a/p2p/ip_table.json
+++ b/p2p/ip_table.json
@@ -2,9 +2,15 @@
  "ip_address": [
   {
    "ipv4": "145.40.90.151",
-   "latency": 262976449,
-   "download": 6.2124926386045,
-   "upload": 5144.270090126969
+   "latency": 146389678,
+   "download": 9.020151819319478,
+   "upload": 6325.413957228309
+  },
+  {
+   "ipv4": "86.99.70.106",
+   "latency": 9320246,
+   "download": 841.138792914018,
+   "upload": 6849.211861191133
   }
  ]
 }
\ No newline at end of file
diff --git a/server/server.go b/server/server.go
index 15cf4c2..a7b90cb 100644
--- a/server/server.go
+++ b/server/server.go
@@ -44,6 +44,7 @@ func Server() error{
 		// Getting IPV4 address of client
 		var ClientHost p2p.IpAddress
 		ClientHost.Ipv4 = c.ClientIP()
+
 		// Variable to store IP table information
 		var IPTable p2p.IpAddresses