diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2015-05-17 08:41:59 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2015-08-18 21:25:38 +0200 |
| commit | abb8a1ecd22a95d56757c0e90ba064c3877c8dcd (patch) | |
| tree | 5099d8450bde0640f9f7ed56bac8ce5d5340a6d0 /src/libimcv/plugins | |
| parent | 5e1b06ff08c0adbf1fa322d63868cab6ccefa2e0 (diff) | |
| download | strongswan-abb8a1ecd22a95d56757c0e90ba064c3877c8dcd.tar.bz2 strongswan-abb8a1ecd22a95d56757c0e90ba064c3877c8dcd.tar.xz | |
Defined generic boolean PA-TNC attribute
Diffstat (limited to 'src/libimcv/plugins')
| -rw-r--r-- | src/libimcv/plugins/imc_os/imc_os.c | 11 | ||||
| -rw-r--r-- | src/libimcv/plugins/imv_os/imv_os_agent.c | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/libimcv/plugins/imc_os/imc_os.c b/src/libimcv/plugins/imc_os/imc_os.c index 4fe8856e6..1cb3848c4 100644 --- a/src/libimcv/plugins/imc_os/imc_os.c +++ b/src/libimcv/plugins/imc_os/imc_os.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Andreas Steffen + * Copyright (C) 2011-2015 Andreas Steffen * HSR Hochschule fuer Technik Rapperswil * * This program is free software; you can redistribute it and/or modify it @@ -18,10 +18,9 @@ #include <imc/imc_agent.h> #include <imc/imc_msg.h> #include <imc/imc_os_info.h> +#include <generic/generic_attr_bool.h> #include <ietf/ietf_attr.h> #include <ietf/ietf_attr_attr_request.h> -#include <ietf/ietf_attr_default_pwd_enabled.h> -#include <ietf/ietf_attr_fwd_enabled.h> #include <ietf/ietf_attr_installed_packages.h> #include <ietf/ietf_attr_numeric_version.h> #include <ietf/ietf_attr_op_status.h> @@ -214,7 +213,8 @@ static void add_fwd_enabled(imc_msg_t *msg) fwd_status = os->get_fwd_status(os); DBG1(DBG_IMC, "IPv4 forwarding is %N", os_fwd_status_names, fwd_status); - attr = ietf_attr_fwd_enabled_create(fwd_status); + attr = generic_attr_bool_create(fwd_status, pen_type_create(PEN_IETF, + IETF_ATTR_FORWARDING_ENABLED)); msg->add_attribute(msg, attr); } @@ -226,7 +226,8 @@ static void add_default_pwd_enabled(imc_msg_t *msg) pa_tnc_attr_t *attr; DBG1(DBG_IMC, "factory default password is disabled"); - attr = ietf_attr_default_pwd_enabled_create(FALSE); + attr = generic_attr_bool_create(FALSE, pen_type_create(PEN_IETF, + IETF_ATTR_FACTORY_DEFAULT_PWD_ENABLED)); msg->add_attribute(msg, attr); } diff --git a/src/libimcv/plugins/imv_os/imv_os_agent.c b/src/libimcv/plugins/imv_os/imv_os_agent.c index 5eefb51ad..41b9d0bef 100644 --- a/src/libimcv/plugins/imv_os/imv_os_agent.c +++ b/src/libimcv/plugins/imv_os/imv_os_agent.c @@ -23,10 +23,9 @@ #include <imcv.h> #include <imv/imv_agent.h> #include <imv/imv_msg.h> +#include <generic/generic_attr_bool.h> #include <ietf/ietf_attr.h> #include <ietf/ietf_attr_attr_request.h> -#include <ietf/ietf_attr_default_pwd_enabled.h> -#include <ietf/ietf_attr_fwd_enabled.h> #include <ietf/ietf_attr_installed_packages.h> #include <ietf/ietf_attr_numeric_version.h> #include <ietf/ietf_attr_op_status.h> @@ -270,12 +269,12 @@ static TNC_Result receive_msg(private_imv_os_agent_t *this, imv_state_t *state, } case IETF_ATTR_FORWARDING_ENABLED: { - ietf_attr_fwd_enabled_t *attr_cast; + generic_attr_bool_t *attr_cast; os_fwd_status_t fwd_status; state->set_action_flags(state, IMV_OS_ATTR_FORWARDING_ENABLED); - attr_cast = (ietf_attr_fwd_enabled_t*)attr; + attr_cast = (generic_attr_bool_t*)attr; fwd_status = attr_cast->get_status(attr_cast); DBG1(DBG_IMV, "IPv4 forwarding is %N", os_fwd_status_names, fwd_status); @@ -288,12 +287,12 @@ static TNC_Result receive_msg(private_imv_os_agent_t *this, imv_state_t *state, } case IETF_ATTR_FACTORY_DEFAULT_PWD_ENABLED: { - ietf_attr_default_pwd_enabled_t *attr_cast; + generic_attr_bool_t *attr_cast; bool default_pwd_status; state->set_action_flags(state, IMV_OS_ATTR_FACTORY_DEFAULT_PWD_ENABLED); - attr_cast = (ietf_attr_default_pwd_enabled_t*)attr; + attr_cast = (generic_attr_bool_t*)attr; default_pwd_status = attr_cast->get_status(attr_cast); DBG1(DBG_IMV, "factory default password is %sabled", default_pwd_status ? "en":"dis"); |