projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Don't use ofpbuf in ofputil_packet_in struct.
[openvswitch]
/
lib
/
nx-match.h
diff --git
a/lib/nx-match.h
b/lib/nx-match.h
index 04da239861b5fbcb6f1b47fc1f61abe81a32cb97..c7ee0f8d22430a239c6c0e1f4c56d1c5bc120db2 100644
(file)
--- 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-35,8
+35,9
@@
struct nx_action_reg_move;
*/
int nx_pull_match(struct ofpbuf *, unsigned int match_len, uint16_t priority,
*/
int nx_pull_match(struct ofpbuf *, unsigned int match_len, uint16_t priority,
- struct cls_rule *);
-int nx_put_match(struct ofpbuf *, const struct cls_rule *);
+ struct cls_rule *, ovs_be64 *cookie, ovs_be64 *cookie_mask);
+int nx_put_match(struct ofpbuf *, const struct cls_rule *,
+ ovs_be64 cookie, ovs_be64 cookie_mask);
char *nx_match_to_string(const uint8_t *, unsigned int match_len);
int nx_match_from_string(const char *, struct ofpbuf *);
char *nx_match_to_string(const uint8_t *, unsigned int match_len);
int nx_match_from_string(const char *, struct ofpbuf *);
@@
-90,8
+91,8
@@
nxm_decode_n_bits(ovs_be16 ofs_nbits)
return (ntohs(ofs_nbits) & 0x3f) + 1;
}
\f
return (ntohs(ofs_nbits) & 0x3f) + 1;
}
\f
-/* Upper bound on the length of an nx_match. The longest nx_match (a
ssuming
- *
we implement 4
registers) would be:
+/* Upper bound on the length of an nx_match. The longest nx_match (a
n
+ *
IPV6 neighbor discovery message using 5
registers) would be:
*
* header value mask total
* ------ ----- ---- -----
*
* header value mask total
* ------ ----- ---- -----
@@
-101,9
+102,13
@@
nxm_decode_n_bits(ovs_be16 ofs_nbits)
* NXM_OF_ETH_TYPE 4 2 -- 6
* NXM_OF_VLAN_TCI 4 2 2 8
* NXM_OF_IP_TOS 4 1 -- 5
* NXM_OF_ETH_TYPE 4 2 -- 6
* NXM_OF_VLAN_TCI 4 2 2 8
* NXM_OF_IP_TOS 4 1 -- 5
+ * NXM_NX_IP_ECN 4 1 -- 5
+ * NXM_OF_IP_TTL 4 1 -- 5
+ * NXM_NX_IP_FRAG 4 1 1 8
* NXM_OF_IP_PROTO 4 2 -- 6
* NXM_OF_IPV6_SRC_W 4 16 16 36
* NXM_OF_IPV6_DST_W 4 16 16 36
* NXM_OF_IP_PROTO 4 2 -- 6
* NXM_OF_IPV6_SRC_W 4 16 16 36
* NXM_OF_IPV6_DST_W 4 16 16 36
+ * NXM_OF_IPV6_LABEL 4 4 -- 8
* NXM_OF_ICMP_TYPE 4 1 -- 5
* NXM_OF_ICMP_CODE 4 1 -- 5
* NXM_NX_ND_TARGET 4 16 -- 20
* NXM_OF_ICMP_TYPE 4 1 -- 5
* NXM_OF_ICMP_CODE 4 1 -- 5
* NXM_NX_ND_TARGET 4 16 -- 20
@@
-112,13
+117,14
@@
nxm_decode_n_bits(ovs_be16 ofs_nbits)
* 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_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_REG_W(4) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
* -------------------------------------------
* NXM_NX_TUN_ID_W 4 8 8 20
* -------------------------------------------
- * total 2
37
+ * total 2
75
*
* So this value is conservative.
*/
*
* So this value is conservative.
*/
-#define NXM_MAX_LEN
256
+#define NXM_MAX_LEN
384
/* This is my guess at the length of a "typical" nx_match, for use in
* predicting space requirements. */
/* This is my guess at the length of a "typical" nx_match, for use in
* predicting space requirements. */