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

added TNC_TNCC_SendMessageLong() and TNC_TNCS_SendMessageLong() functions

This commit is contained in:
Andreas Steffen 2011-12-07 11:44:29 +01:00
parent 3506554804
commit dcb5c5906e
9 changed files with 126 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c
View File

@ -82,14 +82,42 @@ TNC_Result TNC_TNCC_SendMessage(TNC_IMCID imc_id,
TNC_UInt32 msg_len,
TNC_MessageType msg_type)
{
TNC_VendorID msg_vid;
TNC_MessageSubtype msg_subtype;
if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
{
DBG1(DBG_TNC, "ignoring SendMessage() from unregistered IMC %u",
imc_id);
return TNC_RESULT_INVALID_PARAMETER;
}
msg_vid = (msg_type >> 8) & TNC_VENDORID_ANY;
msg_subtype = msg_type & TNC_SUBTYPE_ANY;
return tnc->tnccs->send_message(tnc->tnccs, imc_id, TNC_IMVID_ANY,
connection_id, msg, msg_len, msg_type);
connection_id, 0, msg, msg_len, msg_vid, msg_subtype);
}
/**
* Called by the IMC when an IMC-IMV message is to be sent over IF-TNCCS 2.0
*/
TNC_Result TNC_TNCC_SendMessageLong(TNC_IMCID imc_id,
TNC_ConnectionID connection_id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype,
TNC_UInt32 imv_id)
{
if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
{
DBG1(DBG_TNC, "ignoring SendMessage() from unregistered IMC %u",
imc_id);
return TNC_RESULT_INVALID_PARAMETER;
}
return tnc->tnccs->send_message(tnc->tnccs, imc_id, imv_id, connection_id,
msg_flags, msg, msg_len, msg_vid, msg_subtype);
}
/**
@ -115,6 +143,10 @@ TNC_Result TNC_TNCC_BindFunction(TNC_IMCID id,
{
*function_pointer = (void*)TNC_TNCC_SendMessage;
}
else if (streq(function_name, "TNC_TNCC_SendMessageLong"))
{
*function_pointer = (void*)TNC_TNCC_SendMessageLong;
}
else
{
return TNC_RESULT_INVALID_PARAMETER;

34
src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c
View File

@ -82,14 +82,42 @@ TNC_Result TNC_TNCS_SendMessage(TNC_IMVID imv_id,
TNC_UInt32 msg_len,
TNC_MessageType msg_type)
{
TNC_VendorID msg_vid;
TNC_MessageSubtype msg_subtype;
if (!tnc->imvs->is_registered(tnc->imvs, imv_id))
{
DBG1(DBG_TNC, "ignoring SendMessage() from unregistered IMV %u",
imv_id);
return TNC_RESULT_INVALID_PARAMETER;
}
msg_vid = (msg_type >> 8) & TNC_VENDORID_ANY;
msg_subtype = msg_type & TNC_SUBTYPE_ANY;
return tnc->tnccs->send_message(tnc->tnccs, TNC_IMCID_ANY, imv_id,
connection_id, msg, msg_len, msg_type);
connection_id, 0, msg, msg_len, msg_vid, msg_subtype);
}
/**
* Called by the IMV when an IMV-IMC message is to be sent over IF-TNCCS 2.0
*/
TNC_Result TNC_TNCS_SendMessageLong(TNC_IMVID imv_id,
TNC_ConnectionID connection_id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype,
TNC_UInt32 imc_id)
{
if (!tnc->imvs->is_registered(tnc->imvs, imv_id))
{
DBG1(DBG_TNC, "ignoring SendMessageLong() from unregistered IMV %u",
imv_id);
return TNC_RESULT_INVALID_PARAMETER;
}
return tnc->tnccs->send_message(tnc->tnccs, imc_id, imv_id, connection_id,
msg_flags, msg, msg_len, msg_vid, msg_subtype);
}
/**
@ -175,6 +203,10 @@ TNC_Result TNC_TNCS_BindFunction(TNC_IMVID id,
{
*function_pointer = (void*)TNC_TNCS_SendMessage;
}
else if (streq(function_name, "TNC_TNCS_SendMessageLong"))
{
*function_pointer = (void*)TNC_TNCS_SendMessageLong;
}
else if (streq(function_name, "TNC_TNCS_ProvideRecommendation"))
{
*function_pointer = (void*)TNC_TNCS_ProvideRecommendation;

15
src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c
View File

@ -295,24 +295,22 @@ METHOD(tnccs_manager_t, request_handshake_retry, TNC_Result,
METHOD(tnccs_manager_t, send_message, TNC_Result,
private_tnc_tnccs_manager_t *this, TNC_IMCID imc_id, TNC_IMVID imv_id,
TNC_ConnectionID id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_MessageType msg_type)
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype)
{
enumerator_t *enumerator;
tnccs_connection_entry_t *entry;
tnccs_send_message_t send_message = NULL;
tnccs_t *tnccs = NULL;
TNC_VendorID msg_vid;
TNC_MessageSubtype msg_subtype;
msg_vid = (msg_type >> 8) & TNC_VENDORID_ANY;
msg_subtype = msg_type & TNC_SUBTYPE_ANY;
if (msg_vid == TNC_VENDORID_ANY || msg_subtype == TNC_SUBTYPE_ANY)
{
DBG1(DBG_TNC, "not sending message of invalid type 0x%08x", msg_type);
DBG1(DBG_TNC, "not sending message of invalid type 0x%02x/0x%08x",
msg_vid, msg_subtype);
return TNC_RESULT_INVALID_PARAMETER;
}
@ -332,7 +330,8 @@ METHOD(tnccs_manager_t, send_message, TNC_Result,
if (tnccs && send_message)
{
return send_message(tnccs, imc_id, imv_id, msg, msg_len, msg_type);
return send_message(tnccs, imc_id, imv_id, msg_flags, msg, msg_len,
msg_vid, msg_subtype);
}
return TNC_RESULT_FATAL;
}

21
src/libcharon/plugins/tnccs_11/tnccs_11.c
View File

@ -100,12 +100,14 @@ struct private_tnccs_11_t {
METHOD(tnccs_t, send_msg, TNC_Result,
private_tnccs_11_t* this, TNC_IMCID imc_id, TNC_IMVID imv_id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_MessageType msg_type)
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype)
{
tnccs_msg_t *tnccs_msg;
u_int32_t vendor_id, subtype;
TNC_MessageType msg_type;
enum_name_t *pa_subtype_names;
if (!this->send_msg)
@ -115,18 +117,23 @@ METHOD(tnccs_t, send_msg, TNC_Result,
this->is_server ? imv_id : imc_id);
return TNC_RESULT_ILLEGAL_OPERATION;
}
vendor_id = msg_type >> 8;
subtype = msg_type & 0xff;
pa_subtype_names = get_pa_subtype_names(vendor_id);
if (msg_vid > TNC_VENDORID_ANY || msg_subtype > TNC_SUBTYPE_ANY)
{
return TNC_RESULT_NO_LONG_MESSAGE_TYPES;
}
msg_type = (msg_vid << 8) | msg_subtype;
pa_subtype_names = get_pa_subtype_names(msg_vid);
if (pa_subtype_names)
{
DBG2(DBG_TNC, "creating IMC-IMV message type '%N/%N' 0x%06x/0x%02x",
pen_names, vendor_id, pa_subtype_names, subtype, vendor_id, subtype);
pen_names, msg_vid, pa_subtype_names, msg_subtype,
msg_vid, msg_subtype);
}
else
{
DBG2(DBG_TNC, "creating IMC-IMV message type '%N' 0x%06x/0x%02x",
pen_names, vendor_id, vendor_id, subtype);
pen_names, msg_vid, msg_vid, msg_subtype);
}
tnccs_msg = imc_imv_msg_create(msg_type, chunk_create(msg, msg_len));

11
src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c
View File

@ -211,12 +211,6 @@ METHOD(pb_pa_msg_t, get_exclusive_flag, bool,
return this->excl;
}
METHOD(pb_pa_msg_t, set_exclusive_flag, void,
private_pb_pa_msg_t *this, bool excl)
{
this->excl = excl;
}
/**
* See header
*/
@ -237,7 +231,6 @@ pb_tnc_msg_t *pb_pa_msg_create_from_data(chunk_t data)
.get_validator_id = _get_validator_id,
.get_body = _get_body,
.get_exclusive_flag = _get_exclusive_flag,
.set_exclusive_flag = _set_exclusive_flag,
},
.type = PB_MSG_PA,
.encoding = chunk_clone(data),
@ -251,7 +244,7 @@ pb_tnc_msg_t *pb_pa_msg_create_from_data(chunk_t data)
*/
pb_tnc_msg_t *pb_pa_msg_create(u_int32_t vendor_id, u_int32_t subtype,
u_int16_t collector_id, u_int16_t validator_id,
chunk_t msg_body)
bool excl, chunk_t msg_body)
{
private_pb_pa_msg_t *this;
@ -269,13 +262,13 @@ pb_tnc_msg_t *pb_pa_msg_create(u_int32_t vendor_id, u_int32_t subtype,
.get_validator_id = _get_validator_id,
.get_body = _get_body,
.get_exclusive_flag = _get_exclusive_flag,
.set_exclusive_flag = _set_exclusive_flag,
},
.type = PB_MSG_PA,
.vendor_id = vendor_id,
.subtype = subtype,
.collector_id = collector_id,
.validator_id = validator_id,
.excl = excl,
.msg_body = chunk_clone(msg_body),
);

