p2p: remove redundant listener address check
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
May 11, 2018 at 15:37 UTC
633b04e5da739f89eea1efd5fe6e4b15ef614fce
1 file changed
+10
-21
p2p/outbound.go
+10
-21
@@ -2,7 +2,6 @@ package p2p
2
3
import (
4
"context"
5
- "errors"
5
"time"
6
7
ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
@@ -29,34 +28,24 @@ type outboundListener struct {
28
29
// Dial creates new P2P stream to a remote listener
30
func (p2p *P2P) Dial(ctx context.Context, peer peer.ID, proto string, bindAddr ma.Multiaddr) (Listener, error) {
32
- lnet, _, err := manet.DialArgs(bindAddr)
31
+ maListener, err := manet.Listen(bindAddr)
32
if err != nil {
33
return nil, err
34
}
35
37
- switch lnet {
38
- case "tcp", "tcp4", "tcp6":
39
- maListener, err := manet.Listen(bindAddr)
40
- if err != nil {
41
- return nil, err
42
- }
43
-
44
- listener := &outboundListener{
45
- p2p: p2p,
46
- id: p2p.identity,
36
+ listener := &outboundListener{
37
+ p2p: p2p,
38
+ id: p2p.identity,
39
48
- proto: proto,
49
- peer: peer,
40
+ proto: proto,
41
+ peer: peer,
42
51
- listener: maListener,
52
- }
43
+ listener: maListener,
44
+ }
45
54
- go listener.acceptConns()
46
+ go listener.acceptConns()
47
56
- return listener, nil
57
- default:
58
- return nil, errors.New("unsupported proto: " + lnet)
59
- }
48
+ return listener, nil
49
}
50
51
func (l *outboundListener) dial() (net.Stream, error) {