Working put, small bugs remaining in get and key comparisons in network

Author: Kevintrf

cmd/main/main.go

@@ -1,17 +1,15 @@
 package main
 
 import (
-	"fmt"
+	//"fmt"
 	"strings"
-
 	"github.com/Grumme2/D7024E/internal/d7024e"
 )
 
 func main() {
 	meid := d7024e.NewRandomKademliaID()
 	ip := d7024e.GetLocalIP()
 	splitIP := strings.Split(ip, ".")
-	fmt.Println(splitIP)
 	if splitIP[3] == "3" {
 		mestr := "2111111300000000000000000000123000000000"
 		meid = d7024e.NewKademliaID(mestr)
@@ -25,10 +23,6 @@ func main() {
 	go network.CheckNodesAwaitingResponse()
 	kademlia.JoinNetwork()
 
-	fmt.Println(me.Address)
-	// go network.Listen()
-	// go network.CheckNodesAwaitingResponse()
-
 	cli := d7024e.NewCli(&kademlia)
 	cli.AwaitCommand()
 }

internal/d7024e/cli.go

@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"strings"
 	"time"
+	"encoding/json"
 )
 
 type cli struct {
@@ -31,12 +32,6 @@ func (cli *cli) AwaitCommand() {
 	case "EXIT":
 		fmt.Println("EXIT command detected")
 		return //Exits the function and terminates the node
-	case "PRINT":
-		if len(inputSplit) > 1 {
-			fmt.Println("Printing test: " + inputSplit[1])
-		} else {
-			fmt.Println("Error! Invalid arguments!")
-		}
 	case "PUT":
 		if len(inputSplit) == 2 {
 			fileUpload := inputSplit[1]
@@ -45,14 +40,21 @@ func (cli *cli) AwaitCommand() {
 			cli.kademlia.Store(fileUpload) //File upload works (well atleast the RPC is sent and received properly)
 			//See if file is uploaded
 
-			time.Sleep(3000 * time.Millisecond) //Sleep for 3s
+			time.Sleep(300 * time.Millisecond) //Sleep for 0.3s
 
 			hashedUpload := cli.kademlia.network.MakeHash(fileUpload)
-			dataFound, data, node := cli.kademlia.LookupData(fileUpload)
+
+			hashedJson, err := json.Marshal(hashedUpload)
+			if err != nil {
+				fmt.Println(err)
+			}
+
+			dataFound, data, node := cli.kademlia.LookupData(string(hashedJson))
 			_ = data //Prevent data declared and not used compilation error
 			_ = node //Prevent data declared and not used compilation error
 			if dataFound {
-				fmt.Println("File upload successfully! Hashed upload: " + string(hashedUpload[:]))
+				fmt.Println("File upload successfully! Hashed upload: ")
+				fmt.Println(hashedUpload)
 			} else {
 				fmt.Println(dataFound)
 				fmt.Println(data)
@@ -64,9 +66,18 @@ func (cli *cli) AwaitCommand() {
 			fmt.Println("Error! Invalid arguments!")
 		}
 	case "GET":
-		if len(inputSplit) == 2 {
+		if len(inputSplit) > 2 {
+			inputSplit = space.Split(inputText, 2)
 			hash := inputSplit[1]
-			dataFound, data, node := cli.kademlia.LookupData(hash)
+
+			hashedJson, err := json.Marshal(hash)
+			if err != nil {
+				fmt.Println(err)
+			}
+
+			fmt.Println("Hashedjson: " + string(hashedJson))
+
+			dataFound, data, node := cli.kademlia.LookupData(string(hashedJson))
 			_ = data //Prevent data declared and not used compilation error
 			if dataFound {
 				//Also return which node it was retrieved from

internal/d7024e/contact.go

@@ -27,8 +27,8 @@ func (contact *Contact) CalcDistance(target *KademliaID) {
 
 // Less returns true if contact.distance < otherContact.distance
 func (contact *Contact) Less(otherContact *Contact) bool {
-	fmt.Println(contact.distance)
-	fmt.Println(otherContact.distance)
+	//fmt.Println(contact.distance)
+	//fmt.Println(otherContact.distance)
 	return contact.distance.Less(otherContact.distance)
 }
 

internal/d7024e/kademlia.go

@@ -30,7 +30,7 @@ func (Kademlia *Kademlia) JoinNetwork() {
 	bootStrapNode := NewContact(&bootStrapKademID, bootStrapIP)
 
 	if x == "3" { // if Bootstrap node nothing needs to be done
-		fmt.Println("bootstrapnode")
+		//fmt.Println("bootstrapnode")
 		return
 	} else {
 		i := 0
@@ -95,7 +95,7 @@ func (kademlia *Kademlia) LookupContact(target *Contact) string {
 					}
 
 					if j == 10 {
-						fmt.Printf("hej")
+						//fmt.Printf("hej")
 						return "ERROR! Did not get response in time"
 					}
 				}
@@ -127,8 +127,8 @@ func (kademlia *Kademlia) LookupContact(target *Contact) string {
 
 	}
 	KTrJson := kademlia.network.KTriplesJSON(shortlist.contacts)
-	fmt.Println(KTrJson)
-	fmt.Println(kademlia.network.routingTable.me)
+	//fmt.Println(KTrJson)
+	//fmt.Println(kademlia.network.routingTable.me)
 	return KTrJson
 
 }

internal/d7024e/kademliaid.go

@@ -4,7 +4,7 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"math/rand"
-	"fmt"
+	//"fmt"
 )
 
 // the static number of bytes in a KademliaID
@@ -25,8 +25,6 @@ func NewKademliaID(data string) KademliaID {
 		newKademliaID[i] = decoded[i]
 	}*/
 	hash := sha1.Sum([]byte(data))
-	fmt.Println("HASH------")
-	fmt.Println(hash)
 
 	return hash
 }

internal/d7024e/network.go

@@ -71,11 +71,6 @@ func (network *Network) CheckNodesAwaitingResponse() {
 
 	for e := network.awaitingResponseList.Front(); e != nil; e = e.Next() {
 		nodeTimestamp := e.Value.(AwaitingResponseObject).timestamp
-		fmt.Println(nodeTimestamp)
-		fmt.Println(currentTime)
-		fmt.Println(currentTime - nodeTimestamp)
-		fmt.Println(e.Value.(AwaitingResponseObject).oldNode)
-		fmt.Println(e.Value.(AwaitingResponseObject).newNode)
 		if (currentTime - nodeTimestamp) >= 5 { //If 5 seconds or more have passed
 			network.routingTable.RemoveContact(e.Value.(AwaitingResponseObject).oldNode)
 			network.routingTable.AddContact(e.Value.(AwaitingResponseObject).newNode)
@@ -178,9 +173,8 @@ func (network *Network) ListenHandler(receivedData []byte, connection *net.UDPCo
 	case "OK":
 		responseType = "NONE"
 	case "STORE":
-		key := network.AddToStore(decodedData.Content)
+		network.AddToStore(decodedData.Content)
 		responseType = "OK"
-		responseContent = string(key[:])
 	case "FINDVALUE":
 		dataFound, data := network.LookForData(decodedData.Content)
 		if dataFound {
@@ -207,7 +201,7 @@ func (network *Network) ListenHandler(receivedData []byte, connection *net.UDPCo
 
 	case "FINDNODE_RESPONSE":
 		network.lookUpContactResponse = LookUpContactResponse{decodedData.Content}
-		fmt.Println(network.lookUpContactResponse)
+		//fmt.Println(network.lookUpContactResponse)
 		responseType = "NONE"
 
 	case "PONG":
@@ -224,15 +218,24 @@ func (network *Network) ListenHandler(receivedData []byte, connection *net.UDPCo
 	}
 }
 
-func (network *Network) AddToStore(message string) KademliaID {
+func (network *Network) AddToStore(message string) {
 	hxMsg := network.MakeHash(message)
-	network.routingTable.me.KeyValueStore[string(hxMsg[:])] = message
-	return hxMsg
+
+	hxMsgJSON, err := json.Marshal(hxMsg)
+    if err != nil {
+		fmt.Println(err)
+	}
+	
+	network.routingTable.me.KeyValueStore[string(hxMsgJSON)] = message
 }
 
 func (network *Network) LookForData(hash string) (bool, string) {
 	for key, element := range network.routingTable.me.KeyValueStore {
-		if string(key[:]) == hash {
+		fmt.Println("LookForData loop")
+		fmt.Println("Key: " + key)
+		fmt.Println("Hash: " + hash)
+
+		if key == hash {
 			fmt.Println("LookForData found element: " + element)
 			return true, element
 		}
@@ -241,23 +244,14 @@ func (network *Network) LookForData(hash string) (bool, string) {
 }
 
 func (network *Network) MakeHash(message string) KademliaID {
-		hash := sha1.Sum([]byte(message))
-		fmt.Println("MAKEHASH------")
-		fmt.Println(hash)
-	
-		return hash
+	hash := sha1.Sum([]byte(message))
+	return hash
 }
 
 func (network *Network) storeRPC(message RPC) {
-	hash := network.MakeHash(message.Content)
-	fmt.Printf(string(hash[:]))
 	network.SendMessage(message)
 }
 
-func (network *Network) idToString(id KademliaID) string {
-	return string(id[:])
-}
-
 func (network *Network) JSONEncodeLookUpDataResponse(unencodedResponse LookUpDataResponse) string {
 	encoded, err := json.Marshal(unencodedResponse)
 	if err != nil {