X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fcfm.h;h=8bb6778407e5cf6dddd09c937e5740119844b198;hb=7c690f462fec1af60d76c67fac226fc648ea9149;hp=2b4f888f576ac9e33bbe8526856f3dc80cd6506f;hpb=3967a833e4db33f235f660f5d3f5bd96581d238d;p=sliver-openvswitch.git

diff --git a/lib/cfm.h b/lib/cfm.h
index 2b4f888f5..8bb677840 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011 Nicira Networks.
+/* Copyright (c) 2010, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,8 @@ struct ofpbuf;
     CFM_FAULT_REASON(MAID, maid)           \
     CFM_FAULT_REASON(LOOPBACK, loopback)   \
     CFM_FAULT_REASON(OVERFLOW, overflow)   \
-    CFM_FAULT_REASON(OVERRIDE, override)
+    CFM_FAULT_REASON(OVERRIDE, override)   \
+    CFM_FAULT_REASON(INTERVAL, interval)
 
 enum cfm_fault_bit_index {
 #define CFM_FAULT_REASON(NAME, STR) CFM_FAULT_INDEX_##NAME,
@@ -56,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. */
+
+    bool check_tnl_key;         /* Verify inbound packet key? */
 };
 
 void cfm_init(void);
@@ -70,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 *);
-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);