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

Destroy kernel interface during deregistration, as the plugin goes afterwards

Browse Source
This commit is contained in:
Martin Willi
2011-09-12 13:02:15 +02:00
parent e6816e4670
commit 40e53c40d4
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/kernel/kernel_interface.c
+22 -2
View File
@@ -33,6 +33,16 @@ struct private_kernel_interface_t {
*/ */
kernel_interface_t public; kernel_interface_t public;
/**
* Registered IPsec constructor
*/
kernel_ipsec_constructor_t ipsec_constructor;
/**
* Registered net constructor
*/
kernel_net_constructor_t net_constructor;
/** /**
* ipsec interface * ipsec interface
*/ */
@@ -324,6 +334,7 @@ METHOD(kernel_interface_t, add_ipsec_interface, void,
{ {
if (!this->ipsec) if (!this->ipsec)
{ {
this->ipsec_constructor = constructor;
this->ipsec = constructor(); this->ipsec = constructor();
} }
} }
@@ -331,7 +342,11 @@ METHOD(kernel_interface_t, add_ipsec_interface, void,
METHOD(kernel_interface_t, remove_ipsec_interface, void, METHOD(kernel_interface_t, remove_ipsec_interface, void,
private_kernel_interface_t *this, kernel_ipsec_constructor_t constructor) private_kernel_interface_t *this, kernel_ipsec_constructor_t constructor)
{ {
/* TODO: replace if interface currently in use */ if (constructor == this->ipsec_constructor)
{
this->ipsec->destroy(this->ipsec);
this->ipsec = NULL;
}
} }
METHOD(kernel_interface_t, add_net_interface, void, METHOD(kernel_interface_t, add_net_interface, void,
@@ -339,6 +354,7 @@ METHOD(kernel_interface_t, add_net_interface, void,
{ {
if (!this->net) if (!this->net)
{ {
this->net_constructor = constructor;
this->net = constructor(); this->net = constructor();
} }
} }
@@ -346,7 +362,11 @@ METHOD(kernel_interface_t, add_net_interface, void,
METHOD(kernel_interface_t, remove_net_interface, void, METHOD(kernel_interface_t, remove_net_interface, void,
private_kernel_interface_t *this, kernel_net_constructor_t constructor) private_kernel_interface_t *this, kernel_net_constructor_t constructor)
{ {
/* TODO: replace if interface currently in use */ if (constructor == this->net_constructor)
{
this->net->destroy(this->net);
this->net = NULL;
}
} }
METHOD(kernel_interface_t, add_listener, void, METHOD(kernel_interface_t, add_listener, void,