diff options
author | Justin Pettit <jpettit@nicira.com> | 2011-09-26 15:40:53 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@nicira.com> | 2011-09-29 18:52:28 -0700 |
commit | ae75dae3459202bb7ff6031e4a5f0f696f48432f (patch) | |
tree | 2a0ff73b567dac6f90b42c12ae2e61b301206f1c /lib/cfm.c | |
parent | 7ff2009a9599a4cebeea038764a2d3f13c60f601 (diff) |
cfm: Make argument to ovs-appctl "cfm/show" command optional.
If an argument isn't passed to "cfm/show", it will print information
about all interfaces with CFM enabled.
Diffstat (limited to 'lib/cfm.c')
-rw-r--r-- | lib/cfm.c | 50 |
1 files changed, 32 insertions, 18 deletions
@@ -220,7 +220,8 @@ lookup_remote_mp(const struct cfm *cfm, uint64_t mpid) void cfm_init(void) { - unixctl_command_register("cfm/show", "interface", cfm_unixctl_show, NULL); + unixctl_command_register("cfm/show", "[interface]", cfm_unixctl_show, + NULL); } /* Allocates a 'cfm' object called 'name'. 'cfm' should be initialized by @@ -517,37 +518,50 @@ cfm_find(const char *name) } static void -cfm_unixctl_show(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +cfm_print_details(struct ds *ds, const struct cfm *cfm) { - struct ds ds = DS_EMPTY_INITIALIZER; - const struct cfm *cfm; struct remote_mp *rmp; - cfm = cfm_find(args); - if (!cfm) { - unixctl_command_reply(conn, 501, "no such CFM object"); - return; - } - - ds_put_format(&ds, "MPID %"PRIu64":%s%s\n", cfm->mpid, + ds_put_format(ds, "---- %s ----\n", cfm->name); + ds_put_format(ds, "MPID %"PRIu64":%s%s\n", cfm->mpid, cfm->fault ? " fault" : "", cfm->unexpected_recv ? " unexpected_recv" : ""); - ds_put_format(&ds, "\tinterval: %dms\n", cfm->ccm_interval_ms); - ds_put_format(&ds, "\tnext CCM tx: %lldms\n", + ds_put_format(ds, "\tinterval: %dms\n", cfm->ccm_interval_ms); + ds_put_format(ds, "\tnext CCM tx: %lldms\n", timer_msecs_until_expired(&cfm->tx_timer)); - ds_put_format(&ds, "\tnext fault check: %lldms\n", + ds_put_format(ds, "\tnext fault check: %lldms\n", timer_msecs_until_expired(&cfm->fault_timer)); - ds_put_cstr(&ds, "\n"); + ds_put_cstr(ds, "\n"); HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) { - ds_put_format(&ds, "Remote MPID %"PRIu64":%s\n", + ds_put_format(ds, "Remote MPID %"PRIu64":%s\n", rmp->mpid, rmp->rdi ? " rdi" : ""); - ds_put_format(&ds, "\trecv since check: %s", + ds_put_format(ds, "\trecv since check: %s", rmp->recv ? "true" : "false"); } +} + +static void +cfm_unixctl_show(struct unixctl_conn *conn, + const char *args, void *aux OVS_UNUSED) +{ + struct ds ds = DS_EMPTY_INITIALIZER; + const struct cfm *cfm; + + if (strlen(args)) { + cfm = cfm_find(args); + if (!cfm) { + unixctl_command_reply(conn, 501, "no such CFM object"); + return; + } + cfm_print_details(&ds, cfm); + } else { + HMAP_FOR_EACH (cfm, hmap_node, &all_cfms) { + cfm_print_details(&ds, cfm); + } + } unixctl_command_reply(conn, 200, ds_cstr(&ds)); ds_destroy(&ds); |