9
src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h
View File

@ -71,12 +71,6 @@ struct pb_pa_msg_t {
*/
bool (*get_exclusive_flag)(pb_pa_msg_t *this);
/**
* Set the exclusive flag
*
* @param excl vexclusive flag
*/
void (*set_exclusive_flag)(pb_pa_msg_t *this, bool excl);
};
/**
@ -86,11 +80,12 @@ struct pb_pa_msg_t {
* @param subtype PA Subtype
* @param collector_id Posture Collector ID
* @param validator_id Posture Validator ID
* @param excl Exclusive Flag
* @param msg_body PA Message Body
*/
pb_tnc_msg_t *pb_pa_msg_create(u_int32_t vendor_id, u_int32_t subtype,
u_int16_t collector_id, u_int16_t validator_id,
chunk_t msg_body);
bool excl, chunk_t msg_body);
/**
* Create an unprocessed PB-PA message from raw data

23
src/libcharon/plugins/tnccs_20/tnccs_20.c
View File

@ -99,15 +99,16 @@ struct private_tnccs_20_t {
METHOD(tnccs_t, send_msg, TNC_Result,
private_tnccs_20_t* this, TNC_IMCID imc_id, TNC_IMVID imv_id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_MessageType msg_type)
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype)
{
TNC_MessageSubtype msg_sub_type;
TNC_VendorID msg_vendor_id;
pb_tnc_msg_t *pb_tnc_msg;
pb_tnc_batch_type_t batch_type;
enum_name_t *pa_subtype_names;
bool excl;
if (!this->send_msg)
{
@ -116,24 +117,22 @@ METHOD(tnccs_t, send_msg, TNC_Result,
this->is_server ? imv_id : imc_id);
return TNC_RESULT_ILLEGAL_OPERATION;
}
excl = (msg_flags & TNC_MESSAGE_FLAGS_EXCLUSIVE) != 0;
msg_sub_type = msg_type & TNC_SUBTYPE_ANY;
msg_vendor_id = (msg_type >> 8) & TNC_VENDORID_ANY;
pb_tnc_msg = pb_pa_msg_create(msg_vid, msg_subtype, imc_id, imv_id,
excl, chunk_create(msg, msg_len));
pb_tnc_msg = pb_pa_msg_create(msg_vendor_id, msg_sub_type, imc_id, imv_id,
chunk_create(msg, msg_len));
pa_subtype_names = get_pa_subtype_names(msg_vendor_id);
pa_subtype_names = get_pa_subtype_names(msg_vid);
if (pa_subtype_names)
{
DBG2(DBG_TNC, "creating PB-PA message type '%N/%N' 0x%06x/0x%08x",
pen_names, msg_vendor_id, pa_subtype_names, msg_sub_type,
msg_vendor_id, msg_sub_type);
pen_names, msg_vid, pa_subtype_names, msg_subtype,
msg_vid, msg_subtype);
}
else
{
DBG2(DBG_TNC, "creating PB-PA message type '%N' 0x%06x/0x%08x",
pen_names, msg_vendor_id, msg_vendor_id, msg_sub_type);
pen_names, msg_vid, msg_vid, msg_subtype);
}
/* adding PA message to SDATA or CDATA batch only */

