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

kernel-pfkey: Correctly handle IPSEC_PROTO_ANY in an acquire

Browse Source
This commit is contained in:
Tobias Brunner
2013-07-17 17:45:17 +02:00
parent 84693a3d79
commit a9f14ada34
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+5 -2
View File
@@ -981,6 +981,10 @@ static traffic_selector_t* sadb_address2ts(struct sadb_address *address)
{ {
traffic_selector_t *ts; traffic_selector_t *ts;
host_t *host; host_t *host;
u_int8_t proto;
proto = address->sadb_address_proto;
proto = proto == IPSEC_PROTO_ANY ? 0 : proto;
/* The Linux 2.6 kernel does not set the protocol and port information /* The Linux 2.6 kernel does not set the protocol and port information
* in the src and dst sadb_address extensions of the SADB_ACQUIRE message. * in the src and dst sadb_address extensions of the SADB_ACQUIRE message.
@@ -988,8 +992,7 @@ static traffic_selector_t* sadb_address2ts(struct sadb_address *address)
host = host_create_from_sockaddr((sockaddr_t*)&address[1]); host = host_create_from_sockaddr((sockaddr_t*)&address[1]);
ts = traffic_selector_create_from_subnet(host, ts = traffic_selector_create_from_subnet(host,
address->sadb_address_prefixlen, address->sadb_address_prefixlen,
address->sadb_address_proto, proto, host->get_port(host),
host->get_port(host),
host->get_port(host) ?: 65535); host->get_port(host) ?: 65535);
return ts; return ts;
} }