LBRYCommunity/lbry.go
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 46 Packages Wiki Activity

more

Browse source 
-add rpc_port argument
-run node on localhost for testing
This commit is contained in:
Jack Robison 2018-07-17 17:19:03 -04:00
parent f068daf0b8
commit 0151982bea
2 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dht/contact.go
View file

@ -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.

67
dht/node_rpc.go
View file

@ -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"
@ -12,7 +13,7 @@ import (
)
type NodeRPCServer struct {
Wg sync.WaitGroup
Wg sync.WaitGroup
Node *BootstrapNode
}
@ -23,13 +24,12 @@ type NodeRPC int
type PingArgs struct {
NodeID string
IP string
Port int
IP string
Port int
}
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")
@ -48,16 +48,16 @@ func (n *NodeRPC) Ping(r *http.Request, args *PingArgs, result *PingResult) erro
}
type FindArgs struct {
Key string
Key string
NodeID string
IP string
Port int
IP string
Port int
}
type ContactResponse struct {
NodeID string
IP string
Port int
IP string
Port int
}
type FindNodeResult []ContactResponse
@ -75,7 +75,7 @@ func (n *NodeRPC) FindNode(r *http.Request, args *FindArgs, result *FindNodeResu
return err
}
c := Contact{ID: toQuery, IP: net.ParseIP(args.IP), Port: args.Port}
req := Request{ Arg: &key, Method: "findNode"}
req := Request{Arg: &key, Method: "findNode"}
nodeResponse := rpcServer.Node.Send(c, req)
contacts := []ContactResponse{}
if nodeResponse != nil && nodeResponse.Contacts != nil {
@ -89,7 +89,7 @@ func (n *NodeRPC) FindNode(r *http.Request, args *FindArgs, result *FindNodeResu
type FindValueResult struct {
Contacts []ContactResponse
Value string
Value string
}
func (n *NodeRPC) FindValue(r *http.Request, args *FindArgs, result *FindValueResult) error {
@ -105,7 +105,7 @@ func (n *NodeRPC) FindValue(r *http.Request, args *FindArgs, result *FindValueRe
return err
}
c := Contact{ID: toQuery, IP: net.ParseIP(args.IP), Port: args.Port}
req := Request{ Arg: &key, Method: "findValue"}
req := Request{Arg: &key, Method: "findValue"}
nodeResponse := rpcServer.Node.Send(c, req)
contacts := []ContactResponse{}
if nodeResponse != nil && nodeResponse.FindValueKey != "" {
@ -126,7 +126,7 @@ type IterativeFindValueArgs struct {
}
type IterativeFindValueResult struct {
Contacts []ContactResponse
Contacts []ContactResponse
FoundValue bool
}
@ -149,19 +149,19 @@ func (n *NodeRPC) IterativeFindValue(r *http.Request, args *IterativeFindValueAr
}
type BucketResponse struct {
Start string
End string
Count int
Start string
End string
Count int
Contacts []ContactResponse
}
type RoutingTableResponse struct {
NodeID string
Count int
NodeID string
Count int
Buckets []BucketResponse
}
type GetRoutingTableArgs struct {}
type GetRoutingTableArgs struct{}
func (n *NodeRPC) GetRoutingTable(r *http.Request, args *GetRoutingTableArgs, result *RoutingTableResponse) error {
if rpcServer == nil {
@ -182,14 +182,27 @@ 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()
rpcServer = &NodeRPCServer{
Wg: sync.WaitGroup{},
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
}