X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcfm.h;h=334b80c0ef20fe2e868ae1d7ae34d7179b67e757;hb=b5d29991cc4722aec39c346c3f82291581e92aa0;hp=02f50d5fdad667e828620dc74952c405b7cc1213;hpb=a56104575c4db202bfc5db3079ea969820d77867;p=openvswitch

diff --git a/lib/cfm.h b/lib/cfm.h
index 02f50d5f..334b80c0 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -24,58 +24,27 @@
 struct flow;
 struct ofpbuf;
 
-/* Ethernet destination address of CCM packets. */
-static const uint8_t eth_addr_ccm[6] OVS_UNUSED
-    = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x30 };
-
-#define ETH_TYPE_CFM 0x8902
-
-/* A 'ccm' represents a Continuity Check Message from the 802.1ag
- * specification.  Continuity Check Messages are broadcast periodically so that
- * hosts can determine who they have connectivity to. */
-#define CCM_LEN 74
-#define CCM_MAID_LEN 48
-struct ccm {
-    uint8_t  mdlevel_version; /* MD Level and Version */
-    uint8_t  opcode;
-    uint8_t  flags;
-    uint8_t  tlv_offset;
-    ovs_be32 seq;
-    ovs_be16 mpid;
-    uint8_t  maid[CCM_MAID_LEN];
-    uint8_t  zero[16]; /* Defined by ITU-T Y.1731 should be zero */
-} __attribute__((packed));
-BUILD_ASSERT_DECL(CCM_LEN == sizeof(struct ccm));
-
 struct cfm_settings {
-    uint16_t mpid;              /* The MPID of this CFM. */
+    uint64_t mpid;              /* The MPID of this CFM. */
     int interval;               /* The requested transmission interval. */
-    const char *name;           /* Name of this CFM object. */
-
-    const uint16_t *remote_mpids; /* Array of remote MPIDs */
-    size_t n_remote_mpids;        /* Number of MPIDs in 'remote_mpids'. */
+    bool extended;              /* Run in extended mode. */
+    bool opup;                  /* Operational State. */
+    uint16_t ccm_vlan;          /* CCM Vlan tag. Zero if none. */
 };
 
 void cfm_init(void);
-
-struct cfm *cfm_create(void);
-
+struct cfm *cfm_create(const char *name);
 void cfm_destroy(struct cfm *);
-
 void cfm_run(struct cfm *);
-
 bool cfm_should_send_ccm(struct cfm *);
-
-void cfm_compose_ccm(struct cfm *, struct ccm *);
-
+void cfm_compose_ccm(struct cfm *, struct ofpbuf *packet, uint8_t eth_src[6]);
 void cfm_wait(struct cfm *);
-
 bool cfm_configure(struct cfm *, const struct cfm_settings *);
-
-bool cfm_should_process_flow(const struct flow *);
-
+bool cfm_should_process_flow(const struct cfm *cfm, const struct flow *);
 void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
-
 bool cfm_get_fault(const struct cfm *);
+bool cfm_get_opup(const struct cfm *);
+void cfm_get_remote_mpids(const struct cfm *, const uint64_t **rmps,
+                          size_t *n_rmps);
 
 #endif /* cfm.h */