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
03aa3d25
Commit
03aa3d25
authored
9 years ago
by
Jeromy Johnson
Browse files
Options
Download
Plain Diff
Merge pull request #21 from ipfs/feat/mafmt
use multiaddr format to do validation of addresses
parents
e7ff04ce
64890284
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
wip/js-interop
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
v3.3.7
v3.3.6
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.2.3
v3.2.2
v3.2.1
v3.2.0
v3.1.0
v3.0.0
v2.0.3
v2.0.2
v2.0.1
v1.0.0
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
p2p/net/transport/tcp.go
+3
-2
p2p/net/transport/tcp.go
p2p/net/transport/transport.go
+0
-10
p2p/net/transport/transport.go
p2p/net/transport/utp.go
+3
-4
p2p/net/transport/utp.go
package.json
+6
-0
package.json
with
12 additions
and
16 deletions
+12
-16
p2p/net/transport/tcp.go
View file @
03aa3d25
...
...
@@ -8,6 +8,7 @@ import (
lgbl
"github.com/ipfs/go-libp2p/loggables"
manet
"gx/ipfs/QmQB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed/go-multiaddr-net"
mafmt
"gx/ipfs/QmWLfU4tstw2aNcTykDm44xbSTCYJ9pUJwfhQCKGwckcHx/mafmt"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
reuseport
"gx/ipfs/QmaaC9QMYTQHCbMq3Ebr3uMaAR2ev4AVqMmsJpgQijAZbJ/go-reuseport"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
...
...
@@ -103,7 +104,7 @@ func manetListen(addr ma.Multiaddr) (manet.Listener, error) {
}
func
(
t
*
TcpTransport
)
Matches
(
a
ma
.
Multiaddr
)
bool
{
return
IsTcpMultiaddr
(
a
)
return
mafmt
.
TCP
.
Matches
(
a
)
}
type
tcpDialer
struct
{
...
...
@@ -199,7 +200,7 @@ func (d *tcpDialer) reuseDial(raddr ma.Multiaddr) (manet.Conn, error) {
}
func
(
d
*
tcpDialer
)
Matches
(
a
ma
.
Multiaddr
)
bool
{
return
IsTcpMultiaddr
(
a
)
return
mafmt
.
TCP
.
Matches
(
a
)
}
type
tcpListener
struct
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/transport/transport.go
View file @
03aa3d25
...
...
@@ -49,13 +49,3 @@ type TimeoutOpt time.Duration
type
ReuseportOpt
bool
var
ReusePorts
ReuseportOpt
=
true
func
IsTcpMultiaddr
(
a
ma
.
Multiaddr
)
bool
{
p
:=
a
.
Protocols
()
return
len
(
p
)
==
2
&&
(
p
[
0
]
.
Name
==
"ip4"
||
p
[
0
]
.
Name
==
"ip6"
)
&&
p
[
1
]
.
Name
==
"tcp"
}
func
IsUtpMultiaddr
(
a
ma
.
Multiaddr
)
bool
{
p
:=
a
.
Protocols
()
return
len
(
p
)
==
3
&&
p
[
2
]
.
Name
==
"utp"
}
This diff is collapsed.
Click to expand it.
p2p/net/transport/utp.go
View file @
03aa3d25
...
...
@@ -7,6 +7,7 @@ import (
manet
"gx/ipfs/QmQB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed/go-multiaddr-net"
mautp
"gx/ipfs/QmQB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed/go-multiaddr-net/utp"
utp
"gx/ipfs/QmVs3wq4cN64TFCxANzgSHjGPrjMnRnwPrxU8bqc7YP42s/utp"
mafmt
"gx/ipfs/QmWLfU4tstw2aNcTykDm44xbSTCYJ9pUJwfhQCKGwckcHx/mafmt"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
...
...
@@ -22,8 +23,7 @@ func NewUtpTransport() *UtpTransport {
}
func
(
d
*
UtpTransport
)
Matches
(
a
ma
.
Multiaddr
)
bool
{
p
:=
a
.
Protocols
()
return
len
(
p
)
==
3
&&
p
[
2
]
.
Name
==
"utp"
return
mafmt
.
UTP
.
Matches
(
a
)
}
type
UtpSocket
struct
{
...
...
@@ -129,8 +129,7 @@ func (s *UtpSocket) Accept() (Conn, error) {
}
func
(
s
*
UtpSocket
)
Matches
(
a
ma
.
Multiaddr
)
bool
{
p
:=
a
.
Protocols
()
return
len
(
p
)
==
3
&&
p
[
2
]
.
Name
==
"utp"
return
mafmt
.
UTP
.
Matches
(
a
)
}
func
(
t
*
UtpSocket
)
Close
()
error
{
...
...
This diff is collapsed.
Click to expand it.
package.json
View file @
03aa3d25
...
...
@@ -127,6 +127,12 @@
"name"
:
"go-peerstream"
,
"hash"
:
"QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK"
,
"version"
:
"0.0.0"
},
{
"author"
:
"whyrusleeping"
,
"name"
:
"mafmt"
,
"hash"
:
"QmWLfU4tstw2aNcTykDm44xbSTCYJ9pUJwfhQCKGwckcHx"
,
"version"
:
"0.0.0"
}
],
"language"
:
"go"
,
...
...
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