p2p: p2p ls
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
May 23, 2018 at 17:13 UTC
067154f22fbee2d51776a204ef6b42e675b486c1
1 file changed
+24
-38
core/commands/p2p.go
+24
-38
@@ -58,9 +58,10 @@ are refined`,
58
},
59
60
Subcommands: map[string]*cmds.Command{
61
- "listener": p2pListenerCmd,
62
- "stream": p2pStreamCmd,
63
- "forward": p2pForwardCmd,
61
+ "stream": p2pStreamCmd,
62
+
63
+ "forward": p2pForwardCmd,
64
+ "ls": p2pLsCmd,
65
},
66
}
67
@@ -156,45 +157,12 @@ func forwardLocal(ctx context.Context, p *p2p.P2P, ps pstore.Peerstore, proto st
157
return err
158
}
159
159
-////
160
-// LEGACY
161
-//
162
-//
163
-
164
-// p2pListenerCmd is the 'ipfs p2p listener' command
165
-var p2pListenerCmd = &cmds.Command{
166
- Helptext: cmdkit.HelpText{
167
- Tagline: "P2P listener management.",
168
- ShortDescription: "Create and manage listener p2p endpoints",
169
- },
170
-
171
- Subcommands: map[string]*cmds.Command{
172
- "ls": p2pListenerLsCmd,
173
- "open": p2pListenerListenCmd,
174
- "close": p2pListenerCloseCmd,
175
- },
176
-}
177
-
178
-// p2pStreamCmd is the 'ipfs p2p stream' command
179
-var p2pStreamCmd = &cmds.Command{
180
- Helptext: cmdkit.HelpText{
181
- Tagline: "P2P stream management.",
182
- ShortDescription: "Create and manage p2p streams",
183
- },
184
-
185
- Subcommands: map[string]*cmds.Command{
186
- "ls": p2pStreamLsCmd,
187
- "dial": p2pStreamDialCmd,
188
- "close": p2pStreamCloseCmd,
189
- },
190
-}
191
-
192
-var p2pListenerLsCmd = &cmds.Command{
160
+var p2pLsCmd = &cmds.Command{
161
Helptext: cmdkit.HelpText{
162
Tagline: "List active p2p listeners.",
163
},
164
Options: []cmdkit.Option{
197
- cmdkit.BoolOption("headers", "v", "Print table headers (Id, Protocol, Local, Remote)."),
165
+ cmdkit.BoolOption("headers", "v", "Print table headers (Protocol, Listen, Target)."),
166
},
167
Run: func(req cmds.Request, res cmds.Response) {
168
n, err := getNode(req)
@@ -241,6 +209,24 @@ var p2pListenerLsCmd = &cmds.Command{
209
},
210
}
211
212
+///////
213
+// Listener
214
+//
215
+
216
+// p2pStreamCmd is the 'ipfs p2p stream' command
217
+var p2pStreamCmd = &cmds.Command{
218
+ Helptext: cmdkit.HelpText{
219
+ Tagline: "P2P stream management.",
220
+ ShortDescription: "Create and manage p2p streams",
221
+ },
222
+
223
+ Subcommands: map[string]*cmds.Command{
224
+ "ls": p2pStreamLsCmd,
225
+ "dial": p2pStreamDialCmd,
226
+ "close": p2pStreamCloseCmd,
227
+ },
228
+}
229
+
230
var p2pStreamLsCmd = &cmds.Command{
231
Helptext: cmdkit.HelpText{
232
Tagline: "List active p2p streams.",