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
64890284
Commit
64890284
authored
9 years ago
by
Jeromy
Browse files
Options
Download
Email Patches
Plain Diff
use multiaddr format to do validation of addresses
parent
e7ff04ce
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 @
64890284
...
...
@@ -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 @
64890284
...
...
@@ -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 @
64890284
...
...
@@ -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 @
64890284
...
...
@@ -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