use base IMC ID if src IMC ID is not supported

diff --git a/src/libimcv/plugins/imc_scanner/imc_scanner.c b/src/libimcv/plugins/imc_scanner/imc_scanner.c
index 7f8b04799b1a6feeadb238b22eed4f5859b0eefa..58533eabf711dd567ecff112c294bd4db6fd60be 100644 (file)
--- a/src/libimcv/plugins/imc_scanner/imc_scanner.c
+++ b/src/libimcv/plugins/imc_scanner/imc_scanner.c
@@ -282,6 +282,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        imc_state_t *state;
        enumerator_t *enumerator;
        TNC_Result result;
+       TNC_UInt32 target_imc_id;
        bool fatal_error;
 
        if (!imc_scanner)
@@ -305,6 +306,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        {
                return result;
        }
+       target_imc_id = (dst_imc_id == TNC_IMCID_ANY) ? imc_id : dst_imc_id;
 
        /* preprocess any IETF standard error attributes */
        fatal_error = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg);
@@ -321,7 +323,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                        ietf_attr_assess_result_t *ietf_attr;
 
                        ietf_attr = (ietf_attr_assess_result_t*)attr;
-                       state->set_result(state, dst_imc_id,
+                       state->set_result(state, target_imc_id,
                                                          ietf_attr->get_result(ietf_attr));
                }
        }
@@ -334,7 +336,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        }
 
        /* if no assessment result is known then repeat the measurement */
-       return state->get_result(state, dst_imc_id, NULL) ?
+       return state->get_result(state, target_imc_id, NULL) ?
                   TNC_RESULT_SUCCESS : send_message(connection_id);
 }
 

diff --git a/src/libimcv/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c
index 6283309c45e5b7eeeb7489a31ad1dc50bfb02745..ee8e5b206567c1183f1ce4444b6cfbceba46a37e 100644 (file)
--- a/src/libimcv/plugins/imc_test/imc_test.c
+++ b/src/libimcv/plugins/imc_test/imc_test.c
@@ -284,6 +284,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        imc_state_t *state;
        enumerator_t *enumerator;
        TNC_Result result;
+       TNC_UInt32 target_imc_id;
        bool fatal_error = FALSE;
 
        if (!imc_test)
@@ -307,6 +308,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        {
                return result;
        }
+       target_imc_id = (dst_imc_id == TNC_IMCID_ANY) ? imc_id : dst_imc_id;
 
        /* preprocess any IETF standard error attributes */
        fatal_error = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg);
@@ -322,7 +324,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                        ietf_attr_assess_result_t *ietf_attr;
 
                        ietf_attr = (ietf_attr_assess_result_t*)attr;
-                       state->set_result(state, dst_imc_id,
+                       state->set_result(state, target_imc_id,
                                                          ietf_attr->get_result(ietf_attr));
                }
                else if (attr_type.vendor_id == PEN_ITA)
@@ -354,7 +356,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        }
 
        /* if no assessment result is known then repeat the measurement */
-       return state->get_result(state, dst_imc_id, NULL) ?
+       return state->get_result(state, target_imc_id, NULL) ?
                   TNC_RESULT_SUCCESS : send_message(state, dst_imc_id, src_imv_id);
 }
 

diff --git a/src/libpts/plugins/imc_attestation/imc_attestation.c b/src/libpts/plugins/imc_attestation/imc_attestation.c
index c3df2786674f8bef477c52dbb214c074f2988198..7cb2a0671fa33bb982f240a6b625e9a63c4ddf6f 100644 (file)
--- a/src/libpts/plugins/imc_attestation/imc_attestation.c
+++ b/src/libpts/plugins/imc_attestation/imc_attestation.c
@@ -189,6 +189,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        imc_attestation_state_t *attestation_state;
        enumerator_t *enumerator;
        TNC_Result result;
+       TNC_UInt32 target_imc_id;
 
        if (!imc_attestation)
        {
@@ -212,6 +213,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        {
                return result;
        }
+       target_imc_id = (dst_imc_id == TNC_IMCID_ANY) ? imc_id : dst_imc_id;
        
        /* preprocess any IETF standard error attributes */
        result = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg) ?
@@ -252,7 +254,7 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                                ietf_attr_assess_result_t *ietf_attr;
 
                                ietf_attr = (ietf_attr_assess_result_t*)attr;
-                               state->set_result(state, dst_imc_id,
+                               state->set_result(state, target_imc_id,
                                                                  ietf_attr->get_result(ietf_attr));
                        }
                }