diff options
| author | Martin Willi <martin@revosec.ch> | 2011-06-29 11:59:43 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-09-12 13:02:15 +0200 |
| commit | 40e53c40d4175f865584702110f78ce0f1c92eb4 (patch) | |
| tree | 17d3e8ea02c369534bcc803712e07d9049de7d83 /src/libhydra | |
| parent | e6816e4670d0b937683d95b778ed1a98e8e90c76 (diff) | |
| download | strongswan-40e53c40d4175f865584702110f78ce0f1c92eb4.tar.bz2 strongswan-40e53c40d4175f865584702110f78ce0f1c92eb4.tar.xz | |
Destroy kernel interface during deregistration, as the plugin goes afterwards
Diffstat (limited to 'src/libhydra')
| -rw-r--r-- | src/libhydra/kernel/kernel_interface.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/libhydra/kernel/kernel_interface.c b/src/libhydra/kernel/kernel_interface.c index ebe653ec4..9113d813c 100644 --- a/src/libhydra/kernel/kernel_interface.c +++ b/src/libhydra/kernel/kernel_interface.c @@ -34,6 +34,16 @@ struct private_kernel_interface_t { kernel_interface_t public; /** + * Registered IPsec constructor + */ + kernel_ipsec_constructor_t ipsec_constructor; + + /** + * Registered net constructor + */ + kernel_net_constructor_t net_constructor; + + /** * ipsec interface */ kernel_ipsec_t *ipsec; @@ -324,6 +334,7 @@ METHOD(kernel_interface_t, add_ipsec_interface, void, { if (!this->ipsec) { + this->ipsec_constructor = constructor; this->ipsec = constructor(); } } @@ -331,7 +342,11 @@ METHOD(kernel_interface_t, add_ipsec_interface, void, METHOD(kernel_interface_t, remove_ipsec_interface, void, 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, @@ -339,6 +354,7 @@ METHOD(kernel_interface_t, add_net_interface, void, { if (!this->net) { + this->net_constructor = constructor; this->net = constructor(); } } @@ -346,7 +362,11 @@ METHOD(kernel_interface_t, add_net_interface, void, METHOD(kernel_interface_t, remove_net_interface, void, 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, |