Defined HCD PA subtype in PWG namespace

This commit is contained in:
Andreas Steffen 2015-05-20 12:26:23 +02:00
parent 21b8051c10
commit 92a9c99c38
2 changed files with 32 additions and 2 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2011 Andreas Steffen * Copyright (C) 2010-2015 Andreas Steffen
* *
* HSR Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
* *
@ -16,6 +16,7 @@
#include "tncif_pa_subtypes.h" #include "tncif_pa_subtypes.h"
/* IETF PA Subtype names */
ENUM_BEGIN(pa_subtype_ietf_names, PA_SUBTYPE_IETF_TESTING, PA_SUBTYPE_IETF_NEA_CLIENT, ENUM_BEGIN(pa_subtype_ietf_names, PA_SUBTYPE_IETF_TESTING, PA_SUBTYPE_IETF_NEA_CLIENT,
"Testing", "Testing",
"Operating System", "Operating System",
@ -33,6 +34,7 @@ ENUM_NEXT(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY, PA_SUBTYPE_IETF_ANY,
); );
ENUM_END(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY); ENUM_END(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY);
/* TCG PA Subtype names */
ENUM_BEGIN(pa_subtype_tcg_names, PA_SUBTYPE_TCG_PTS, PA_SUBTYPE_TCG_SWID, ENUM_BEGIN(pa_subtype_tcg_names, PA_SUBTYPE_TCG_PTS, PA_SUBTYPE_TCG_SWID,
"PTS", "PTS",
"SCAP", "SCAP",
@ -44,6 +46,17 @@ ENUM_NEXT(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY, PA_SUBTYPE_TCG_ANY,
); );
ENUM_END(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY); ENUM_END(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY);
/* PWG PA Subtype names */
ENUM_BEGIN(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD, PA_SUBTYPE_PWG_HCD,
"HCD"
);
ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_ANY, PA_SUBTYPE_PWG_ANY,
PA_SUBTYPE_PWG_HCD,
"ANY"
);
ENUM_END(pa_subtype_pwg_names, PA_SUBTYPE_PWG_ANY);
/* FHH PA Subtype names */
ENUM_BEGIN(pa_subtype_fhh_names, PA_SUBTYPE_FHH_HOSTSCANNER, PA_SUBTYPE_FHH_DUMMY, ENUM_BEGIN(pa_subtype_fhh_names, PA_SUBTYPE_FHH_HOSTSCANNER, PA_SUBTYPE_FHH_DUMMY,
"HostScanner", "HostScanner",
"Dummy" "Dummy"
@ -63,6 +76,7 @@ ENUM_NEXT(pa_subtype_fhh_names, PA_SUBTYPE_FHH_ANY, PA_SUBTYPE_FHH_ANY,
); );
ENUM_END(pa_subtype_fhh_names, PA_SUBTYPE_FHH_ANY); ENUM_END(pa_subtype_fhh_names, PA_SUBTYPE_FHH_ANY);
/* ITA-HSR PA Subtype names */
ENUM_BEGIN(pa_subtype_ita_names, PA_SUBTYPE_ITA_TEST, PA_SUBTYPE_ITA_ECHO, ENUM_BEGIN(pa_subtype_ita_names, PA_SUBTYPE_ITA_TEST, PA_SUBTYPE_ITA_ECHO,
"Test", "Test",
"Echo" "Echo"
@ -84,6 +98,8 @@ enum_name_t* get_pa_subtype_names(pen_t pen)
return pa_subtype_ietf_names; return pa_subtype_ietf_names;
case PEN_TCG: case PEN_TCG:
return pa_subtype_tcg_names; return pa_subtype_tcg_names;
case PEN_PWG:
return pa_subtype_pwg_names;
case PEN_FHH: case PEN_FHH:
return pa_subtype_fhh_names; return pa_subtype_fhh_names;
case PEN_ITA: case PEN_ITA:

View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil * Copyright (C) 2011-2015 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -64,6 +65,19 @@ extern enum_name_t *pa_subtype_ietf_names;
*/ */
extern enum_name_t *pa_subtype_tcg_names; extern enum_name_t *pa_subtype_tcg_names;
/**
* PA-TNC PWG Subtypes
*/
enum pa_subtype_pwg_t {
PA_SUBTYPE_PWG_HCD = 0x01,
PA_SUBTYPE_PWG_ANY = 0xff
};
/**
* enum name for pa_subtype_pwg_t.
*/
extern enum_name_t *pa_subtype_pwg_names;
/** /**
* PA-TNC FHH Subtypes * PA-TNC FHH Subtypes
*/ */