summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpyr <pyr@openbsd.org>2007-06-12 18:09:00 +0000
committerpyr <pyr@openbsd.org>2007-06-12 18:09:00 +0000
commit30e88fcd99ca7cf56f2a91469e563af09cc8d45b (patch)
tree09e059b26ed76cda9c3fb755b786d5c45001bd63
parent``dot'' notation (diff)
downloadwireguard-openbsd-30e88fcd99ca7cf56f2a91469e563af09cc8d45b.tar.xz
wireguard-openbsd-30e88fcd99ca7cf56f2a91469e563af09cc8d45b.zip
reflect msf's changes to the imsg framework in hoststated.
-rw-r--r--usr.sbin/hoststatectl/hoststatectl.c22
-rw-r--r--usr.sbin/relayctl/relayctl.c22
2 files changed, 22 insertions, 22 deletions
diff --git a/usr.sbin/hoststatectl/hoststatectl.c b/usr.sbin/hoststatectl/hoststatectl.c
index 68182e732a6..5b1c7421c66 100644
--- a/usr.sbin/hoststatectl/hoststatectl.c
+++ b/usr.sbin/hoststatectl/hoststatectl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hoststatectl.c,v 1.19 2007/05/29 23:19:18 pyr Exp $ */
+/* $OpenBSD: hoststatectl.c,v 1.20 2007/06/12 18:09:00 pyr Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -142,42 +142,42 @@ main(int argc, char *argv[])
case SHOW_SUM:
case SHOW_HOSTS:
case SHOW_RELAYS:
- imsg_compose(ibuf, IMSG_CTL_SHOW_SUM, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_SHOW_SUM, 0, 0, -1, NULL, 0);
printf("Type\t%4s\t%-24s\t%-7s\tStatus\n",
"Id", "Name", "Avlblty");
break;
case SERV_ENABLE:
- imsg_compose(ibuf, IMSG_CTL_SERVICE_ENABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_SERVICE_ENABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case SERV_DISABLE:
- imsg_compose(ibuf, IMSG_CTL_SERVICE_DISABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_SERVICE_DISABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case TABLE_ENABLE:
- imsg_compose(ibuf, IMSG_CTL_TABLE_ENABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_TABLE_ENABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case TABLE_DISABLE:
- imsg_compose(ibuf, IMSG_CTL_TABLE_DISABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_TABLE_DISABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case HOST_ENABLE:
- imsg_compose(ibuf, IMSG_CTL_HOST_ENABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_HOST_ENABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case HOST_DISABLE:
- imsg_compose(ibuf, IMSG_CTL_HOST_DISABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_HOST_DISABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case SHUTDOWN:
- imsg_compose(ibuf, IMSG_CTL_SHUTDOWN, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_SHUTDOWN, 0, 0, -1, NULL, 0);
break;
case RELOAD:
- imsg_compose(ibuf, IMSG_CTL_RELOAD, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_RELOAD, 0, 0, -1, NULL, 0);
break;
case MONITOR:
- imsg_compose(ibuf, IMSG_CTL_NOTIFY, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_NOTIFY, 0, 0, -1, NULL, 0);
break;
}
diff --git a/usr.sbin/relayctl/relayctl.c b/usr.sbin/relayctl/relayctl.c
index d4663156688..0dfbeb7eadf 100644
--- a/usr.sbin/relayctl/relayctl.c
+++ b/usr.sbin/relayctl/relayctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayctl.c,v 1.19 2007/05/29 23:19:18 pyr Exp $ */
+/* $OpenBSD: relayctl.c,v 1.20 2007/06/12 18:09:00 pyr Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -142,42 +142,42 @@ main(int argc, char *argv[])
case SHOW_SUM:
case SHOW_HOSTS:
case SHOW_RELAYS:
- imsg_compose(ibuf, IMSG_CTL_SHOW_SUM, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_SHOW_SUM, 0, 0, -1, NULL, 0);
printf("Type\t%4s\t%-24s\t%-7s\tStatus\n",
"Id", "Name", "Avlblty");
break;
case SERV_ENABLE:
- imsg_compose(ibuf, IMSG_CTL_SERVICE_ENABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_SERVICE_ENABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case SERV_DISABLE:
- imsg_compose(ibuf, IMSG_CTL_SERVICE_DISABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_SERVICE_DISABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case TABLE_ENABLE:
- imsg_compose(ibuf, IMSG_CTL_TABLE_ENABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_TABLE_ENABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case TABLE_DISABLE:
- imsg_compose(ibuf, IMSG_CTL_TABLE_DISABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_TABLE_DISABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case HOST_ENABLE:
- imsg_compose(ibuf, IMSG_CTL_HOST_ENABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_HOST_ENABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case HOST_DISABLE:
- imsg_compose(ibuf, IMSG_CTL_HOST_DISABLE, 0, 0,
+ imsg_compose(ibuf, IMSG_CTL_HOST_DISABLE, 0, 0, -1,
&res->id, sizeof(res->id));
break;
case SHUTDOWN:
- imsg_compose(ibuf, IMSG_CTL_SHUTDOWN, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_SHUTDOWN, 0, 0, -1, NULL, 0);
break;
case RELOAD:
- imsg_compose(ibuf, IMSG_CTL_RELOAD, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_RELOAD, 0, 0, -1, NULL, 0);
break;
case MONITOR:
- imsg_compose(ibuf, IMSG_CTL_NOTIFY, 0, 0, NULL, 0);
+ imsg_compose(ibuf, IMSG_CTL_NOTIFY, 0, 0, -1, NULL, 0);
break;
}