X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fcfm.h;h=0f3e97c337a28c8f0de99340eef1044d0e2fd975;hb=6b900de4efd368be88ef3db88b1eff8f835a7cf7;hp=de4c299268c8fc8b3bd11afdbe74745384b25628;hpb=4653c5583a3ec9d7184782fee3d2f93602795686;p=sliver-openvswitch.git

diff --git a/lib/cfm.h b/lib/cfm.h
index de4c29926..0f3e97c33 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -23,6 +23,8 @@
 
 struct flow;
 struct ofpbuf;
+struct netdev;
+struct flow_wildcards;
 
 #define CFM_RANDOM_VLAN UINT16_MAX
 
@@ -53,27 +55,32 @@ struct cfm_settings {
     uint64_t mpid;              /* The MPID of this CFM. */
     int interval;               /* The requested transmission interval. */
     bool extended;              /* Run in extended mode. */
+    bool demand;                /* Run in demand mode. */
     bool opup;                  /* Operational State. */
     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);
-struct cfm *cfm_create(const char *name);
-void cfm_destroy(struct cfm *);
+struct cfm *cfm_create(const struct netdev *);
+struct cfm *cfm_ref(const struct cfm *);
+void cfm_unref(struct cfm *);
 void cfm_run(struct cfm *);
 bool cfm_should_send_ccm(struct cfm *);
 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 cfm *cfm, const struct flow *);
+void cfm_set_netdev(struct cfm *, const struct netdev *);
+bool cfm_should_process_flow(const struct cfm *cfm, const struct flow *,
+                             struct flow_wildcards *);
 void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
 int cfm_get_fault(const struct cfm *);
 int cfm_get_health(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);
+void cfm_get_remote_mpids(const struct cfm *, uint64_t **rmps, size_t *n_rmps);
 const char *cfm_fault_reason_to_str(int fault);
 
 #endif /* cfm.h */