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

id-payload: Enable multiple calls to get_ts() for subnet traffic selectors

Browse Source 
The second call resulted in a /32 subnet previously.
This commit is contained in:
Tobias Brunner
2014-12-05 09:32:38 +01:00
parent 7459f3a5ac
commit bf5d0693ef
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/id_payload.c
+5 -2
View File
@@ -258,17 +258,20 @@ static traffic_selector_t *get_ts_from_range(private_id_payload_t *this,
static traffic_selector_t *get_ts_from_subnet(private_id_payload_t *this, static traffic_selector_t *get_ts_from_subnet(private_id_payload_t *this,
ts_type_t type) ts_type_t type)
{ {
traffic_selector_t *ts;
chunk_t net, netmask; chunk_t net, netmask;
int i; int i;
net = chunk_create(this->id_data.ptr, this->id_data.len / 2); net = chunk_create(this->id_data.ptr, this->id_data.len / 2);
netmask = chunk_skip(this->id_data, this->id_data.len / 2); netmask = chunk_clone(chunk_skip(this->id_data, this->id_data.len / 2));
for (i = 0; i < net.len; i++) for (i = 0; i < net.len; i++)
{ {
netmask.ptr[i] = (netmask.ptr[i] ^ 0xFF) | net.ptr[i]; netmask.ptr[i] = (netmask.ptr[i] ^ 0xFF) | net.ptr[i];
} }
return traffic_selector_create_from_bytes(this->protocol_id, type, ts = traffic_selector_create_from_bytes(this->protocol_id, type,
net, this->port, netmask, this->port ?: 65535); net, this->port, netmask, this->port ?: 65535);
chunk_free(&netmask);
return ts;
} }
/** /**