fix(corerouting) pass transport addr
Brian Tiger Chow committed
Feb 6, 2015 at 13:49 UTC
c0ca02486b4ba54e2df60f4fe0575fdb68c02804
4 files changed
+17
-17
cmd/ipfs/daemon.go
+1
-1
@@ -114,7 +114,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
114
return
115
}
116
if routingOption == routingOptionSupernodeKwd {
117
- servers, err := repo.Config().GCR.ServerIPFSAddrs()
117
+ servers, err := repo.Config().SupernodeRouting.ServerIPFSAddrs()
118
if err != nil {
119
res.SetError(err, cmds.ErrNormal)
120
repo.Close() // because ownership hasn't been transferred to the node
repo/config/config.go
+10
-10
@@ -16,16 +16,16 @@ var log = u.Logger("config")
16
17
// Config is used to load IPFS config files.
18
type Config struct {
19
- Identity Identity // local node's peer identity
20
- Datastore Datastore // local node's storage
21
- Addresses Addresses // local node's addresses
22
- Mounts Mounts // local node's mount points
23
- Version Version // local node's version management
24
- Bootstrap []string // local nodes's bootstrap peer addresses
25
- Tour Tour // local node's tour position
26
- Gateway Gateway // local node's gateway server options
27
- GCR GCR // local node's routing servers (if GCR enabled)
28
- Log Log
19
+ Identity Identity // local node's peer identity
20
+ Datastore Datastore // local node's storage
21
+ Addresses Addresses // local node's addresses
22
+ Mounts Mounts // local node's mount points
23
+ Version Version // local node's version management
24
+ Bootstrap []string // local nodes's bootstrap peer addresses
25
+ Tour Tour // local node's tour position
26
+ Gateway Gateway // local node's gateway server options
27
+ SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
28
+ Log Log
29
}
30
31
const (
repo/config/init.go
+2
-2
@@ -26,7 +26,7 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
26
return nil, err
27
}
28
29
- gcr, err := initGCR()
29
+ snr, err := initSNRConfig()
30
if err != nil {
31
return nil, err
32
}
@@ -45,7 +45,7 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
45
},
46
47
Bootstrap: BootstrapPeerStrings(bootstrapPeers),
48
- GCR: *gcr,
48
+ SupernodeRouting: *snr,
49
Datastore: *ds,
50
Identity: identity,
51
Log: Log{
repo/config/supernode.go
renamed
+4
-4
@@ -5,7 +5,7 @@ import "github.com/jbenet/go-ipfs/util/ipfsaddr"
5
// TODO replace with final servers before merge
6
7
// TODO rename
8
-type GCR struct {
8
+type SupernodeClientConfig struct {
9
Servers []string
10
}
11
@@ -14,14 +14,14 @@ var DefaultGCRServers = []string{
14
"/ip4/107.170.215.87/tcp/4001/ipfs/QmZDYP9GBjkAmZrS5usSzPnLf41haq6jJhJDmWgnSM4zvW",
15
}
16
17
-func initGCR() (*GCR, error) {
17
+func initSNRConfig() (*SupernodeClientConfig, error) {
18
// TODO perform validation
19
- return &GCR{
19
+ return &SupernodeClientConfig{
20
Servers: DefaultGCRServers,
21
}, nil
22
}
23
24
-func (gcr *GCR) ServerIPFSAddrs() ([]ipfsaddr.IPFSAddr, error) {
24
+func (gcr *SupernodeClientConfig) ServerIPFSAddrs() ([]ipfsaddr.IPFSAddr, error) {
25
var addrs []ipfsaddr.IPFSAddr
26
for _, server := range gcr.Servers {
27
addr, err := ipfsaddr.ParseString(server)