diff options
Diffstat (limited to 'src/libcharon/plugins')
3 files changed, 8 insertions, 19 deletions
diff --git a/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c b/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c index 390d90651..6622a9634 100644 --- a/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c @@ -33,7 +33,6 @@ #include <threading/thread.h> #include <threading/mutex.h> #include <processing/jobs/callback_job.h> -#include <processing/jobs/update_sa_job.h> /** default timeout for generated SPIs (in seconds) */ #define SPI_TIMEOUT 30 @@ -1306,7 +1305,6 @@ static void process_mapping(private_kernel_klips_ipsec_t *this, struct sadb_msg* pfkey_msg_t response; u_int32_t spi, reqid; host_t *old_src, *new_src; - job_t *job; DBG2(DBG_KNL, "received an SADB_X_NAT_T_NEW_MAPPING"); @@ -1355,10 +1353,8 @@ static void process_mapping(private_kernel_klips_ipsec_t *this, struct sadb_msg* new_src = host_create_from_sockaddr(addr); if (new_src) { - DBG1(DBG_KNL, "NAT mappings of ESP CHILD_SA with SPI %.8x and" - " reqid {%d} changed, queuing update job", ntohl(spi), reqid); - job = (job_t*)update_sa_job_create(reqid, new_src); - hydra->processor->queue_job(hydra->processor, job); + charon->kernel_interface->mapping(charon->kernel_interface, reqid, + spi, new_src); } } } diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c index b603b136a..8d4d2c933 100644 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -42,7 +42,6 @@ #include <utils/hashtable.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/migrate_job.h> -#include <processing/jobs/update_sa_job.h> /** required for Linux 2.6.26 kernel and later */ #ifndef XFRM_STATE_AF_UNSPEC @@ -705,7 +704,6 @@ static void process_migrate(private_kernel_netlink_ipsec_t *this, struct nlmsghd static void process_mapping(private_kernel_netlink_ipsec_t *this, struct nlmsghdr *hdr) { - job_t *job; u_int32_t spi, reqid; struct xfrm_user_mapping *mapping; host_t *host; @@ -722,10 +720,8 @@ static void process_mapping(private_kernel_netlink_ipsec_t *this, mapping->new_sport); if (host) { - DBG1(DBG_KNL, "NAT mappings of ESP CHILD_SA with SPI %.8x and " - "reqid {%u} changed, queuing update job", ntohl(spi), reqid); - job = (job_t*)update_sa_job_create(reqid, host); - hydra->processor->queue_job(hydra->processor, job); + charon->kernel_interface->mapping(charon->kernel_interface, reqid, + spi, host); } } } diff --git a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index b91b6d141..28cc98021 100644 --- a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -61,7 +61,6 @@ #include <threading/mutex.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/migrate_job.h> -#include <processing/jobs/update_sa_job.h> /** non linux specific */ #ifndef IPPROTO_COMP @@ -1040,7 +1039,6 @@ static void process_mapping(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* pfkey_msg_t response; u_int32_t spi, reqid; host_t *host; - job_t *job; DBG2(DBG_KNL, "received an SADB_X_NAT_T_NEW_MAPPING"); @@ -1052,7 +1050,8 @@ static void process_mapping(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* if (!response.x_sa2) { - DBG1(DBG_KNL, "received SADB_X_NAT_T_NEW_MAPPING is missing required information"); + DBG1(DBG_KNL, "received SADB_X_NAT_T_NEW_MAPPING is missing required " + "information"); return; } @@ -1080,10 +1079,8 @@ static void process_mapping(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* host = host_create_from_sockaddr(sa); if (host) { - DBG1(DBG_KNL, "NAT mappings of ESP CHILD_SA with SPI %.8x and " - "reqid {%u} changed, queuing update job", ntohl(spi), reqid); - job = (job_t*)update_sa_job_create(reqid, host); - hydra->processor->queue_job(hydra->processor, job); + charon->kernel_interface->mapping(charon->kernel_interface, reqid, + spi, host); } } } |