X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnx-match.h;h=bd4fea27e092b79478d7a50468fe538a2a5865b0;hb=1452b28ca636521b6e16f76787524f83205ec7a3;hp=e02e22b4618153859e093f1700fe7f6a281cba32;hpb=b6c9e612fa0801037c60339a931d29413e8fa08f;p=openvswitch

diff --git a/lib/nx-match.h b/lib/nx-match.h
index e02e22b4..bd4fea27 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,46 @@ 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 *);
 
 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. */
+
+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:
  *
@@ -71,4 +109,8 @@ void nxm_execute_reg_load(const struct nx_action_reg_load *, struct flow *);
  */
 #define NXM_MAX_LEN 192
 
+/* 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 */