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

Added missing break;s when converting ID_IP_ADDRESS types to ts, extracted function

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:12 +01:00
parent bd8700f055
commit caa6f772c8
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/id_payload.c
+14 -10
View File
@@ -270,6 +270,16 @@ static traffic_selector_t *get_ts_from_subnet(private_id_payload_t *this,
net, this->port, netmask, this->port ?: 65535);
}
/**
* Create a traffic selector from an IP ID
*/
static traffic_selector_t *get_ts_from_ip(private_id_payload_t *this,
ts_type_t type)
{
return traffic_selector_create_from_bytes(this->protocol_id, type,
this->id_data, this->port, this->id_data, this->port ?: 65535);
}
METHOD(id_payload_t, get_ts, traffic_selector_t*,
private_id_payload_t *this)
{
@@ -300,23 +310,17 @@ METHOD(id_payload_t, get_ts, traffic_selector_t*,
}
break;
case ID_IPV4_ADDR:
{
if (this->id_data.len == 4)
{
return traffic_selector_create_from_bytes(this->protocol_id,
TS_IPV4_ADDR_RANGE, this->id_data, this->port,
this->id_data, this->port ?: 65535);
return get_ts_from_ip(this, TS_IPV4_ADDR_RANGE);
}
}
break;
case ID_IPV6_ADDR:
{
if (this->id_data.len == 16)
{
return traffic_selector_create_from_bytes(this->protocol_id,
TS_IPV4_ADDR_RANGE, this->id_data, this->port,
this->id_data, this->port ?: 65535);
return get_ts_from_ip(this, TS_IPV6_ADDR_RANGE);
}
}
break;
default:
break;
}