config: swarm is list of addrs
Juan Batiz-Benet committed
Nov 20, 2014 at 04:35 UTC
1a5cb300cb80a7dbd8d6a895e8f976c2fa6b4ce2
4 files changed
+15
-12
cmd/ipfs/init.go
+5
-2
@@ -179,8 +179,11 @@ func initConfig(configFilename string, dspathOverride string, nBitsForKeypair in
179
180
// setup the node addresses.
181
Addresses: config.Addresses{
182
- Swarm: "/ip4/0.0.0.0/tcp/4001",
183
- API: "/ip4/127.0.0.1/tcp/5001",
182
+ Swarm: []string{
183
+ "/ip4/0.0.0.0/tcp/4001",
184
+ "/ip4/0.0.0.0/udp/4002/utp",
185
+ },
186
+ API: "/ip4/127.0.0.1/tcp/5001",
187
},
188
189
Bootstrap: []*config.BootstrapPeer{
config/config.go
+2
-2
@@ -36,8 +36,8 @@ type Datastore struct {
36
37
// Addresses stores the (string) multiaddr addresses for the node.
38
type Addresses struct {
39
- Swarm string // address for the swarm network
40
- API string // address for the local API (RPC)
39
+ Swarm []string // addresses for the swarm network
40
+ API string // address for the local API (RPC)
41
}
42
43
// Mounts stores the (string) mount points
core/core.go
+6
-6
@@ -268,15 +268,15 @@ func initConnections(ctx context.Context, cfg *config.Config, pstore peer.Peerst
268
}
269
270
func listenAddresses(cfg *config.Config) ([]ma.Multiaddr, error) {
271
- var listen []ma.Multiaddr
271
273
- if len(cfg.Addresses.Swarm) > 0 {
274
- maddr, err := ma.NewMultiaddr(cfg.Addresses.Swarm)
272
+ var err error
273
+ listen := make([]ma.Multiaddr, len(cfg.Addresses.Swarm))
274
+ for i, addr := range cfg.Addresses.Swarm {
275
+
276
+ listen[i], err = ma.NewMultiaddr(addr)
277
if err != nil {
276
- return nil, fmt.Errorf("Failure to parse config.Addresses.Swarm: %s", cfg.Addresses.Swarm)
278
+ return nil, fmt.Errorf("Failure to parse config.Addresses.Swarm[%d]: %s", i, cfg.Addresses.Swarm)
279
}
278
-
279
- listen = append(listen, maddr)
280
}
281
282
return listen, nil
core/core_test.go
+2
-2
@@ -17,7 +17,7 @@ func TestInitialization(t *testing.T) {
17
Type: "memory",
18
},
19
Addresses: config.Addresses{
20
- Swarm: "/ip4/0.0.0.0/tcp/4001",
20
+ Swarm: []string{"/ip4/0.0.0.0/tcp/4001"},
21
API: "/ip4/127.0.0.1/tcp/8000",
22
},
23
},
@@ -29,7 +29,7 @@ func TestInitialization(t *testing.T) {
29
Path: ".testdb",
30
},
31
Addresses: config.Addresses{
32
- Swarm: "/ip4/0.0.0.0/tcp/4001",
32
+ Swarm: []string{"/ip4/0.0.0.0/tcp/4001"},
33
API: "/ip4/127.0.0.1/tcp/8000",
34
},
35
},