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
5c8093b0
Commit
5c8093b0
authored
8 years ago
by
John Steidley
Browse files
Options
Download
Email Patches
Plain Diff
gosimple
parent
b32016eb
master
2018-Q4-OKR
docs-improvements
feat/backoff-listing
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feat/update/go-reuseport
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
v4.0.4
v4.0.3
v4.0.2
v4.0.1
v4.0.0
v3.6.0
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.4.3
v3.4.2
v3.4.1
v3.4.0
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
p2p/discovery/mdns.go
+17
-20
p2p/discovery/mdns.go
p2p/nat/nat.go
+1
-1
p2p/nat/nat.go
p2p/net/conn/dial.go
+1
-1
p2p/net/conn/dial.go
p2p/net/conn/dial_test.go
+2
-2
p2p/net/conn/dial_test.go
p2p/net/conn/listen.go
+1
-1
p2p/net/conn/listen.go
p2p/net/swarm/dial_test.go
+2
-2
p2p/net/swarm/dial_test.go
p2p/net/swarm/swarm_net.go
+1
-1
p2p/net/swarm/swarm_net.go
p2p/protocol/ping/ping.go
+1
-1
p2p/protocol/ping/ping.go
p2p/test/backpressure/backpressure_test.go
+2
-2
p2p/test/backpressure/backpressure_test.go
with
28 additions
and
31 deletions
+28
-31
p2p/discovery/mdns.go
View file @
5c8093b0
...
...
@@ -110,28 +110,25 @@ func (m *mdnsService) Close() error {
func
(
m
*
mdnsService
)
pollForEntries
()
{
ticker
:=
time
.
NewTicker
(
m
.
interval
)
for
{
select
{
case
<-
ticker
.
C
:
entriesCh
:=
make
(
chan
*
mdns
.
ServiceEntry
,
16
)
go
func
()
{
for
entry
:=
range
entriesCh
{
m
.
handleEntry
(
entry
)
}
}()
qp
:=
mdns
.
QueryParam
{}
qp
.
Domain
=
"local"
qp
.
Entries
=
entriesCh
qp
.
Service
=
ServiceTag
qp
.
Timeout
=
time
.
Second
*
5
err
:=
mdns
.
Query
(
&
qp
)
if
err
!=
nil
{
log
.
Error
(
"mdns lookup error: "
,
err
)
for
range
ticker
.
C
{
entriesCh
:=
make
(
chan
*
mdns
.
ServiceEntry
,
16
)
go
func
()
{
for
entry
:=
range
entriesCh
{
m
.
handleEntry
(
entry
)
}
close
(
entriesCh
)
}()
qp
:=
mdns
.
QueryParam
{}
qp
.
Domain
=
"local"
qp
.
Entries
=
entriesCh
qp
.
Service
=
ServiceTag
qp
.
Timeout
=
time
.
Second
*
5
err
:=
mdns
.
Query
(
&
qp
)
if
err
!=
nil
{
log
.
Error
(
"mdns lookup error: "
,
err
)
}
close
(
entriesCh
)
}
}
...
...
This diff is collapsed.
Click to expand it.
p2p/nat/nat.go
View file @
5c8093b0
...
...
@@ -208,7 +208,7 @@ func (m *mapping) ExternalAddr() (ma.Multiaddr, error) {
ctime
:=
m
.
cacheTime
cval
:=
m
.
cached
m
.
cacheLk
.
Unlock
()
if
time
.
Now
()
.
Sub
(
ctime
)
<
CacheTime
{
if
time
.
Since
(
ctime
)
<
CacheTime
{
return
cval
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/dial.go
View file @
5c8093b0
...
...
@@ -86,7 +86,7 @@ func (d *Dialer) Dial(ctx context.Context, raddr ma.Multiaddr, remote peer.ID) (
return
}
if
d
.
PrivateKey
==
nil
||
EncryptConnections
==
false
{
if
d
.
PrivateKey
==
nil
||
!
EncryptConnections
{
log
.
Warning
(
"dialer %s dialing INSECURELY %s at %s!"
,
d
,
remote
,
raddr
)
connOut
=
c
return
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/dial_test.go
View file @
5c8093b0
...
...
@@ -514,7 +514,7 @@ func TestConcurrentAccept(t *testing.T) {
}
limit
:=
delay
*
time
.
Duration
(
n
)
took
:=
time
.
Now
()
.
Sub
(
before
)
took
:=
time
.
Since
(
before
)
if
took
>
limit
{
t
.
Fatal
(
"took too long!"
)
}
...
...
@@ -606,7 +606,7 @@ func TestConnectionTimeouts(t *testing.T) {
c
.
Close
()
}
took
:=
time
.
Now
()
.
Sub
(
before
)
took
:=
time
.
Since
(
before
)
if
took
>
time
.
Second
*
5
{
t
.
Fatal
(
"hanging dials shouldnt block good dials"
)
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/listen.go
View file @
5c8093b0
...
...
@@ -93,7 +93,7 @@ func (l *listener) Accept() (net.Conn, error) {
return
nil
,
err
}
if
l
.
privk
==
nil
||
EncryptConnections
==
false
{
if
l
.
privk
==
nil
||
!
EncryptConnections
{
log
.
Warning
(
"listener %s listening INSECURELY!"
,
l
)
return
c
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/dial_test.go
View file @
5c8093b0
...
...
@@ -187,7 +187,7 @@ func TestDialWait(t *testing.T) {
}
else
{
t
.
Log
(
"correctly got error:"
,
err
)
}
duration
:=
time
.
Now
()
.
Sub
(
before
)
duration
:=
time
.
Since
(
before
)
dt
:=
s1
.
dialT
if
duration
<
dt
*
dialAttempts
{
...
...
@@ -451,7 +451,7 @@ func TestDialBackoffClears(t *testing.T) {
}
else
{
t
.
Log
(
"correctly got error:"
,
err
)
}
duration
:=
time
.
Now
()
.
Sub
(
before
)
duration
:=
time
.
Since
(
before
)
dt
:=
s1
.
dialT
if
duration
<
dt
*
dialAttempts
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/swarm_net.go
View file @
5c8093b0
...
...
@@ -124,7 +124,7 @@ func (n *Network) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
// For now only returns Connected || NotConnected. Expand into more later.
func
(
n
*
Network
)
Connectedness
(
p
peer
.
ID
)
inet
.
Connectedness
{
c
:=
n
.
Swarm
()
.
ConnectionsToPeer
(
p
)
if
c
!=
nil
&&
len
(
c
)
>
0
{
if
len
(
c
)
>
0
{
return
inet
.
Connected
}
return
inet
.
NotConnected
...
...
This diff is collapsed.
Click to expand it.
p2p/protocol/ping/ping.go
View file @
5c8093b0
...
...
@@ -121,5 +121,5 @@ func ping(s inet.Stream) (time.Duration, error) {
return
0
,
errors
.
New
(
"ping packet was incorrect!"
)
}
return
time
.
Now
()
.
Sub
(
before
),
nil
return
time
.
Since
(
before
),
nil
}
This diff is collapsed.
Click to expand it.
p2p/test/backpressure/backpressure_test.go
View file @
5c8093b0
...
...
@@ -318,7 +318,7 @@ func TestStBackpressureStreamWrite(t *testing.T) {
receive
(
s
,
b
)
roundsTotal
=
roundsTotal
+
b
}
roundsTime
:=
time
.
Now
()
.
Sub
(
roundsStart
)
roundsTime
:=
time
.
Since
(
roundsStart
)
// now read continously, while we measure stats.
stop
:=
make
(
chan
struct
{})
...
...
@@ -341,7 +341,7 @@ func TestStBackpressureStreamWrite(t *testing.T) {
contTotal
+=
n
}
stop
<-
struct
{}{}
contTime
:=
time
.
Now
()
.
Sub
(
contStart
)
contTime
:=
time
.
Since
(
contStart
)
// now compare! continuous should've been faster AND larger
if
roundsTime
<
contTime
{
...
...
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