19
src/libtnccs/tnc/tnccs/tnccs.h
View File

@ -63,15 +63,20 @@ typedef tnccs_t *(*tnccs_constructor_t)(bool is_server);
*
* @param imc_id ID of IMC or TNC_IMCID_ANY
* @param imc_id ID of IMV or TNC_IMVID_ANY
* @param msg_flags message flags
* @param msg message to be added
* @param msg_len message length
* @param msg_type message type
* @return result code
* @param msg_vid message vendor ID
* @param msg_subtype message subtype
* @return return code
*/
typedef TNC_Result (*tnccs_send_message_t)(tnccs_t* tncss, TNC_IMCID imc_id,
TNC_IMVID imv_id,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_MessageType msg_type);
typedef TNC_Result (*tnccs_send_message_t)(tnccs_t* tncss,
TNC_IMCID imc_id,
TNC_IMVID imv_id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype);
#endif /** TNCCS_H_ @}*/

19
src/libtnccs/tnc/tnccs/tnccs_manager.h
View File

@ -106,17 +106,22 @@ struct tnccs_manager_t {
* @param imc_id ID of IMC or TNC_IMCID_ANY
* @param imv_id ID of IMV or TNC_IMVID_ANY
* @param id ID of target connection
* @param msg_flags message flags
* @param msg message to be added
* @param msg_len message length
* @param msg_type message type
* @param msg_vid message vendor ID
* @param msg_subtype message subtype
* @return return code
*/
TNC_Result (*send_message)(tnccs_manager_t *this, TNC_IMCID imc_id,
TNC_IMVID imv_id,
TNC_ConnectionID id,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_MessageType msg_type);
TNC_Result (*send_message)(tnccs_manager_t *this,
TNC_IMCID imc_id,
TNC_IMVID imv_id,
TNC_ConnectionID id,
TNC_UInt32 msg_flags,
TNC_BufferReference msg,
TNC_UInt32 msg_len,
TNC_VendorID msg_vid,
TNC_MessageSubtype msg_subtype);
/**
* Deliver an IMV Action Recommendation and IMV Evaluation Result to the TNCS