summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2015-02-06 16:33:53 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-02-08 10:17:40 +0900
commitaef9838a8f446ec5f3f160516137268c7cec8e37 (patch)
tree8c08b5a294c7c6b85653871fffa36f9ea469a27b
parentc938f094f42d376e95d23759ab2706081d93162b (diff)
ofproto_v1_3: Implement EXT-109 and EXT-233
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/ofproto/ofproto_v1_3.py5
-rw-r--r--ryu/ofproto/oxm_fields.py4
2 files changed, 9 insertions, 0 deletions
diff --git a/ryu/ofproto/ofproto_v1_3.py b/ryu/ofproto/ofproto_v1_3.py
index b80c5120..d07bad91 100644
--- a/ryu/ofproto/ofproto_v1_3.py
+++ b/ryu/ofproto/ofproto_v1_3.py
@@ -1178,6 +1178,11 @@ oxm_types = [
oxm_fields.OpenFlowBasic('tunnel_id', 38, type_desc.Int8),
oxm_fields.OpenFlowBasic('ipv6_exthdr', 39, type_desc.Int2),
oxm_fields.OldONFExperimenter('pbb_uca', 2560, type_desc.Int1),
+ # EXT-109 TCP flags match field Extension
+ oxm_fields.ONFExperimenter('tcp_flags', 42, type_desc.Int2),
+ # EXT-233 Output match Extension
+ # NOTE(yamamoto): The spec says uint64_t but I assume it's an error.
+ oxm_fields.ONFExperimenter('actset_output', 43, type_desc.Int4),
oxm_fields.NiciraExtended1('tun_ipv4_src', 31, type_desc.IPv4Addr),
oxm_fields.NiciraExtended1('tun_ipv4_dst', 32, type_desc.IPv4Addr),
diff --git a/ryu/ofproto/oxm_fields.py b/ryu/ofproto/oxm_fields.py
index 52a53d0d..ed7f821d 100644
--- a/ryu/ofproto/oxm_fields.py
+++ b/ryu/ofproto/oxm_fields.py
@@ -95,6 +95,10 @@ class _Experimenter(_OxmClass):
self.num = (self.experimenter_id, self.oxm_type)
+class ONFExperimenter(_Experimenter):
+ experimenter_id = ofproto_common.ONF_EXPERIMENTER_ID
+
+
class OldONFExperimenter(_Experimenter):
# This class is for the old version of EXT-256
experimenter_id = ofproto_common.ONF_EXPERIMENTER_ID