NXT_FLOW_END_CONFIG__OBSOLETE,
NXT_FLOW_END__OBSOLETE,
NXT_MGMT__OBSOLETE,
+
+ /* Use the high 32 bits of the cookie field as the tunnel ID in the flow
+ * match. */
+ NXT_TUN_ID_FROM_COOKIE,
};
struct nicira_header {
};
OFP_ASSERT(sizeof(struct nicira_header) == 16);
+struct nxt_tun_id_cookie {
+ struct ofp_header header;
+ uint32_t vendor; /* NX_VENDOR_ID. */
+ uint32_t subtype; /* NXT_TUN_ID_FROM_COOKIE */
+ uint8_t set; /* Nonzero to enable, zero to disable. */
+ uint8_t pad[7];
+};
+OFP_ASSERT(sizeof(struct nxt_tun_id_cookie) == 24);
enum nx_action_subtype {
NXAST_SNAT__OBSOLETE, /* No longer used. */
/* Searches the flow table again, using a flow that is slightly modified
* from the original lookup:
*
- * - The flow's in_port is changed to that specified in the 'in_port'
- * member of struct nx_action_resubmit.
+ * - The 'in_port' member of struct nx_action_resubmit is used as the
+ * flow's in_port.
*
* - If NXAST_RESUBMIT is preceded by actions that affect the flow
* (e.g. OFPAT_SET_VLAN_VID), then the flow is updated with the new
* values.
*
- * If the modified flow matches in the flow table, then the corresponding
+ * Following the lookup, the original in_port is restored.
+ *
+ * If the modified flow matched in the flow table, then the corresponding
* actions are executed, except that NXAST_RESUBMIT actions found in the
* secondary set of actions are ignored. Afterward, actions following
* NXAST_RESUBMIT in the original set of actions, if any, are executed; any
*
* NXAST_RESUBMIT may be used any number of times within a set of actions.
*/
- NXAST_RESUBMIT
+ NXAST_RESUBMIT,
+
+ NXAST_SET_TUNNEL /* Set encapsulating tunnel ID. */
};
/* Action structure for NXAST_RESUBMIT. */
struct nx_action_resubmit {
uint16_t type; /* OFPAT_VENDOR. */
- uint16_t len; /* Length is 8. */
+ uint16_t len; /* Length is 16. */
uint32_t vendor; /* NX_VENDOR_ID. */
uint16_t subtype; /* NXAST_RESUBMIT. */
uint16_t in_port; /* New in_port for checking flow table. */
};
OFP_ASSERT(sizeof(struct nx_action_resubmit) == 16);
+/* Action structure for NXAST_SET_TUNNEL. */
+struct nx_action_set_tunnel {
+ uint16_t type; /* OFPAT_VENDOR. */
+ uint16_t len; /* Length is 16. */
+ uint32_t vendor; /* NX_VENDOR_ID. */
+ uint16_t subtype; /* NXAST_SET_TUNNEL. */
+ uint8_t pad[2];
+ uint32_t tun_id; /* Tunnel ID. */
+};
+OFP_ASSERT(sizeof(struct nx_action_set_tunnel) == 16);
+
/* Header for Nicira-defined actions. */
struct nx_action_header {
uint16_t type; /* OFPAT_VENDOR. */
- uint16_t len; /* Length is 8. */
+ uint16_t len; /* Length is 16. */
uint32_t vendor; /* NX_VENDOR_ID. */
uint16_t subtype; /* NXAST_*. */
uint8_t pad[6];
};
OFP_ASSERT(sizeof(struct nx_action_header) == 16);
+/* Wildcard for tunnel ID. */
+#define NXFW_TUN_ID (1 << 25)
+
+#define NXFW_ALL NXFW_TUN_ID
+#define OVSFW_ALL (OFPFW_ALL | NXFW_ALL)
+
#endif /* openflow/nicira-ext.h */