add dns support to tcp and udp formats.

Author: raulk

patterns.go

@@ -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

@@ -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{