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

fixed payload order in IKE_AUTH

Browse Source
This commit is contained in:
Martin Willi
2007-03-08 15:59:21 +00:00
parent 069f01cfef
commit 3b7fdcf6c6
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/encoding/message.c
+27 -7
View File
@@ -481,18 +481,38 @@ static bool is_encoded(private_message_t *this)
*/ */
static void add_payload(private_message_t *this, payload_t *payload) static void add_payload(private_message_t *this, payload_t *payload)
{ {
payload_t *last_payload; payload_t *last_payload, *first_payload;
if (this->payloads->get_count(this->payloads) > 0)
if ((this->is_request && payload->get_type(payload) == ID_INITIATOR) ||
(!this->is_request && payload->get_type(payload) == ID_RESPONDER))
{ {
this->payloads->get_last(this->payloads,(void **) &last_payload); /* HOTD: insert ID payload in the beginning to respect RFC */
last_payload->set_next_type(last_payload, payload->get_type(payload)); if (this->payloads->get_first(this->payloads,
(void **)&first_payload) == SUCCESS)
{
payload->set_next_type(payload, first_payload->get_type(first_payload));
}
else
{
payload->set_next_type(payload, NO_PAYLOAD);
}
this->first_payload = payload->get_type(payload);
this->payloads->insert_first(this->payloads, payload);
} }
else else
{ {
this->first_payload = payload->get_type(payload); if (this->payloads->get_count(this->payloads) > 0)
{
this->payloads->get_last(this->payloads,(void **) &last_payload);
last_payload->set_next_type(last_payload, payload->get_type(payload));
}
else
{
this->first_payload = payload->get_type(payload);
}
payload->set_next_type(payload, NO_PAYLOAD);
this->payloads->insert_last(this->payloads, payload);
} }
payload->set_next_type(payload, NO_PAYLOAD);
this->payloads->insert_last(this->payloads, (void*)payload);
DBG2(DBG_ENC ,"added payload of type %N to message", DBG2(DBG_ENC ,"added payload of type %N to message",
payload_type_names, payload->get_type(payload)); payload_type_names, payload->get_type(payload));