X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnx-match.h;h=64e22c9b57540493c923581fa1dd6e8ffe953447;hb=ce27cbee00fa713c419d5fd5f7dece469f41c0a7;hp=07d695de015b9eae3d192f830a186f0f6c48a8e9;hpb=4291acd23d801a0274f5a4f8107b2a907f4fbdd5;p=openvswitch

diff --git a/lib/nx-match.h b/lib/nx-match.h
index 07d695de..64e22c9b 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,9 @@ 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 *);
 
+uint64_t nxm_read_field_bits(ovs_be32 header, ovs_be16 ofs_nbits,
+                             const struct flow *);
+
 void nxm_parse_reg_move(struct nx_action_reg_move *, const char *);
 void nxm_parse_reg_load(struct nx_action_reg_load *, const char *);
 
@@ -49,12 +52,23 @@ 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 struct mf_field *nxm_field_to_mf_field(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. */
@@ -89,21 +103,23 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits)
  *  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. */