projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial OpenFlow 1.3 support
[openvswitch]
/
lib
/
cfm.h
diff --git
a/lib/cfm.h
b/lib/cfm.h
index 4e421fbd68afdde975b7189327440b976e65f0aa..8bb6778407e5cf6dddd09c937e5740119844b198 100644
(file)
--- a/
lib/cfm.h
+++ b/
lib/cfm.h
@@
-33,8
+33,7
@@
struct ofpbuf;
CFM_FAULT_REASON(LOOPBACK, loopback) \
CFM_FAULT_REASON(OVERFLOW, overflow) \
CFM_FAULT_REASON(OVERRIDE, override) \
CFM_FAULT_REASON(LOOPBACK, loopback) \
CFM_FAULT_REASON(OVERFLOW, overflow) \
CFM_FAULT_REASON(OVERRIDE, override) \
- CFM_FAULT_REASON(INTERVAL, interval) \
- CFM_FAULT_REASON(SEQUENCE, sequence)
+ CFM_FAULT_REASON(INTERVAL, interval)
enum cfm_fault_bit_index {
#define CFM_FAULT_REASON(NAME, STR) CFM_FAULT_INDEX_##NAME,
enum cfm_fault_bit_index {
#define CFM_FAULT_REASON(NAME, STR) CFM_FAULT_INDEX_##NAME,
@@
-58,6
+57,8
@@
struct cfm_settings {
uint16_t ccm_vlan; /* CCM Vlan tag. Zero if none.
CFM_RANDOM_VLAN if random. */
uint8_t ccm_pcp; /* CCM Priority. Zero if none. */
uint16_t ccm_vlan; /* CCM Vlan tag. Zero if none.
CFM_RANDOM_VLAN if random. */
uint8_t ccm_pcp; /* CCM Priority. Zero if none. */
+
+ bool check_tnl_key; /* Verify inbound packet key? */
};
void cfm_init(void);
};
void cfm_init(void);
@@
-72,7
+73,7
@@
bool cfm_should_process_flow(const struct cfm *cfm, const struct flow *);
void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
int cfm_get_fault(const struct cfm *);
int cfm_get_health(const struct cfm *);
void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
int cfm_get_fault(const struct cfm *);
int cfm_get_health(const struct cfm *);
-
bool
cfm_get_opup(const struct cfm *);
+
int
cfm_get_opup(const struct cfm *);
void cfm_get_remote_mpids(const struct cfm *, const uint64_t **rmps,
size_t *n_rmps);
const char *cfm_fault_reason_to_str(int fault);
void cfm_get_remote_mpids(const struct cfm *, const uint64_t **rmps,
size_t *n_rmps);
const char *cfm_fault_reason_to_str(int fault);