Add TCP src/dst port traffic selection criteria to TrafficSelector
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
index 31c53a8..a388b48 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
@@ -140,6 +140,16 @@
}
@Override
+ public Builder matchTcpSrc(Short tcpPort) {
+ return add(Criteria.matchTcpSrc(tcpPort));
+ }
+
+ @Override
+ public Builder matchTcpDst(Short tcpPort) {
+ return add(Criteria.matchTcpDst(tcpPort));
+ }
+
+ @Override
public TrafficSelector build() {
return new DefaultTrafficSelector(ImmutableSet.copyOf(selector.values()));
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
index c704c8f..41bceb8 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
@@ -98,6 +98,20 @@
public Builder matchIPDst(IpPrefix ip);
/**
+ * Matches a TCP source port number.
+ * @param tcpPort a TCP source port number
+ * @return a selection builder
+ */
+ public Builder matchTcpSrc(Short tcpPort);
+
+ /**
+ * Matches a TCP destination port number.
+ * @param tcpPort a TCP destination port number
+ * @return a selection builder
+ */
+ public Builder matchTcpDst(Short tcpPort);
+
+ /**
* Builds an immutable traffic selector.
*
* @return traffic selector
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
index a819bd3..8bd0960 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
@@ -113,6 +113,25 @@
return new IPCriterion(ip, Type.IPV4_DST);
}
+ /**
+ * Creates a match on TCP source port field using the specified value.
+ *
+ * @param tcpPort
+ * @return match criterion
+ */
+ public static Criterion matchTcpSrc(Short tcpPort) {
+ return new TcpPortCriterion(tcpPort, Type.TCP_SRC);
+ }
+
+ /**
+ * Creates a match on TCP destination port field using the specified value.
+ *
+ * @param tcpPort
+ * @return match criterion
+ */
+ public static Criterion matchTcpDst(Short tcpPort) {
+ return new TcpPortCriterion(tcpPort, Type.TCP_DST);
+ }
/*
* Implementations of criteria.
@@ -437,4 +456,49 @@
}
+ public static final class TcpPortCriterion implements Criterion {
+
+ private final Short tcpPort;
+ private final Type type;
+
+ public TcpPortCriterion(Short tcpPort, Type type) {
+ this.tcpPort = tcpPort;
+ this.type = type;
+ }
+
+ @Override
+ public Type type() {
+ return this.type;
+ }
+
+ public Short tcpPort() {
+ return this.tcpPort;
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("tcpPort", tcpPort).toString();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(tcpPort, type);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof TcpPortCriterion) {
+ TcpPortCriterion that = (TcpPortCriterion) obj;
+ return Objects.equals(tcpPort, that.tcpPort) &&
+ Objects.equals(type, that.type);
+
+
+ }
+ return false;
+ }
+ }
}