From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 31 Aug 2012 09:13:39 +0000 (+0200)
Subject: Register TKM bus listener in charon-tkm
X-Git-Tag: 5.0.3rc1~39^2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0ce4116b0380dbfa3890781c6cf2e40f9ac4654;p=thirdparty%2Fstrongswan.git

Register TKM bus listener in charon-tkm
---

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index e102b4e0d7..f2a58b21e1 100644
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -37,6 +37,12 @@
 #include "tkm_nonceg.h"
 #include "tkm_diffie_hellman.h"
 #include "tkm_keymat.h"
+#include "tkm_listener.h"
+
+/**
+ * TKM bus listener for IKE authorize events.
+ */
+static tkm_listener_t *listener;
 
 /**
  * PID file, in which charon-tkm stores its process id
@@ -319,6 +325,10 @@ int main(int argc, char *argv[])
 		goto deinit;
 	}
 
+	/* register TKM authorization hook */
+	listener = tkm_listener_create();
+	charon->bus->add_listener(charon->bus, &listener->listener);
+
 	/* add handler for SEGV and ILL,
 	 * INT and TERM are handled by sigwait() in run() */
 	action.sa_handler = segv_handler;
@@ -342,6 +352,8 @@ int main(int argc, char *argv[])
 
 	unlink_pidfile();
 	status = 0;
+	charon->bus->remove_listener(charon->bus, &listener->listener);
+	listener->destroy(listener);
 
 deinit:
 	libcharon_deinit();