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

refactored PA-TNC attribute error handling

Browse Source
This commit is contained in:
Andreas Steffen
2012-07-12 21:26:18 +02:00
parent b6e23b24f3
commit c5d2e61802
2 changed files with 26 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/imc/imc_agent.c
+13 -40
View File
@@ -530,11 +530,11 @@ METHOD(imc_agent_t, receive_message, TNC_Result,
TNC_VendorID msg_vid, TNC_MessageSubtype msg_subtype, TNC_VendorID msg_vid, TNC_MessageSubtype msg_subtype,
TNC_UInt32 src_imv_id, TNC_UInt32 dst_imc_id, pa_tnc_msg_t **pa_tnc_msg) TNC_UInt32 src_imv_id, TNC_UInt32 dst_imc_id, pa_tnc_msg_t **pa_tnc_msg)
{ {
pa_tnc_msg_t *pa_msg, *error_msg; pa_tnc_msg_t *pa_msg;
pa_tnc_attr_t *error_attr; pa_tnc_attr_t *error_attr;
linked_list_t *error_attr_list;
enumerator_t *enumerator; enumerator_t *enumerator;
TNC_MessageType msg_type; TNC_UInt32 src_imc_id, dst_imv_id;
TNC_UInt32 msg_flags, src_imc_id, dst_imv_id;
TNC_ConnectionID connection_id; TNC_ConnectionID connection_id;
TNC_Result result; TNC_Result result;
@@ -570,51 +570,24 @@ METHOD(imc_agent_t, receive_message, TNC_Result,
*pa_tnc_msg = pa_msg; *pa_tnc_msg = pa_msg;
break; break;
case VERIFY_ERROR: case VERIFY_ERROR:
/* build error message */ /* extract and copy by refence all error attributes */
error_msg = pa_tnc_msg_create(this->max_msg_len); error_attr_list = linked_list_create();
enumerator = pa_msg->create_error_enumerator(pa_msg); enumerator = pa_msg->create_error_enumerator(pa_msg);
while (enumerator->enumerate(enumerator, &error_attr)) while (enumerator->enumerate(enumerator, &error_attr))
{ {
error_msg->add_attribute(error_msg, error_attr_list->insert_last(error_attr_list,
error_attr->get_ref(error_attr)); error_attr->get_ref(error_attr));
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
error_msg->build(error_msg);
/* send error message */ src_imc_id = (dst_imc_id == TNC_IMCID_ANY) ? this->id : dst_imc_id;
if (state->has_long(state) && this->send_message_long) dst_imv_id = state->has_excl(state) ? src_imv_id : TNC_IMVID_ANY;
{
if (state->has_excl(state))
{
msg_flags = TNC_MESSAGE_FLAGS_EXCLUSIVE;
dst_imv_id = src_imv_id;
}
else
{
msg_flags = 0;
dst_imv_id = TNC_IMVID_ANY;
}
src_imc_id = (dst_imc_id == TNC_IMCID_ANY) ? this->id
: dst_imc_id;
result = this->send_message_long(src_imc_id, connection_id, result = send_message(this, connection_id, state->has_excl(state),
msg_flags, msg.ptr, msg.len, msg_vid, src_imc_id, dst_imv_id, error_attr_list);
msg_subtype, dst_imv_id);
}
else if (this->send_message)
{
msg_type = (msg_vid << 8) | msg_subtype;
result = this->send_message(this->id, connection_id, error_attr_list->destroy(error_attr_list);
msg.ptr, msg.len, msg_type);
}
else
{
result = TNC_RESULT_FATAL;
}
/* clean up */
error_msg->destroy(error_msg);
pa_msg->destroy(pa_msg); pa_msg->destroy(pa_msg);
return result; return result;
case FAILED: case FAILED:
src/libimcv/imv/imv_agent.c
+13 -42
View File
@@ -567,11 +567,11 @@ METHOD(imv_agent_t, receive_message, TNC_Result,
TNC_VendorID msg_vid, TNC_MessageSubtype msg_subtype, TNC_VendorID msg_vid, TNC_MessageSubtype msg_subtype,
TNC_UInt32 src_imc_id, TNC_UInt32 dst_imv_id, pa_tnc_msg_t **pa_tnc_msg) TNC_UInt32 src_imc_id, TNC_UInt32 dst_imv_id, pa_tnc_msg_t **pa_tnc_msg)
{ {
pa_tnc_msg_t *pa_msg, *error_msg; pa_tnc_msg_t *pa_msg;
pa_tnc_attr_t *error_attr; pa_tnc_attr_t *error_attr;
linked_list_t *error_attr_list;
enumerator_t *enumerator; enumerator_t *enumerator;
TNC_MessageType msg_type; TNC_UInt32 src_imv_id, dst_imc_id;
TNC_UInt32 msg_flags, src_imv_id, dst_imc_id;
TNC_ConnectionID connection_id; TNC_ConnectionID connection_id;
TNC_Result result; TNC_Result result;
@@ -607,53 +607,24 @@ METHOD(imv_agent_t, receive_message, TNC_Result,
*pa_tnc_msg = pa_msg; *pa_tnc_msg = pa_msg;
break; break;
case VERIFY_ERROR: case VERIFY_ERROR:
/* build error message */ /* extract and copy by refence all error attributes */
error_msg = pa_tnc_msg_create(this->max_msg_len); error_attr_list = linked_list_create();
enumerator = pa_msg->create_error_enumerator(pa_msg); enumerator = pa_msg->create_error_enumerator(pa_msg);
while (enumerator->enumerate(enumerator, &error_attr)) while (enumerator->enumerate(enumerator, &error_attr))
{ {
error_msg->add_attribute(error_msg, error_attr_list->insert_last(error_attr_list,
error_attr->get_ref(error_attr)); error_attr->get_ref(error_attr));
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
error_msg->build(error_msg);
/* send error message */ src_imv_id = (dst_imv_id == TNC_IMVID_ANY) ? this->id : dst_imv_id;
msg = error_msg->get_encoding(error_msg); dst_imc_id = state->has_excl(state) ? src_imc_id : TNC_IMCID_ANY;
if (state->has_long(state) && this->send_message_long) result = send_message(this, connection_id, state->has_excl(state),
{ src_imv_id, dst_imc_id, error_attr_list);
if (state->has_excl(state))
{
msg_flags = TNC_MESSAGE_FLAGS_EXCLUSIVE;
dst_imc_id = src_imc_id;
}
else
{
msg_flags = 0;
dst_imc_id = TNC_IMCID_ANY;
}
src_imv_id = (dst_imv_id == TNC_IMVID_ANY) ? this->id
: dst_imv_id;
result = this->send_message_long(src_imv_id, connection_id,
msg_flags, msg.ptr, msg.len, msg_vid,
msg_subtype, dst_imc_id);
}
else if (this->send_message)
{
msg_type = (msg_vid << 8) | msg_subtype;
result = this->send_message(this->id, connection_id, error_attr_list->destroy(error_attr_list);
msg.ptr, msg.len, msg_type);
}
else
{
result = TNC_RESULT_FATAL;
}
/* clean up */
error_msg->destroy(error_msg);
pa_msg->destroy(pa_msg); pa_msg->destroy(pa_msg);
return result; return result;
case FAILED: case FAILED: