diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-11-07 03:38:56 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-11-07 03:38:56 +0000 |
| commit | f11a54bc89df3e9fce2f6066e822f91aeca26597 (patch) | |
| tree | 883d23ee650bb4359bba2dae072604c543ae94ee /src/charon/plugins/kernel_pfkey | |
| parent | 2c81539395341880f2e7084c01f4dbcf0b5ba8d7 (diff) | |
| download | strongswan-f11a54bc89df3e9fce2f6066e822f91aeca26597.tar.bz2 strongswan-f11a54bc89df3e9fce2f6066e822f91aeca26597.tar.xz | |
SADB_X_EXT_KMADDRESS is not present in old kernels
Diffstat (limited to 'src/charon/plugins/kernel_pfkey')
| -rw-r--r-- | src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index 00051ae47..68f777cb7 100644 --- a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -834,11 +834,10 @@ 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 local_len, reqid = 0; - host_t *local, *remote; + u_int32_t reqid = 0; + host_t *local = NULL, *remote = NULL; job_t *job; DBG2(DBG_KNL, "received an SADB_X_MIGRATE"); @@ -850,16 +849,24 @@ 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_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...%H", local, remote); + + /* SADB_X_EXT_KMADDRESS is not present in unpatched kernels < 2.6.28 */ + if (response.x_kmaddress) + { + sockaddr_t *local_addr, *remote_addr; + u_int32_t local_len; + + 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); + DBG2(DBG_KNL, " kmaddress: %H...%H", local, remote); + } if (src_ts && dst_ts) { |