implemented IETF Numeric Version attribute
This commit is contained in:
Andreas Steffen
@@ -19,6 +19,7 @@
|
||||
#include "ietf/ietf_attr_fwd_enabled.h"
|
||||
#include "ietf/ietf_attr_default_pwd_enabled.h"
|
||||
#include "ietf/ietf_attr_installed_packages.h"
|
||||
#include "ietf/ietf_attr_numeric_version.h"
|
||||
#include "ietf/ietf_attr_op_status.h"
|
||||
#include "ietf/ietf_attr_pa_tnc_error.h"
|
||||
#include "ietf/ietf_attr_port_filter.h"
|
||||
@@ -54,6 +55,8 @@ pa_tnc_attr_t* ietf_attr_create_from_data(u_int32_t type, chunk_t value)
|
||||
return ietf_attr_attr_request_create_from_data(value);
|
||||
case IETF_ATTR_PRODUCT_INFORMATION:
|
||||
return ietf_attr_product_info_create_from_data(value);
|
||||
case IETF_ATTR_NUMERIC_VERSION:
|
||||
return ietf_attr_numeric_version_create_from_data(value);
|
||||
case IETF_ATTR_STRING_VERSION:
|
||||
return ietf_attr_string_version_create_from_data(value);
|
||||
case IETF_ATTR_OPERATIONAL_STATUS:
|
||||
@@ -73,7 +76,6 @@ pa_tnc_attr_t* ietf_attr_create_from_data(u_int32_t type, chunk_t value)
|
||||
case IETF_ATTR_FACTORY_DEFAULT_PWD_ENABLED:
|
||||
return ietf_attr_default_pwd_enabled_create_from_data(value);
|
||||
case IETF_ATTR_TESTING:
|
||||
case IETF_ATTR_NUMERIC_VERSION:
|
||||
case IETF_ATTR_RESERVED:
|
||||
default:
|
||||
return NULL;
|
||||
|
||||
@@ -0,0 +1,281 @@
|
||||
/*
|
||||
* Copyright (C) 2012 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
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
#include "ietf_attr_numeric_version.h"
|
||||
|
||||
#include <pa_tnc/pa_tnc_msg.h>
|
||||
#include <bio/bio_writer.h>
|
||||
#include <bio/bio_reader.h>
|
||||
#include <debug.h>
|
||||
|
||||
typedef struct private_ietf_attr_numeric_version_t private_ietf_attr_numeric_version_t;
|
||||
|
||||
/**
|
||||
* PA-TNC Numeric Version type (see section 4.2.3 of RFC 5792)
|
||||
*
|
||||
* 1 2 3
|
||||
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Major Version Number |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Minor Version Number |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Build Number |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Service Pack Major | Service Pack Minor |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
*/
|
||||
|
||||
#define NUMERIC_VERSION_SIZE 16
|
||||
|
||||
/**
|
||||
* Private data of an ietf_attr_numeric_version_t object.
|
||||
*/
|
||||
struct private_ietf_attr_numeric_version_t {
|
||||
|
||||
/**
|
||||
* Public members of ietf_attr_numeric_version_t
|
||||
*/
|
||||
ietf_attr_numeric_version_t public;
|
||||
|
||||
/**
|
||||
* Vendor-specific attribute type
|
||||
*/
|
||||
pen_type_t type;
|
||||
|
||||
/**
|
||||
* Attribute value
|
||||
*/
|
||||
chunk_t value;
|
||||
|
||||
/**
|
||||
* Noskip flag
|
||||
*/
|
||||
bool noskip_flag;
|
||||
|
||||
/**
|
||||
* Major Version Number
|
||||
*/
|
||||
u_int32_t major_version;
|
||||
|
||||
/**
|
||||
* Minor Version Number
|
||||
*/
|
||||
u_int32_t minor_version;
|
||||
|
||||
/**
|
||||
* IBuild Number
|
||||
*/
|
||||
u_int32_t build;
|
||||
|
||||
/**
|
||||
* Service Pack Major Number
|
||||
*/
|
||||
u_int16_t service_pack_major;
|
||||
|
||||
/**
|
||||
* Service Pack Minor Number
|
||||
*/
|
||||
u_int16_t service_pack_minor;
|
||||
|
||||
/**
|
||||
* Reference count
|
||||
*/
|
||||
refcount_t ref;
|
||||
};
|
||||
|
||||
METHOD(pa_tnc_attr_t, get_type, pen_type_t,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
return this->type;
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, get_value, chunk_t,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
return this->value;
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, get_noskip_flag, bool,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
return this->noskip_flag;
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, set_noskip_flag,void,
|
||||
private_ietf_attr_numeric_version_t *this, bool noskip)
|
||||
{
|
||||
this->noskip_flag = noskip;
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, build, void,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
bio_writer_t *writer;
|
||||
|
||||
if (this->value.ptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
writer = bio_writer_create(NUMERIC_VERSION_SIZE);
|
||||
writer->write_uint32(writer, this->major_version);
|
||||
writer->write_uint32(writer, this->minor_version);
|
||||
writer->write_uint32(writer, this->build);
|
||||
writer->write_uint32(writer, this->service_pack_major);
|
||||
writer->write_uint32(writer, this->service_pack_minor);
|
||||
|
||||
this->value = chunk_clone(writer->get_buf(writer));
|
||||
writer->destroy(writer);
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, process, status_t,
|
||||
private_ietf_attr_numeric_version_t *this, u_int32_t *offset)
|
||||
{
|
||||
bio_reader_t *reader;
|
||||
|
||||
if (this->value.len < NUMERIC_VERSION_SIZE)
|
||||
{
|
||||
DBG1(DBG_TNC, "insufficient data for IETF numeric version");
|
||||
*offset = 0;
|
||||
return FAILED;
|
||||
}
|
||||
reader = bio_reader_create(this->value);
|
||||
reader->read_uint32(reader, &this->major_version);
|
||||
reader->read_uint32(reader, &this->minor_version);
|
||||
reader->read_uint32(reader, &this->build);
|
||||
reader->read_uint16(reader, &this->service_pack_major);
|
||||
reader->read_uint16(reader, &this->service_pack_minor);
|
||||
reader->destroy(reader);
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
ref_get(&this->ref);
|
||||
return &this->public.pa_tnc_attribute;
|
||||
}
|
||||
|
||||
METHOD(pa_tnc_attr_t, destroy, void,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
if (ref_put(&this->ref))
|
||||
{
|
||||
free(this->value.ptr);
|
||||
free(this);
|
||||
}
|
||||
}
|
||||
|
||||
METHOD(ietf_attr_numeric_version_t, get_version, void,
|
||||
private_ietf_attr_numeric_version_t *this, u_int32_t *major, u_int32_t *minor)
|
||||
{
|
||||
if (major)
|
||||
{
|
||||
*major = this->major_version;
|
||||
}
|
||||
if (minor)
|
||||
{
|
||||
*minor = this->minor_version;
|
||||
}
|
||||
}
|
||||
|
||||
METHOD(ietf_attr_numeric_version_t, get_build, u_int32_t,
|
||||
private_ietf_attr_numeric_version_t *this)
|
||||
{
|
||||
return this->build;
|
||||
}
|
||||
|
||||
METHOD(ietf_attr_numeric_version_t, get_service_pack, void,
|
||||
private_ietf_attr_numeric_version_t *this, u_int16_t *major, u_int16_t *minor)
|
||||
{
|
||||
if (major)
|
||||
{
|
||||
*major = this->service_pack_major;
|
||||
}
|
||||
if (minor)
|
||||
{
|
||||
*minor = this->service_pack_minor;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Described in header.
|
||||
*/
|
||||
pa_tnc_attr_t *ietf_attr_numeric_version_create(u_int32_t major, u_int32_t minor,
|
||||
u_int32_t build,
|
||||
u_int16_t service_pack_major,
|
||||
u_int16_t service_pack_minor)
|
||||
{
|
||||
private_ietf_attr_numeric_version_t *this;
|
||||
|
||||
INIT(this,
|
||||
.public = {
|
||||
.pa_tnc_attribute = {
|
||||
.get_type = _get_type,
|
||||
.get_value = _get_value,
|
||||
.get_noskip_flag = _get_noskip_flag,
|
||||
.set_noskip_flag = _set_noskip_flag,
|
||||
.build = _build,
|
||||
.process = _process,
|
||||
.get_ref = _get_ref,
|
||||
.destroy = _destroy,
|
||||
},
|
||||
.get_version = _get_version,
|
||||
.get_build = _get_build,
|
||||
.get_service_pack = _get_service_pack,
|
||||
},
|
||||
.type = { PEN_IETF, IETF_ATTR_NUMERIC_VERSION },
|
||||
.major_version = major,
|
||||
.minor_version = minor,
|
||||
.build = build,
|
||||
.service_pack_major = service_pack_major,
|
||||
.service_pack_minor = service_pack_minor,
|
||||
.ref = 1,
|
||||
);
|
||||
|
||||
return &this->public.pa_tnc_attribute;
|
||||
}
|
||||
|
||||
/**
|
||||
* Described in header.
|
||||
*/
|
||||
pa_tnc_attr_t *ietf_attr_numeric_version_create_from_data(chunk_t data)
|
||||
{
|
||||
private_ietf_attr_numeric_version_t *this;
|
||||
|
||||
INIT(this,
|
||||
.public = {
|
||||
.pa_tnc_attribute = {
|
||||
.get_type = _get_type,
|
||||
.get_value = _get_value,
|
||||
.build = _build,
|
||||
.process = _process,
|
||||
.get_ref = _get_ref,
|
||||
.destroy = _destroy,
|
||||
},
|
||||
.get_version = _get_version,
|
||||
.get_build = _get_build,
|
||||
.get_service_pack = _get_service_pack,
|
||||
},
|
||||
.type = { PEN_IETF, IETF_ATTR_NUMERIC_VERSION },
|
||||
.value = chunk_clone(data),
|
||||
.ref = 1,
|
||||
);
|
||||
|
||||
return &this->public.pa_tnc_attribute;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
/*
|
||||
* Copyright (C) 2012 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
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup ietf_attr_numeric_versiont ietf_attr_numeric_version
|
||||
* @{ @ingroup ietf
|
||||
*/
|
||||
|
||||
#ifndef IETF_ATTR_NUMERIC_VERSION_H_
|
||||
#define IETF_ATTR_NUMERIC_VERSION_H_
|
||||
|
||||
typedef struct ietf_attr_numeric_version_t ietf_attr_numeric_version_t;
|
||||
|
||||
#include "ietf_attr.h"
|
||||
#include "pa_tnc/pa_tnc_attr.h"
|
||||
|
||||
|
||||
/**
|
||||
* Class implementing the IETF PA-TNC String Version attribute.
|
||||
*
|
||||
*/
|
||||
struct ietf_attr_numeric_version_t {
|
||||
|
||||
/**
|
||||
* Public PA-TNC attribute interface
|
||||
*/
|
||||
pa_tnc_attr_t pa_tnc_attribute;
|
||||
|
||||
/**
|
||||
* Gets the Major and Minor Version Numbers
|
||||
*
|
||||
* @param major Major Version Number
|
||||
* @param minor Minor Version Number
|
||||
*/
|
||||
void (*get_version)(ietf_attr_numeric_version_t *this,
|
||||
u_int32_t *major, u_int32_t *minor);
|
||||
|
||||
/**
|
||||
* Gets the Build Number
|
||||
*
|
||||
* @param major Major Version Number
|
||||
* @param minor Minor Version Number
|
||||
*/
|
||||
u_int32_t (*get_build)(ietf_attr_numeric_version_t *this);
|
||||
|
||||
/**
|
||||
* Gets the Major and Minor Numbers of the Service Pack
|
||||
*
|
||||
* @param major Service Pack Major Number
|
||||
* @param minor Servcie Pack Minor Number
|
||||
*/
|
||||
void (*get_service_pack)(ietf_attr_numeric_version_t *this,
|
||||
u_int16_t *major, u_int16_t *minor);
|
||||
};
|
||||
|
||||
/**
|
||||
* Creates an ietf_attr_numeric_version_t object
|
||||
*
|
||||
*/
|
||||
pa_tnc_attr_t* ietf_attr_numeric_version_create(u_int32_t major, u_int32_t minor,
|
||||
u_int32_t build,
|
||||
u_int16_t service_pack_major,
|
||||
u_int16_t service_pack_minor);
|
||||
|
||||
/**
|
||||
* Creates an ietf_attr_numeric_version_t object from received data
|
||||
*
|
||||
* @param value unparsed attribute value
|
||||
*/
|
||||
pa_tnc_attr_t* ietf_attr_numeric_version_create_from_data(chunk_t value);
|
||||
|
||||
#endif /** IETF_ATTR_NUMERIC_VERSION_H_ @}*/
|
||||
Reference in New Issue
Block a user