if (f->priority == flow->priority
&& f->key.wildcards == flow->key.wildcards
&& flow_matches_2wild(&f->key, &flow->key)) {
- /* Keep stats from the original flow */
- flow->init_time = f->init_time;
- flow->packet_count = f->packet_count;
- flow->byte_count = f->byte_count;
-
flow->serial = f->serial;
list_replace_rcu(&f->node, &flow->node);
list_replace_rcu(&f->iter_node, &flow->iter_node);
}
static int table_linear_modify(struct sw_table *swt,
- const struct sw_flow_key *key,
- const struct ofp_action *actions, int n_actions)
+ const struct sw_flow_key *key, uint16_t priority, int strict,
+ const struct ofp_action_header *actions, size_t actions_len)
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *flow;
unsigned int count = 0;
list_for_each_entry (flow, &tl->flows, node) {
- if (flow_matches_1wild(&flow->key, key)) {
- flow_replace_acts(flow, actions, n_actions);
+ if (flow_matches_desc(&flow->key, key, strict)
+ && (!strict || (flow->priority == priority))) {
+ flow_replace_acts(flow, actions, actions_len);
count++;
}
}
}
static int table_linear_delete(struct sw_table *swt,
- const struct sw_flow_key *key, uint16_t priority, int strict)
+ const struct sw_flow_key *key, uint16_t out_port,
+ uint16_t priority, int strict)
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *flow;
unsigned int count = 0;
list_for_each_entry (flow, &tl->flows, node) {
- if (flow_del_matches(&flow->key, key, strict)
+ if (flow_matches_desc(&flow->key, key, strict)
+ && flow_has_out_port(flow, out_port)
&& (!strict || (flow->priority == priority)))
count += do_delete(swt, flow);
}
}
static int table_linear_iterate(struct sw_table *swt,
- const struct sw_flow_key *key,
+ const struct sw_flow_key *key, uint16_t out_port,
struct sw_table_position *position,
int (*callback)(struct sw_flow *, void *),
void *private)
start = position->private[0];
list_for_each_entry (flow, &tl->iter_flows, iter_node) {
if (flow->serial >= start
- && flow_matches_2wild(key, &flow->key)) {
+ && flow_matches_2wild(key, &flow->key)
+ && flow_has_out_port(flow, out_port)) {
int error = callback(flow, private);
if (error) {
position->private[0] = flow->serial;
stats->wildcards = OFPFW_ALL;
stats->n_flows = tl->n_flows;
stats->max_flows = tl->max_flows;
+ stats->n_lookup = swt->n_lookup;
stats->n_matched = swt->n_matched;
}