aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/stroke/stroke_socket.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-05-04 11:21:33 +0200
committerMartin Willi <martin@revosec.ch>2011-05-16 15:24:14 +0200
commita694b481eed8ffbbbfde899dfdee54a394ec49d8 (patch)
tree16ffc1fcc9714e56a7e6adb1682d149845f27495 /src/libcharon/plugins/stroke/stroke_socket.c
parenta2302d2322bea1e65079abede55e590035212d03 (diff)
downloadstrongswan-a694b481eed8ffbbbfde899dfdee54a394ec49d8.tar.bz2
strongswan-a694b481eed8ffbbbfde899dfdee54a394ec49d8.tar.xz
Added a statusallnb stroke command to show status non-blocking
Diffstat (limited to 'src/libcharon/plugins/stroke/stroke_socket.c')
-rw-r--r--src/libcharon/plugins/stroke/stroke_socket.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c
index 592c77623..d6846807b 100644
--- a/src/libcharon/plugins/stroke/stroke_socket.c
+++ b/src/libcharon/plugins/stroke/stroke_socket.c
@@ -322,11 +322,11 @@ static void stroke_del_ca(private_stroke_socket_t *this,
* show status of daemon
*/
static void stroke_status(private_stroke_socket_t *this,
- stroke_msg_t *msg, FILE *out, bool all)
+ stroke_msg_t *msg, FILE *out, bool all, bool wait)
{
pop_string(msg, &(msg->status.name));
- this->list->status(this->list, msg, out, all);
+ this->list->status(this->list, msg, out, all, wait);
}
/**
@@ -546,10 +546,13 @@ static job_requeue_t process(stroke_job_context_t *ctx)
stroke_rekey(this, msg, out);
break;
case STR_STATUS:
- stroke_status(this, msg, out, FALSE);
+ stroke_status(this, msg, out, FALSE, TRUE);
break;
case STR_STATUS_ALL:
- stroke_status(this, msg, out, TRUE);
+ stroke_status(this, msg, out, TRUE, TRUE);
+ break;
+ case STR_STATUS_ALL_NOBLK:
+ stroke_status(this, msg, out, TRUE, FALSE);
break;
case STR_ADD_CONN:
stroke_add_conn(this, msg);