Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
p2p
go-p2p-swarm
Commits
5c228621
Unverified
Commit
5c228621
authored
Mar 29, 2020
by
Steven Allen
Committed by
GitHub
Mar 29, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #185 from libp2p/fix/listenaddr-err
feat: handle no addresses
parents
ad905b0a
1db72f71
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
28 deletions
+41
-28
go.mod
go.mod
+2
-2
go.sum
go.sum
+6
-15
swarm_addr.go
swarm_addr.go
+14
-10
swarm_addr_test.go
swarm_addr_test.go
+19
-1
No files found.
go.mod
View file @
5c228621
...
@@ -5,7 +5,7 @@ require (
...
@@ -5,7 +5,7 @@ require (
github.com/jbenet/goprocess
v0.1.3
github.com/jbenet/goprocess
v0.1.3
github.com/libp2p/go-addr-util
v0.0.1
github.com/libp2p/go-addr-util
v0.0.1
github.com/libp2p/go-conn-security-multistream
v0.1.0
github.com/libp2p/go-conn-security-multistream
v0.1.0
github.com/libp2p/go-libp2p-core
v0.
3
.0
github.com/libp2p/go-libp2p-core
v0.
4
.0
github.com/libp2p/go-libp2p-loggables
v0.1.0
github.com/libp2p/go-libp2p-loggables
v0.1.0
github.com/libp2p/go-libp2p-peerstore
v0.1.4
github.com/libp2p/go-libp2p-peerstore
v0.1.4
github.com/libp2p/go-libp2p-secio
v0.2.1
github.com/libp2p/go-libp2p-secio
v0.2.1
...
@@ -15,7 +15,7 @@ require (
...
@@ -15,7 +15,7 @@ require (
github.com/libp2p/go-maddr-filter
v0.0.5
github.com/libp2p/go-maddr-filter
v0.0.5
github.com/libp2p/go-stream-muxer-multistream
v0.2.0
github.com/libp2p/go-stream-muxer-multistream
v0.2.0
github.com/libp2p/go-tcp-transport
v0.1.1
github.com/libp2p/go-tcp-transport
v0.1.1
github.com/multiformats/go-multiaddr
v0.2.
0
github.com/multiformats/go-multiaddr
v0.2.
1
github.com/multiformats/go-multiaddr-fmt
v0.1.0
github.com/multiformats/go-multiaddr-fmt
v0.1.0
github.com/multiformats/go-multiaddr-net
v0.1.2
github.com/multiformats/go-multiaddr-net
v0.1.2
github.com/whyrusleeping/multiaddr-filter
v0.0.0-20160516205228-e903e4adabd7
github.com/whyrusleeping/multiaddr-filter
v0.0.0-20160516205228-e903e4adabd7
...
...
go.sum
View file @
5c228621
...
@@ -68,6 +68,7 @@ github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUP
...
@@ -68,6 +68,7 @@ github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUP
github.com/ipfs/go-cid
v0.0.2/go.mod h1:
GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid
v0.0.2/go.mod h1:
GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid
v0.0.3 h1:
UIAh32wymBpStoe83YCzwVQQ5Oy/H0FdxvUS6DJDzms=
github.com/ipfs/go-cid
v0.0.3 h1:
UIAh32wymBpStoe83YCzwVQQ5Oy/H0FdxvUS6DJDzms=
github.com/ipfs/go-cid
v0.0.3/go.mod h1:
GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid
v0.0.3/go.mod h1:
GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid
v0.0.5 h1:
o0Ix8e/ql7Zb5UVUJEUfjsWCIY8t48++9lR8qi6oiJU=
github.com/ipfs/go-cid
v0.0.5/go.mod h1:
plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
github.com/ipfs/go-cid
v0.0.5/go.mod h1:
plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
github.com/ipfs/go-datastore
v0.1.0/go.mod h1:
d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore
v0.1.0/go.mod h1:
d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore
v0.1.1/go.mod h1:
w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
github.com/ipfs/go-datastore
v0.1.1/go.mod h1:
w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
...
@@ -105,8 +106,6 @@ github.com/libp2p/go-conn-security-multistream v0.1.0 h1:aqGmto+ttL/uJgX0JtQI0tD
...
@@ -105,8 +106,6 @@ github.com/libp2p/go-conn-security-multistream v0.1.0 h1:aqGmto+ttL/uJgX0JtQI0tD
github.com/libp2p/go-conn-security-multistream
v0.1.0/go.mod h1:
aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
github.com/libp2p/go-conn-security-multistream
v0.1.0/go.mod h1:
aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
github.com/libp2p/go-flow-metrics
v0.0.1 h1:
0gxuFd2GuK7IIP5pKljLwps6TvcuYgvG7Atqi3INF5s=
github.com/libp2p/go-flow-metrics
v0.0.1 h1:
0gxuFd2GuK7IIP5pKljLwps6TvcuYgvG7Atqi3INF5s=
github.com/libp2p/go-flow-metrics
v0.0.1/go.mod h1:
Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
github.com/libp2p/go-flow-metrics
v0.0.1/go.mod h1:
Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
github.com/libp2p/go-flow-metrics
v0.0.2 h1:
U5TvqfoyR6GVRM+bC15Ux1ltar1kbj6Zw6xOVR02CZs=
github.com/libp2p/go-flow-metrics
v0.0.2/go.mod h1:
HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
github.com/libp2p/go-flow-metrics
v0.0.3 h1:
8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
github.com/libp2p/go-flow-metrics
v0.0.3 h1:
8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
github.com/libp2p/go-flow-metrics
v0.0.3/go.mod h1:
HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
github.com/libp2p/go-flow-metrics
v0.0.3/go.mod h1:
HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
github.com/libp2p/go-libp2p-core
v0.0.1 h1:
HSTZtFIq/W5Ue43Zw+uWZyy2Vl5WtF0zDjKN8/DT/1I=
github.com/libp2p/go-libp2p-core
v0.0.1 h1:
HSTZtFIq/W5Ue43Zw+uWZyy2Vl5WtF0zDjKN8/DT/1I=
...
@@ -117,10 +116,6 @@ github.com/libp2p/go-libp2p-core v0.2.2 h1:Sv1ggdoMx9c7v7FOFkR7agraHCnAgqYsXrU1A
...
@@ -117,10 +116,6 @@ github.com/libp2p/go-libp2p-core v0.2.2 h1:Sv1ggdoMx9c7v7FOFkR7agraHCnAgqYsXrU1A
github.com/libp2p/go-libp2p-core
v0.2.2/go.mod h1:
8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
github.com/libp2p/go-libp2p-core
v0.2.2/go.mod h1:
8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
github.com/libp2p/go-libp2p-core
v0.2.4 h1:
Et6ykkTwI6PU44tr8qUF9k43vP0aduMNniShAbUJJw8=
github.com/libp2p/go-libp2p-core
v0.2.4 h1:
Et6ykkTwI6PU44tr8qUF9k43vP0aduMNniShAbUJJw8=
github.com/libp2p/go-libp2p-core
v0.2.4/go.mod h1:
STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
github.com/libp2p/go-libp2p-core
v0.2.4/go.mod h1:
STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
github.com/libp2p/go-libp2p-core
v0.2.5 h1:
iP1PIiIrlRrGbE1fYq2918yBc5NlCH3pFuIPSWU9hds=
github.com/libp2p/go-libp2p-core
v0.2.5/go.mod h1:
6+5zJmKhsf7yHn1RbmYDu08qDUpIUxGdqHuEZckmZOA=
github.com/libp2p/go-libp2p-core
v0.3.0 h1:
F7PqduvrztDtFsAa/bcheQ3azmNo+Nq7m8hQY5GiUW8=
github.com/libp2p/go-libp2p-core
v0.3.0/go.mod h1:
ACp3DmS3/N64c2jDzcV429ukDpicbL6+TrrxANBjPGw=
github.com/libp2p/go-libp2p-core
v0.4.0 h1:
LjZJP/Yy4q8kc724izkYQ9v6YkAmkKCOaE5jLv/NZRo=
github.com/libp2p/go-libp2p-core
v0.4.0 h1:
LjZJP/Yy4q8kc724izkYQ9v6YkAmkKCOaE5jLv/NZRo=
github.com/libp2p/go-libp2p-core
v0.4.0/go.mod h1:
49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
github.com/libp2p/go-libp2p-core
v0.4.0/go.mod h1:
49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
github.com/libp2p/go-libp2p-loggables
v0.1.0 h1:
h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
github.com/libp2p/go-libp2p-loggables
v0.1.0 h1:
h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
...
@@ -134,15 +129,12 @@ github.com/libp2p/go-libp2p-secio v0.2.1 h1:eNWbJTdyPA7NxhP7J3c5lT97DC5d+u+Ildkg
...
@@ -134,15 +129,12 @@ github.com/libp2p/go-libp2p-secio v0.2.1 h1:eNWbJTdyPA7NxhP7J3c5lT97DC5d+u+Ildkg
github.com/libp2p/go-libp2p-secio
v0.2.1/go.mod h1:
cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
github.com/libp2p/go-libp2p-secio
v0.2.1/go.mod h1:
cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
github.com/libp2p/go-libp2p-testing
v0.0.2/go.mod h1:
gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing
v0.0.2/go.mod h1:
gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing
v0.0.3/go.mod h1:
gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing
v0.0.3/go.mod h1:
gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing
v0.0.4/go.mod h1:
gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing
v0.1.0 h1:
WaFRj/t3HdMZGNZqnU2pS7pDRBmMeoDx7/HDNpeyT9U=
github.com/libp2p/go-libp2p-testing
v0.1.0 h1:
WaFRj/t3HdMZGNZqnU2pS7pDRBmMeoDx7/HDNpeyT9U=
github.com/libp2p/go-libp2p-testing
v0.1.0/go.mod h1:
xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
github.com/libp2p/go-libp2p-testing
v0.1.0/go.mod h1:
xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
github.com/libp2p/go-libp2p-testing
v0.1.1 h1:
U03z3HnGI7Ni8Xx6ONVZvUFOAzWYmolWf5W5jAOPNmU=
github.com/libp2p/go-libp2p-testing
v0.1.1 h1:
U03z3HnGI7Ni8Xx6ONVZvUFOAzWYmolWf5W5jAOPNmU=
github.com/libp2p/go-libp2p-testing
v0.1.1/go.mod h1:
xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
github.com/libp2p/go-libp2p-testing
v0.1.1/go.mod h1:
xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
github.com/libp2p/go-libp2p-transport-upgrader
v0.1.1 h1:
PZMS9lhjK9VytzMCW3tWHAXtKXmlURSc3ZdvwEcKCzw=
github.com/libp2p/go-libp2p-transport-upgrader
v0.1.1 h1:
PZMS9lhjK9VytzMCW3tWHAXtKXmlURSc3ZdvwEcKCzw=
github.com/libp2p/go-libp2p-transport-upgrader
v0.1.1/go.mod h1:
IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
github.com/libp2p/go-libp2p-transport-upgrader
v0.1.1/go.mod h1:
IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
github.com/libp2p/go-libp2p-yamux
v0.2.1 h1:
Q3XYNiKCC2vIxrvUJL+Jg1kiyeEaIDNKLjgEjo3VQdI=
github.com/libp2p/go-libp2p-yamux
v0.2.1/go.mod h1:
1FBXiHDk1VyRM1C0aez2bCfHQ4vMZKkAQzZbkSQt5fI=
github.com/libp2p/go-libp2p-yamux
v0.2.2 h1:
eGvbqWqWY9S5lrpe2gA0UCOLCdzCgYSAR3vo/xCsNQg=
github.com/libp2p/go-libp2p-yamux
v0.2.2 h1:
eGvbqWqWY9S5lrpe2gA0UCOLCdzCgYSAR3vo/xCsNQg=
github.com/libp2p/go-libp2p-yamux
v0.2.2/go.mod h1:
lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
github.com/libp2p/go-libp2p-yamux
v0.2.2/go.mod h1:
lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
github.com/libp2p/go-maddr-filter
v0.0.4 h1:
hx8HIuuwk34KePddrp2mM5ivgPkZ09JH4AvsALRbFUs=
github.com/libp2p/go-maddr-filter
v0.0.4 h1:
hx8HIuuwk34KePddrp2mM5ivgPkZ09JH4AvsALRbFUs=
...
@@ -169,8 +161,6 @@ github.com/libp2p/go-stream-muxer-multistream v0.2.0 h1:714bRJ4Zy9mdhyTLJ+ZKiROm
...
@@ -169,8 +161,6 @@ github.com/libp2p/go-stream-muxer-multistream v0.2.0 h1:714bRJ4Zy9mdhyTLJ+ZKiROm
github.com/libp2p/go-stream-muxer-multistream
v0.2.0/go.mod h1:
j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
github.com/libp2p/go-stream-muxer-multistream
v0.2.0/go.mod h1:
j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
github.com/libp2p/go-tcp-transport
v0.1.1 h1:
yGlqURmqgNA2fvzjSgZNlHcsd/IulAnKM8Ncu+vlqnw=
github.com/libp2p/go-tcp-transport
v0.1.1 h1:
yGlqURmqgNA2fvzjSgZNlHcsd/IulAnKM8Ncu+vlqnw=
github.com/libp2p/go-tcp-transport
v0.1.1/go.mod h1:
3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
github.com/libp2p/go-tcp-transport
v0.1.1/go.mod h1:
3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
github.com/libp2p/go-yamux
v1.2.3 h1:
xX8A36vpXb59frIzWFdEgptLMsOANMFq2K7fPRlunYI=
github.com/libp2p/go-yamux
v1.2.3/go.mod h1:
FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/libp2p/go-yamux
v1.3.0 h1:
FsYzT16Wq2XqUGJsBbOxoz9g+dFklvNi7jN6YFPfl7U=
github.com/libp2p/go-yamux
v1.3.0 h1:
FsYzT16Wq2XqUGJsBbOxoz9g+dFklvNi7jN6YFPfl7U=
github.com/libp2p/go-yamux
v1.3.0/go.mod h1:
FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/libp2p/go-yamux
v1.3.0/go.mod h1:
FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/magiconair/properties
v1.8.0/go.mod h1:
PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties
v1.8.0/go.mod h1:
PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
...
@@ -212,6 +202,7 @@ github.com/multiformats/go-multiaddr v0.1.1 h1:rVAztJYMhCQ7vEFr8FvxW3mS+HF2eY/oP
...
@@ -212,6 +202,7 @@ github.com/multiformats/go-multiaddr v0.1.1 h1:rVAztJYMhCQ7vEFr8FvxW3mS+HF2eY/oP
github.com/multiformats/go-multiaddr
v0.1.1/go.mod h1:
aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
github.com/multiformats/go-multiaddr
v0.1.1/go.mod h1:
aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
github.com/multiformats/go-multiaddr
v0.2.0 h1:
lR52sFwcTCuQb6bTfnXF6zA2XfyYvyd+5a9qECv/J90=
github.com/multiformats/go-multiaddr
v0.2.0 h1:
lR52sFwcTCuQb6bTfnXF6zA2XfyYvyd+5a9qECv/J90=
github.com/multiformats/go-multiaddr
v0.2.0/go.mod h1:
0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
github.com/multiformats/go-multiaddr
v0.2.0/go.mod h1:
0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
github.com/multiformats/go-multiaddr
v0.2.1 h1:
SgG/cw5vqyB5QQe5FPe2TqggU9WtrA9X4nZw7LlVqOI=
github.com/multiformats/go-multiaddr
v0.2.1/go.mod h1:
s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
github.com/multiformats/go-multiaddr
v0.2.1/go.mod h1:
s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
github.com/multiformats/go-multiaddr-dns
v0.0.1/go.mod h1:
9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
github.com/multiformats/go-multiaddr-dns
v0.0.1/go.mod h1:
9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
github.com/multiformats/go-multiaddr-fmt
v0.1.0 h1:
WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
github.com/multiformats/go-multiaddr-fmt
v0.1.0 h1:
WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
...
@@ -231,14 +222,14 @@ github.com/multiformats/go-multihash v0.0.5 h1:1wxmCvTXAifAepIMyF39vZinRw5sbqjPs
...
@@ -231,14 +222,14 @@ github.com/multiformats/go-multihash v0.0.5 h1:1wxmCvTXAifAepIMyF39vZinRw5sbqjPs
github.com/multiformats/go-multihash
v0.0.5/go.mod h1:
lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
github.com/multiformats/go-multihash
v0.0.5/go.mod h1:
lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
github.com/multiformats/go-multihash
v0.0.8 h1:
wrYcW5yxSi3dU07n5jnuS5PrNwyHy0zRHGVoUugWvXg=
github.com/multiformats/go-multihash
v0.0.8 h1:
wrYcW5yxSi3dU07n5jnuS5PrNwyHy0zRHGVoUugWvXg=
github.com/multiformats/go-multihash
v0.0.8/go.mod h1:
YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
github.com/multiformats/go-multihash
v0.0.8/go.mod h1:
YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
github.com/multiformats/go-multihash
v0.0.10 h1:
lMoNbh2Ssd9PUF74Nz008KGzGPlfeV6wH3rit5IIGCM=
github.com/multiformats/go-multihash
v0.0.13 h1:
06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
github.com/multiformats/go-multihash
v0.0.10/go.mod h1:
YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
github.com/multiformats/go-multihash
v0.0.13/go.mod h1:
VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
github.com/multiformats/go-multihash
v0.0.13/go.mod h1:
VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
github.com/multiformats/go-multistream
v0.1.0 h1:
UpO6jrsjqs46mqAK3n6wKRYFhugss9ArzbyUzU+4wkQ=
github.com/multiformats/go-multistream
v0.1.0 h1:
UpO6jrsjqs46mqAK3n6wKRYFhugss9ArzbyUzU+4wkQ=
github.com/multiformats/go-multistream
v0.1.0/go.mod h1:
fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
github.com/multiformats/go-multistream
v0.1.0/go.mod h1:
fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
github.com/multiformats/go-varint
v0.0.1 h1:
TR/0rdQtnNxuN2IhiB639xC3tWM4IUi7DkTBVTdGW/M=
github.com/multiformats/go-varint
v0.0.1 h1:
TR/0rdQtnNxuN2IhiB639xC3tWM4IUi7DkTBVTdGW/M=
github.com/multiformats/go-varint
v0.0.1/go.mod h1:
3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint
v0.0.1/go.mod h1:
3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint
v0.0.2/go.mod h1:
3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint
v0.0.2/go.mod h1:
3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint
v0.0.5 h1:
XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
github.com/multiformats/go-varint
v0.0.5/go.mod h1:
3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint
v0.0.5/go.mod h1:
3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/onsi/ginkgo
v1.6.0/go.mod h1:
lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo
v1.6.0/go.mod h1:
lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo
v1.7.0/go.mod h1:
lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo
v1.7.0/go.mod h1:
lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
...
@@ -276,6 +267,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
...
@@ -276,6 +267,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify
v1.2.2/go.mod h1:
a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify
v1.2.2/go.mod h1:
a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify
v1.3.0 h1:
TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify
v1.3.0 h1:
TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify
v1.3.0/go.mod h1:
M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify
v1.3.0/go.mod h1:
M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify
v1.4.0 h1:
2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify
v1.4.0/go.mod h1:
j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify
v1.4.0/go.mod h1:
j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/syndtr/goleveldb
v1.0.0/go.mod h1:
ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/syndtr/goleveldb
v1.0.0/go.mod h1:
ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/ugorji/go/codec
v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:
VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec
v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:
VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
...
@@ -292,8 +284,7 @@ go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
...
@@ -292,8 +284,7 @@ go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
go.opencensus.io
v0.21.0/go.mod h1:
mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io
v0.21.0/go.mod h1:
mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io
v0.22.1 h1:
8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
go.opencensus.io
v0.22.1 h1:
8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
go.opencensus.io
v0.22.1/go.mod h1:
Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
go.opencensus.io
v0.22.1/go.mod h1:
Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
go.opencensus.io
v0.22.2 h1:
75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
go.opencensus.io
v0.22.3 h1:
8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
go.opencensus.io
v0.22.2/go.mod h1:
yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io
v0.22.3/go.mod h1:
yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io
v0.22.3/go.mod h1:
yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
golang.org/x/crypto
v0.0.0-20170930174604-9419663f5a44/go.mod h1:
6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto
v0.0.0-20170930174604-9419663f5a44/go.mod h1:
6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto
v0.0.0-20180904163835-0709b304e793/go.mod h1:
6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto
v0.0.0-20180904163835-0709b304e793/go.mod h1:
6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
...
...
swarm_addr.go
View file @
5c228621
...
@@ -34,7 +34,7 @@ func (s *Swarm) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
...
@@ -34,7 +34,7 @@ func (s *Swarm) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
isEOL
:=
time
.
Now
()
.
After
(
s
.
listeners
.
cacheEOL
)
isEOL
:=
time
.
Now
()
.
After
(
s
.
listeners
.
cacheEOL
)
s
.
listeners
.
RUnlock
()
// RLock end
s
.
listeners
.
RUnlock
()
// RLock end
if
ifaceListenAddres
!=
nil
&&
!
isEOL
{
if
!
isEOL
{
// Cache is valid, clone the slice
// Cache is valid, clone the slice
return
append
(
ifaceListenAddres
[
:
0
:
0
],
ifaceListenAddres
...
),
nil
return
append
(
ifaceListenAddres
[
:
0
:
0
],
ifaceListenAddres
...
),
nil
}
}
...
@@ -46,16 +46,20 @@ func (s *Swarm) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
...
@@ -46,16 +46,20 @@ func (s *Swarm) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
ifaceListenAddres
=
s
.
listeners
.
ifaceListenAddres
ifaceListenAddres
=
s
.
listeners
.
ifaceListenAddres
isEOL
=
time
.
Now
()
.
After
(
s
.
listeners
.
cacheEOL
)
isEOL
=
time
.
Now
()
.
After
(
s
.
listeners
.
cacheEOL
)
if
ifaceListenAddres
==
nil
||
isEOL
{
if
isEOL
{
// Cache is still invalid
// Cache is still invalid
listenAddres
:=
s
.
listenAddressesNoLock
()
var
err
error
if
len
(
listenAddres
)
>
0
{
ifaceListenAddres
,
err
=
addrutil
.
ResolveUnspecifiedAddresses
(
// We're actually listening on addresses.
s
.
listenAddressesNoLock
(),
nil
)
var
err
error
ifaceListenAddres
,
err
=
addrutil
.
ResolveUnspecifiedAddresses
(
listenAddres
,
nil
)
if
err
!=
nil
{
s
.
listeners
.
Unlock
()
// Lock early exit
if
err
!=
nil
{
return
nil
,
err
s
.
listeners
.
Unlock
()
// Lock early exit
return
nil
,
err
}
}
else
{
ifaceListenAddres
=
nil
}
}
s
.
listeners
.
ifaceListenAddres
=
ifaceListenAddres
s
.
listeners
.
ifaceListenAddres
=
ifaceListenAddres
...
...
swarm_addr_test.go
View file @
5c228621
...
@@ -8,6 +8,8 @@ import (
...
@@ -8,6 +8,8 @@ import (
"github.com/libp2p/go-libp2p-core/test"
"github.com/libp2p/go-libp2p-core/test"
ma
"github.com/multiformats/go-multiaddr"
ma
"github.com/multiformats/go-multiaddr"
swarmt
"github.com/libp2p/go-libp2p-swarm/testing"
)
)
func
TestDialBadAddrs
(
t
*
testing
.
T
)
{
func
TestDialBadAddrs
(
t
*
testing
.
T
)
{
...
@@ -37,8 +39,10 @@ func TestDialBadAddrs(t *testing.T) {
...
@@ -37,8 +39,10 @@ func TestDialBadAddrs(t *testing.T) {
}
}
func
TestAddrRace
(
t
*
testing
.
T
)
{
func
TestAddrRace
(
t
*
testing
.
T
)
{
ctx
:=
context
.
Background
()
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
s
:=
makeSwarms
(
ctx
,
t
,
1
)[
0
]
s
:=
makeSwarms
(
ctx
,
t
,
1
)[
0
]
defer
s
.
Close
()
a1
,
err
:=
s
.
InterfaceListenAddresses
()
a1
,
err
:=
s
.
InterfaceListenAddresses
()
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -53,3 +57,17 @@ func TestAddrRace(t *testing.T) {
...
@@ -53,3 +57,17 @@ func TestAddrRace(t *testing.T) {
t
.
Fatal
(
"got the exact same address set twice; this could lead to data races"
)
t
.
Fatal
(
"got the exact same address set twice; this could lead to data races"
)
}
}
}
}
func
TestAddressesWithoutListening
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
s
:=
swarmt
.
GenSwarm
(
t
,
ctx
,
swarmt
.
OptDialOnly
)
a1
,
err
:=
s
.
InterfaceListenAddresses
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
len
(
a1
)
!=
0
{
t
.
Fatalf
(
"expected to be listening on no addresses, was listening on %d"
,
len
(
a1
))
}
}
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