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

Encode a single IP traffic selector as ID_IPV?_ADDRESS identity

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:12 +01:00
parent caa6f772c8
commit 695aff41f5
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/id_payload.c
+16 -3
View File
@@ -391,7 +391,19 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts)
this = (private_id_payload_t*)id_payload_create(ID_V1); this = (private_id_payload_t*)id_payload_create(ID_V1);
if (ts->to_subnet(ts, &net, &mask)) if (ts->is_host(ts, NULL))
{
if (ts->get_type(ts) == TS_IPV4_ADDR_RANGE)
{
this->id_type = ID_IPV4_ADDR;
}
else
{
this->id_type = ID_IPV6_ADDR;
}
this->id_data = chunk_clone(ts->get_from_address(ts));
}
else if (ts->to_subnet(ts, &net, &mask))
{ {
u_int8_t netmask[16], len, byte; u_int8_t netmask[16], len, byte;
@@ -418,6 +430,7 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts)
} }
this->id_data = chunk_cat("cc", net->get_address(net), this->id_data = chunk_cat("cc", net->get_address(net),
chunk_create(netmask, len)); chunk_create(netmask, len));
net->destroy(net);
} }
else else
{ {
@@ -431,12 +444,12 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts)
} }
this->id_data = chunk_cat("cc", this->id_data = chunk_cat("cc",
ts->get_from_address(ts), ts->get_to_address(ts)); ts->get_from_address(ts), ts->get_to_address(ts));
net->destroy(net);
} }
this->port = ts->get_from_port(ts); this->port = ts->get_from_port(ts);
this->protocol_id = ts->get_protocol(ts); this->protocol_id = ts->get_protocol(ts);
this->payload_length += this->id_data.len; this->payload_length += this->id_data.len;
net->destroy(net);
return &this->public; return &this->public;
} }