#include <linux/skbuff.h>
#include <linux/if_ether.h>
-#include "openflow.h"
+#include "openflow/openflow.h"
struct sk_buff;
struct ofp_flow_mod;
uint32_t nw_dst_mask; /* 1-bit in each significant nw_dst bit. */
};
+/* The match fields for ICMP type and code use the transport source and
+ * destination port fields, respectively. */
+#define icmp_type tp_src
+#define icmp_code tp_dst
+
/* Compare two sw_flow_keys and return true if they are the same flow, false
* otherwise. Wildcards and netmasks are not considered. */
static inline int flow_keys_equal(const struct sw_flow_key *a,
* swap them out atomically when the modify command comes from a Flow
* Modify message. */
struct sw_flow_actions {
- unsigned int n_actions;
+ size_t actions_len;
struct rcu_head rcu;
- struct ofp_action actions[0];
+ struct ofp_action_header actions[0];
};
/* Locking:
int flow_matches_1wild(const struct sw_flow_key *, const struct sw_flow_key *);
int flow_matches_2wild(const struct sw_flow_key *, const struct sw_flow_key *);
-int flow_del_matches(const struct sw_flow_key *, const struct sw_flow_key *,
+int flow_matches_desc(const struct sw_flow_key *, const struct sw_flow_key *,
int);
-struct sw_flow *flow_alloc(int n_actions, gfp_t flags);
+int flow_has_out_port(struct sw_flow *, uint16_t);
+struct sw_flow *flow_alloc(size_t actions_len, gfp_t flags);
void flow_free(struct sw_flow *);
void flow_deferred_free(struct sw_flow *);
void flow_deferred_free_acts(struct sw_flow_actions *);
-void flow_replace_acts(struct sw_flow *, const struct ofp_action *, int);
+void flow_replace_acts(struct sw_flow *, const struct ofp_action_header *,
+ size_t);
int flow_extract(struct sk_buff *, uint16_t in_port, struct sw_flow_key *);
void flow_extract_match(struct sw_flow_key* to, const struct ofp_match* from);
void flow_fill_match(struct ofp_match* to, const struct sw_flow_key* from);