Fix up usage of flow_wildcards_t.

[openvswitch] / lib / cfm.h

diff --git a/lib/cfm.h b/lib/cfm.h
index e4bb6dffc52b327d6ebeb03cb956767f2e397d29..4bb8dc93ee71228ba8d3f9dd4afa1e63c6cf7c53 100644 (file)
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -24,6 +24,7 @@
 
 struct flow;
 struct ofpbuf;
+struct ds;
 
 /* Ethernet destination address of CCM packets. */
 static const uint8_t eth_addr_ccm[6] OVS_UNUSED
@@ -68,19 +69,10 @@ struct remote_mp {
     uint16_t mpid;         /* The Maintenance Point ID of this 'remote_mp'. */
     struct hmap_node node; /* In 'cfm' 'remote_mps' or 'x_remote_mps'. */
 
-    long long recv_time; /* Time the most recent CCM was received. */
+    bool recv;           /* CCM was received since last fault check. */
     bool fault;          /* Indicates a connectivity fault. */
 };
 
-/* Remote MAIDs keep track of incoming CCM messages which have a different MAID
- * than this CFM instance. */
-struct remote_maid {
-    uint8_t maid[CCM_MAID_LEN]; /* The remote MAID. */
-    struct hmap_node node;      /* In 'cfm' 'x_remote_maids'. */
-
-    long long recv_time; /* Most recent receive time for this 'remote_maid'. */
-};
-
 struct cfm *cfm_create(void);
 
 void cfm_destroy(struct cfm *);
@@ -106,4 +98,6 @@ bool cfm_should_process_flow(const struct flow *);
 
 void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
 
+void cfm_dump_ds(const struct cfm *, struct ds *);
+
 #endif /* cfm.h */