Commit d3f70d18 authored by Jeromy Johnson's avatar Jeromy Johnson Committed by GitHub
Browse files

Merge pull request #114 from libp2p/feat/context-dial

conn/dial: implement contextDial up the stack
parents 8c7eede2 c9ca0729
...@@ -152,7 +152,7 @@ func (d *Dialer) rawConnDial(ctx context.Context, raddr ma.Multiaddr, remote pee ...@@ -152,7 +152,7 @@ func (d *Dialer) rawConnDial(ctx context.Context, raddr ma.Multiaddr, remote pee
return nil, fmt.Errorf("no dialer for %s", raddr) return nil, fmt.Errorf("no dialer for %s", raddr)
} }
return sd.Dial(raddr) return sd.DialContext(ctx, raddr)
} }
func pickLocalAddr(laddrs []ma.Multiaddr, raddr ma.Multiaddr) (laddr ma.Multiaddr) { func pickLocalAddr(laddrs []ma.Multiaddr, raddr ma.Multiaddr) (laddr ma.Multiaddr) {
......
...@@ -113,11 +113,6 @@ ...@@ -113,11 +113,6 @@
"name": "go-stream-muxer", "name": "go-stream-muxer",
"version": "1.0.0" "version": "1.0.0"
}, },
{
"hash": "QmaaC9QMYTQHCbMq3Ebr3uMaAR2ev4AVqMmsJpgQijAZbJ",
"name": "go-reuseport",
"version": "0.0.0"
},
{ {
"hash": "QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A", "hash": "QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A",
"name": "go-notifier", "name": "go-notifier",
...@@ -159,9 +154,9 @@ ...@@ -159,9 +154,9 @@
}, },
{ {
"author": "whyrusleeping", "author": "whyrusleeping",
"hash": "QmQCGn5uWpL1wWntVzCWQrNmXBZ5a1PXbxZNFtPPbFk3KC", "hash": "Qmazcq5ZXnyP5smvUquM8dAro6ZAppExxyV7Z3URq3dzin",
"name": "go-libp2p-transport", "name": "go-libp2p-transport",
"version": "1.3.6" "version": "1.6.1"
}, },
{ {
"author": "whyrusleeping", "author": "whyrusleeping",
...@@ -189,9 +184,9 @@ ...@@ -189,9 +184,9 @@
}, },
{ {
"author": "whyrusleeping", "author": "whyrusleeping",
"hash": "Qmb5uXFWQMcJdJK6nMSZ92HRvc1okWutVgLFsyesKdpemc", "hash": "QmWEQk3Ak32B2nAVjAnXzAsfXGHCyjvrHB9vroooWhEr8j",
"name": "ws-transport", "name": "ws-transport",
"version": "1.0.6" "version": "1.2.2"
} }
], ],
"gxVersion": "0.4.0", "gxVersion": "0.4.0",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment