latest

Author: Grumme2

cmd/main/main.go

@@ -13,29 +13,20 @@ func main() {
 	ip := d7024e.GetLocalIP()
 	splitIP := strings.Split(ip, ".")
 	fmt.Println(splitIP)
-<<<<<<< HEAD
 	if splitIP[3] == "3" {
 		mestr := "2111111300000000000000000000123000000000"
 		meid2 := d7024e.NewKademliaID(&mestr)
 		meid = &meid2
-=======
-	if splitIP[3] == "3" { // if ip ends with a 3 its the bootstrapnode
-		mestr := "2111111300000000000000000000123000000000" // hard coded bootstrap node id
-		meid = d7024e.NewKademliaID(&mestr)
->>>>>>> some changes
 	}
 	me := d7024e.NewContact(meid, ip)
 	rt := d7024e.NewRoutingTable(me)
 	network := d7024e.NewNetwork(rt)
 	kademlia := d7024e.NewKademlia(&network)
-<<<<<<< HEAD
 
 	go network.Listen()
 	go network.CheckNodesAwaitingResponse()
 	// kademlia.JoinNetwork()
-=======
-	kademlia.JoinNetwork()
->>>>>>> some changes
+
 	fmt.Println(me.Address)
 	// go network.Listen()
 	// go network.CheckNodesAwaitingResponse()

docker-compose.yml

@@ -27,13 +27,9 @@ services:
 #      - "4000:80"
     networks:
       - kademlia_network
-        # ipv4_address: 10.0.4.5
 
 networks:
   kademlia_network:
-    # ipam:
-    #   driver: default
-    #   config:
-    #     - subnet: 10.0.4.0/16
+
 
 

internal/d7024e/kademlia.go

@@ -25,7 +25,7 @@ func (Kademlia *Kademlia) JoinNetwork() {
 
 	bootStrapSplitIP := append(splitIP, "3")
 	bootStrapIP := strings.Join(bootStrapSplitIP, ".") // Bootstrap nodes iP address
-
+	fmt.Println(bootStrapIP)
 	bootStrapNodeStr := "2111111300000000000000000000123000000000" // hardcoded bootstrapnode ID
 	bootStrapKademID := NewKademliaID(&bootStrapNodeStr)
 	bootStrapNode := NewContact(&bootStrapKademID, bootStrapIP)
@@ -41,14 +41,14 @@ func (Kademlia *Kademlia) JoinNetwork() {
 			Kademlia.network.SendMessage(pingRPC)
 			time.Sleep(500 * time.Millisecond)
 			ping, message := Kademlia.network.SendPINGMessage() // gets ping result
-
+			fmt.Println(message)
 			if ping && message == fmt.Sprint(i) { // checks if ping gave a response
 
-				LookUpContactRPC := NewRPC(bootStrapNode, Kademlia.network.routingTable.me.Address, "FINDNODE", "") // lookup contact rpc should just call lookupcontact
-				Kademlia.network.SendMessage(LookUpContactRPC)
-
-				// Kademlia.network.routingTable.AddContact(bootStrapNode)
-				// Kademlia.LookupContact(&Kademlia.network.routingTable.me) // Broken right now so are just doing the rpc call
+				// LookUpContactRPC := NewRPC(bootStrapNode, Kademlia.network.routingTable.me.Address, "FINDNODE", "") // lookup contact rpc should just call lookupcontact
+				// Kademlia.network.SendMessage(LookUpContactRPC)
+				//
+				Kademlia.network.routingTable.AddContact(bootStrapNode)
+				Kademlia.LookupContact(&Kademlia.network.routingTable.me) // Broken right now so are just doing the rpc call
 
 				break // breaks when node has joined network
 

internal/d7024e/network.go

@@ -173,7 +173,7 @@ func (network *Network) ListenHandler(receivedData []byte, connection *net.UDPCo
 	switch decodedData.MessageType {
 	case "PING":
 		responseType = "PONG"
-		responseContent = decodedData.Content
+		// responseContent = decodedData.Content
 	case "OK":
 		responseType = "NONE"
 	case "STORE":