--- openflow-2014-11-12-3.h 2015-07-23 09:54:18.048479399 -0700 +++ openflow-2014-11-18.h 2015-07-23 09:54:18.052479399 -0700 @@ -315,9 +315,9 @@ /* Configure/Modify behavior of a flow table */ struct ofp_table_mod { struct ofp_header header; - uint8_t table_id; /* ID of the table, OFPTT_ALL indicates all tables */ - uint8_t pad[3]; /* Pad to 32 bits */ - uint32_t config; /* Bitmap of OFPTC_* flags */ + uint8_t table_id; /* ID of the table, OFPTT_ALL indicates all tables */ + uint8_t pad[3]; /* Pad to 32 bits */ + uint32_t config; /* Bitmap of OFPTC_* flags */ /* Table Mod Property list */ struct ofp_table_mod_prop_header properties[0]; @@ -1187,7 +1187,7 @@ #define OXM_OF_IPV6_EXTHDR_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_EXTHDR, 2) /* Bit definitions for IPv6 Extension Header pseudo-field. */ -enum ofp_ipv6exthdr_flags { +enum ofp_ipv6exthdr_flags { OFPIEH_NONEXT = 1 << 0, /* "No next header" encountered. */ OFPIEH_ESP = 1 << 1, /* Encrypted Sec Payload header present. */ OFPIEH_AUTH = 1 << 2, /* Authentication header present. */ @@ -1408,11 +1408,11 @@ OFP_ASSERT(sizeof(struct ofp_action_header) == 4); enum ofp_controller_max_len { - OFPCML_MAX = 0xffe5, /* maximum max_len value which can be used - to request a specific byte length. */ - OFPCML_NO_BUFFER = 0xffff /* indicates that no buffering should be - applied and the whole packet is to be - sent to the controller. */ + OFPCML_MAX = 0xffe5, /* maximum max_len value which can be used + to request a specific byte length. */ + OFPCML_NO_BUFFER = 0xffff /* indicates that no buffering should be + applied and the whole packet is to be + sent to the controller. */ }; /* Action structure for OFPAT_OUTPUT, which sends packets out 'port'. @@ -1705,11 +1705,11 @@ OFPGC_ADD = 0, /* New group. */ OFPGC_MODIFY = 1, /* Modify all matching groups. */ OFPGC_DELETE = 2, /* Delete all matching groups. */ - OFPGC_INSERT_BUCKET = 3,/* Insert action buckets to the already available - list of action buckets in a matching group */ + OFPGC_INSERT_BUCKET = 3,/* Insert action buckets to the already available + list of action buckets in a matching group */ /* OFPGC_??? = 4, */ /* Reserved for future use. */ - OFPGC_REMOVE_BUCKET = 5,/* Remove all action buckets or any specific action - bucket from matching group */ + OFPGC_REMOVE_BUCKET = 5,/* Remove all action buckets or any specific action + bucket from matching group */ }; /* Group bucket property types. */ @@ -1766,7 +1766,7 @@ uint16_t len; /* Length of the bucket in bytes, including this header and any padding to make it 64-bit aligned. */ - uint16_t action_array_len; /* Length of all actions in bytes. */ + uint16_t action_array_len; /* Length of all actions in bytes. */ uint32_t bucket_id; /* Bucket Id used to identify bucket*/ /* Followed by: * - Exactly 'action_array_len' bytes containing an array of @@ -1779,20 +1779,20 @@ }; OFP_ASSERT(sizeof(struct ofp_bucket) == 8); -/* Bucket Id can be any value between 0 and OFPG_BUCKET_MAX */ -enum ofp_group_bucket { - OFPG_BUCKET_MAX = 0xffffff00, /* Last usable bucket ID */ - OFPG_BUCKET_FIRST = 0xfffffffd, /* First bucket ID in the list of action - buckets of a group. This is applicable - for OFPGC_INSERT_BUCKET and - OFPGC_REMOVE_BUCKET commands */ - OFPG_BUCKET_LAST = 0xfffffffe, /* Last bucket ID in the list of action - buckets of a group. This is applicable - for OFPGC_INSERT_BUCKET and - OFPGC_REMOVE_BUCKET commands */ +/* Bucket Id can be any value between 0 and OFPG_BUCKET_MAX */ +enum ofp_group_bucket { + OFPG_BUCKET_MAX = 0xffffff00, /* Last usable bucket ID. */ + OFPG_BUCKET_FIRST = 0xfffffffd, /* First bucket ID in the list of action + buckets of a group. This is applicable + for OFPGC_INSERT_BUCKET and + OFPGC_REMOVE_BUCKET commands. */ + OFPG_BUCKET_LAST = 0xfffffffe, /* Last bucket ID in the list of action + buckets of a group. This is applicable + for OFPGC_INSERT_BUCKET and + OFPGC_REMOVE_BUCKET commands. */ OFPG_BUCKET_ALL = 0xffffffff /* All action buckets in a group, - This is applicable for - only OFPGC_REMOVE_BUCKET command */ + This is applicable for + only OFPGC_REMOVE_BUCKET command. */ }; /* Group property types. */ @@ -1830,9 +1830,9 @@ uint8_t type; /* One of OFPGT_*. */ uint8_t pad; /* Pad to 64 bits. */ uint32_t group_id; /* Group identifier. */ - uint16_t bucket_array_len; /* Length of action buckets data. */ - uint8_t pad2[2]; /* Pad to 64 bits. */ - uint32_t command_bucket_id; /* Bucket Id used as part of + uint16_t bucket_array_len; /* Length of action buckets data. */ + uint8_t pad2[2]; /* Pad to 64 bits. */ + uint32_t command_bucket_id; /* Bucket Id used as part of OFPGC_INSERT_BUCKET and OFPGC_REMOVE_BUCKET commands execution.*/ /* Followed by: @@ -1844,7 +1844,7 @@ bucket_array_len bytes. */ //struct ofp_group_prop_header properties[0]; }; -OFP_ASSERT (sizeof(struct ofp_group_mod) == 24); +OFP_ASSERT (sizeof(struct ofp_group_mod) == 24); /* Group types. Values in the range [128, 255] are reserved for experimental * use. */ @@ -2057,7 +2057,8 @@ enum ofp_bad_request_code { OFPBRC_BAD_VERSION = 0, /* ofp_header.version not supported. */ OFPBRC_BAD_TYPE = 1, /* ofp_header.type not supported. */ - OFPBRC_BAD_MULTIPART = 2, /* ofp_multipart_request.type not supported. */ + OFPBRC_BAD_MULTIPART = 2, /* ofp_multipart_request.type not + supported. */ OFPBRC_BAD_EXPERIMENTER = 3, /* Experimenter id not supported * (in ofp_experimenter_header or * ofp_multipart_request or @@ -2074,11 +2075,14 @@ OFPBRC_BAD_PACKET = 12, /* Invalid packet in packet-out. */ OFPBRC_MULTIPART_BUFFER_OVERFLOW = 13, /* ofp_multipart_request overflowed the assigned buffer. */ - OFPBRC_MULTIPART_REQUEST_TIMEOUT = 14, /* Timeout during multipart request. */ + OFPBRC_MULTIPART_REQUEST_TIMEOUT = 14, /* Timeout during multipart + request. */ OFPBRC_MULTIPART_REPLY_TIMEOUT = 15, /* Timeout during multipart reply. */ - OFPBRC_MULTIPART_BAD_SCHED = 16, /* Switch received a OFPMP_BUNDLE_FEATURES request and failed - * to update the scheduling tolerance. */ - OFPBRC_PIPELINE_FIELDS_ONLY = 17, /* Match fields must include only pipeline fields */ + OFPBRC_MULTIPART_BAD_SCHED = 16, /* Switch received a OFPMP_BUNDLE_FEATURES + request and failed to update the + scheduling tolerance. */ + OFPBRC_PIPELINE_FIELDS_ONLY = 17, /* Match fields must include only + pipeline fields. */ OFPBRC_UNKNOWN = 18, /* Unspecified error. */ }; @@ -2107,8 +2111,8 @@ OFPBAC_BAD_SET_MASK = 16, /* Bad mask in SET_FIELD action. */ }; -/* ofp_error_msg 'code' values for OFPET_BAD_INSTRUCTION. 'data' contains at least - * the first 64 bytes of the failed request. */ +/* ofp_error_msg 'code' values for OFPET_BAD_INSTRUCTION. 'data' contains at + * least the first 64 bytes of the failed request. */ enum ofp_bad_instruction_code { OFPBIC_UNKNOWN_INST = 0, /* Unknown instruction. */ OFPBIC_UNSUP_INST = 1, /* Switch or table does not support the @@ -2194,7 +2198,7 @@ OFPGMFC_BAD_WATCH = 13, /* Error in watch port/group. */ OFPGMFC_EPERM = 14, /* Permissions error. */ OFPGMFC_UNKNOWN_BUCKET = 15, /* Invalid bucket identifier used in - INSERT BUCKET or REMOVE BUCKET + INSERT BUCKET or REMOVE BUCKET command. */ OFPGMFC_BUCKET_EXISTS = 16, /* Can't insert bucket because a bucket already exist with that bucket-id. */ @@ -2334,14 +2338,16 @@ OFPBFC_MSG_BAD_LEN = 8, /* Length problem in included message. */ OFPBFC_MSG_BAD_XID = 9, /* Inconsistent or duplicate XID. */ OFPBFC_MSG_UNSUP = 10, /* Unsupported message in this bundle. */ - OFPBFC_MSG_CONFLICT = 11, /* Unsupported message combination in this bundle. */ + OFPBFC_MSG_CONFLICT = 11, /* Unsupported message combination in this + bundle. */ OFPBFC_MSG_TOO_MANY = 12, /* Can't handle this many messages in bundle. */ OFPBFC_MSG_FAILED = 13, /* One message in bundle failed. */ OFPBFC_TIMEOUT = 14, /* Bundle is taking too long. */ OFPBFC_BUNDLE_IN_PROGRESS = 15, /* Bundle is locking the resource. */ - OFPBFC_SCHED_NOT_SUPPORTED = 16, /* Scheduled commit was received and scheduling is not supported. */ - OFPBFC_SCHED_FUTURE = 17, /* Scheduled commit time exceeds upper bound. */ - OFPBFC_SCHED_PAST = 18, /* Scheduled commit time exceeds lower bound. */ + OFPBFC_SCHED_NOT_SUPPORTED = 16, /* Scheduled commit was received and + scheduling is not supported. */ + OFPBFC_SCHED_FUTURE = 17, /* Scheduled commit time exceeds upper bound. */ + OFPBFC_SCHED_PAST = 18, /* Scheduled commit time exceeds lower bound. */ }; /* OFPT_ERROR: Error message (datapath -> controller). */ @@ -2520,7 +2526,8 @@ char hw_desc[DESC_STR_LEN]; /* Hardware description. */ char sw_desc[DESC_STR_LEN]; /* Software description. */ char serial_num[SERIAL_NUM_LEN]; /* Serial number. */ - char dp_desc[DESC_STR_LEN]; /* Human readable description of datapath. */ + char dp_desc[DESC_STR_LEN]; /* Human readable description of + datapath. */ }; OFP_ASSERT(sizeof(struct ofp_desc) == 1056); @@ -2964,8 +2971,8 @@ uint8_t type; /* One of OFPGT_*. */ uint8_t pad; /* Pad to 64 bits. */ uint32_t group_id; /* Group identifier. */ - uint16_t bucket_array_len; /* Length of action buckets data. */ - uint8_t pad2[6]; /* Pad to 64 bits. */ + uint16_t bucket_array_len; /* Length of action buckets data. */ + uint8_t pad2[6]; /* Pad to 64 bits. */ /* Followed by: * - Exactly 'bucket_array_len' bytes containing an array of * struct ofp_bucket. @@ -3413,14 +3420,20 @@ uint16_t type; /* OFPTMPBF_TIME_CAPABILITY. */ uint16_t length; /* Length in bytes of this property. */ uint8_t pad[4]; - struct ofp_time sched_accuracy; /* The scheduling accuracy, i.e., how accurately the switch can - * perform a scheduled commit. This field is used only in bundle - * features replies, and is ignored in bundle features requests. */ + struct ofp_time sched_accuracy; /* The scheduling accuracy, i.e., how + * accurately the switch can perform a + * scheduled commit. This field is used + * only in bundle features replies, and + * is ignored in bundle features + * requests. */ struct ofp_time sched_max_future; /* The maximal difference between the * scheduling time and the current time.*/ - struct ofp_time sched_max_past; /* If the scheduling time occurs in the past, defines the maximal - * difference between the current time and the scheduling time.*/ - struct ofp_time timestamp; /* Indicates the time during the transmission of this message.*/ + struct ofp_time sched_max_past; /* If the scheduling time occurs in the + * past, defines the maximal difference + * between the current time and the + * scheduling time.*/ + struct ofp_time timestamp; /* Indicates the time during the + * transmission of this message.*/ }; OFP_ASSERT(sizeof(struct ofp_bundle_features_prop_time) == 72); @@ -3665,7 +3678,7 @@ /* Bundle property types. */ enum ofp_bundle_prop_type { - OFPBPT_TIME = 1, /* Time property. */ + OFPBPT_TIME = 1, /* Time property. */ OFPBPT_EXPERIMENTER = 0xFFFF, /* Experimenter property. */ }; @@ -3717,7 +3730,7 @@ enum ofp_bundle_flags { OFPBF_ATOMIC = 1 << 0, /* Execute atomically. */ OFPBF_ORDERED = 1 << 1, /* Execute in specified order. */ - OFPBF_TIME = 1 << 2, /* Execute in specified time. */ + OFPBF_TIME = 1 << 2, /* Execute in specified time. */ }; /* Message structure for OFPT_BUNDLE_CONTROL. */ @@ -3747,7 +3760,8 @@ * bytes of all-zero bytes */ /* Bundle Property list. */ - //struct ofp_bundle_prop_header properties[0]; /* Zero or more properties. */ + //struct ofp_bundle_prop_header properties[0]; /* Zero or more + properties. */ }; OFP_ASSERT(sizeof(struct ofp_bundle_add_msg) == 24);