ipfs swarm addrs listen command, fix t0060-daemon

Necessary for meaningful semantics in the presence of address filtering.

License: MIT
Signed-off-by: vyzo <vyzo@hackzen.org>

core/commands/swarm.go

@@ -202,7 +202,8 @@ var swarmAddrsCmd = &cmds.Command{
 `,
 	},
 	Subcommands: map[string]*cmds.Command{
-		"local": swarmAddrsLocalCmd,
+		"local":  swarmAddrsLocalCmd,
+		"listen": swarmAddrsListenCmd,
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 
@@ -301,6 +302,46 @@ var swarmAddrsLocalCmd = &cmds.Command{
 	},
 }
 
+var swarmAddrsListenCmd = &cmds.Command{
+	Helptext: cmds.HelpText{
+		Tagline: "List interface listening addresses.",
+		ShortDescription: `
+'ipfs swarm addrs listen' lists all interface addresses the node is listening on.
+`,
+	},
+	Run: func(req cmds.Request, res cmds.Response) {
+
+		n, err := req.InvocContext().GetNode()
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		if n.PeerHost == nil {
+			res.SetError(errNotOnline, cmds.ErrClient)
+			return
+		}
+
+		var addrs []string
+		maddrs, err := n.PeerHost.Network().InterfaceListenAddresses()
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		for _, addr := range maddrs {
+			addrs = append(addrs, addr.String())
+		}
+		sort.Sort(sort.StringSlice(addrs))
+
+		res.SetOutput(&stringList{addrs})
+	},
+	Type: stringList{},
+	Marshalers: cmds.MarshalerMap{
+		cmds.Text: stringListMarshaler,
+	},
+}
+
 var swarmConnectCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Open connection to a given address.",

test/sharness/t0060-daemon.sh

@@ -21,6 +21,10 @@ test_expect_success "'ipfs swarm addrs local' works" '
   ipfs swarm addrs local >local_addrs
 '
 
+test_expect_success "ipfs swarm addrs listen; works" '
+  ipfs swarm addrs listen >listen_addrs
+'
+
 test_expect_success "ipfs peer id looks good" '
   test_check_peerid "$PEERID"
 '
@@ -38,7 +42,7 @@ test_expect_success "ipfs gateway works with the correct allowed origin port" '
 test_expect_success "ipfs daemon output looks good" '
   STARTFILE="ipfs cat /ipfs/$HASH_WELCOME_DOCS/readme" &&
   echo "Initializing daemon..." >expected_daemon &&
-  sed "s/^/Swarm listening on /" local_addrs >>expected_daemon &&
+  sed "s/^/Swarm listening on /" listen_addrs >>expected_daemon &&
   sed "s/^/Swarm announcing /" local_addrs >>expected_daemon &&
   echo "API server listening on '$API_MADDR'" >>expected_daemon &&
   echo "Gateway (readonly) server listening on '$GWAY_MADDR'" >>expected_daemon &&