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

the PB-TNC protocol is working

Browse Source
This commit is contained in:
Andreas Steffen
2010-12-10 23:21:13 +01:00
parent 512d2e045f
commit 4ca368d223
2 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
+6 -6
View File
@@ -130,8 +130,8 @@ METHOD(pb_tnc_batch_t, get_encoding, chunk_t,
METHOD(pb_tnc_batch_t, add_message, void,
private_pb_tnc_batch_t *this, pb_tnc_message_t* msg)
{
DBG2(DBG_TNC, " adding %N Message", pb_tnc_msg_type_names,
msg->get_type(msg));
DBG2(DBG_TNC, "adding %N Message", pb_tnc_msg_type_names,
msg->get_type(msg));
this->messages->insert_last(this->messages, msg);
}
@@ -369,8 +369,8 @@ static status_t process_tnc_message(private_pb_tnc_batch_t *this)
{
if (flags & PB_TNC_FLAG_NOSKIP)
{
DBG1(DBG_TNC, "cannot process PB-TNC Message with Vendor ID 0x%06x "
" and type 0x%08x", vendor_id, msg_type);
DBG1(DBG_TNC, "reject PB-TNC Message (Vendor ID 0x%06x / "
"Type 0x%08x)", vendor_id, msg_type);
msg = pb_error_message_create(TRUE, IETF_VENDOR_ID,
PB_ERROR_UNSUPPORTED_MANDATORY_MESSAGE);
err_msg = (pb_error_message_t*)msg;
@@ -379,8 +379,8 @@ static status_t process_tnc_message(private_pb_tnc_batch_t *this)
}
else
{
DBG1(DBG_TNC, "ignore PB-TNC Message with Vendor ID 0x%06x "
" and type 0x%08x", vendor_id, msg_type);
DBG1(DBG_TNC, "ignore PB-TNC Message (Vendor ID 0x%06x / "
"Type 0x%08x)", vendor_id, msg_type);
this->offset += msg_len;
return SUCCESS;
}
src/libcharon/plugins/tnccs_20/tnccs_20.c
+44 -9
View File
@@ -167,7 +167,7 @@ static void handle_message(private_tnccs_20_t *this, pb_tnc_message_t *msg)
rec_msg = (pb_access_recommendation_message_t*)msg;
rec = rec_msg->get_access_recommendation(rec_msg);
DBG1(DBG_TNC, "access_recommendation is '%N'",
DBG1(DBG_TNC, "access recommendation is '%N'",
action_recommendation_names, rec);
break;
}
@@ -408,14 +408,49 @@ METHOD(tls_t, build, status_t,
/* Do not allow any asynchronous IMCs or IMVs to add additional messages */
this->mutex->lock(this->mutex);
/**
* if the DECIDED state has been reached, close down the TNCCS connection
* by sending an empty CLOSE batch unless a CRETRY batch is under way
*/
if (this->state_machine->get_state(this->state_machine) == PB_STATE_DECIDED &&
!this->batch)
if (!this->batch)
{
this->batch = pb_tnc_batch_create(this->is_server, PB_BATCH_CLOSE);
pb_tnc_state_t state;
state = this->state_machine->get_state(this->state_machine);
if (this->is_server)
{
if (state == PB_STATE_SERVER_WORKING)
{
TNC_IMV_Action_Recommendation rec;
TNC_IMV_Evaluation_Result eval;
pb_tnc_message_t *msg;
/* Is an overall recommendation available? */
if (!this->recs->have_recommendation(this->recs, &rec, &eval))
{
charon->imvs->solicit_recommendation(charon->imvs,
this->connection_id);
}
if (this->recs->have_recommendation(this->recs, &rec, &eval))
{
this->batch = pb_tnc_batch_create(this->is_server,
PB_BATCH_RESULT);
msg = pb_assessment_result_message_create(eval);
this->batch->add_message(this->batch, msg);
msg = pb_access_recommendation_message_create(rec);
this->batch->add_message(this->batch, msg);
}
}
}
else
{
/**
* if the DECIDED state has been reached and no CRETRY is under way
* or if a CLOSE batch with error messages has been received,
* reply with an empty CLOSE batch.
*/
if (state == PB_STATE_DECIDED || state == PB_STATE_END)
{
this->batch = pb_tnc_batch_create(this->is_server, PB_BATCH_CLOSE);
}
}
}
if (this->batch)
@@ -479,7 +514,7 @@ METHOD(tls_t, is_complete, bool,
if (this->recs && this->recs->have_recommendation(this->recs, &rec, &eval))
{
DBG2(DBG_TNC, "Final recommendation '%N' and evaluation '%N'",
DBG2(DBG_TNC, "Final recommendation is '%N' and evaluation is '%N'",
action_recommendation_names, rec, evaluation_result_names, eval);
return charon->imvs->enforce_recommendation(charon->imvs, rec);