imc/imv->send_message() uses attr_list

This commit is contained in:
Andreas Steffen
2012-07-11 23:34:51 +02:00
parent c9c3da66a8
commit 246c9ad831
9 changed files with 59 additions and 81 deletions
@@ -221,7 +221,7 @@ end:
static TNC_Result send_message(TNC_ConnectionID connection_id)
{
pa_tnc_msg_t *msg;
linked_list_t *attr_list;
pa_tnc_attr_t *attr;
ietf_attr_port_filter_t *attr_port_filter;
TNC_Result result;
@@ -234,12 +234,11 @@ static TNC_Result send_message(TNC_ConnectionID connection_id)
attr->destroy(attr);
return TNC_RESULT_FATAL;
}
msg = pa_tnc_msg_create();
msg->add_attribute(msg, attr);
msg->build(msg);
attr_list = linked_list_create();
attr_list->insert_last(attr_list, attr);
result = imc_scanner->send_message(imc_scanner, connection_id, FALSE, 0,
TNC_IMVID_ANY, msg->get_encoding(msg));
msg->destroy(msg);
TNC_IMVID_ANY, attr_list);
attr_list->destroy(attr_list);
return result;
}
+7 -7
View File
@@ -162,30 +162,30 @@ static TNC_Result send_message(imc_state_t *state, TNC_UInt32 src_imc_id,
TNC_UInt32 dst_imv_id)
{
imc_test_state_t *test_state;
pa_tnc_msg_t *msg;
linked_list_t *attr_list;
pa_tnc_attr_t *attr;
bool excl;
TNC_ConnectionID connection_id;
TNC_Result result;
attr_list = linked_list_create();
connection_id = state->get_connection_id(state);
test_state = (imc_test_state_t*)state;
msg = pa_tnc_msg_create();
if (test_state->get_dummy_size(test_state))
{
attr = ita_attr_dummy_create(test_state->get_dummy_size(test_state));
attr->set_noskip_flag(attr, TRUE);
msg->add_attribute(msg, attr);
attr_list->insert_last(attr_list, attr);
}
attr = ita_attr_command_create(test_state->get_command(test_state));
attr->set_noskip_flag(attr, TRUE);
msg->add_attribute(msg, attr);
msg->build(msg);
attr_list->insert_last(attr_list, attr);
excl = dst_imv_id != TNC_IMVID_ANY;
result = imc_test->send_message(imc_test, connection_id, excl, src_imc_id,
dst_imv_id, msg->get_encoding(msg));
msg->destroy(msg);
dst_imv_id, attr_list);
attr_list->destroy(attr_list);
return result;
}
+5 -5
View File
@@ -102,6 +102,7 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
{
pa_tnc_msg_t *pa_tnc_msg;
pa_tnc_attr_t *attr;
linked_list_t *attr_list;
imv_state_t *state;
imv_test_state_t *test_state;
enumerator_t *enumerator;
@@ -217,13 +218,12 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
/* repeat the measurement ? */
if (test_state->another_round(test_state, src_imc_id))
{
attr_list = linked_list_create();
attr = ita_attr_command_create("repeat");
pa_tnc_msg = pa_tnc_msg_create();
pa_tnc_msg->add_attribute(pa_tnc_msg, attr);
pa_tnc_msg->build(pa_tnc_msg);
attr_list->insert_last(attr_list, attr);
result = imv_test->send_message(imv_test, connection_id, TRUE, imv_id,
src_imc_id, pa_tnc_msg->get_encoding(pa_tnc_msg));
pa_tnc_msg->destroy(pa_tnc_msg);
src_imc_id, attr_list);
attr_list->destroy(attr_list);
return result;
}