ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Reuse generic constructor in IMV/IMC message

This commit is contained in:
Martin Willi 2012-11-19 16:18:50 +01:00
parent a6722e5653
commit 7e45257f7d
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libimcv/imc/imc_msg.c
View File

@ -447,26 +447,10 @@ imc_msg_t *imc_msg_create_from_long_data(imc_agent_t *agent, imc_state_t *state,
{
private_imc_msg_t *this;
INIT(this,
.public = {
.get_src_id = _get_src_id,
.get_dst_id = _get_dst_id,
.send = _send_,
.receive = _receive,
.add_attribute = _add_attribute,
.create_attribute_enumerator = _create_attribute_enumerator,
.get_encoding = _get_encoding,
.destroy = _destroy,
},
.connection_id = connection_id,
.src_id = src_id,
.dst_id = dst_id,
.msg_type = pen_type_create(msg_vid, msg_subtype),
.attr_list = linked_list_create(),
.pa_msg = pa_tnc_msg_create_from_data(msg),
.agent = agent,
.state = state,
);
this = (private_imc_msg_t*)imc_msg_create(agent, state,
connection_id, src_id, dst_id,
pen_type_create(msg_vid, msg_subtype));
this->pa_msg = pa_tnc_msg_create_from_data(msg);
return &this->public;
}

28
src/libimcv/imv/imv_msg.c
View File

@ -426,30 +426,10 @@ imv_msg_t *imv_msg_create_from_long_data(imv_agent_t *agent, imv_state_t *state,
{
private_imv_msg_t *this;
INIT(this,
.public = {
.get_src_id = _get_src_id,
.get_dst_id = _get_dst_id,
.set_msg_type = _set_msg_type,
.send = _send_,
.send_assessment = _send_assessment,
.receive = _receive,
.add_attribute = _add_attribute,
.delete_attributes = _delete_attributes,
.create_attribute_enumerator = _create_attribute_enumerator,
.get_encoding = _get_encoding,
.destroy = _destroy,
},
.connection_id = connection_id,
.src_id = src_id,
.dst_id = dst_id,
.msg_type = pen_type_create(msg_vid, msg_subtype),
.attr_list = linked_list_create(),
.pa_msg = pa_tnc_msg_create_from_data(msg),
.agent = agent,
.state = state,
);
this = (private_imv_msg_t*)imv_msg_create(agent, state,
connection_id, src_id, dst_id,
pen_type_create(msg_vid, msg_subtype));
this->pa_msg = pa_tnc_msg_create_from_data(msg);
return &this->public;
}