diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-05-28 00:04:48 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-05-28 00:04:48 +0000 |
| commit | 0511f50b24d46a5d68342bf4bba01dcaeb999127 (patch) | |
| tree | e46238d685b17a74c0472658050e5e966765af66 | |
| parent | 4f7c11ce3d4f59ddf41b15eef5275289bc5ad1f3 (diff) | |
Reflect recent hoststated changes into hoststatectl
This unbreaks the tree.
Fixed from the depth of the OpenBSD lair.
| -rw-r--r-- | usr.sbin/hoststatectl/hoststatectl.c | 12 | ||||
| -rw-r--r-- | usr.sbin/relayctl/relayctl.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/hoststatectl/hoststatectl.c b/usr.sbin/hoststatectl/hoststatectl.c index ae8f0f50c18..d2cb50a5671 100644 --- a/usr.sbin/hoststatectl/hoststatectl.c +++ b/usr.sbin/hoststatectl/hoststatectl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hoststatectl.c,v 1.16 2007/02/22 05:59:13 reyk Exp $ */ +/* $OpenBSD: hoststatectl.c,v 1.17 2007/05/28 00:04:47 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -311,23 +311,23 @@ show_summary_msg(struct imsg *imsg, int type) break; service = imsg->data; printf("service\t%4u\t%-24s\t%-7s\t%s\n", - service->id, service->name, "", - print_service_status(service->flags)); + service->conf.id, service->conf.name, "", + print_service_status(service->conf.flags)); break; case IMSG_CTL_TABLE: if (type == SHOW_RELAYS) break; table = imsg->data; printf("table\t%4u\t%-24s\t%-7s\t%s\n", - table->id, table->name, "", - print_table_status(table->up, table->flags)); + table->conf.id, table->conf.name, "", + print_table_status(table->up, table->conf.flags)); break; case IMSG_CTL_HOST: if (type == SHOW_RELAYS) break; host = imsg->data; printf("host\t%4u\t%-24s\t%-7s\t%s\n", - host->id, host->name, + host->conf.id, host->conf.name, print_availability(host->check_cnt, host->up_cnt), print_host_status(host->up, host->flags)); if (type == SHOW_HOSTS && host->check_cnt) { diff --git a/usr.sbin/relayctl/relayctl.c b/usr.sbin/relayctl/relayctl.c index 565f04722e5..276c466c4f8 100644 --- a/usr.sbin/relayctl/relayctl.c +++ b/usr.sbin/relayctl/relayctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayctl.c,v 1.16 2007/02/22 05:59:13 reyk Exp $ */ +/* $OpenBSD: relayctl.c,v 1.17 2007/05/28 00:04:47 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -311,23 +311,23 @@ show_summary_msg(struct imsg *imsg, int type) break; service = imsg->data; printf("service\t%4u\t%-24s\t%-7s\t%s\n", - service->id, service->name, "", - print_service_status(service->flags)); + service->conf.id, service->conf.name, "", + print_service_status(service->conf.flags)); break; case IMSG_CTL_TABLE: if (type == SHOW_RELAYS) break; table = imsg->data; printf("table\t%4u\t%-24s\t%-7s\t%s\n", - table->id, table->name, "", - print_table_status(table->up, table->flags)); + table->conf.id, table->conf.name, "", + print_table_status(table->up, table->conf.flags)); break; case IMSG_CTL_HOST: if (type == SHOW_RELAYS) break; host = imsg->data; printf("host\t%4u\t%-24s\t%-7s\t%s\n", - host->id, host->name, + host->conf.id, host->conf.name, print_availability(host->check_cnt, host->up_cnt), print_host_status(host->up, host->flags)); if (type == SHOW_HOSTS && host->check_cnt) { |