projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-test: Enhancements to the ovs-test tool
[openvswitch]
/
ofproto
/
ofproto-dpif.c
diff --git
a/ofproto/ofproto-dpif.c
b/ofproto/ofproto-dpif.c
index f2b933963952be5c151ec088d51c4491c797ee88..a42d09eb9575f2dc8f6f09667335e5bbc667a567 100644
(file)
--- a/
ofproto/ofproto-dpif.c
+++ b/
ofproto/ofproto-dpif.c
@@
-145,8
+145,8
@@
static void update_mirror_stats(struct ofproto_dpif *ofproto,
uint64_t packets, uint64_t bytes);
struct ofbundle {
uint64_t packets, uint64_t bytes);
struct ofbundle {
- struct ofproto_dpif *ofproto; /* Owning ofproto. */
struct hmap_node hmap_node; /* In struct ofproto's "bundles" hmap. */
struct hmap_node hmap_node; /* In struct ofproto's "bundles" hmap. */
+ struct ofproto_dpif *ofproto; /* Owning ofproto. */
void *aux; /* Key supplied by ofproto's client. */
char *name; /* Identifier for log messages. */
void *aux; /* Key supplied by ofproto's client. */
char *name; /* Identifier for log messages. */
@@
-1119,6
+1119,14
@@
get_cfm_remote_mpids(const struct ofport *ofport_, const uint64_t **rmps,
return -1;
}
}
return -1;
}
}
+
+static int
+get_cfm_health(const struct ofport *ofport_)
+{
+ struct ofport_dpif *ofport = ofport_dpif_cast(ofport_);
+
+ return ofport->cfm ? cfm_get_health(ofport->cfm) : -1;
+}
\f
/* Spanning Tree. */
\f
/* Spanning Tree. */
@@
-6491,6
+6499,7
@@
const struct ofproto_class ofproto_dpif_class = {
set_cfm,
get_cfm_fault,
get_cfm_remote_mpids,
set_cfm,
get_cfm_fault,
get_cfm_remote_mpids,
+ get_cfm_health,
set_stp,
get_stp_status,
set_stp_port,
set_stp,
get_stp_status,
set_stp_port,