aboutsummaryrefslogtreecommitdiffstats
path: root/p2p/discover
diff options
context:
space:
mode:
Diffstat (limited to 'p2p/discover')
-rw-r--r--p2p/discover/node.go4
-rw-r--r--p2p/discover/table.go16
-rw-r--r--p2p/discover/udp.go8
3 files changed, 21 insertions, 7 deletions
diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index d8a5cc351..3e79ddb53 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -387,3 +387,7 @@ func (db *nodeDB) add(id NodeID, addr *net.UDPAddr, tcpPort uint16) *Node {
db.update(n)
return n
}
+
+func (db *nodeDB) close() {
+ db.ldb.Close()
+}
diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index ba2f9b8ec..3702a2114 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -11,6 +11,9 @@ import (
"sort"
"sync"
"time"
+
+ "github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/logger/glog"
)
const (
@@ -58,8 +61,14 @@ type bucket struct {
entries []*Node
}
-func newTable(t transport, ourID NodeID, ourAddr *net.UDPAddr) *Table {
- db, _ := newNodeDB("", Version)
+func newTable(t transport, ourID NodeID, ourAddr *net.UDPAddr, seedCache string) *Table {
+ // Load the bootstrap seed cache (use in memory db upon failure)
+ db, err := newNodeDB(seedCache, Version)
+ if err != nil {
+ glog.V(logger.Warn).Infoln("Failed to open bootstrap seed cache:", err)
+ db, _ = newNodeDB("", Version)
+ }
+ // Create the bootstrap table
tab := &Table{
net: t,
db: db,
@@ -81,9 +90,10 @@ func (tab *Table) Self() *Node {
return tab.self
}
-// Close terminates the network listener.
+// Close terminates the network listener and flushes the seed cache.
func (tab *Table) Close() {
tab.net.close()
+ tab.db.close()
}
// Bootstrap sets the bootstrap nodes. These nodes are used to connect
diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go
index 07a1a739c..c26703f19 100644
--- a/p2p/discover/udp.go
+++ b/p2p/discover/udp.go
@@ -144,7 +144,7 @@ type reply struct {
}
// ListenUDP returns a new table that listens for UDP packets on laddr.
-func ListenUDP(priv *ecdsa.PrivateKey, laddr string, natm nat.Interface) (*Table, error) {
+func ListenUDP(priv *ecdsa.PrivateKey, laddr string, natm nat.Interface, seedCache string) (*Table, error) {
addr, err := net.ResolveUDPAddr("udp", laddr)
if err != nil {
return nil, err
@@ -153,12 +153,12 @@ func ListenUDP(priv *ecdsa.PrivateKey, laddr string, natm nat.Interface) (*Table
if err != nil {
return nil, err
}
- tab, _ := newUDP(priv, conn, natm)
+ tab, _ := newUDP(priv, conn, natm, seedCache)
glog.V(logger.Info).Infoln("Listening,", tab.self)
return tab, nil
}
-func newUDP(priv *ecdsa.PrivateKey, c conn, natm nat.Interface) (*Table, *udp) {
+func newUDP(priv *ecdsa.PrivateKey, c conn, natm nat.Interface, seedCache string) (*Table, *udp) {
udp := &udp{
conn: c,
priv: priv,
@@ -176,7 +176,7 @@ func newUDP(priv *ecdsa.PrivateKey, c conn, natm nat.Interface) (*Table, *udp) {
realaddr = &net.UDPAddr{IP: ext, Port: realaddr.Port}
}
}
- udp.Table = newTable(udp, PubkeyID(&priv.PublicKey), realaddr)
+ udp.Table = newTable(udp, PubkeyID(&priv.PublicKey), realaddr, seedCache)
go udp.loop()
go udp.readLoop()
return udp.Table, udp