From d8fdd1018e1654b04b614354a493026a9dad30e5 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 21 Aug 2015 13:57:00 +0200 Subject: [PATCH] starter: Don't flush SAs in the kernel If starter is not used we don't do that either. And this allows us to move the stuff in libhydra back to libcharon. --- src/starter/netkey.c | 12 ------------ src/starter/netkey.h | 1 - src/starter/starter.c | 1 - 3 files changed, 14 deletions(-) diff --git a/src/starter/netkey.c b/src/starter/netkey.c index 0b677fb792..3eb6973a1c 100644 --- a/src/starter/netkey.c +++ b/src/starter/netkey.c @@ -55,15 +55,3 @@ bool starter_netkey_init(void) DBG2(DBG_APP, "found netkey IPsec stack"); return TRUE; } - -void starter_netkey_cleanup(void) -{ - if (!lib->plugins->load(lib->plugins, - lib->settings->get_str(lib->settings, "starter.load", PLUGINS))) - { - DBG1(DBG_APP, "unable to load kernel plugins"); - return; - } - hydra->kernel_interface->flush_sas(hydra->kernel_interface); - lib->plugins->unload(lib->plugins); -} diff --git a/src/starter/netkey.h b/src/starter/netkey.h index c129241742..bc71af2ed2 100644 --- a/src/starter/netkey.h +++ b/src/starter/netkey.h @@ -16,7 +16,6 @@ #define _STARTER_NETKEY_H_ extern bool starter_netkey_init (void); -extern void starter_netkey_cleanup (void); #endif /* _STARTER_NETKEY_H_ */ diff --git a/src/starter/starter.c b/src/starter/starter.c index a192989230..ab1ebdd5df 100644 --- a/src/starter/starter.c +++ b/src/starter/starter.c @@ -703,7 +703,6 @@ int main (int argc, char **argv) { starter_stop_charon(); } - starter_netkey_cleanup(); confread_free(cfg); unlink(starter_pid_file); cleanup(); -- 2.47.2