X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcfm.h;h=2556a325b36b9bc396537c79ff18e8a38799edf2;hb=f67f13545ebe61e02dc3aee98b60dc362f96946c;hp=334b80c0ef20fe2e868ae1d7ae34d7179b67e757;hpb=75a4ead16d571a4e30cb4b54c5456e30a20c3d78;p=openvswitch

diff --git a/lib/cfm.h b/lib/cfm.h
index 334b80c0..2556a325 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -24,12 +24,38 @@
 struct flow;
 struct ofpbuf;
 
+#define CFM_RANDOM_VLAN UINT16_MAX
+
+#define CFM_FAULT_REASONS                  \
+    CFM_FAULT_REASON(RECV, recv)           \
+    CFM_FAULT_REASON(RDI, rdi)             \
+    CFM_FAULT_REASON(MAID, maid)           \
+    CFM_FAULT_REASON(LOOPBACK, loopback)   \
+    CFM_FAULT_REASON(OVERFLOW, overflow)   \
+    CFM_FAULT_REASON(OVERRIDE, override)
+
+enum cfm_fault_bit_index {
+#define CFM_FAULT_REASON(NAME, STR) CFM_FAULT_INDEX_##NAME,
+    CFM_FAULT_REASONS
+#undef CFM_FAULT_REASON
+    CFM_FAULT_N_REASONS
+};
+
+enum cfm_fault_reason {
+#define CFM_FAULT_REASON(NAME, STR) \
+    CFM_FAULT_##NAME = 1 << CFM_FAULT_INDEX_##NAME,
+    CFM_FAULT_REASONS
+#undef CFM_FAULT_REASON
+};
+
 struct cfm_settings {
     uint64_t mpid;              /* The MPID of this CFM. */
     int interval;               /* The requested transmission interval. */
     bool extended;              /* Run in extended mode. */
     bool opup;                  /* Operational State. */
-    uint16_t ccm_vlan;          /* CCM Vlan tag. 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. */
 };
 
 void cfm_init(void);
@@ -42,9 +68,10 @@ void cfm_wait(struct cfm *);
 bool cfm_configure(struct cfm *, const struct cfm_settings *);
 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 *);
+int 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);
+const char *cfm_fault_reason_to_str(int fault);
 
 #endif /* cfm.h */