denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-libipsec: Use CALLBACK for libipsec callbacks

Browse Source
This commit is contained in:
Tobias Brunner
2023-05-23 13:19:47 +02:00
parent dbd5707077
commit a049868d78
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_libipsec/kernel_libipsec_router.c
+11 -23
View File
@@ -94,28 +94,21 @@ static bool tun_entry_equals(tun_entry_t *a, tun_entry_t *b)
return a->addr->ip_equals(a->addr, b->addr); return a->addr->ip_equals(a->addr, b->addr);
} }
/** CALLBACK(send_esp, void,
* Outbound callback void *data, esp_packet_t *packet)
*/
static void send_esp(void *data, esp_packet_t *packet)
{ {
charon->sender->send_no_marker(charon->sender, (packet_t*)packet); charon->sender->send_no_marker(charon->sender, (packet_t*)packet);
} }
/** CALLBACK(receiver_esp_cb, void,
* Receiver callback void *data, packet_t *packet)
*/
static void receiver_esp_cb(void *data, packet_t *packet)
{ {
ipsec->processor->queue_inbound(ipsec->processor, ipsec->processor->queue_inbound(ipsec->processor,
esp_packet_create_from_packet(packet)); esp_packet_create_from_packet(packet));
} }
/** CALLBACK(deliver_plain, void,
* Inbound callback private_kernel_libipsec_router_t *this, ip_packet_t *packet)
*/
static void deliver_plain(private_kernel_libipsec_router_t *this,
ip_packet_t *packet)
{ {
tun_device_t *tun; tun_device_t *tun;
tun_entry_t *entry, lookup = { tun_entry_t *entry, lookup = {
@@ -292,12 +285,9 @@ METHOD(kernel_libipsec_router_t, get_tun_name, char*,
METHOD(kernel_libipsec_router_t, destroy, void, METHOD(kernel_libipsec_router_t, destroy, void,
private_kernel_libipsec_router_t *this) private_kernel_libipsec_router_t *this)
{ {
charon->receiver->del_esp_cb(charon->receiver, charon->receiver->del_esp_cb(charon->receiver, receiver_esp_cb);
(receiver_esp_cb_t)receiver_esp_cb); ipsec->processor->unregister_outbound(ipsec->processor, send_esp);
ipsec->processor->unregister_outbound(ipsec->processor, ipsec->processor->unregister_inbound(ipsec->processor, deliver_plain);
(ipsec_outbound_cb_t)send_esp);
ipsec->processor->unregister_inbound(ipsec->processor,
(ipsec_inbound_cb_t)deliver_plain);
charon->kernel->remove_listener(charon->kernel, &this->public.listener); charon->kernel->remove_listener(charon->kernel, &this->public.listener);
this->lock->destroy(this->lock); this->lock->destroy(this->lock);
this->tuns->destroy(this->tuns); this->tuns->destroy(this->tuns);
@@ -352,10 +342,8 @@ kernel_libipsec_router_t *kernel_libipsec_router_create()
charon->kernel->add_listener(charon->kernel, &this->public.listener); charon->kernel->add_listener(charon->kernel, &this->public.listener);
ipsec->processor->register_outbound(ipsec->processor, send_esp, NULL); ipsec->processor->register_outbound(ipsec->processor, send_esp, NULL);
ipsec->processor->register_inbound(ipsec->processor, ipsec->processor->register_inbound(ipsec->processor, deliver_plain, this);
(ipsec_inbound_cb_t)deliver_plain, this); charon->receiver->add_esp_cb(charon->receiver, receiver_esp_cb, NULL);
charon->receiver->add_esp_cb(charon->receiver,
(receiver_esp_cb_t)receiver_esp_cb, NULL);
lib->processor->queue_job(lib->processor, lib->processor->queue_job(lib->processor,
(job_t*)callback_job_create((callback_job_cb_t)handle_plain, this, (job_t*)callback_job_create((callback_job_cb_t)handle_plain, this,
NULL, (callback_job_cancel_t)return_false)); NULL, (callback_job_cancel_t)return_false));