cfm: Migrate cfm/show unixctl command to CFM module.

This patch moves the cfm/show unixctl show command from the bridge
to the CFM module.  This is more in line with how LACP does it, and
will make future patches easier to implement.

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/cfm.h b/lib/cfm.h
index 4bb8dc93e..c83a7cce1 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -1,5 +1,4 @@
-/*
- * 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.
@@ -24,7 +23,6 @@
 
 struct flow;
 struct ofpbuf;
-struct ds;
 
 /* Ethernet destination address of CCM packets. */
 static const uint8_t eth_addr_ccm[6] OVS_UNUSED
@@ -57,6 +55,7 @@ struct cfm {
     uint16_t mpid;              /* The MPID of this CFM. */
     uint8_t maid[CCM_MAID_LEN]; /* The MAID of this CFM. */
     int interval;               /* The requested transmission interval. */
+    const char *name;           /* Name of this CFM object. */
 
     /* Statistics. */
     struct hmap remote_mps;     /* Expected remote MPs. */
@@ -73,6 +72,8 @@ struct remote_mp {
     bool fault;          /* Indicates a connectivity fault. */
 };
 
+void cfm_init(void);
+
 struct cfm *cfm_create(void);
 
 void cfm_destroy(struct cfm *);
@@ -98,6 +99,4 @@ 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 */