diff options
| author | Ben Pfaff <blp@nicira.com> | 2013-03-06 14:50:26 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-03-06 16:23:28 -0800 |
| commit | 4cd9ab26c3a265d168d082b9e50777b9306fe2f8 (patch) | |
| tree | 91697389481496637463172a9f4ec986c03cf56b /ofproto/ofproto.h | |
| parent | 18637fdc2e3279240b61eef5162aaff159e766d0 (diff) | |
bridge: Fix interpretation of 'health' member of struct ofproto_cfm_status.
Commit 9a9e3786b3a8 (ofproto: Merge all the CFM query functions into one.)
mistakenly interpreted struct ofproto_cfm_status as always being in the
range [0,100]. It can in fact take the value -1 if the health status is
not currently well-defined.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'ofproto/ofproto.h')
| -rw-r--r-- | ofproto/ofproto.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 3ea56df5..5960d7bc 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -362,8 +362,8 @@ void ofproto_free_ofproto_controller_info(struct shash *); /* CFM status query. */ struct ofproto_cfm_status { - enum cfm_fault_reason faults; /* 0 if not faulted. */ - int health; /* Health status in [0,100] range. */ + /* 0 if not faulted, otherwise a combination of one or more reasons. */ + enum cfm_fault_reason faults; /* 0 if the remote CFM endpoint is operationally down, * 1 if the remote CFM endpoint is operationally up, @@ -371,6 +371,11 @@ struct ofproto_cfm_status { * mode. */ int remote_opstate; + /* Ordinarily a "health status" in the range 0...100 inclusive, with 0 + * being worst and 100 being best, or -1 if the health status is not + * well-defined. */ + int health; + /* MPIDs of remote maintenance points whose CCMs have been received. */ const uint64_t *rmps; size_t n_rmps; |