denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a statusallnb stroke command to show status non-blocking

Browse Source
This commit is contained in:
Martin Willi
2011-05-16 15:24:14 +02:00
parent a2302d2322
commit a694b481ee
7 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_list.c
+3 -2
View File
@@ -389,7 +389,8 @@ static void log_auth_cfgs(FILE *out, peer_cfg_t *peer_cfg, bool local)
}
METHOD(stroke_list_t, status, void,
private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bool all)
private_stroke_list_t *this, stroke_msg_t *msg, FILE *out,
bool all, bool wait)
{
enumerator_t *enumerator, *children;
ike_cfg_t *ike_cfg;
@@ -531,7 +532,7 @@ METHOD(stroke_list_t, status, void,
fprintf(out, "Security Associations:\n");
enumerator = charon->controller->create_ike_sa_enumerator(
charon->controller, TRUE);
charon->controller, wait);
while (enumerator->enumerate(enumerator, &ike_sa))
{
bool ike_printed = FALSE;
src/libcharon/plugins/stroke/stroke_list.h
+3 -1
View File
@@ -47,8 +47,10 @@ struct stroke_list_t {
* @param msg stroke message
* @param out stroke console stream
* @param all TRUE for "statusall"
* @param wait TRUE to wait for IKE_SA entries, FALSE to skip if locked
*/
void (*status)(stroke_list_t *this, stroke_msg_t *msg, FILE *out, bool all);
void (*status)(stroke_list_t *this, stroke_msg_t *msg, FILE *out,
bool all, bool wait);
/**
* Log pool leases to stroke console.
src/libcharon/plugins/stroke/stroke_socket.c
+7 -4
View File
@@ -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);