Fix load-tester.shutdown_when_complete option.

It didn't work when used together with delete_after_established=yes.
This commit is contained in:
Tobias Brunner
2011-07-18 18:46:50 +02:00
parent 369c2e1dee
commit ebbdc3250b
@@ -41,6 +41,11 @@ struct private_load_tester_listener_t {
*/ */
u_int established; u_int established;
/**
* Number of terminated SAs
*/
u_int terminated;
/** /**
* Shutdown the daemon if we have established this SA count * Shutdown the daemon if we have established this SA count
*/ */
@@ -52,10 +57,9 @@ METHOD(listener_t, ike_updown, bool,
{ {
if (up) if (up)
{ {
ike_sa_id_t *id; ike_sa_id_t *id = ike_sa->get_id(ike_sa);
this->established++; this->established++;
id = ike_sa->get_id(ike_sa);
if (this->delete_after_established) if (this->delete_after_established)
{ {
@@ -74,7 +78,7 @@ METHOD(listener_t, ike_updown, bool,
} }
else else
{ {
this->established--; this->terminated++;
} }
return TRUE; return TRUE;
} }
@@ -82,7 +86,7 @@ METHOD(listener_t, ike_updown, bool,
METHOD(load_tester_listener_t, get_established, u_int, METHOD(load_tester_listener_t, get_established, u_int,
private_load_tester_listener_t *this) private_load_tester_listener_t *this)
{ {
return this->established; return this->established - this->terminated;
} }
METHOD(load_tester_listener_t, destroy, void, METHOD(load_tester_listener_t, destroy, void,