#include <stdlib.h>
#include "flow.h"
#include "list.h"
+#include "openflow/openflow.h"
#include "switch-flow.h"
#include "datapath.h"
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
struct sw_flow *flow;
LIST_FOR_EACH (flow, struct sw_flow, node, &tl->flows) {
- if (flow_matches(&flow->key, key))
+ if (flow_matches_1wild(key, &flow->key))
return flow;
}
return NULL;
LIST_FOR_EACH (f, struct sw_flow, node, &tl->flows) {
if (f->priority == flow->priority
&& f->key.wildcards == flow->key.wildcards
- && flow_matches(&f->key, &flow->key)) {
+ && flow_matches_2wild(&f->key, &flow->key)) {
flow->serial = f->serial;
list_replace(&flow->node, &f->node);
list_replace(&flow->iter_node, &f->iter_node);
tl->n_flows++;
/* Insert the entry immediately in front of where we're pointing. */
+ flow->serial = tl->next_serial++;
list_insert(&f->node, &flow->node);
list_push_front(&tl->iter_flows, &flow->iter_node);
return 1;
}
+static int table_linear_modify(struct sw_table *swt,
+ 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 (flow, struct sw_flow, node, &tl->flows) {
+ if (flow_matches_desc(&flow->key, key, strict)
+ && (!strict || (flow->priority == priority))) {
+ flow_replace_acts(flow, actions, actions_len);
+ count++;
+ }
+ }
+ return count;
+}
+
static void
do_delete(struct sw_flow *flow)
{
static int table_linear_delete(struct sw_table *swt,
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;
unsigned int count = 0;
LIST_FOR_EACH_SAFE (flow, n, struct sw_flow, node, &tl->flows) {
- 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))) {
do_delete(flow);
count++;
static int table_linear_iterate(struct sw_table *swt,
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 (flow, struct sw_flow, iter_node, &tl->iter_flows) {
- if (flow->serial <= start && flow_matches(key, &flow->key)) {
+ if (flow->serial <= start
+ && 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 - 1);
{
struct sw_table_linear *tl = (struct sw_table_linear *) swt;
stats->name = "linear";
- stats->n_flows = tl->n_flows;
+ 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;
}
swt = &tl->swt;
swt->lookup = table_linear_lookup;
swt->insert = table_linear_insert;
+ swt->modify = table_linear_modify;
swt->delete = table_linear_delete;
swt->timeout = table_linear_timeout;
swt->destroy = table_linear_destroy;