VLOG_DEFINE_THIS_MODULE(bundle);
-static uint16_t
+static ofp_port_t
execute_ab(const struct ofpact_bundle *bundle,
- bool (*slave_enabled)(uint16_t ofp_port, void *aux), void *aux)
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)
{
size_t i;
for (i = 0; i < bundle->n_slaves; i++) {
- uint16_t slave = bundle->slaves[i];
+ ofp_port_t slave = bundle->slaves[i];
if (slave_enabled(slave, aux)) {
return slave;
}
return OFPP_NONE;
}
-static uint16_t
-execute_hrw(const struct ofpact_bundle *bundle, const struct flow *flow,
- bool (*slave_enabled)(uint16_t ofp_port, void *aux), void *aux)
+static ofp_port_t
+execute_hrw(const struct ofpact_bundle *bundle,
+ const struct flow *flow, struct flow_wildcards *wc,
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)
{
uint32_t flow_hash, best_hash;
int best, i;
+ if (bundle->n_slaves > 1) {
+ flow_mask_hash_fields(flow, wc, bundle->fields);
+ }
+
flow_hash = flow_hash_fields(flow, bundle->fields, bundle->basis);
best = -1;
best_hash = 0;
return best >= 0 ? bundle->slaves[best] : OFPP_NONE;
}
-/* Executes 'bundle' on 'flow'. Uses 'slave_enabled' to determine if the slave
- * designated by 'ofp_port' is up. Returns the chosen slave, or OFPP_NONE if
- * none of the slaves are acceptable. */
-uint16_t
-bundle_execute(const struct ofpact_bundle *bundle, const struct flow *flow,
- bool (*slave_enabled)(uint16_t ofp_port, void *aux), void *aux)
+/* Executes 'bundle' on 'flow'. Sets fields in 'wc' that were used to
+ * calculate the result. Uses 'slave_enabled' to determine if the slave
+ * designated by 'ofp_port' is up. Returns the chosen slave, or
+ * OFPP_NONE if none of the slaves are acceptable. */
+ofp_port_t
+bundle_execute(const struct ofpact_bundle *bundle,
+ const struct flow *flow, struct flow_wildcards *wc,
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux),
+ void *aux)
{
switch (bundle->algorithm) {
case NX_BD_ALG_HRW:
- return execute_hrw(bundle, flow, slave_enabled, aux);
+ return execute_hrw(bundle, flow, wc, slave_enabled, aux);
case NX_BD_ALG_ACTIVE_BACKUP:
return execute_ab(bundle, slave_enabled, aux);
}
enum ofperr
-bundle_check(const struct ofpact_bundle *bundle, int max_ports,
+bundle_check(const struct ofpact_bundle *bundle, ofp_port_t max_ports,
const struct flow *flow)
{
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
}
for (i = 0; i < bundle->n_slaves; i++) {
- uint16_t ofp_port = bundle->slaves[i];
+ ofp_port_t ofp_port = bundle->slaves[i];
enum ofperr error;
error = ofputil_check_output_port(ofp_port, max_ports);
slaves = ofpbuf_put_zeros(openflow, slaves_len);
for (i = 0; i < bundle->n_slaves; i++) {
- slaves[i] = htons(bundle->slaves[i]);
+ slaves[i] = htons(ofp_to_u16(bundle->slaves[i]));
}
}
bundle = ofpact_put_BUNDLE(ofpacts);
for (;;) {
- uint16_t slave_port;
+ ofp_port_t slave_port;
char *slave;
- slave = strtok_r(NULL, ", [", save_ptr);
+ slave = strtok_r(NULL, ", []", save_ptr);
if (!slave || bundle->n_slaves >= BUNDLE_MAX_SLAVES) {
break;
}
- slave_port = atoi(slave);
+ if (!ofputil_port_from_string(slave, &slave_port)) {
+ ovs_fatal(0, "%s: bad port number", slave);
+ }
ofpbuf_put(ofpacts, &slave_port, sizeof slave_port);
bundle = ofpacts->l2;
ds_put_cstr(s, ",");
}
- ds_put_format(s, "%"PRIu16, bundle->slaves[i]);
+ ofputil_format_port(bundle->slaves[i], s);
}
ds_put_cstr(s, ")");