From 82febdd2762d496d47fe6a66fdf33e88403581c6 Mon Sep 17 00:00:00 2001 From: Brent Salisbury Date: Fri, 22 Aug 2014 16:10:46 -0400 Subject: [PATCH] Changed the tcp_flag match builder param in /util/md/match Patch#2 -Did the same for the TCP port num. Patch#1 -Changed the tcp builder to use the instance variable passed in the match tcpflag util method rather then hardcoded to 0x002(tcp_syn) Change-Id: I29d54c87af24678a6e99692b986ae5a84d60ced2 Signed-off-by: Brent Salisbury --- .../ovsdb/utils/mdsal/openflow/MatchUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java index d92d5b4650..22f78f14c2 100644 --- a/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java +++ b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java @@ -312,6 +312,9 @@ public class MatchUtils { /** * Test match for TCP_Flags * + * @param matchBuilder MatchBuilder Object without a match yet + * @param tcpPort PortNumber representing a destination TCP port + * @param tcpFlag int representing a tcp_flag * @return match containing TCP_Flag (), IP Protocol (TCP), TCP_Flag (SYN) *

* Defined TCP Flag values in OVS v2.1+ @@ -319,7 +322,7 @@ public class MatchUtils { * TCP_PSH 0x008 / TCP_ACK 0x010 / TCP_URG 0x020 * TCP_ECE 0x040 / TCP_CWR 0x080 / TCP_NS 0x100 */ - public static MatchBuilder createTcpFlagMatch(MatchBuilder matchBuilder, int tcpFlag) { + public static MatchBuilder createTcpFlagMatch(MatchBuilder matchBuilder, PortNumber tcpPort, int tcpFlag) { // Ethertype match EthernetMatchBuilder ethernetType = new EthernetMatchBuilder(); @@ -334,13 +337,13 @@ public class MatchUtils { matchBuilder.setIpMatch(ipMatch.build()); // TCP Port Match - PortNumber dstPort = new PortNumber(80); + PortNumber dstPort = new PortNumber(tcpPort); TcpMatchBuilder tcpMatch = new TcpMatchBuilder(); tcpMatch.setTcpDestinationPort(dstPort); matchBuilder.setLayer4Match(tcpMatch.build()); TcpFlagMatchBuilder tcpFlagMatch = new TcpFlagMatchBuilder(); - tcpFlagMatch.setTcpFlag(0x002); + tcpFlagMatch.setTcpFlag(tcpFlag); matchBuilder.setTcpFlagMatch(tcpFlagMatch.build()); return matchBuilder; } -- 2.36.6