Merge branch 'ikev1-clean' into ikev1-master
[strongswan.git] / src / libimcv / imc / imc_agent.c
index 0a01f7d..6bba697 100644 (file)
@@ -54,6 +54,11 @@ struct private_imc_agent_t {
        TNC_IMCID id;
 
        /**
+        * List of additional IMC IDs assigned by TNCC
+        */
+       linked_list_t *additional_ids;
+
+       /**
         * list of TNCC connection entries
         */
        linked_list_t *connections;
@@ -485,16 +490,40 @@ METHOD(imc_agent_t, send_message, TNC_Result,
 }
 
 METHOD(imc_agent_t, receive_message, TNC_Result,
-       private_imc_agent_t *this, TNC_ConnectionID connection_id, chunk_t msg,
-       TNC_MessageType msg_type, pa_tnc_msg_t **pa_tnc_msg)
+       private_imc_agent_t *this, imc_state_t *state, chunk_t msg,
+       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)
 {
        pa_tnc_msg_t *pa_msg, *error_msg;
        pa_tnc_attr_t *error_attr;
        enumerator_t *enumerator;
+       TNC_MessageType msg_type;
+       TNC_UInt32 msg_flags, src_imc_id, dst_imv_id;
+       TNC_ConnectionID connection_id;
        TNC_Result result;
 
-       DBG2(DBG_IMV, "IMC %u \"%s\" received message type 0x%08x for Connection ID %u",
-                                  this->id, this->name, msg_type, connection_id);
+       connection_id = state->get_connection_id(state);
+
+       if (state->has_long(state))
+       {
+               if (dst_imc_id != TNC_IMCID_ANY)
+               {
+                       DBG2(DBG_IMC, "IMC %u \"%s\" received message for Connection ID %u "
+                                                 "from IMV %u to IMC %u", this->id, this->name,
+                                                  connection_id, src_imv_id, dst_imc_id);
+               }
+               else
+               {
+                       DBG2(DBG_IMC, "IMC %u \"%s\" received message for Connection ID %u "
+                                                 "from IMV %u", this->id, this->name, connection_id,
+                                                  src_imv_id);
+               }
+       }
+       else
+       {
+               DBG2(DBG_IMC, "IMC %u \"%s\" received message for Connection ID %u",
+                                          this->id, this->name, connection_id);
+       }
 
        *pa_tnc_msg = NULL;
        pa_msg = pa_tnc_msg_create_from_data(msg);
@@ -505,12 +534,6 @@ METHOD(imc_agent_t, receive_message, TNC_Result,
                        *pa_tnc_msg = pa_msg;
                        break;
                case VERIFY_ERROR:
-                       if (!this->send_message)
-                       {
-                               /* TNCC doen't have a SendMessage() function */
-                               return TNC_RESULT_FATAL;
-                       }
-
                        /* build error message */
                        error_msg = pa_tnc_msg_create();
                        enumerator = pa_msg->create_error_enumerator(pa_msg);
@@ -523,9 +546,36 @@ METHOD(imc_agent_t, receive_message, TNC_Result,
                        error_msg->build(error_msg);
 
                        /* send error message */
-                       msg = error_msg->get_encoding(error_msg);
-                       result = this->send_message(this->id, connection_id,
+                       if (state->has_long(state) && this->send_message_long)
+                       {
+                               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,
+                                                                               msg_flags, msg.ptr, msg.len, msg_vid,
+                                                                               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,
                                                                                msg.ptr, msg.len, msg_type);
+                       }
+                       else
+                       {
+                               result = TNC_RESULT_FATAL;
+                       }
 
                        /* clean up */
                        error_msg->destroy(error_msg);
@@ -539,20 +589,56 @@ METHOD(imc_agent_t, receive_message, TNC_Result,
        return TNC_RESULT_SUCCESS;
 }
 
-METHOD(imc_agent_t, reserve_additional_id, TNC_Result,
-       private_imc_agent_t *this, TNC_UInt32 *id)
+METHOD(imc_agent_t, reserve_additional_ids, TNC_Result,
+       private_imc_agent_t *this, int count)
 {
+       TNC_Result result;
+       TNC_UInt32 id;
+       void *pointer;
+
        if (!this->reserve_additional_id)
        {
+               DBG1(DBG_IMC, "IMC %u \"%s\" did not detect the capability to reserve "
+                                         "additional IMC IDs from the TNCC", this->id, this->name);
                return TNC_RESULT_ILLEGAL_OPERATION;
        }
-       return this->reserve_additional_id(this->id, id);
+       while (count > 0)
+       {
+               result = this->reserve_additional_id(this->id, &id);
+               if (result != TNC_RESULT_SUCCESS)
+               {
+                       DBG1(DBG_IMC, "IMC %u \"%s\" failed to reserve %d additional IMC IDs",
+                                                 this->id, this->name, count);
+                       return result;
+               }
+               count--;
+
+               /* store the scalar value in the pointer */
+               pointer = (void*)id;
+               this->additional_ids->insert_last(this->additional_ids, pointer);
+               DBG2(DBG_IMC, "IMC %u \"%s\" reserved additional ID %u",
+                                         this->id, this->name, id);
+       }
+       return TNC_RESULT_SUCCESS;
+}
+
+METHOD(imc_agent_t, count_additional_ids, int,
+       private_imc_agent_t *this)
+{
+       return  this->additional_ids->get_count(this->additional_ids);
+}
+
+METHOD(imc_agent_t, create_id_enumerator, enumerator_t*,
+       private_imc_agent_t *this)
+{
+       return this->additional_ids->create_enumerator(this->additional_ids);
 }
 
 METHOD(imc_agent_t, destroy, void,
        private_imc_agent_t *this)
 {
        DBG1(DBG_IMC, "IMC %u \"%s\" terminated", this->id, this->name);
+       this->additional_ids->destroy(this->additional_ids);
        this->connections->destroy_function(this->connections, free);
        this->connection_lock->destroy(this->connection_lock);
        free(this);
@@ -585,13 +671,16 @@ imc_agent_t *imc_agent_create(const char *name,
                        .get_state = _get_state,
                        .send_message = _send_message,
                        .receive_message = _receive_message,
-                       .reserve_additional_id = _reserve_additional_id,
+                       .reserve_additional_ids = _reserve_additional_ids,
+                       .count_additional_ids = _count_additional_ids,
+                       .create_id_enumerator = _create_id_enumerator,
                        .destroy = _destroy,
                },
                .name = name,
                .vendor_id = vendor_id,
                .subtype = subtype,
                .id = id,
+               .additional_ids = linked_list_create(),
                .connections = linked_list_create(),
                .connection_lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
        );