ovs_be16 len; /* Length the bucket in bytes, including
this header and any padding to make it
64-bit aligned. */
- ovs_be16 actions_len; /* Length of all actions in bytes. */
+ ovs_be16 action_array_len; /* Length of all actions in bytes. */
ovs_be32 bucket_id; /* Bucket Id used to identify bucket*/
/* Followed by exactly len - 8 bytes of group bucket properties. */
/* Followed by:
- * - Exactly 'actions_len' bytes containing an array of
+ * - Exactly 'action_array_len' bytes containing an array of
* struct ofp_action_*.
* - Zero or more bytes of group bucket properties to fill out the
* overall length in header.length. */
uint8_t type; /* One of OFPGT11_*. */
uint8_t pad; /* Pad to 64 bits. */
ovs_be32 group_id; /* Group identifier. */
- ovs_be16 bucket_list_len; /* Length of action buckets data. */
+ ovs_be16 bucket_array_len; /* Length of action buckets data. */
uint8_t pad1[2]; /* Pad to 64 bits. */
ovs_be32 command_bucket_id; /* Bucket Id used as part of
* OFPGC15_INSERT_BUCKET and
* OFPGC15_REMOVE_BUCKET commands
* execution.*/
/* Followed by:
- * - Exactly 'bucket_list_len' bytes containing an array of
+ * - Exactly 'bucket_array_len' bytes containing an array of
* struct ofp15_bucket.
* - Zero or more bytes of group properties to fill out the overall
* length in header.length. */
ob = ofpbuf_at_assert(openflow, start, sizeof *ob);
ob->len = htons(ofpbuf_size(openflow) - start);
- ob->actions_len = htons(actions_len);
+ ob->action_array_len = htons(actions_len);
ob->bucket_id = htonl(bucket_id);
}
}
ob_len = ntohs(ob->len);
- actions_len = ntohs(ob->actions_len);
+ actions_len = ntohs(ob->action_array_len);
if (ob_len < sizeof *ob) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OpenFlow message bucket length "
ogm->type = gm->type;
ogm->group_id = htonl(gm->group_id);
ogm->command_bucket_id = htonl(gm->command_bucket_id);
- ogm->bucket_list_len = htons(ofpbuf_size(b) - start_ogm - sizeof *ogm);
+ ogm->bucket_array_len = htons(ofpbuf_size(b) - start_ogm - sizeof *ogm);
id_pool_destroy(bucket_ids);
return b;
return OFPERR_OFPGMFC_BAD_BUCKET;
}
- bucket_list_len = ntohs(ogm->bucket_list_len);
+ bucket_list_len = ntohs(ogm->bucket_array_len);
if (bucket_list_len < ofpbuf_size(msg)) {
VLOG_WARN_RL(&bad_ofmsg_rl, "group has %u trailing bytes",
ofpbuf_size(msg) - bucket_list_len);