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

quick-mode: Correctly prepare NAT-OA payloads as responder

Browse Source 
The initiator's address was sent back twice previously.

Fixes #2268.
This commit is contained in:
Tobias Brunner
2017-03-06 15:10:35 +01:00
parent 6885375e66
commit d8f0d9c284
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+13 -8
View File
@@ -703,25 +703,30 @@ static void add_nat_oa_payloads(private_quick_mode_t *this, message_t *message)
{ {
identification_t *id; identification_t *id;
id_payload_t *nat_oa; id_payload_t *nat_oa;
host_t *src, *dst; host_t *init, *resp;
payload_type_t nat_oa_payload_type; payload_type_t nat_oa_payload_type;
src = message->get_source(message); if (this->initiator)
dst = message->get_destination(message); {
init = message->get_source(message);
src = this->initiator ? src : dst; resp = message->get_destination(message);
dst = this->initiator ? dst : src; }
else
{
init = message->get_destination(message);
resp = message->get_source(message);
}
nat_oa_payload_type = get_nat_oa_payload_type(this->ike_sa); nat_oa_payload_type = get_nat_oa_payload_type(this->ike_sa);
/* first NAT-OA is the initiator's address */ /* first NAT-OA is the initiator's address */
id = identification_create_from_sockaddr(src->get_sockaddr(src)); id = identification_create_from_sockaddr(init->get_sockaddr(init));
nat_oa = id_payload_create_from_identification(nat_oa_payload_type, id); nat_oa = id_payload_create_from_identification(nat_oa_payload_type, id);
message->add_payload(message, (payload_t*)nat_oa); message->add_payload(message, (payload_t*)nat_oa);
id->destroy(id); id->destroy(id);
/* second NAT-OA is that of the responder */ /* second NAT-OA is that of the responder */
id = identification_create_from_sockaddr(dst->get_sockaddr(dst)); id = identification_create_from_sockaddr(resp->get_sockaddr(resp));
nat_oa = id_payload_create_from_identification(nat_oa_payload_type, id); nat_oa = id_payload_create_from_identification(nat_oa_payload_type, id);
message->add_payload(message, (payload_t*)nat_oa); message->add_payload(message, (payload_t*)nat_oa);
id->destroy(id); id->destroy(id);