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

refactored reason string and remediation instructions framework

Browse Source
This commit is contained in:
Andreas Steffen
2012-11-23 12:30:33 +01:00
parent b5d27839ad
commit ee6aeca892
15 changed files with 781 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imv_test/imv_test_state.c
+25 -38
View File
@@ -14,6 +14,8 @@
*/
#include "imv_test_state.h"
#include "imv/imv_lang_string.h"
#include "imv/imv_reason_string.h"
#include <utils/lexparser.h>
#include <collections/linked_list.h>
@@ -66,6 +68,11 @@ struct private_imv_test_state_t {
*/
TNC_IMV_Evaluation_Result eval;
/**
* TNC Reason String
*/
imv_reason_string_t *reason_string;
/**
* List of IMCs
*/
@@ -83,24 +90,20 @@ struct imc_entry_t {
int rounds;
};
typedef struct entry_t entry_t;
/**
* Supported languages
*/
static char* languages[] = { "en", "de", "fr", "pl" };
/**
* Define an internal reason string entry
* Table of reason strings
*/
struct entry_t {
char *lang;
char *string;
};
/**
* Table of multi-lingual reason string entries
*/
static entry_t reasons[] = {
static imv_lang_string_t reasons[] = {
{ "en", "IMC Test was not configured with \"command = allow\"" },
{ "de", "IMC Test wurde nicht mit \"command = allow\" konfiguriert" },
{ "fr", "IMC Test n'etait pas configuré avec \"command = allow\"" },
{ "pl", "IMC Test nie zostało skonfigurowany z \"command = allow\"" }
{ "pl", "IMC Test nie zostało skonfigurowany z \"command = allow\"" },
{ NULL, NULL }
};
METHOD(imv_state_t, get_connection_id, TNC_ConnectionID,
@@ -164,40 +167,23 @@ METHOD(imv_state_t, set_recommendation, void,
METHOD(imv_state_t, get_reason_string, bool,
private_imv_test_state_t *this, enumerator_t *language_enumerator,
char **reason_string, char **reason_language)
chunk_t *reason_string, char **reason_language)
{
bool match = FALSE;
char *lang;
int i;
*reason_language = imv_lang_string_select_lang(language_enumerator,
languages, countof(languages));
/* set the default language */
*reason_language = reasons[0].lang;
*reason_string = reasons[0].string;
while (language_enumerator->enumerate(language_enumerator, &lang))
{
for (i = 0 ; i < countof(reasons); i++)
{
if (streq(lang, reasons[i].lang))
{
match = TRUE;
*reason_language = reasons[i].lang;
*reason_string = reasons[i].string;
break;
}
}
if (match)
{
break;
}
}
/* Instantiate a TNC Reason String object */
DESTROY_IF(this->reason_string);
this->reason_string = imv_reason_string_create(*reason_language);
this->reason_string->add_reason(this->reason_string, reasons);
*reason_string = this->reason_string->get_encoding(this->reason_string);
return TRUE;
}
METHOD(imv_state_t, get_remediation_instructions, bool,
private_imv_test_state_t *this, enumerator_t *language_enumerator,
char **string, char **lang_code, char **uri)
chunk_t *string, char **lang_code, char **uri)
{
return FALSE;
}
@@ -205,6 +191,7 @@ METHOD(imv_state_t, get_remediation_instructions, bool,
METHOD(imv_state_t, destroy, void,
private_imv_test_state_t *this)
{
DESTROY_IF(this->reason_string);
this->imcs->destroy_function(this->imcs, free);
free(this);
}