Defined HCD PA subtype in PWG namespace

diff --git a/src/libtncif/tncif_pa_subtypes.c b/src/libtncif/tncif_pa_subtypes.c
index bf1e999b3a8b2be4f7f30a452f409c23d6fa737c..56e89302c1fd2194ecdf5c0a1810e9d4adf8076c 100644 (file)
--- a/src/libtncif/tncif_pa_subtypes.c
+++ b/src/libtncif/tncif_pa_subtypes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andreas Steffen
+ * Copyright (C) 2010-2015 Andreas Steffen
  *
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -16,6 +16,7 @@
 
 #include "tncif_pa_subtypes.h"
 
+/* IETF PA Subtype names */
 ENUM_BEGIN(pa_subtype_ietf_names, PA_SUBTYPE_IETF_TESTING, PA_SUBTYPE_IETF_NEA_CLIENT,
        "Testing",
        "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);
 
+/* TCG PA Subtype names */
 ENUM_BEGIN(pa_subtype_tcg_names, PA_SUBTYPE_TCG_PTS, PA_SUBTYPE_TCG_SWID,
        "PTS",
        "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);
 
+/* 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,
        "HostScanner",
        "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);
 
+/* ITA-HSR PA Subtype names */
 ENUM_BEGIN(pa_subtype_ita_names, PA_SUBTYPE_ITA_TEST, PA_SUBTYPE_ITA_ECHO,
        "Test",
        "Echo"
@@ -84,6 +98,8 @@ enum_name_t* get_pa_subtype_names(pen_t pen)
                        return pa_subtype_ietf_names;
                case PEN_TCG:
                        return pa_subtype_tcg_names;
+               case PEN_PWG:
+                       return pa_subtype_pwg_names;
                case PEN_FHH:
                        return pa_subtype_fhh_names;
                case PEN_ITA:

diff --git a/src/libtncif/tncif_pa_subtypes.h b/src/libtncif/tncif_pa_subtypes.h
index 0855d1df31343ab3da958ac81cbfd41075d8e4b6..dd764e19c3395e565d41d6f5c17574af751ec131 100644 (file)
--- a/src/libtncif/tncif_pa_subtypes.h
+++ b/src/libtncif/tncif_pa_subtypes.h
@@ -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
  * 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;
 
+/**
+ * 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
  */