From f6c7a21601622909b8751ad0dbcb7e2589bb827b Mon Sep 17 00:00:00 2001 From: Akilan Date: Tue, 24 Jan 2023 13:22:42 +0000 Subject: [PATCH] changed the sceheduler --- client/clientIPTable/Iptable.go | 289 ++++++++++++++++---------------- 1 file changed, 145 insertions(+), 144 deletions(-) diff --git a/client/clientIPTable/Iptable.go b/client/clientIPTable/Iptable.go index 1817cef..e39fe87 100644 --- a/client/clientIPTable/Iptable.go +++ b/client/clientIPTable/Iptable.go @@ -1,138 +1,139 @@ package clientIPTable import ( - "encoding/json" - "fmt" - "git.sr.ht/~akilan1999/p2p-rendering-computation/config" - "git.sr.ht/~akilan1999/p2p-rendering-computation/p2p" - "io" - "io/ioutil" - "mime/multipart" - "net/http" - "os" + "encoding/json" + "fmt" + "git.sr.ht/~akilan1999/p2p-rendering-computation/config" + "git.sr.ht/~akilan1999/p2p-rendering-computation/p2p" + "io" + "io/ioutil" + "mime/multipart" + "net/http" + "os" ) // UpdateIpTable Does the following to update it's IP table func UpdateIpTable(IpAddress string, serverPort string) error { - config, err := config.ConfigInit() - if err != nil { - return err - } + config, err := config.ConfigInit() + if err != nil { + return err + } - client := http.Client{} + client := http.Client{} - var resp []byte + var resp []byte - version := p2p.Ip4or6(IpAddress) - if version == "version 6" { - resp, err = UploadMultipartFile(client, "http://["+IpAddress+"]:"+serverPort+"/IpTable", "json", config.IPTable) - if err != nil { - return err - } - } else { - resp, err = UploadMultipartFile(client, "http://"+IpAddress+":"+serverPort+"/IpTable", "json", config.IPTable) - if err != nil { - return err - } - } + version := p2p.Ip4or6(IpAddress) + if version == "version 6" { + resp, err = UploadMultipartFile(client, "http://["+IpAddress+"]:"+serverPort+"/IpTable", "json", config.IPTable) + if err != nil { + return err + } + } else { + resp, err = UploadMultipartFile(client, "http://"+IpAddress+":"+serverPort+"/IpTable", "json", config.IPTable) + if err != nil { + return err + } + } - if resp == nil { - return nil - } + if resp == nil { + return nil + } - //resp, err := SendPostRequest("http://"+IpAddress+":8088/IpTable", - // config.IPTable, - // "json") - // - //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) + var ipStruct p2p.IpAddresses + json.Unmarshal(resp, &ipStruct) - // Updates IP table based on information provided - // by the server - if len(ipStruct.IpAddress) > 0 { - err = ipStruct.SpeedTestUpdatedIPTable() - if err != nil { - return err - } - } + // Updates IP table based on information provided + // by the server + if len(ipStruct.IpAddress) > 0 { + err = ipStruct.SpeedTestUpdatedIPTable() + if err != nil { + return err + } + } - return nil + return nil } // UpdateIpTableListClient updates IP tables (Default 3 hops) based on server information available // on the ip tables func UpdateIpTableListClient() error { + // Get config information + Config, err := config.ConfigInit() + if err != nil { + return err + } - // Ensure that the IP Table has Node pingable - err := p2p.LocalSpeedTestIpTable() - if err != nil { - return err - } + // Ensure that the IP Table has Node pingable + err = p2p.LocalSpeedTestIpTable() + if err != nil { + return err + } - // IP addresses to not append to struct due to - // duplication + // IP addresses to not append to struct due to + // duplication - Addresses, err := p2p.ReadIpTable() - //var DoNotRead p2p.IpAddresses + Addresses, err := p2p.ReadIpTable() + var DoNotRead p2p.IpAddresses - currentIPV4, err := p2p.CurrentPublicIP() - if err != nil { - return err - } + currentIPV4, err := p2p.CurrentPublicIP() + if err != nil { + return err + } - // Run loop 1 times - for i := 0; i < 1; i++ { - // Gets information from IP table - //Addresses, err = p2p.ReadIpTable() - //if err != nil { - // return err - //} - // - //DoNotRead.IpAddress = append(DoNotRead.IpAddress, PublicIP) + // Run loop 2 times + for i := 0; i < 2; i++ { + // Gets information from IP table + Addresses, err = p2p.ReadIpTable() + if err != nil { + return err + } - // Updates IP table based on server IP table - for j := range Addresses.IpAddress { + //DoNotRead.IpAddress = append(DoNotRead.IpAddress, PublicIP) - //Exists := false - // - //if PublicIP.Ipv4 == Addresses.IpAddress[j].Ipv4 || (PublicIP.Ipv6 != "" && Addresses.IpAddress[j].Ipv6 == PublicIP.Ipv6){ - // 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 || (DoNotRead.IpAddress[k].Ipv6 != "" && Addresses.IpAddress[j].Ipv6 == DoNotRead.IpAddress[k].Ipv6) { - // Exists = true - // break - // } - //} - // - //// If the struct exists then continues - //if Exists { - // continue - //} + // Updates IP table based on server IP table + for j := range Addresses.IpAddress { - if Addresses.IpAddress[j].Ipv6 != "" { - err = UpdateIpTable(Addresses.IpAddress[j].Ipv6, Addresses.IpAddress[j].ServerPort) - } else if Addresses.IpAddress[j].Ipv4 != currentIPV4 { - err = UpdateIpTable(Addresses.IpAddress[j].Ipv4, Addresses.IpAddress[j].ServerPort) - } + Exists := false + // If the address is local then add to the local list + if currentIPV4 == Addresses.IpAddress[j].Ipv4 && Addresses.IpAddress[j].ServerPort == Config.ServerPort { + Exists = true + } - if err != nil { - return err - } + // Check if IP addresses is there in the struct DoNotRead + for k := range DoNotRead.IpAddress { + if (DoNotRead.IpAddress[k].Ipv4 == Addresses.IpAddress[j].Ipv4 && DoNotRead.IpAddress[k].ServerPort == Addresses.IpAddress[j].ServerPort) || (DoNotRead.IpAddress[k].Ipv6 != "" && Addresses.IpAddress[j].Ipv6 == DoNotRead.IpAddress[k].Ipv6) { + Exists = true + break + } + } - //Appends server1 IP address to variable DoNotRead - //DoNotRead.IpAddress = append(DoNotRead.IpAddress, Addresses.IpAddress[j]) - } - } + // If the struct exists then continues + if Exists { + continue + } - return nil + if Addresses.IpAddress[j].Ipv6 != "" { + go UpdateIpTable(Addresses.IpAddress[j].Ipv6, Addresses.IpAddress[j].ServerPort) + } else if Addresses.IpAddress[j].Ipv4 != currentIPV4 { + go UpdateIpTable(Addresses.IpAddress[j].Ipv4, Addresses.IpAddress[j].ServerPort) + } + + //Appends server1 IP address to variable DoNotRead + DoNotRead.IpAddress = append(DoNotRead.IpAddress, Addresses.IpAddress[j]) + } + } + + return nil } // SendPostRequest Sends a file as a @@ -182,58 +183,58 @@ func UpdateIpTableListClient() error { //} func UploadMultipartFile(client http.Client, uri, key, path string) ([]byte, error) { - body, writer := io.Pipe() + body, writer := io.Pipe() - req, err := http.NewRequest(http.MethodPost, uri, body) - if err != nil { - return nil, err - } + 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()) + mwriter := multipart.NewWriter(writer) + req.Header.Add("Content-Type", mwriter.FormDataContentType()) - errchan := make(chan error) + errchan := make(chan error) - go func() { - defer close(errchan) - defer writer.Close() - defer mwriter.Close() + go func() { + defer close(errchan) + defer writer.Close() + defer mwriter.Close() - w, err := mwriter.CreateFormFile(key, path) - if err != nil { - errchan <- err - return - } + 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() + 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 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 - } - }() + if err := mwriter.Close(); err != nil { + errchan <- err + return + } + }() - resp, err := client.Do(req) - if err != nil { - return nil, err - } + resp, err := client.Do(req) + if err != nil { + return nil, err + } - content, err := ioutil.ReadAll(resp.Body) + content, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } + if err != nil { + return nil, err + } - return content, nil + return content, nil }