summaryrefslogtreecommitdiffhomepage
path: root/ryu/ofproto/ofproto_v1_4.py
diff options
context:
space:
mode:
Diffstat (limited to 'ryu/ofproto/ofproto_v1_4.py')
-rw-r--r--ryu/ofproto/ofproto_v1_4.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/ryu/ofproto/ofproto_v1_4.py b/ryu/ofproto/ofproto_v1_4.py
index 250c0e12..3f107eb7 100644
--- a/ryu/ofproto/ofproto_v1_4.py
+++ b/ryu/ofproto/ofproto_v1_4.py
@@ -19,6 +19,7 @@ OpenFlow 1.4 definitions.
"""
from ryu.lib import type_desc
+from ryu.ofproto import nx_match
from ryu.ofproto import ofproto_utils
from ryu.ofproto import oxm_fields
@@ -390,10 +391,12 @@ oxm_types = [
oxm_fields.OpenFlowBasic('tunnel_id', 38, type_desc.Int8),
oxm_fields.OpenFlowBasic('ipv6_exthdr', 39, type_desc.Int2),
oxm_fields.OpenFlowBasic('pbb_uca', 41, type_desc.Int1),
- oxm_fields.NiciraExtended1('tun_ipv4_src', 31, type_desc.IPv4Addr),
- oxm_fields.NiciraExtended1('tun_ipv4_dst', 32, type_desc.IPv4Addr),
- oxm_fields.NiciraExtended1('pkt_mark', 33, type_desc.Int4),
-]
+ # 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),
+] + nx_match.oxm_types
oxm_fields.generate(__name__)