X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.h;h=05d6acecf48ae28531aad26a28be0c7a4727cb14;hb=8321fb9c570bd25bb8925e7b5116ab90662113b5;hp=1c683eca97d61cf7d27c331a9118b16578b8845d;hpb=a23aab1fc2f66b63ba9b7e4b9c9a8f6d58c367d0;p=openvswitch

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index 1c683eca..05d6acec 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -22,16 +22,23 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "flow.h"
+#include "openvswitch/types.h"
 
 struct ofpbuf;
 struct ofp_action_header;
 
+/* Alignment of ofp_actions. */
+#define OFP_ACTION_ALIGN 8
+
 /* 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 **);
+                        ovs_be32 xid, struct ofpbuf **);
+void *make_nxmsg_xid(size_t openflow_len, uint32_t subtype, ovs_be32 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,
+void *put_openflow_xid(size_t openflow_len, uint8_t type, ovs_be32 xid,
                        struct ofpbuf *);
 void update_openflow_length(struct ofpbuf *);
 struct ofpbuf *make_flow_mod(uint16_t command, const struct flow *,
@@ -59,8 +66,6 @@ int check_ofp_message(const struct ofp_header *, uint8_t type, size_t size);
 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;
@@ -77,11 +82,14 @@ const union ofp_action *actions_first(struct actions_iterator *,
                                       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 *);
 
 /* OpenFlow vendors.
  *
@@ -95,7 +103,7 @@ char *ofp_match_to_literal_string(const struct ofp_match *match);
 #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 {
@@ -145,12 +153,21 @@ 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
@@ -159,7 +176,7 @@ static inline int
 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
@@ -167,7 +184,7 @@ ofp_mkerr_vendor(uint8_t vendor, uint16_t type, uint16_t code)
 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