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

Support "opaque" ports in traffic selector subset calculation

Browse Source
This commit is contained in:
Martin Willi
2013-02-21 10:51:19 +01:00
parent 7dbe1feef1
commit 7b368af61a
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/selectors/traffic_selector.c
+32 -6
View File
@@ -177,6 +177,22 @@ static u_int8_t calc_netbits(private_traffic_selector_t *this)
static private_traffic_selector_t *traffic_selector_create(u_int8_t protocol, static private_traffic_selector_t *traffic_selector_create(u_int8_t protocol,
ts_type_t type, u_int16_t from_port, u_int16_t to_port); ts_type_t type, u_int16_t from_port, u_int16_t to_port);
/**
* Check if TS contains "opaque" ports
*/
static bool is_opaque(private_traffic_selector_t *this)
{
return this->from_port == 0xffff && this->to_port == 0;
}
/**
* Check if TS contains "any" ports
*/
static bool is_any(private_traffic_selector_t *this)
{
return this->from_port == 0 && this->to_port == 0xffff;
}
/** /**
* Described in header. * Described in header.
*/ */
@@ -249,7 +265,7 @@ int traffic_selector_printf_hook(printf_hook_data_t *data,
/* check if we have protocol and/or port selectors */ /* check if we have protocol and/or port selectors */
has_proto = this->protocol != 0; has_proto = this->protocol != 0;
has_ports = !(this->from_port == 0 && this->to_port == 0xFFFF); has_ports = !is_any(this);
if (!has_proto && !has_ports) if (!has_proto && !has_ports)
{ {
@@ -348,12 +364,22 @@ METHOD(traffic_selector_t, get_subset, traffic_selector_t*,
/* select protocol, which is not zero */ /* select protocol, which is not zero */
protocol = max(this->protocol, other->protocol); protocol = max(this->protocol, other->protocol);
/* calculate the maximum port range allowed for both */ if ((is_opaque(this) && is_opaque(other)) ||
from_port = max(this->from_port, other->from_port); (is_opaque(this) && is_any(other)) ||
to_port = min(this->to_port, other->to_port); (is_opaque(other) && is_any(this)))
if (from_port > to_port)
{ {
return NULL; from_port = 0xffff;
to_port = 0;
}
else
{
/* calculate the maximum port range allowed for both */
from_port = max(this->from_port, other->from_port);
to_port = min(this->to_port, other->to_port);
if (from_port > to_port)
{
return NULL;
}
} }
/* get higher from-address */ /* get higher from-address */
if (memcmp(this->from, other->from, size) > 0) if (memcmp(this->from, other->from, size) > 0)