Integrate nm plugin directly in charon-nm.

This commit is contained in:
Tobias Brunner
2012-05-03 13:57:03 +02:00
parent 1c7a733e36
commit b64f333612
13 changed files with 67 additions and 85 deletions
+12 -1
View File
@@ -31,6 +31,8 @@
#include <utils/backtrace.h>
#include <threading/thread.h>
#include <nm/nm_backend.h>
/**
* Hook in library for debugging messages
*/
@@ -270,10 +272,17 @@ int main(int argc, char *argv[])
goto deinit;
}
/* load NM backend */
if (!nm_backend_init())
{
DBG1(DBG_DMN, "failed to initialize NetworkManager backend - aborting charon-nm");
goto deinit_nm;
}
if (!drop_capabilities())
{
DBG1(DBG_DMN, "capability dropping failed - aborting charon-nm");
goto deinit;
goto deinit_nm;
}
/* add handler for SEGV and ILL,
@@ -299,6 +308,8 @@ int main(int argc, char *argv[])
status = 0;
deinit_nm:
nm_backend_deinit();
deinit:
libcharon_deinit();
libhydra_deinit();