From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 8 Aug 2012 12:49:52 +0000 (+0200)
Subject: Add simple callbacks to receive/send ESP packets via libipsec/receiver.
X-Git-Tag: 5.0.1~210^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b3cf0c87ae5a73fad48933ff070f4b8ec919d98;p=thirdparty%2Fstrongswan.git

Add simple callbacks to receive/send ESP packets via libipsec/receiver.
---

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
index 40ca86ac50..bd28e7de92 100644
--- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
@@ -21,6 +21,7 @@
 
 #include <daemon.h>
 #include <library.h>
+#include <ipsec.h>
 #include <processing/jobs/callback_job.h>
 #include <threading/rwlock.h>
 
@@ -70,6 +71,25 @@ struct private_android_service_t {
 
 };
 
+/**
+ * Outbound callback
+ */
+static void send_esp(void *data, esp_packet_t *packet)
+{
+	charon->sender->send_no_marker(charon->sender, (packet_t*)packet);
+}
+
+/**
+ * Receiver callback
+ */
+static void receiver_esp_cb(void *data, packet_t *packet)
+{
+	esp_packet_t *esp_packet;
+
+	esp_packet = esp_packet_create_from_packet(packet);
+	ipsec->processor->queue_inbound(ipsec->processor, esp_packet);
+}
+
 /**
  * Add a route to the TUN device builder
  */
@@ -156,6 +176,12 @@ static bool setup_tun_device(private_android_service_t *this,
 	this->lock->unlock(this->lock);
 
 	DBG1(DBG_DMN, "successfully created TUN device");
+
+	charon->receiver->add_esp_cb(charon->receiver,
+								(receiver_esp_cb_t)receiver_esp_cb, NULL);
+	ipsec->processor->register_outbound(ipsec->processor,
+									   (ipsec_outbound_cb_t)send_esp, NULL);
+
 	return TRUE;
 }
 
@@ -175,6 +201,11 @@ static void close_tun_device(private_android_service_t *this)
 	tunfd = this->tunfd;
 	this->tunfd = -1;
 	this->lock->unlock(this->lock);
+
+	ipsec->processor->unregister_outbound(ipsec->processor,
+										 (ipsec_outbound_cb_t)send_esp);
+	charon->receiver->del_esp_cb(charon->receiver,
+								(receiver_esp_cb_t)receiver_esp_cb);
 	close(tunfd);
 }