/* OpenFlow protocol utility functions. */
void *make_openflow(size_t openflow_len, uint8_t type, struct ofpbuf **);
+void *make_nxmsg(size_t openflow_len, uint32_t subtype, struct ofpbuf **);
void *make_openflow_xid(size_t openflow_len, uint8_t type,
uint32_t xid, struct ofpbuf **);
+void *make_nxmsg_xid(size_t openflow_len, uint32_t subtype, uint32_t xid,
+ struct ofpbuf **);
void *put_openflow(size_t openflow_len, uint8_t type, struct ofpbuf *);
void *put_openflow_xid(size_t openflow_len, uint8_t type, uint32_t xid,
struct ofpbuf *);
int check_ofp_message_array(const struct ofp_header *, uint8_t type,
size_t size, size_t array_elt_size,
size_t *n_array_elts);
-int check_ofp_packet_out(const struct ofp_header *, struct ofpbuf *data,
- int *n_actions, int max_ports);
struct flow_stats_iterator {
const uint8_t *pos, *end;
size_t n_actions);
const union ofp_action *actions_next(struct actions_iterator *);
int validate_actions(const union ofp_action *, size_t n_actions,
- int max_ports);
+ const struct flow *, int max_ports);
bool action_outputs_to_port(const union ofp_action *, uint16_t port);
void normalize_match(struct ofp_match *);
char *ofp_match_to_literal_string(const struct ofp_match *match);
+
+int ofputil_pull_actions(struct ofpbuf *, unsigned int actions_len,
+ union ofp_action **, size_t *);
\f
/* OpenFlow vendors.
*
#define OFPUTIL_VENDORS \
/* vendor name vendor value */ \
OFPUTIL_VENDOR(OFPUTIL_VENDOR_OPENFLOW, 0x00000000) \
- OFPUTIL_VENDOR(OFPUTIL_VENDOR_NICIRA, 0x00002320)
+ OFPUTIL_VENDOR(OFPUTIL_VENDOR_NICIRA, NX_VENDOR_ID)
/* OFPUTIL_VENDOR_* definitions. */
enum ofputil_vendor_codes {
* the vendor codes can fit. */
BUILD_ASSERT_DECL(OFPUTIL_N_VENDORS <= 16);
+/* These are macro versions of the functions defined below. The macro versions
+ * are intended for use in contexts where function calls are not allowed,
+ * e.g. static initializers and case labels. */
+#define OFP_MKERR(TYPE, CODE) ((1 << 30) | ((TYPE) << 16) | (CODE))
+#define OFP_MKERR_VENDOR(VENDOR, TYPE, CODE) \
+ ((1 << 30) | ((VENDOR) << 26) | ((TYPE) << 16) | (CODE))
+#define OFP_MKERR_NICIRA(TYPE, CODE) \
+ OFP_MKERR_VENDOR(OFPUTIL_VENDOR_NICIRA, TYPE, CODE)
+
/* Returns the standard OpenFlow error with the specified 'type' and 'code' as
* an integer. */
static inline int
ofp_mkerr(uint16_t type, uint16_t code)
{
- return (1 << 30) | (type << 16) | code;
+ return OFP_MKERR(type, code);
}
/* Returns the OpenFlow vendor error with the specified 'vendor', 'type', and
ofp_mkerr_vendor(uint8_t vendor, uint16_t type, uint16_t code)
{
assert(vendor < OFPUTIL_N_VENDORS);
- return (1 << 30) | (vendor << 26) | (type << 16) | code;
+ return OFP_MKERR_VENDOR(vendor, type, code);
}
/* Returns the OpenFlow vendor error with Nicira as vendor, with the specific
static inline int
ofp_mkerr_nicira(uint16_t type, uint16_t code)
{
- return ofp_mkerr_vendor(OFPUTIL_VENDOR_NICIRA, type, code);
+ return OFP_MKERR_NICIRA(type, code);
}
/* Returns true if 'error' encodes an OpenFlow standard or vendor extension