Add functions/types for matching UDP src/dst ports

Author: asimeth-do

ovs/match.go

@@ -75,6 +75,8 @@ const (
 	tunTTL      = "tun_ttl"
 	tunv6DST    = "tun_ipv6_dst"
 	tunv6SRC    = "tun_ipv6_src"
+	udpDST      = "udp_dst"
+	udpSRC      = "udp_src"
 	vlanTCI1    = "vlan_tci1"
 	vlanTCI     = "vlan_tci"
 )
@@ -879,8 +881,7 @@ func (m *arpProtocolAddressMatch) GoString() string {
 	return fmt.Sprintf("ovs.ARPTargetProtocolAddress(%q)", m.ip)
 }
 
-// TransportSourcePort matches packets with a transport layer (TCP/UDP) source
-// port matching port.
+// TransportSourcePort matches packets with a TCP source port matching port.
 func TransportSourcePort(port uint16) Match {
 	return &transportPortMatch{
 		srcdst: source,
@@ -889,8 +890,7 @@ func TransportSourcePort(port uint16) Match {
 	}
 }
 
-// TransportDestinationPort matches packets with a transport layer (TCP/UDP)
-// destination port matching port.
+// TransportDestinationPort matches packets with a TCP destination port matching port.
 func TransportDestinationPort(port uint16) Match {
 	return &transportPortMatch{
 		srcdst: destination,
@@ -899,8 +899,7 @@ func TransportDestinationPort(port uint16) Match {
 	}
 }
 
-// TransportSourceMaskedPort matches packets with a transport layer (TCP/UDP)
-// source port matching a masked port range.
+// TransportSourceMaskedPort matches packets with TCP source port matching a masked port range.
 func TransportSourceMaskedPort(port uint16, mask uint16) Match {
 	return &transportPortMatch{
 		srcdst: source,
@@ -909,8 +908,7 @@ func TransportSourceMaskedPort(port uint16, mask uint16) Match {
 	}
 }
 
-// TransportDestinationMaskedPort matches packets with a transport layer (TCP/UDP)
-// destination port matching a masked port range.
+// TransportDestinationMaskedPort matches packets with a TCP destination port matching a masked port range.
 func TransportDestinationMaskedPort(port uint16, mask uint16) Match {
 	return &transportPortMatch{
 		srcdst: destination,
@@ -919,6 +917,73 @@ func TransportDestinationMaskedPort(port uint16, mask uint16) Match {
 	}
 }
 
+// UdpSourcePort matches packets with a UDP source port matching port.
+func UdpSourcePort(port uint16) Match {
+	return &udpPortMatch{
+		srcdst: source,
+		port:   port,
+		mask:   0,
+	}
+}
+
+// UdpDestinationPort matches packets with a UDP destination port matching port.
+func UdpDestinationPort(port uint16) Match {
+	return &udpPortMatch{
+		srcdst: destination,
+		port:   port,
+		mask:   0,
+	}
+}
+
+// UdpSourceMaskedPort matches packets with UDP source port matching a masked port range.
+func UdpSourceMaskedPort(port uint16, mask uint16) Match {
+	return &udpPortMatch{
+		srcdst: source,
+		port:   port,
+		mask:   mask,
+	}
+}
+
+// UdpDestinationMaskedPort matches packets with a UDP destination port matching a masked port range.
+func UdpDestinationMaskedPort(port uint16, mask uint16) Match {
+	return &udpPortMatch{
+		srcdst: destination,
+		port:   port,
+		mask:   mask,
+	}
+}
+
+// A udpPortMatch is a Match returned by Udp{Source,Destination}Port.
+type udpPortMatch struct {
+	srcdst string
+	port   uint16
+	mask   uint16
+}
+
+var _ Match = &udpPortMatch{}
+
+// MarshalText implements Match.
+func (m *udpPortMatch) MarshalText() ([]byte, error) {
+	return matchUdpPort(m.srcdst, m.port, m.mask)
+}
+
+// GoString implements Match.
+func (m *udpPortMatch) GoString() string {
+	if m.mask > 0 {
+		if m.srcdst == source {
+			return fmt.Sprintf("ovs.UdpSourceMaskedPort(%#x, %#x)", m.port, m.mask)
+		}
+
+		return fmt.Sprintf("ovs.UdpDestinationMaskedPort(%#x, %#x)", m.port, m.mask)
+	}
+
+	if m.srcdst == source {
+		return fmt.Sprintf("ovs.UdpSourcePort(%d)", m.port)
+	}
+
+	return fmt.Sprintf("ovs.UdpDestinationPort(%d)", m.port)
+}
+
 // A transportPortMatch is a Match returned by Transport{Source,Destination}Port.
 type transportPortMatch struct {
 	srcdst string
@@ -1491,6 +1556,17 @@ func matchTransportPort(srcdst string, port uint16, mask uint16) ([]byte, error)
 	return bprintf("tp_%s=0x%04x/0x%04x", srcdst, port, mask), nil
 }
 
+// matchUdpPort is the common implementation for
+// Udp{Source,Destination}Port.
+func matchUdpPort(srcdst string, port uint16, mask uint16) ([]byte, error) {
+	// No mask specified
+	if mask == 0 {
+		return bprintf("udp_%s=%d", srcdst, port), nil
+	}
+
+	return bprintf("udp_%s=0x%04x/0x%04x", srcdst, port, mask), nil
+}
+
 // IPFragFlag is a string type which can be used with the IPFragMatch.
 type IPFragFlag string
 

ovs/matchparser.go

@@ -35,7 +35,7 @@ func parseMatch(key string, value string) (Match, error) {
 		return parseIntMatch(key, value, math.MaxUint8)
 	case ctZone:
 		return parseIntMatch(key, value, math.MaxUint16)
-	case tpSRC, tpDST:
+	case tpSRC, tpDST, udpSRC, udpDST:
 		return parsePort(key, value, math.MaxUint16)
 	case conjID:
 		return parseIntMatch(key, value, math.MaxUint32)
@@ -215,6 +215,10 @@ func parsePort(key string, value string, max int) (Match, error) {
 		return TransportSourceMaskedPort(uint16(values[0]), uint16(values[1])), nil
 	case tpDST:
 		return TransportDestinationMaskedPort(uint16(values[0]), uint16(values[1])), nil
+	case udpSRC:
+		return UdpSourceMaskedPort(uint16(values[0]), uint16(values[1])), nil
+	case udpDST:
+		return UdpDestinationMaskedPort(uint16(values[0]), uint16(values[1])), nil
 	}
 	// Return error if input is invalid
 	return nil, fmt.Errorf("no action matched for %s=%s", key, value)