Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
4f17a651
Commit
4f17a651
authored
8 years ago
by
Jeromy
Browse files
Options
Download
Email Patches
Plain Diff
add negotiate timeout option to basichost
parent
405d49a9
master
2018-Q4-OKR
docs-improvements
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feature/standardize-readme
fix/473
fix/no-custom-field
fix/reset-ping-stream
fix/revert-correct-external-addr
gx/update-jccl6u
gx/update-nza0mn
jenkinsfile
kevina/fix-go-vet
multistream-ping
punching
revert-276-update-go-detect-race
v6.0.23
v6.0.22
v6.0.21
v6.0.20
v6.0.19
v6.0.18
v6.0.17
v6.0.16
v6.0.15
v6.0.14
v6.0.13
v6.0.12
v6.0.11
v6.0.10
v6.0.9
v6.0.8
v6.0.7
v6.0.6
v6.0.5
v6.0.4
v6.0.3
v6.0.2
v6.0.1
v6.0.0
v5.0.21
v5.0.20
v5.0.19
v5.0.18
v5.0.17
v5.0.16
v5.0.15
v5.0.14
v5.0.13
v5.0.12
v5.0.11
v5.0.10
v5.0.9
v5.0.8
v5.0.7
v5.0.6
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.5.5
v4.5.4
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.5
v4.4.4
v4.4.3
v4.4.2
v4.4.1
v4.4.0
v4.3.12
v4.3.11
v4.3.10
v4.3.9
v4.3.8
v4.3.7
v4.3.6
v4.3.5
v4.3.4
v4.3.3
v4.3.2
v4.3.1
v4.3.0
v4.2.0
v4.1.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
p2p/host/basic/basic_host.go
+25
-2
p2p/host/basic/basic_host.go
p2p/net/mock/mock_net.go
+1
-0
p2p/net/mock/mock_net.go
with
26 additions
and
2 deletions
+26
-2
p2p/host/basic/basic_host.go
View file @
4f17a651
...
...
@@ -23,6 +23,8 @@ import (
var
log
=
logging
.
Logger
(
"basichost"
)
var
NegotiateTimeout
=
time
.
Second
*
60
// Option is a type used to pass in options to the host.
type
Option
int
...
...
@@ -48,6 +50,8 @@ type BasicHost struct {
relay
*
relay
.
RelayService
natmgr
*
natManager
NegotiateTimeout
time
.
Duration
proc
goprocess
.
Process
bwc
metrics
.
Reporter
...
...
@@ -56,8 +60,9 @@ type BasicHost struct {
// New constructs and sets up a new *BasicHost with given Network
func
New
(
net
inet
.
Network
,
opts
...
interface
{})
*
BasicHost
{
h
:=
&
BasicHost
{
network
:
net
,
mux
:
msmux
.
NewMultistreamMuxer
(),
network
:
net
,
mux
:
msmux
.
NewMultistreamMuxer
(),
NegotiateTimeout
:
NegotiateTimeout
,
}
h
.
proc
=
goprocess
.
WithTeardown
(
func
()
error
{
...
...
@@ -106,6 +111,15 @@ func (h *BasicHost) newConnHandler(c inet.Conn) {
// TODO: this feels a bit wonky
func
(
h
*
BasicHost
)
newStreamHandler
(
s
inet
.
Stream
)
{
before
:=
time
.
Now
()
if
h
.
NegotiateTimeout
!=
0
{
if
err
:=
s
.
SetDeadline
(
time
.
Now
()
.
Add
(
h
.
NegotiateTimeout
));
err
!=
nil
{
log
.
Error
(
"setting stream deadline: "
,
err
)
s
.
Close
()
return
}
}
protoID
,
handle
,
err
:=
h
.
Mux
()
.
Negotiate
(
s
)
took
:=
time
.
Now
()
.
Sub
(
before
)
if
err
!=
nil
{
...
...
@@ -121,6 +135,15 @@ func (h *BasicHost) newStreamHandler(s inet.Stream) {
s
.
Close
()
return
}
if
h
.
NegotiateTimeout
!=
0
{
if
err
:=
s
.
SetDeadline
(
time
.
Time
{});
err
!=
nil
{
log
.
Error
(
"resetting stream deadline: "
,
err
)
s
.
Close
()
return
}
}
s
.
SetProtocol
(
protocol
.
ID
(
protoID
))
if
h
.
bwc
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/mock/mock_net.go
View file @
4f17a651
...
...
@@ -85,6 +85,7 @@ func (mn *mocknet) AddPeerWithPeerstore(p peer.ID, ps pstore.Peerstore) (host.Ho
}
h
:=
bhost
.
New
(
n
)
h
.
NegotiateTimeout
=
0
mn
.
proc
.
AddChild
(
n
.
proc
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help