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
mf
go-multiaddr-fmt
Commits
53297ecb
Commit
53297ecb
authored
Feb 27, 2019
by
Raúl Kripalani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add dns support to tcp and udp formats.
parent
18dc2358
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
patterns.go
patterns.go
+11
-5
patterns_test.go
patterns_test.go
+6
-3
No files found.
patterns.go
View file @
53297ecb
...
...
@@ -23,13 +23,19 @@ var DNS = Or(
// Define IP as either ipv4 or ipv6
var
IP
=
Or
(
Base
(
ma
.
P_IP4
),
Base
(
ma
.
P_IP6
))
// Define TCP as 'tcp' on top of either ipv4 or ipv6
var
TCP
=
And
(
IP
,
Base
(
ma
.
P_TCP
))
// Define TCP as 'tcp' on top of either ipv4 or ipv6, or dns equivalents.
var
TCP
=
Or
(
And
(
DNS
,
Base
(
ma
.
P_TCP
)),
And
(
IP
,
Base
(
ma
.
P_TCP
)),
)
// Define UDP as 'udp' on top of either ipv4 or ipv6
var
UDP
=
And
(
IP
,
Base
(
ma
.
P_UDP
))
// Define UDP as 'udp' on top of either ipv4 or ipv6, or dns equivalents.
var
UDP
=
Or
(
And
(
DNS
,
Base
(
ma
.
P_UDP
)),
And
(
IP
,
Base
(
ma
.
P_UDP
)),
)
// Define UTP as 'utp' on top of udp (on top of ipv4 or ipv6)
// Define UTP as 'utp' on top of udp (on top of ipv4 or ipv6)
.
var
UTP
=
And
(
UDP
,
Base
(
ma
.
P_UTP
))
// Define QUIC as 'quic' on top of udp (on top of ipv4 or ipv6)
...
...
patterns_test.go
View file @
53297ecb
...
...
@@ -43,9 +43,6 @@ func TestBasicMatching(t *testing.T) {
"/dns4/ipfs.io"
,
"/dns4/libp2p.io"
,
"/dns6/protocol.ai"
,
"/dns4/protocol.ai/tcp/80"
,
"/dns6/protocol.ai/tcp/80"
,
"/dnsaddr/protocol.ai/tcp/8"
,
}
bad_dns
:=
[]
string
{
...
...
@@ -65,6 +62,9 @@ func TestBasicMatching(t *testing.T) {
good_tcp
:=
[]
string
{
"/ip4/0.0.7.6/tcp/1234"
,
"/ip6/::/tcp/0"
,
"/dns4/protocol.ai/tcp/80"
,
"/dns6/protocol.ai/tcp/80"
,
"/dnsaddr/protocol.ai/tcp/8"
,
}
bad_tcp
:=
[]
string
{
...
...
@@ -75,6 +75,9 @@ func TestBasicMatching(t *testing.T) {
good_udp
:=
[]
string
{
"/ip4/0.0.7.6/udp/1234"
,
"/ip6/::/udp/0"
,
"/dns4/protocol.ai/udp/80"
,
"/dns6/protocol.ai/udp/80"
,
"/dnsaddr/protocol.ai/udp/8"
,
}
bad_udp
:=
[]
string
{
...
...
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