X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnx-match.h;h=a76ad1f2e12f7ba9b9fda2ad3833a71f27cdcd35;hb=cb034511802ff7516ca2a94da1e161965fb80ad0;hp=d0e1c653e48e7f3296acf545b6d2ad8b4b2a8e46;hpb=c979df0569a8e3a5e923f569b8302d1cbdf7610c;p=openvswitch

diff --git a/lib/nx-match.h b/lib/nx-match.h
index d0e1c653..a76ad1f2 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -53,6 +53,13 @@ int nxm_check_reg_load(const struct nx_action_reg_load *, 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 *);
 
+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. */
 
@@ -86,21 +93,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. */