X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnx-match.h;h=a7441d0b39fcbd36321ec2351de5e54a748f7e60;hb=refs%2Fheads%2Freview;hp=e02e22b4618153859e093f1700fe7f6a281cba32;hpb=b6c9e612fa0801037c60339a931d29413e8fa08f;p=sliver-openvswitch.git

diff --git a/lib/nx-match.h b/lib/nx-match.h
index e02e22b46..a7441d0b3 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -18,8 +18,12 @@
 #define NX_MATCH_H 1
 
 #include <stdint.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include "openvswitch/types.h"
 
 struct cls_rule;
+struct ds;
 struct flow;
 struct ofpbuf;
 struct nx_action_reg_load;
@@ -37,12 +41,52 @@ int nx_put_match(struct ofpbuf *, const struct cls_rule *);
 char *nx_match_to_string(const uint8_t *, unsigned int match_len);
 int nx_match_from_string(const char *, struct ofpbuf *);
 
+void nxm_parse_reg_move(struct nx_action_reg_move *, const char *);
+void nxm_parse_reg_load(struct nx_action_reg_load *, const char *);
+
+void nxm_format_reg_move(const struct nx_action_reg_move *, struct ds *);
+void nxm_format_reg_load(const struct nx_action_reg_load *, struct ds *);
+
 int nxm_check_reg_move(const struct nx_action_reg_move *, const struct flow *);
 int nxm_check_reg_load(const struct nx_action_reg_load *, const struct flow *);
+int nxm_src_check(ovs_be32 src, unsigned int ofs, unsigned int n_bits,
+                  const struct flow *);
+int nxm_dst_check(ovs_be32 dst, unsigned int ofs, unsigned int n_bits,
+                  const struct flow *);
 
 void nxm_execute_reg_move(const struct nx_action_reg_move *, struct flow *);
 void nxm_execute_reg_load(const struct nx_action_reg_load *, struct flow *);
+void nxm_reg_load(ovs_be32 dst, ovs_be16 ofs_nbits, uint64_t src_data,
+                  struct flow *);
+
+int nxm_field_bytes(uint32_t header);
+int nxm_field_bits(uint32_t header);
+
+const char *nxm_parse_field_bits(const char *s,
+                                 uint32_t *headerp, int *ofsp, int *n_bitsp);
+void nxm_format_field_bits(struct ds *, uint32_t header, int ofs, int n_bits);
 
+/* Dealing with the 'ofs_nbits' members of struct nx_action_reg_load and struct
+ * nx_action_multipath. */
+
+static inline ovs_be16
+nxm_encode_ofs_nbits(int ofs, int n_bits)
+{
+    return htons((ofs << 6) | (n_bits - 1));
+}
+
+static inline int
+nxm_decode_ofs(ovs_be16 ofs_nbits)
+{
+    return ntohs(ofs_nbits) >> 6;
+}
+
+static inline int
+nxm_decode_n_bits(ovs_be16 ofs_nbits)
+{
+    return (ntohs(ofs_nbits) & 0x3f) + 1;
+}
+
 /* Upper bound on the length of an nx_match.  The longest nx_match (assuming
  * we implement 4 registers) would be:
  *
@@ -55,20 +99,26 @@ void nxm_execute_reg_load(const struct nx_action_reg_load *, struct flow *);
  *  NXM_OF_VLAN_TCI     4       2     2      8
  *  NXM_OF_IP_TOS       4       1    --      5
  *  NXM_OF_IP_PROTO     4       2    --      6
- *  NXM_OF_IP_SRC_W     4       4     4     12
- *  NXM_OF_IP_DST_W     4       4     4     12
- *  NXM_OF_TCP_SRC      4       2    --      6
- *  NXM_OF_TCP_DST      4       2    --      6
+ *  NXM_OF_IPV6_SRC_W   4      16    16     36
+ *  NXM_OF_IPV6_DST_W   4      16    16     36
+ *  NXM_OF_ICMP_TYPE    4       1    --      5
+ *  NXM_OF_ICMP_CODE    4       1    --      5
+ *  NXM_NX_ND_TARGET    4      16    --     20
+ *  NXM_NX_ND_SLL       4       6    --     10
  *  NXM_NX_REG_W(0)     4       4     4     12
  *  NXM_NX_REG_W(1)     4       4     4     12
  *  NXM_NX_REG_W(2)     4       4     4     12
  *  NXM_NX_REG_W(3)     4       4     4     12
  *  NXM_NX_TUN_ID_W     4       8     8     20
  *  -------------------------------------------
- *  total                                  161
+ *  total                                  237
  *
  * So this value is conservative.
  */
-#define NXM_MAX_LEN 192
+#define NXM_MAX_LEN 256
+
+/* This is my guess at the length of a "typical" nx_match, for use in
+ * predicting space requirements. */
+#define NXM_TYPICAL_LEN 64
 
 #endif /* nx-match.h */