From daa2ab2f6e1e7e52232bae2803167ae2673e18f2 Mon Sep 17 00:00:00 2001 From: Sriram Natarajan Date: Mon, 8 Sep 2014 23:46:31 -0700 Subject: [PATCH] Fix-Incorrect-Enum-Names-and-Values OpenFlow 1.3 and 1.4 header files --- ryu/ofproto/ofproto_v1_3.py | 4 ++-- ryu/ofproto/ofproto_v1_4.py | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_3.py b/ryu/ofproto/ofproto_v1_3.py index 418bab1..4ef036c 100644 --- a/ryu/ofproto/ofproto_v1_3.py +++ b/ryu/ofproto/ofproto_v1_3.py @@ -368,7 +368,7 @@ OFP_DEFAULT_PRIORITY = 0x8000 OFPFF_SEND_FLOW_REM = 1 << 0 # Send flow removed message when flow # expires or is deleted. OFPFF_CHECK_OVERLAP = 1 << 1 # Check for overlapping entries first. -OFPFF_RESET_COUNT = 1 << 2 # Reset flow packet and byte counts. +OFPFF_RESET_COUNTS = 1 << 2 # Reset flow packet and byte counts. OFPFF_NO_PKT_COUNTS = 1 << 3 # Don't keep track of packet count. OFPFF_NO_BYT_COUNTS = 1 << 4 # Don't keep track of byte count. @@ -939,7 +939,7 @@ OFPBIC_UNSUP_METADATA_MASK = 4 # Metadata mask value unsupported by # datapath. OFPBIC_BAD_EXPERIMENTER = 5 # Unknown experimenter id specified. OFPBIC_BAD_EXP_TYPE = 6 # Unknown instruction for experimenter id. -OFPBIC_BAD_EXP_LEN = 7 # Length problem in instrucitons. +OFPBIC_BAD_LEN = 7 # Length problem in instrucitons. OFPBIC_EPERM = 8 # Permissions error. # enum ofp_bad_match_code diff --git a/ryu/ofproto/ofproto_v1_4.py b/ryu/ofproto/ofproto_v1_4.py index 610a34e..9ad32d8 100644 --- a/ryu/ofproto/ofproto_v1_4.py +++ b/ryu/ofproto/ofproto_v1_4.py @@ -320,7 +320,7 @@ OFPXMC_EXPERIMENTER = 0xFFFF # Experimenter class # enum ofp_vlan_id OFPVID_PRESENT = 0x1000 # bit that indicate that a VLAN id is set. - +OFPVID_NONE = 0X0000 # No VLAN id was set. def _oxm_tlv_header(class_, field, hasmask, length): return (class_ << 16) | (field << 9) | (hasmask << 8) | length @@ -536,7 +536,7 @@ OFP_DEFAULT_PRIORITY = 0x8000 OFPFF_SEND_FLOW_REM = 1 << 0 # Send flow removed message when flow # expires or is deleted. OFPFF_CHECK_OVERLAP = 1 << 1 # Check for overlapping entries first. -OFPFF_RESET_COUNT = 1 << 2 # Reset flow packet and byte counts. +OFPFF_RESET_COUNTS = 1 << 2 # Reset flow packet and byte counts. OFPFF_NO_PKT_COUNTS = 1 << 3 # Don't keep track of packet count. OFPFF_NO_BYT_COUNTS = 1 << 4 # Don't keep track of byte count. @@ -587,7 +587,7 @@ assert (calcsize(OFP_PACKET_OUT_PACK_STR) + OFP_HEADER_SIZE == OFP_PACKET_OUT_SIZE) # enum ofp_packet_in_reason -OFPR_NO_MATCH = 0 # No matching flow (table-miss flow entry). +OFPR_TABLE_MISS = 0 # No matching flow (table-miss flow entry). OFPR_APPLY_ACTION = 1 # Output to controller in apply-actions. OFPR_INVALID_TTL = 2 # Packet has invalid TTL. OFPR_ACTION_SET = 3 # Output to controller in action set. @@ -760,7 +760,7 @@ OFPBIC_UNSUP_METADATA_MASK = 4 # Metadata mask value unsupported by # datapath. OFPBIC_BAD_EXPERIMENTER = 5 # Unknown experimenter id specified. OFPBIC_BAD_EXP_TYPE = 6 # Unknown instruction for experimenter id. -OFPBIC_BAD_EXP_LEN = 7 # Length problem in instrucitons. +OFPBIC_BAD_LEN = 7 # Length problem in instrucitons. OFPBIC_EPERM = 8 # Permissions error. OFPBIC_DUP_INST = 9 # Duplicate instruction. @@ -950,7 +950,7 @@ OFPMP_FLOW = 1 OFPMP_AGGREGATE = 2 OFPMP_TABLE = 3 OFPMP_PORT_STATS = 4 -OFPMP_QUEUE = 5 +OFPMP_QUEUE_STATS = 5 OFPMP_GROUP = 6 OFPMP_GROUP_DESC = 7 OFPMP_GROUP_FEATURES = 8 @@ -1469,5 +1469,6 @@ assert (calcsize(OFP_BUNDLE_ADD_MSG_PACK_STR) + OFP_HEADER_SIZE == # define constants OFP_VERSION = 0x05 -OFP_TCP_PORT = 6633 +OFP_TCP_PORT = 6653 +OFP_SSL_PORT = 6653 MAX_XID = 0xffffffff -- 1.7.9.3