more

-add rpc_port argument
-run node on localhost for testing

dht/contact.go

@@ -17,8 +17,8 @@ import (
 type Contact struct {
 	ID       bits.Bitmap
 	IP       net.IP
-	Port     int
-	PeerPort int
+	Port     int // the udp port used for the dht
+	PeerPort int // the tcp port a peer can be contacted on for blob requests
 }
 
 // Equals returns true if two contacts are the same.

dht/node_rpc.go

@@ -1,10 +1,11 @@
 package dht
 
 import (
+	"errors"
 	"net"
 	"net/http"
-	"errors"
 	"sync"
+
 	"github.com/gorilla/mux"
 	"github.com/gorilla/rpc"
 	"github.com/gorilla/rpc/json"
@@ -29,7 +30,6 @@ type PingArgs struct {
 
 type PingResult string
 
-
 func (n *NodeRPC) Ping(r *http.Request, args *PingArgs, result *PingResult) error {
 	if rpcServer == nil {
 		return errors.New("no node set up")
@@ -182,6 +182,20 @@ func (n *NodeRPC) GetRoutingTable(r *http.Request, args *GetRoutingTableArgs, re
 	return nil
 }
 
+type AddKnownNodeResponse struct{}
+
+func (n *NodeRPC) AddKnownNode(r *http.Request, args *ContactResponse, result *AddKnownNodeResponse) error {
+	if rpcServer == nil {
+		return errors.New("no node set up")
+	}
+	rpcServer.Node.AddKnownNode(
+		Contact{
+			bits.FromHexP(args.NodeID),
+			net.ParseIP(args.IP), args.Port, 0,
+		})
+	return nil
+}
+
 func RunRPCServer(address, rpcPath string, node *BootstrapNode) NodeRPCServer {
 	mut.Lock()
 	defer mut.Unlock()
@@ -189,7 +203,6 @@ func RunRPCServer(address, rpcPath string, node *BootstrapNode) NodeRPCServer {
 		Wg:   sync.WaitGroup{},
 		Node: node,
 	}
-	c := make(chan *http.Server)
 	rpcServer.Wg.Add(1)
 	go func() {
 		s := rpc.NewServer()
@@ -202,15 +215,7 @@ func RunRPCServer(address, rpcPath string, node *BootstrapNode) NodeRPCServer {
 		server := &http.Server{Addr: address, Handler: r}
 		log.Println("rpc listening on " + address)
 		server.ListenAndServe()
-		c <- server
-	}()
-	go func() {
-		rpcServer.Wg.Wait()
-		close(c)
-		log.Println("stopped rpc listening on " + address)
-		for server := range c {
-			server.Close()
-		}
 	}()
+
 	return *rpcServer
 }