ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

added retrieval of remote kmaddress via PF_KEY

This commit is contained in:
Andreas Steffen 2008-11-07 03:23:59 +00:00
parent a70df08c9b
commit 2c81539395
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c
View File

@ -587,7 +587,7 @@ static void process_migrate(private_kernel_netlink_ipsec_t *this, struct nlmsghd
kmaddress = (struct xfrm_user_kmaddress*)RTA_DATA(rta);
local = xfrm2host(kmaddress->family, &kmaddress->local, 0);
remote = xfrm2host(kmaddress->family, &kmaddress->remote, 0);
DBG2(DBG_KNL, " %H...%H", local, remote);
DBG2(DBG_KNL, " kmaddress: %H...%H", local, remote);
}
else if (rta->rta_type == XFRMA_MIGRATE)
{

17
src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
View File

@ -834,10 +834,11 @@ static void process_expire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg*
static void process_migrate(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* msg)
{
pfkey_msg_t response;
sockaddr_t *local_addr, *remote_addr;
traffic_selector_t *src_ts, *dst_ts;
policy_dir_t dir;
u_int32_t reqid = 0;
host_t *local;
u_int32_t local_len, reqid = 0;
host_t *local, *remote;
job_t *job;
DBG2(DBG_KNL, "received an SADB_X_MIGRATE");
@ -849,18 +850,23 @@ static void process_migrate(private_kernel_pfkey_ipsec_t *this, struct sadb_msg*
}
src_ts = sadb_address2ts(response.src);
dst_ts = sadb_address2ts(response.dst);
local = host_create_from_sockaddr((sockaddr_t*)&response.x_kmaddress[1]);
local_addr = (sockaddr_t*)&response.x_kmaddress[1];
local = host_create_from_sockaddr(local_addr);
local_len = (local_addr->sa_family == AF_INET6)?
sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in);
remote_addr = (sockaddr_t*)((u_int8_t*)local_addr + local_len);
remote = host_create_from_sockaddr(remote_addr);
dir = kernel2dir(response.x_policy->sadb_x_policy_dir);
DBG2(DBG_KNL, " policy %R === %R %N, id %u", src_ts, dst_ts,
policy_dir_names, dir, response.x_policy->sadb_x_policy_id);
DBG2(DBG_KNL, " kmaddress: %H", local);
DBG2(DBG_KNL, " kmaddress: %H...%H", local, remote);
if (src_ts && dst_ts)
{
DBG1(DBG_KNL, "creating migrate job for policy %R === %R %N with reqid {%u}",
src_ts, dst_ts, policy_dir_names, dir, reqid, local);
job = (job_t*)migrate_job_create(reqid, src_ts, dst_ts, dir,
local, NULL);
local, remote);
charon->processor->queue_job(charon->processor, job);
}
else
@ -868,6 +874,7 @@ static void process_migrate(private_kernel_pfkey_ipsec_t *this, struct sadb_msg*
DESTROY_IF(src_ts);
DESTROY_IF(dst_ts);
DESTROY_IF(local);
DESTROY_IF(remote);
}
}