vici: Add ike/child-rekey events
This commit is contained in:
parent
7f21363ee5
commit
65ac0851c0
|
@ -749,6 +749,21 @@ The _ike-updown_ event is issued when an IKE_SA is established or terminated.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
### ike-rekey ###
|
||||||
|
|
||||||
|
The _ike-rekey_ event is issued when an IKE_SA is rekeyed.
|
||||||
|
|
||||||
|
{
|
||||||
|
<IKE_SA config name> = {
|
||||||
|
old = {
|
||||||
|
<same data as in the list-sas event, but without child-sas section>
|
||||||
|
}
|
||||||
|
new = {
|
||||||
|
<same data as in the list-sas event, but without child-sas section>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
### child-updown ###
|
### child-updown ###
|
||||||
|
|
||||||
The _child-updown_ event is issued when a CHILD_SA is established or terminated.
|
The _child-updown_ event is issued when a CHILD_SA is established or terminated.
|
||||||
|
@ -761,6 +776,27 @@ The _child-updown_ event is issued when a CHILD_SA is established or terminated.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
### child-rekey ###
|
||||||
|
|
||||||
|
The _child-rekey_ event is issued when a CHILD_SA is rekeyed.
|
||||||
|
|
||||||
|
{
|
||||||
|
<IKE_SA config name> = {
|
||||||
|
<same data as in the list-sas event, but with the child-sas section
|
||||||
|
as follows>
|
||||||
|
child-sas = {
|
||||||
|
<child-sa-name> = {
|
||||||
|
old = {
|
||||||
|
<same data as in the list-sas event>
|
||||||
|
}
|
||||||
|
new = {
|
||||||
|
<same data as in the list-sas event>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# libvici C client library #
|
# libvici C client library #
|
||||||
|
|
||||||
libvici is the reference implementation of a C client library implementing
|
libvici is the reference implementation of a C client library implementing
|
||||||
|
|
|
@ -1031,7 +1031,9 @@ static void manage_commands(private_vici_query_t *this, bool reg)
|
||||||
this->dispatcher->manage_event(this->dispatcher, "list-conn", reg);
|
this->dispatcher->manage_event(this->dispatcher, "list-conn", reg);
|
||||||
this->dispatcher->manage_event(this->dispatcher, "list-cert", reg);
|
this->dispatcher->manage_event(this->dispatcher, "list-cert", reg);
|
||||||
this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
|
this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
|
||||||
|
this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg);
|
||||||
this->dispatcher->manage_event(this->dispatcher, "child-updown", reg);
|
this->dispatcher->manage_event(this->dispatcher, "child-updown", reg);
|
||||||
|
this->dispatcher->manage_event(this->dispatcher, "child-rekey", reg);
|
||||||
manage_command(this, "list-sas", list_sas, reg);
|
manage_command(this, "list-sas", list_sas, reg);
|
||||||
manage_command(this, "list-policies", list_policies, reg);
|
manage_command(this, "list-policies", list_policies, reg);
|
||||||
manage_command(this, "list-conns", list_conns, reg);
|
manage_command(this, "list-conns", list_conns, reg);
|
||||||
|
@ -1070,6 +1072,35 @@ METHOD(listener_t, ike_updown, bool,
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
METHOD(listener_t, ike_rekey, bool,
|
||||||
|
private_vici_query_t *this, ike_sa_t *old, ike_sa_t *new)
|
||||||
|
{
|
||||||
|
vici_builder_t *b;
|
||||||
|
time_t now;
|
||||||
|
|
||||||
|
if (!this->dispatcher->has_event_listeners(this->dispatcher, "ike-rekey"))
|
||||||
|
{
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
now = time_monotonic(NULL);
|
||||||
|
|
||||||
|
b = vici_builder_create();
|
||||||
|
b->begin_section(b, old->get_name(old));
|
||||||
|
b->begin_section(b, "old");
|
||||||
|
list_ike(this, b, old, now);
|
||||||
|
b->end_section(b);
|
||||||
|
b->begin_section(b, "new");
|
||||||
|
list_ike(this, b, new, now);
|
||||||
|
b->end_section(b);
|
||||||
|
b->end_section(b);
|
||||||
|
|
||||||
|
this->dispatcher->raise_event(this->dispatcher,
|
||||||
|
"ike-rekey", 0, b->finalize(b));
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
METHOD(listener_t, child_updown, bool,
|
METHOD(listener_t, child_updown, bool,
|
||||||
private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
|
private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
|
||||||
{
|
{
|
||||||
|
@ -1106,6 +1137,45 @@ METHOD(listener_t, child_updown, bool,
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
METHOD(listener_t, child_rekey, bool,
|
||||||
|
private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *old,
|
||||||
|
child_sa_t *new)
|
||||||
|
{
|
||||||
|
vici_builder_t *b;
|
||||||
|
time_t now;
|
||||||
|
|
||||||
|
if (!this->dispatcher->has_event_listeners(this->dispatcher, "child-rekey"))
|
||||||
|
{
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
now = time_monotonic(NULL);
|
||||||
|
b = vici_builder_create();
|
||||||
|
|
||||||
|
b->begin_section(b, ike_sa->get_name(ike_sa));
|
||||||
|
list_ike(this, b, ike_sa, now);
|
||||||
|
b->begin_section(b, "child-sas");
|
||||||
|
|
||||||
|
b->begin_section(b, old->get_name(old));
|
||||||
|
|
||||||
|
b->begin_section(b, "old");
|
||||||
|
list_child(this, b, old, now);
|
||||||
|
b->end_section(b);
|
||||||
|
b->begin_section(b, "new");
|
||||||
|
list_child(this, b, new, now);
|
||||||
|
b->end_section(b);
|
||||||
|
|
||||||
|
b->end_section(b);
|
||||||
|
|
||||||
|
b->end_section(b);
|
||||||
|
b->end_section(b);
|
||||||
|
|
||||||
|
this->dispatcher->raise_event(this->dispatcher,
|
||||||
|
"child-rekey", 0, b->finalize(b));
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
METHOD(vici_query_t, destroy, void,
|
METHOD(vici_query_t, destroy, void,
|
||||||
private_vici_query_t *this)
|
private_vici_query_t *this)
|
||||||
{
|
{
|
||||||
|
@ -1124,7 +1194,9 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
|
||||||
.public = {
|
.public = {
|
||||||
.listener = {
|
.listener = {
|
||||||
.ike_updown = _ike_updown,
|
.ike_updown = _ike_updown,
|
||||||
|
.ike_rekey = _ike_rekey,
|
||||||
.child_updown = _child_updown,
|
.child_updown = _child_updown,
|
||||||
|
.child_rekey = _child_rekey,
|
||||||
},
|
},
|
||||||
.destroy = _destroy,
|
.destroy = _destroy,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue