- implemented and tested cp_payload_t
This commit is contained in:
parent
f673471b10
commit
7ba3f707df
|
@ -47,6 +47,8 @@
|
||||||
#include <encoding/payloads/ts_payload.h>
|
#include <encoding/payloads/ts_payload.h>
|
||||||
#include <encoding/payloads/delete_payload.h>
|
#include <encoding/payloads/delete_payload.h>
|
||||||
#include <encoding/payloads/vendor_id_payload.h>
|
#include <encoding/payloads/vendor_id_payload.h>
|
||||||
|
#include <encoding/payloads/cp_payload.h>
|
||||||
|
#include <encoding/payloads/configuration_attribute.h>
|
||||||
|
|
||||||
|
|
||||||
typedef struct private_generator_t private_generator_t;
|
typedef struct private_generator_t private_generator_t;
|
||||||
|
@ -295,6 +297,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t
|
||||||
number_of_bits = 8;
|
number_of_bits = 8;
|
||||||
break;
|
break;
|
||||||
case U_INT_16:
|
case U_INT_16:
|
||||||
|
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||||
number_of_bits = 16;
|
number_of_bits = 16;
|
||||||
break;
|
break;
|
||||||
case U_INT_32:
|
case U_INT_32:
|
||||||
|
@ -399,6 +402,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t
|
||||||
|
|
||||||
}
|
}
|
||||||
case U_INT_16:
|
case U_INT_16:
|
||||||
|
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||||
{
|
{
|
||||||
u_int16_t int16_val = htons(*((u_int16_t*)(this->data_struct + offset)));
|
u_int16_t int16_val = htons(*((u_int16_t*)(this->data_struct + offset)));
|
||||||
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int16_val, sizeof(int16_val));
|
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int16_val, sizeof(int16_val));
|
||||||
|
@ -682,6 +686,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
|
||||||
case IKE_SPI:
|
case IKE_SPI:
|
||||||
case TS_TYPE:
|
case TS_TYPE:
|
||||||
case ATTRIBUTE_TYPE:
|
case ATTRIBUTE_TYPE:
|
||||||
|
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||||
{
|
{
|
||||||
this->generate_u_int_type(this,rules[i].type,rules[i].offset);
|
this->generate_u_int_type(this,rules[i].type,rules[i].offset);
|
||||||
break;
|
break;
|
||||||
|
@ -743,6 +748,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
|
||||||
case CERT_DATA:
|
case CERT_DATA:
|
||||||
case CERTREQ_DATA:
|
case CERTREQ_DATA:
|
||||||
case SPIS:
|
case SPIS:
|
||||||
|
case CONFIGURATION_ATTRIBUTE_VALUE:
|
||||||
case VID_DATA:
|
case VID_DATA:
|
||||||
{
|
{
|
||||||
u_int32_t payload_length_position_offset;
|
u_int32_t payload_length_position_offset;
|
||||||
|
@ -779,6 +785,9 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
|
||||||
case VID_DATA:
|
case VID_DATA:
|
||||||
header_length = VENDOR_ID_PAYLOAD_HEADER_LENGTH;
|
header_length = VENDOR_ID_PAYLOAD_HEADER_LENGTH;
|
||||||
break;
|
break;
|
||||||
|
case CONFIGURATION_ATTRIBUTE_VALUE:
|
||||||
|
header_length = CONFIGURATION_ATTRIBUTE_HEADER_LENGTH;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -898,6 +907,41 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
|
||||||
int16_val = htons(length_of_transform);
|
int16_val = htons(length_of_transform);
|
||||||
this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),transform_length_position_offset);
|
this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),transform_length_position_offset);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case CONFIGURATION_ATTRIBUTES:
|
||||||
|
{
|
||||||
|
/* before iterative generate the configuration attributes, store the current length position */
|
||||||
|
u_int32_t configurations_length_position_offset = this->last_payload_length_position_offset;
|
||||||
|
|
||||||
|
u_int16_t length_of_configurations = CP_PAYLOAD_HEADER_LENGTH;
|
||||||
|
u_int16_t int16_val;
|
||||||
|
linked_list_t *configuration_attributes =*((linked_list_t **)(this->data_struct + rules[i].offset));
|
||||||
|
|
||||||
|
iterator_t *iterator;
|
||||||
|
/* create forward iterator */
|
||||||
|
iterator = configuration_attributes->create_iterator(configuration_attributes,TRUE);
|
||||||
|
while (iterator->has_next(iterator))
|
||||||
|
{
|
||||||
|
payload_t *current_attribute;
|
||||||
|
u_int32_t before_generate_position_offset;
|
||||||
|
u_int32_t after_generate_position_offset;
|
||||||
|
|
||||||
|
iterator->current(iterator,(void **)¤t_attribute);
|
||||||
|
|
||||||
|
before_generate_position_offset = this->get_current_buffer_offset(this);
|
||||||
|
this->public.generate_payload(&(this->public),current_attribute);
|
||||||
|
after_generate_position_offset = this->get_current_buffer_offset(this);
|
||||||
|
|
||||||
|
/* increase size of transform */
|
||||||
|
length_of_configurations += (after_generate_position_offset - before_generate_position_offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator->destroy(iterator);
|
||||||
|
|
||||||
|
int16_val = htons(length_of_configurations);
|
||||||
|
this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),configurations_length_position_offset);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ATTRIBUTE_FORMAT:
|
case ATTRIBUTE_FORMAT:
|
||||||
|
@ -922,7 +966,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
|
||||||
// status = this->write_bytes_to_buffer(this,(this->data_struct + rules[i].offset),2);
|
// status = this->write_bytes_to_buffer(this,(this->data_struct + rules[i].offset),2);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ATTRIBUTE_VALUE:
|
case ATTRIBUTE_VALUE:
|
||||||
{
|
{
|
||||||
if (this->attribute_format == FALSE)
|
if (this->attribute_format == FALSE)
|
||||||
|
|
|
@ -48,6 +48,8 @@
|
||||||
#include <encoding/payloads/ts_payload.h>
|
#include <encoding/payloads/ts_payload.h>
|
||||||
#include <encoding/payloads/delete_payload.h>
|
#include <encoding/payloads/delete_payload.h>
|
||||||
#include <encoding/payloads/vendor_id_payload.h>
|
#include <encoding/payloads/vendor_id_payload.h>
|
||||||
|
#include <encoding/payloads/cp_payload.h>
|
||||||
|
#include <encoding/payloads/configuration_attribute.h>
|
||||||
|
|
||||||
|
|
||||||
typedef struct private_parser_t private_parser_t;
|
typedef struct private_parser_t private_parser_t;
|
||||||
|
@ -759,6 +761,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case CONFIGURATION_ATTRIBUTES:
|
||||||
|
{
|
||||||
|
size_t configuration_attributes_length = payload_length - CP_PAYLOAD_HEADER_LENGTH;
|
||||||
|
if (this->parse_list(this, rule_number, output + rule->offset, CONFIGURATION_ATTRIBUTE, configuration_attributes_length) != SUCCESS)
|
||||||
|
{
|
||||||
|
pld->destroy(pld);
|
||||||
|
return PARSE_ERROR;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case ATTRIBUTE_FORMAT:
|
case ATTRIBUTE_FORMAT:
|
||||||
{
|
{
|
||||||
if (this->parse_bit(this, rule_number, output + rule->offset) != SUCCESS)
|
if (this->parse_bit(this, rule_number, output + rule->offset) != SUCCESS)
|
||||||
|
@ -779,6 +791,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ
|
||||||
attribute_format = *(bool*)(output + rule->offset);
|
attribute_format = *(bool*)(output + rule->offset);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||||
|
{
|
||||||
|
if (this->parse_uint16(this, rule_number, output + rule->offset) != SUCCESS)
|
||||||
|
{
|
||||||
|
pld->destroy(pld);
|
||||||
|
return PARSE_ERROR;
|
||||||
|
}
|
||||||
|
attribute_length = *(u_int16_t*)(output + rule->offset);
|
||||||
|
break;
|
||||||
|
}
|
||||||
case ATTRIBUTE_LENGTH_OR_VALUE:
|
case ATTRIBUTE_LENGTH_OR_VALUE:
|
||||||
{
|
{
|
||||||
if (this->parse_uint16(this, rule_number, output + rule->offset) != SUCCESS)
|
if (this->parse_uint16(this, rule_number, output + rule->offset) != SUCCESS)
|
||||||
|
@ -871,6 +893,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case CONFIGURATION_ATTRIBUTE_VALUE:
|
||||||
|
{
|
||||||
|
size_t data_length = attribute_length;
|
||||||
|
if (this->parse_chunk(this, rule_number, output + rule->offset, data_length) != SUCCESS)
|
||||||
|
{
|
||||||
|
pld->destroy(pld);
|
||||||
|
return PARSE_ERROR;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case KEY_EXCHANGE_DATA:
|
case KEY_EXCHANGE_DATA:
|
||||||
{
|
{
|
||||||
size_t keydata_length = payload_length - KE_PAYLOAD_HEADER_LENGTH;
|
size_t keydata_length = payload_length - KE_PAYLOAD_HEADER_LENGTH;
|
||||||
|
|
|
@ -57,6 +57,15 @@ $(BUILD_DIR)delete_payload.o : $(PAYLOADS_DIR)delete_payload.c $(PAYLOADS_DIR)
|
||||||
OBJS+= $(BUILD_DIR)vendor_id_payload.o
|
OBJS+= $(BUILD_DIR)vendor_id_payload.o
|
||||||
$(BUILD_DIR)vendor_id_payload.o : $(PAYLOADS_DIR)vendor_id_payload.c $(PAYLOADS_DIR)vendor_id_payload.h
|
$(BUILD_DIR)vendor_id_payload.o : $(PAYLOADS_DIR)vendor_id_payload.c $(PAYLOADS_DIR)vendor_id_payload.h
|
||||||
$(CC) $(CFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
|
OBJS+= $(BUILD_DIR)cp_payload.o
|
||||||
|
$(BUILD_DIR)cp_payload.o : $(PAYLOADS_DIR)cp_payload.c $(PAYLOADS_DIR)cp_payload.h
|
||||||
|
$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
|
OBJS+= $(BUILD_DIR)configuration_attribute.o
|
||||||
|
$(BUILD_DIR)configuration_attribute.o : $(PAYLOADS_DIR)configuration_attribute.c $(PAYLOADS_DIR)configuration_attribute.h
|
||||||
|
$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
|
|
||||||
OBJS+= $(BUILD_DIR)ts_payload.o
|
OBJS+= $(BUILD_DIR)ts_payload.o
|
||||||
$(BUILD_DIR)ts_payload.o : $(PAYLOADS_DIR)ts_payload.c $(PAYLOADS_DIR)ts_payload.h
|
$(BUILD_DIR)ts_payload.o : $(PAYLOADS_DIR)ts_payload.c $(PAYLOADS_DIR)ts_payload.h
|
||||||
|
|
|
@ -0,0 +1,284 @@
|
||||||
|
/**
|
||||||
|
* @file configuration_attribute.c
|
||||||
|
*
|
||||||
|
* @brief Implementation of configuration_attribute_t.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Jan Hutter, Martin Willi
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* offsetof macro */
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#include "configuration_attribute.h"
|
||||||
|
|
||||||
|
#include <encoding/payloads/encodings.h>
|
||||||
|
#include <types.h>
|
||||||
|
#include <utils/allocator.h>
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct private_configuration_attribute_t private_configuration_attribute_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Private data of an configuration_attribute_t object.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
struct private_configuration_attribute_t {
|
||||||
|
/**
|
||||||
|
* Public configuration_attribute_t interface.
|
||||||
|
*/
|
||||||
|
configuration_attribute_t public;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Type of the attribute.
|
||||||
|
*/
|
||||||
|
u_int16_t attribute_type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Length of the attribute.
|
||||||
|
*/
|
||||||
|
u_int16_t attribute_length;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attribute value as chunk.
|
||||||
|
*/
|
||||||
|
chunk_t attribute_value;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* String mappings for configuration_attribute_type_t.
|
||||||
|
*/
|
||||||
|
mapping_t configuration_attribute_type_m[] = {
|
||||||
|
{INTERNAL_IP4_ADDRESS, "INTERNAL_IP4_ADDRESS"},
|
||||||
|
{INTERNAL_IP4_NETMASK, "INTERNAL_IP4_NETMASK"},
|
||||||
|
{INTERNAL_IP4_DNS, "INTERNAL_IP4_DNS"},
|
||||||
|
{INTERNAL_IP4_NBNS, "INTERNAL_IP4_NBNS"},
|
||||||
|
{INTERNAL_ADDRESS_EXPIRY, "INTERNAL_ADDRESS_EXPIRY"},
|
||||||
|
{INTERNAL_IP4_DHCP, "INTERNAL_IP4_DHCP"},
|
||||||
|
{APPLICATION_VERSION, "APPLICATION_VERSION"},
|
||||||
|
{INTERNAL_IP6_ADDRESS, "INTERNAL_IP6_ADDRESS"},
|
||||||
|
{INTERNAL_IP6_DNS, "INTERNAL_IP6_DNS"},
|
||||||
|
{INTERNAL_IP6_NBNS, "INTERNAL_IP6_NBNS"},
|
||||||
|
{INTERNAL_IP6_DHCP, "INTERNAL_IP6_DHCP"},
|
||||||
|
{INTERNAL_IP4_SUBNET, "INTERNAL_IP4_SUBNET"},
|
||||||
|
{SUPPORTED_ATTRIBUTES, "SUPPORTED_ATTRIBUTES"},
|
||||||
|
{INTERNAL_IP6_SUBNET, "INTERNAL_IP6_SUBNET"},
|
||||||
|
{MAPPING_END, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encoding rules to parse or generate a configuration attribute.
|
||||||
|
*
|
||||||
|
* The defined offsets are the positions in a object of type
|
||||||
|
* private_configuration_attribute_t.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
encoding_rule_t configuration_attribute_encodings[] = {
|
||||||
|
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
/* type of the attribute as 15 bit unsigned integer */
|
||||||
|
{ ATTRIBUTE_TYPE, offsetof(private_configuration_attribute_t, attribute_type) },
|
||||||
|
/* Length of attribute value */
|
||||||
|
{ CONFIGURATION_ATTRIBUTE_LENGTH, offsetof(private_configuration_attribute_t, attribute_length)},
|
||||||
|
/* Value of attribute if attribute format flag is zero */
|
||||||
|
{ CONFIGURATION_ATTRIBUTE_VALUE, offsetof(private_configuration_attribute_t, attribute_value)}
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
!R| Attribute Type ! Length |
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
| |
|
||||||
|
~ Value ~
|
||||||
|
| |
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.verify.
|
||||||
|
*/
|
||||||
|
static status_t verify(private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
switch (this->attribute_type)
|
||||||
|
{
|
||||||
|
case INTERNAL_IP4_ADDRESS:
|
||||||
|
case INTERNAL_IP4_NETMASK:
|
||||||
|
case INTERNAL_IP4_DNS:
|
||||||
|
case INTERNAL_IP4_NBNS:
|
||||||
|
case INTERNAL_ADDRESS_EXPIRY:
|
||||||
|
case INTERNAL_IP4_DHCP:
|
||||||
|
case APPLICATION_VERSION:
|
||||||
|
case INTERNAL_IP6_ADDRESS:
|
||||||
|
case INTERNAL_IP6_DNS:
|
||||||
|
case INTERNAL_IP6_NBNS:
|
||||||
|
case INTERNAL_IP6_DHCP:
|
||||||
|
case INTERNAL_IP4_SUBNET:
|
||||||
|
case SUPPORTED_ATTRIBUTES:
|
||||||
|
case INTERNAL_IP6_SUBNET:
|
||||||
|
{
|
||||||
|
/* Attribute types are not checked in here */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->attribute_length != this->attribute_value.len)
|
||||||
|
{
|
||||||
|
return FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_encoding_rules.
|
||||||
|
*/
|
||||||
|
static void get_encoding_rules(private_configuration_attribute_t *this, encoding_rule_t **rules, size_t *rule_count)
|
||||||
|
{
|
||||||
|
*rules = configuration_attribute_encodings;
|
||||||
|
*rule_count = sizeof(configuration_attribute_encodings) / sizeof(encoding_rule_t);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_type.
|
||||||
|
*/
|
||||||
|
static payload_type_t get_type(private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
return CONFIGURATION_ATTRIBUTE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_next_type.
|
||||||
|
*/
|
||||||
|
static payload_type_t get_next_type(private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
return (NO_PAYLOAD);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.set_next_type.
|
||||||
|
*/
|
||||||
|
static void set_next_type(private_configuration_attribute_t *this,payload_type_t type)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.get_length.
|
||||||
|
*/
|
||||||
|
static size_t get_length(private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
return (this->attribute_value.len + CONFIGURATION_ATTRIBUTE_HEADER_LENGTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.set_value.
|
||||||
|
*/
|
||||||
|
static void set_value(private_configuration_attribute_t *this, chunk_t value)
|
||||||
|
{
|
||||||
|
if (this->attribute_value.ptr != NULL)
|
||||||
|
{
|
||||||
|
/* free existing value */
|
||||||
|
allocator_free_chunk(&(this->attribute_value));
|
||||||
|
}
|
||||||
|
|
||||||
|
this->attribute_value.ptr = allocator_clone_bytes(value.ptr,value.len);
|
||||||
|
this->attribute_value.len = value.len;
|
||||||
|
|
||||||
|
this->attribute_length = this->attribute_value.len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.get_value.
|
||||||
|
*/
|
||||||
|
static chunk_t get_value (private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
return this->attribute_value;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.set_attribute_type.
|
||||||
|
*/
|
||||||
|
static void set_attribute_type (private_configuration_attribute_t *this, u_int16_t type)
|
||||||
|
{
|
||||||
|
this->attribute_type = type & 0x7FFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.get_attribute_type.
|
||||||
|
*/
|
||||||
|
static u_int16_t get_attribute_type (private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
return this->attribute_type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.get_attribute_length.
|
||||||
|
*/
|
||||||
|
static u_int16_t get_attribute_length (private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
return this->attribute_length;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of configuration_attribute_t.destroy and payload_t.destroy.
|
||||||
|
*/
|
||||||
|
static void destroy(private_configuration_attribute_t *this)
|
||||||
|
{
|
||||||
|
if (this->attribute_value.ptr != NULL)
|
||||||
|
{
|
||||||
|
allocator_free(this->attribute_value.ptr);
|
||||||
|
}
|
||||||
|
allocator_free(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Described in header.
|
||||||
|
*/
|
||||||
|
configuration_attribute_t *configuration_attribute_create()
|
||||||
|
{
|
||||||
|
private_configuration_attribute_t *this = allocator_alloc_thing(private_configuration_attribute_t);
|
||||||
|
|
||||||
|
/* payload interface */
|
||||||
|
this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
|
||||||
|
this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
|
||||||
|
this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
|
||||||
|
this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
|
||||||
|
this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
|
||||||
|
this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
|
||||||
|
this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
|
||||||
|
|
||||||
|
/* public functions */
|
||||||
|
this->public.set_value = (void (*) (configuration_attribute_t *,chunk_t)) set_value;
|
||||||
|
this->public.get_value = (chunk_t (*) (configuration_attribute_t *)) get_value;
|
||||||
|
this->public.set_attribute_type = (void (*) (configuration_attribute_t *,u_int16_t type)) set_attribute_type;
|
||||||
|
this->public.get_attribute_type = (u_int16_t (*) (configuration_attribute_t *)) get_attribute_type;
|
||||||
|
this->public.get_attribute_length = (u_int16_t (*) (configuration_attribute_t *)) get_attribute_length;
|
||||||
|
this->public.destroy = (void (*) (configuration_attribute_t *)) destroy;
|
||||||
|
|
||||||
|
/* set default values of the fields */
|
||||||
|
this->attribute_type = 0;
|
||||||
|
this->attribute_value = CHUNK_INITIALIZER;
|
||||||
|
this->attribute_length = 0;
|
||||||
|
|
||||||
|
return (&(this->public));
|
||||||
|
}
|
|
@ -0,0 +1,146 @@
|
||||||
|
/**
|
||||||
|
* @file configuration_attribute.h
|
||||||
|
*
|
||||||
|
* @brief Interface of configuration_attribute_t.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Jan Hutter, Martin Willi
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _CONFIGURATION_ATTRIBUTE_H_
|
||||||
|
#define _CONFIGURATION_ATTRIBUTE_H_
|
||||||
|
|
||||||
|
#include <types.h>
|
||||||
|
#include <encoding/payloads/payload.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration attribute header length in bytes.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
#define CONFIGURATION_ATTRIBUTE_HEADER_LENGTH 4
|
||||||
|
|
||||||
|
|
||||||
|
typedef enum configuration_attribute_type_t configuration_attribute_type_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Type of the attribute, as in IKEv2 draft 3.15.1.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
enum configuration_attribute_type_t {
|
||||||
|
INTERNAL_IP4_ADDRESS = 1,
|
||||||
|
INTERNAL_IP4_NETMASK = 2,
|
||||||
|
INTERNAL_IP4_DNS = 3,
|
||||||
|
INTERNAL_IP4_NBNS = 4,
|
||||||
|
INTERNAL_ADDRESS_EXPIRY = 5,
|
||||||
|
INTERNAL_IP4_DHCP = 6,
|
||||||
|
APPLICATION_VERSION = 7,
|
||||||
|
INTERNAL_IP6_ADDRESS = 8,
|
||||||
|
INTERNAL_IP6_DNS = 10,
|
||||||
|
INTERNAL_IP6_NBNS = 11,
|
||||||
|
INTERNAL_IP6_DHCP = 12,
|
||||||
|
INTERNAL_IP4_SUBNET = 13,
|
||||||
|
SUPPORTED_ATTRIBUTES = 14,
|
||||||
|
INTERNAL_IP6_SUBNET = 15
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* String mappings for configuration_attribute_type_t.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
extern mapping_t configuration_attribute_type_m[];
|
||||||
|
|
||||||
|
typedef struct configuration_attribute_t configuration_attribute_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Object representing an IKEv2- CONFIGURATION Attribute.
|
||||||
|
*
|
||||||
|
* The CONFIGURATION ATTRIBUTE format is described in RFC section 3.15.1.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
struct configuration_attribute_t {
|
||||||
|
/**
|
||||||
|
* The payload_t interface.
|
||||||
|
*/
|
||||||
|
payload_t payload_interface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Returns the currently set value of the attribute.
|
||||||
|
*
|
||||||
|
* @warning Returned data are not copied.
|
||||||
|
*
|
||||||
|
* @param this calling configuration_attribute_t object
|
||||||
|
* @return chunk_t pointing to the value
|
||||||
|
*/
|
||||||
|
chunk_t (*get_value) (configuration_attribute_t *this);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Sets the value of the attribute.
|
||||||
|
*
|
||||||
|
* @warning Value is getting copied.
|
||||||
|
*
|
||||||
|
* @param this calling configuration_attribute_t object
|
||||||
|
* @param value chunk_t pointing to the value to set
|
||||||
|
*/
|
||||||
|
void (*set_value) (configuration_attribute_t *this, chunk_t value);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Sets the type of the attribute.
|
||||||
|
*
|
||||||
|
* @param this calling configuration_attribute_t object
|
||||||
|
* @param type type to set (most significant bit is set to zero)
|
||||||
|
*/
|
||||||
|
void (*set_attribute_type) (configuration_attribute_t *this, u_int16_t type);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief get the type of the attribute.
|
||||||
|
*
|
||||||
|
* @param this calling configuration_attribute_t object
|
||||||
|
* @return type of the value
|
||||||
|
*/
|
||||||
|
u_int16_t (*get_attribute_type) (configuration_attribute_t *this);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief get the length of an attribute.
|
||||||
|
*
|
||||||
|
* @param this calling configuration_attribute_t object
|
||||||
|
* @return type of the value
|
||||||
|
*/
|
||||||
|
u_int16_t (*get_attribute_length) (configuration_attribute_t *this);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Destroys an configuration_attribute_t object.
|
||||||
|
*
|
||||||
|
* @param this configuration_attribute_t object to destroy
|
||||||
|
*/
|
||||||
|
void (*destroy) (configuration_attribute_t *this);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Creates an empty configuration_attribute_t object.
|
||||||
|
*
|
||||||
|
* @return created configuration_attribute_t object
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
configuration_attribute_t *configuration_attribute_create();
|
||||||
|
|
||||||
|
#endif /*_CONFIGURATION_ATTRIBUTE_H_*/
|
|
@ -0,0 +1,313 @@
|
||||||
|
/**
|
||||||
|
* @file cp_payload.c
|
||||||
|
*
|
||||||
|
* @brief Implementation of cp_payload_t.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Jan Hutter, Martin Willi
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* offsetof macro */
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#include "cp_payload.h"
|
||||||
|
|
||||||
|
#include <encoding/payloads/encodings.h>
|
||||||
|
#include <utils/allocator.h>
|
||||||
|
#include <utils/linked_list.h>
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* String mappings for config_type_t.
|
||||||
|
*/
|
||||||
|
mapping_t config_type_m[] = {
|
||||||
|
{CFG_REQUEST, "CFG_REQUEST"},
|
||||||
|
{CFG_REPLY, "CFG_REPLY"},
|
||||||
|
{CFG_SET, "CFG_SET"},
|
||||||
|
{CFG_ACK, "CFG_ACK"},
|
||||||
|
{MAPPING_END, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct private_cp_payload_t private_cp_payload_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Private data of an cp_payload_t object.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
struct private_cp_payload_t {
|
||||||
|
/**
|
||||||
|
* Public cp_payload_t interface.
|
||||||
|
*/
|
||||||
|
cp_payload_t public;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Next payload type.
|
||||||
|
*/
|
||||||
|
u_int8_t next_payload;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Critical flag.
|
||||||
|
*/
|
||||||
|
bool critical;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Length of this payload.
|
||||||
|
*/
|
||||||
|
u_int16_t payload_length;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration Attributes in this payload are stored in a linked_list_t.
|
||||||
|
*/
|
||||||
|
linked_list_t * attributes;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Config Type.
|
||||||
|
*/
|
||||||
|
u_int8_t config_type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Computes the length of this payload.
|
||||||
|
*
|
||||||
|
* @param this calling private_cp_payload_t object
|
||||||
|
*/
|
||||||
|
void (*compute_length) (private_cp_payload_t *this);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encoding rules to parse or generate a IKEv2-CP Payload
|
||||||
|
*
|
||||||
|
* The defined offsets are the positions in a object of type
|
||||||
|
* private_cp_payload_t.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
encoding_rule_t cp_payload_encodings[] = {
|
||||||
|
/* 1 Byte next payload type, stored in the field next_payload */
|
||||||
|
{ U_INT_8, offsetof(private_cp_payload_t, next_payload) },
|
||||||
|
/* the critical bit */
|
||||||
|
{ FLAG, offsetof(private_cp_payload_t, critical) },
|
||||||
|
/* 7 Bit reserved bits, nowhere stored */
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
{ RESERVED_BIT, 0 },
|
||||||
|
/* Length of the whole CP payload*/
|
||||||
|
{ PAYLOAD_LENGTH, offsetof(private_cp_payload_t, payload_length) },
|
||||||
|
/* Proposals are stored in a proposal substructure,
|
||||||
|
offset points to a linked_list_t pointer */
|
||||||
|
{ U_INT_8, offsetof(private_cp_payload_t, config_type) },
|
||||||
|
{ RESERVED_BYTE,0 },
|
||||||
|
{ RESERVED_BYTE,0 },
|
||||||
|
{ RESERVED_BYTE,0 },
|
||||||
|
{ CONFIGURATION_ATTRIBUTES, offsetof(private_cp_payload_t, attributes) }
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
! Next Payload !C! RESERVED ! Payload Length !
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
! CFG Type ! RESERVED !
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
! !
|
||||||
|
~ Configuration Attributes ~
|
||||||
|
! !
|
||||||
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.verify.
|
||||||
|
*/
|
||||||
|
static status_t verify(private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
status_t status = SUCCESS;
|
||||||
|
iterator_t *iterator;
|
||||||
|
|
||||||
|
if (this->critical)
|
||||||
|
{
|
||||||
|
/* critical bit set! */
|
||||||
|
return FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator = this->attributes->create_iterator(this->attributes,TRUE);
|
||||||
|
|
||||||
|
while(iterator->has_next(iterator))
|
||||||
|
{
|
||||||
|
configuration_attribute_t *attribute;
|
||||||
|
iterator->current(iterator,(void **)&attribute);
|
||||||
|
status = attribute->payload_interface.verify(&(attribute->payload_interface));
|
||||||
|
if (status != SUCCESS)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator->destroy(iterator);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_encoding_rules.
|
||||||
|
*/
|
||||||
|
static void get_encoding_rules(private_cp_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
|
||||||
|
{
|
||||||
|
*rules = cp_payload_encodings;
|
||||||
|
*rule_count = sizeof(cp_payload_encodings) / sizeof(encoding_rule_t);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_type.
|
||||||
|
*/
|
||||||
|
static payload_type_t get_type(private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
return CONFIGURATION;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_next_type.
|
||||||
|
*/
|
||||||
|
static payload_type_t get_next_type(private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
return (this->next_payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.set_next_type.
|
||||||
|
*/
|
||||||
|
static void set_next_type(private_cp_payload_t *this,payload_type_t type)
|
||||||
|
{
|
||||||
|
this->next_payload = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.get_length.
|
||||||
|
*/
|
||||||
|
static size_t get_length(private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
this->compute_length(this);
|
||||||
|
return this->payload_length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of cp_payload_t.create_configuration_attribute_iterator.
|
||||||
|
*/
|
||||||
|
static iterator_t *create_configuration_attribute_iterator (private_cp_payload_t *this,bool forward)
|
||||||
|
{
|
||||||
|
return this->attributes->create_iterator(this->attributes,forward);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of cp_payload_t.add_proposal_substructure.
|
||||||
|
*/
|
||||||
|
static void add_configuration_attribute (private_cp_payload_t *this,configuration_attribute_t *attribute)
|
||||||
|
{
|
||||||
|
this->attributes->insert_last(this->attributes,(void *) attribute);
|
||||||
|
this->compute_length(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of cp_payload_t.set_config_type.
|
||||||
|
*/
|
||||||
|
static void set_config_type (private_cp_payload_t *this,config_type_t config_type)
|
||||||
|
{
|
||||||
|
this->config_type = config_type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of cp_payload_t.get_config_type.
|
||||||
|
*/
|
||||||
|
static config_type_t get_config_type (private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
return this->config_type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of private_cp_payload_t.compute_length.
|
||||||
|
*/
|
||||||
|
static void compute_length (private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
iterator_t *iterator;
|
||||||
|
size_t length = CP_PAYLOAD_HEADER_LENGTH;
|
||||||
|
iterator = this->attributes->create_iterator(this->attributes,TRUE);
|
||||||
|
while (iterator->has_next(iterator))
|
||||||
|
{
|
||||||
|
payload_t *current_attribute;
|
||||||
|
iterator->current(iterator,(void **) ¤t_attribute);
|
||||||
|
length += current_attribute->get_length(current_attribute);
|
||||||
|
}
|
||||||
|
iterator->destroy(iterator);
|
||||||
|
|
||||||
|
this->payload_length = length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of payload_t.destroy and cp_payload_t.destroy.
|
||||||
|
*/
|
||||||
|
static status_t destroy(private_cp_payload_t *this)
|
||||||
|
{
|
||||||
|
/* all attributes are getting destroyed */
|
||||||
|
while (this->attributes->get_count(this->attributes) > 0)
|
||||||
|
{
|
||||||
|
configuration_attribute_t *current_attribute;
|
||||||
|
this->attributes->remove_last(this->attributes,(void **)¤t_attribute);
|
||||||
|
current_attribute->destroy(current_attribute);
|
||||||
|
}
|
||||||
|
this->attributes->destroy(this->attributes);
|
||||||
|
|
||||||
|
allocator_free(this);
|
||||||
|
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Described in header.
|
||||||
|
*/
|
||||||
|
cp_payload_t *cp_payload_create()
|
||||||
|
{
|
||||||
|
private_cp_payload_t *this = allocator_alloc_thing(private_cp_payload_t);
|
||||||
|
|
||||||
|
/* public interface */
|
||||||
|
this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
|
||||||
|
this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
|
||||||
|
this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
|
||||||
|
this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
|
||||||
|
this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
|
||||||
|
this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
|
||||||
|
this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
|
||||||
|
|
||||||
|
/* public functions */
|
||||||
|
this->public.create_configuration_attribute_iterator = (iterator_t* (*) (cp_payload_t *,bool)) create_configuration_attribute_iterator;
|
||||||
|
this->public.add_configuration_attribute = (void (*) (cp_payload_t *,configuration_attribute_t *)) add_configuration_attribute;
|
||||||
|
this->public.set_config_type = (void (*) (cp_payload_t *, config_type_t)) set_config_type;
|
||||||
|
this->public.get_config_type = (config_type_t (*) (cp_payload_t *)) get_config_type;
|
||||||
|
this->public.destroy = (void (*) (cp_payload_t *)) destroy;
|
||||||
|
|
||||||
|
|
||||||
|
/* private functions */
|
||||||
|
this->compute_length = compute_length;
|
||||||
|
|
||||||
|
/* set default values of the fields */
|
||||||
|
this->critical = FALSE;
|
||||||
|
this->next_payload = NO_PAYLOAD;
|
||||||
|
this->payload_length = CP_PAYLOAD_HEADER_LENGTH;
|
||||||
|
|
||||||
|
this->attributes = linked_list_create();
|
||||||
|
return (&(this->public));
|
||||||
|
}
|
|
@ -0,0 +1,119 @@
|
||||||
|
/**
|
||||||
|
* @file cp_payload.h
|
||||||
|
*
|
||||||
|
* @brief Interface of cp_payload_t.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Jan Hutter, Martin Willi
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CP_PAYLOAD_H_
|
||||||
|
#define CP_PAYLOAD_H_
|
||||||
|
|
||||||
|
#include <types.h>
|
||||||
|
#include <encoding/payloads/payload.h>
|
||||||
|
#include <encoding/payloads/configuration_attribute.h>
|
||||||
|
#include <utils/linked_list.h>
|
||||||
|
#include <config/init_config.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CP_PAYLOAD length in bytes without any proposal substructure.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
#define CP_PAYLOAD_HEADER_LENGTH 8
|
||||||
|
|
||||||
|
|
||||||
|
typedef enum config_type_t config_type_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Config Type of an Configuration Payload.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
enum config_type_t {
|
||||||
|
CFG_REQUEST = 1,
|
||||||
|
CFG_REPLY = 2,
|
||||||
|
CFG_SET = 3,
|
||||||
|
CFG_ACK = 4,
|
||||||
|
};
|
||||||
|
|
||||||
|
extern mapping_t config_type_m[];
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct cp_payload_t cp_payload_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class representing an IKEv2-CP Payload.
|
||||||
|
*
|
||||||
|
* The CP Payload format is described in RFC section 3.15.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
struct cp_payload_t {
|
||||||
|
/**
|
||||||
|
* The payload_t interface.
|
||||||
|
*/
|
||||||
|
payload_t payload_interface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Creates an iterator of stored configuration_attribute_t objects.
|
||||||
|
*
|
||||||
|
* @warning The created iterator has to get destroyed by the caller!
|
||||||
|
*
|
||||||
|
* @warning When deleting an attribute using this iterator,
|
||||||
|
* the length of this configuration_attribute_t has to be refreshed
|
||||||
|
* by calling get_length()!
|
||||||
|
*
|
||||||
|
* @param this calling cp_payload_t object
|
||||||
|
* @param[in] forward iterator direction (TRUE: front to end)
|
||||||
|
* @return created iterator_t object
|
||||||
|
*/
|
||||||
|
iterator_t *(*create_configuration_attribute_iterator) (cp_payload_t *this, bool forward);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Adds a configuration_attribute_t object to this object.
|
||||||
|
*
|
||||||
|
* @warning The added configuration_attribute_t object is
|
||||||
|
* getting destroyed in destroy function of cp_payload_t.
|
||||||
|
*
|
||||||
|
* @param this calling cp_payload_t object
|
||||||
|
* @param attribute configuration_attribute_t object to add
|
||||||
|
*/
|
||||||
|
void (*add_configuration_attribute) (cp_payload_t *this, configuration_attribute_t *attribute);
|
||||||
|
|
||||||
|
void (*set_config_type) (cp_payload_t *this,config_type_t config_type);
|
||||||
|
|
||||||
|
config_type_t (*get_config_type) (cp_payload_t *this);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Destroys an cp_payload_t object.
|
||||||
|
*
|
||||||
|
* @param this cp_payload_t object to destroy
|
||||||
|
*/
|
||||||
|
void (*destroy) (cp_payload_t *this);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Creates an empty cp_payload_t object
|
||||||
|
*
|
||||||
|
* @return created cp_payload_t object
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
|
cp_payload_t *cp_payload_create();
|
||||||
|
|
||||||
|
#endif /*CP_PAYLOAD_H_*/
|
|
@ -58,5 +58,10 @@ mapping_t encoding_type_m[] = {
|
||||||
{CERTREQ_DATA, "CERTREQ_DATA"},
|
{CERTREQ_DATA, "CERTREQ_DATA"},
|
||||||
{SPIS, "SPIS"},
|
{SPIS, "SPIS"},
|
||||||
{VID_DATA, "VID_DATA"},
|
{VID_DATA, "VID_DATA"},
|
||||||
|
{VID_DATA, "VID_DATA"},
|
||||||
|
{CONFIGURATION_ATTRIBUTES, "CONFIGURATION_ATTRIBUTES"},
|
||||||
|
{CONFIGURATION_ATTRIBUTE_LENGTH, "CONFIGURATION_ATTRIBUTE_LENGTH"},
|
||||||
|
{CONFIGURATION_ATTRIBUTE_VALUE, "CONFIGURATION_ATTRIBUTE_VALUE"},
|
||||||
|
|
||||||
{MAPPING_END, NULL}
|
{MAPPING_END, NULL}
|
||||||
};
|
};
|
||||||
|
|
|
@ -245,6 +245,29 @@ enum encoding_type_t{
|
||||||
* to be stored in the pointed linked_list.
|
* to be stored in the pointed linked_list.
|
||||||
*/
|
*/
|
||||||
TRANSFORM_ATTRIBUTES,
|
TRANSFORM_ATTRIBUTES,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Representating one or more Attributes of a configuration payload.
|
||||||
|
*
|
||||||
|
* The offset points to a linked_list_t pointer.
|
||||||
|
*
|
||||||
|
* When generating the configuration_attribute_t objects are stored
|
||||||
|
* in the pointed linked_list.
|
||||||
|
*
|
||||||
|
* When parsing the parsed configuration_attribute_t objects have
|
||||||
|
* to be stored in the pointed linked_list.
|
||||||
|
*/
|
||||||
|
CONFIGURATION_ATTRIBUTES,
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* When generating the content of the chunkt pointing to
|
||||||
|
* is written.
|
||||||
|
*
|
||||||
|
* When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to.
|
||||||
|
*/
|
||||||
|
CONFIGURATION_ATTRIBUTE_VALUE,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Representing a 1 Bit flag specifying the format of a transform attribute.
|
* Representing a 1 Bit flag specifying the format of a transform attribute.
|
||||||
*
|
*
|
||||||
|
@ -287,6 +310,20 @@ enum encoding_type_t{
|
||||||
*/
|
*/
|
||||||
ATTRIBUTE_LENGTH_OR_VALUE,
|
ATTRIBUTE_LENGTH_OR_VALUE,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This field contains the length or the value of an configuration attribute.
|
||||||
|
* Its stored in a 16 unsigned integer field.
|
||||||
|
*
|
||||||
|
* When generating it must be changed from host to network order.
|
||||||
|
* The value is read from the associated data struct.
|
||||||
|
* The current write position is moved 16 bit forward afterwards.
|
||||||
|
*
|
||||||
|
* When parsing it must be changed from network to host order.
|
||||||
|
* The value is written to the associated data struct.
|
||||||
|
* The current read pointer is moved 16 bit forward afterwards.
|
||||||
|
*/
|
||||||
|
CONFIGURATION_ATTRIBUTE_LENGTH,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Depending on the field of type ATTRIBUTE_FORMAT
|
* Depending on the field of type ATTRIBUTE_FORMAT
|
||||||
* this field is available or missing and so parsed/generated
|
* this field is available or missing and so parsed/generated
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
#include <encoding/payloads/ts_payload.h>
|
#include <encoding/payloads/ts_payload.h>
|
||||||
#include <encoding/payloads/delete_payload.h>
|
#include <encoding/payloads/delete_payload.h>
|
||||||
#include <encoding/payloads/vendor_id_payload.h>
|
#include <encoding/payloads/vendor_id_payload.h>
|
||||||
|
#include <encoding/payloads/cp_payload.h>
|
||||||
|
#include <encoding/payloads/configuration_attribute.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* build the mappings for payload_type_t
|
* build the mappings for payload_type_t
|
||||||
|
@ -64,6 +66,7 @@ mapping_t payload_type_m[] = {
|
||||||
{TRANSFORM_SUBSTRUCTURE, "TRANSFORM_SUBSTRUCTURE"},
|
{TRANSFORM_SUBSTRUCTURE, "TRANSFORM_SUBSTRUCTURE"},
|
||||||
{TRANSFORM_ATTRIBUTE, "TRANSFORM_ATTRIBUTE"},
|
{TRANSFORM_ATTRIBUTE, "TRANSFORM_ATTRIBUTE"},
|
||||||
{TRAFFIC_SELECTOR_SUBSTRUCTURE, "TRAFFIC_SELECTOR_SUBSTRUCTURE"},
|
{TRAFFIC_SELECTOR_SUBSTRUCTURE, "TRAFFIC_SELECTOR_SUBSTRUCTURE"},
|
||||||
|
{CONFIGURATION_ATTRIBUTE,"CONFIGURATION_ATTRIBUTE"},
|
||||||
{MAPPING_END, NULL}
|
{MAPPING_END, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -110,6 +113,10 @@ payload_t *payload_create(payload_type_t type)
|
||||||
return (payload_t*)delete_payload_create();
|
return (payload_t*)delete_payload_create();
|
||||||
case VENDOR_ID:
|
case VENDOR_ID:
|
||||||
return (payload_t*)vendor_id_payload_create();
|
return (payload_t*)vendor_id_payload_create();
|
||||||
|
case CONFIGURATION:
|
||||||
|
return (payload_t*)cp_payload_create();
|
||||||
|
case CONFIGURATION_ATTRIBUTE:
|
||||||
|
return (payload_t*)configuration_attribute_create();
|
||||||
case ENCRYPTED:
|
case ENCRYPTED:
|
||||||
return (payload_t*)encryption_payload_create();
|
return (payload_t*)encryption_payload_create();
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -166,6 +166,14 @@ enum payload_type_t{
|
||||||
* used internally to handle a transform selector like a payload.
|
* used internally to handle a transform selector like a payload.
|
||||||
*/
|
*/
|
||||||
TRAFFIC_SELECTOR_SUBSTRUCTURE = 144,
|
TRAFFIC_SELECTOR_SUBSTRUCTURE = 144,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CONFIGURATION_ATTRIBUTE has a value of PRIVATE USE space.
|
||||||
|
*
|
||||||
|
* This payload type is not send over wire and just
|
||||||
|
* used internally to handle a transform attribute like a payload.
|
||||||
|
*/
|
||||||
|
CONFIGURATION_ATTRIBUTE = 145,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
#include <encoding/payloads/ts_payload.h>
|
#include <encoding/payloads/ts_payload.h>
|
||||||
#include <encoding/payloads/delete_payload.h>
|
#include <encoding/payloads/delete_payload.h>
|
||||||
#include <encoding/payloads/vendor_id_payload.h>
|
#include <encoding/payloads/vendor_id_payload.h>
|
||||||
|
#include <encoding/payloads/cp_payload.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Described in Header
|
* Described in Header
|
||||||
|
@ -1346,3 +1347,78 @@ void test_generator_with_vendor_id_payload(tester_t *tester)
|
||||||
|
|
||||||
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
|
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Described in header
|
||||||
|
*/
|
||||||
|
void test_generator_with_cp_payload(tester_t *tester)
|
||||||
|
{
|
||||||
|
generator_t *generator;
|
||||||
|
configuration_attribute_t *attribute1, *attribute2;
|
||||||
|
cp_payload_t *configuration;
|
||||||
|
chunk_t data;
|
||||||
|
chunk_t generated_data;
|
||||||
|
logger_t *logger;
|
||||||
|
|
||||||
|
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"CP Payload");
|
||||||
|
|
||||||
|
/* create generator */
|
||||||
|
generator = generator_create();
|
||||||
|
tester->assert_true(tester,(generator != NULL), "generator create check");
|
||||||
|
|
||||||
|
/* create attribute 1 */
|
||||||
|
attribute1 = configuration_attribute_create();
|
||||||
|
char *stringval = "abcd";
|
||||||
|
data.ptr = (void *) stringval;
|
||||||
|
data.len = 4;
|
||||||
|
attribute1->set_value(attribute1,data);
|
||||||
|
attribute1->set_attribute_type(attribute1,3);
|
||||||
|
logger->log(logger,CONTROL,"attribute1 created");
|
||||||
|
|
||||||
|
/* create attribute 2 */
|
||||||
|
attribute2 = configuration_attribute_create();
|
||||||
|
stringval = "efgh";
|
||||||
|
data.ptr = (void *) stringval;
|
||||||
|
data.len = 4;
|
||||||
|
attribute2->set_value(attribute2,data);
|
||||||
|
attribute2->set_attribute_type(attribute2,4);
|
||||||
|
logger->log(logger,CONTROL,"attribute2 created");
|
||||||
|
|
||||||
|
/* create configuration */
|
||||||
|
configuration = cp_payload_create();
|
||||||
|
tester->assert_true(tester,(configuration != NULL), "configuration create check");
|
||||||
|
configuration->add_configuration_attribute(configuration,attribute1);
|
||||||
|
configuration->add_configuration_attribute(configuration,attribute2);
|
||||||
|
configuration->set_config_type(configuration,5); /* hex 5 */
|
||||||
|
|
||||||
|
|
||||||
|
logger->log(logger,CONTROL,"cp payload created");
|
||||||
|
|
||||||
|
generator->generate_payload(generator,(payload_t *)configuration);
|
||||||
|
generator->write_to_chunk(generator,&generated_data);
|
||||||
|
logger->log_chunk(logger,RAW,"generated configuration",&generated_data);
|
||||||
|
|
||||||
|
u_int8_t expected_generation3[] = {
|
||||||
|
/* cp payload header */
|
||||||
|
0x00,0x00,0x00,0x18,
|
||||||
|
0x05,0x00,0x00,0x00,
|
||||||
|
/* configuration attribute 1*/
|
||||||
|
0x00,0x03,0x00,0x04,
|
||||||
|
0x61,0x62,0x63,0x64,
|
||||||
|
/* configuration attribute 2*/
|
||||||
|
0x00,0x04,0x00,0x04,
|
||||||
|
0x65,0x66,0x67,0x68,
|
||||||
|
};
|
||||||
|
|
||||||
|
logger->log_bytes(logger,RAW,"expected configuration",expected_generation3,sizeof(expected_generation3));
|
||||||
|
|
||||||
|
tester->assert_true(tester,(memcmp(expected_generation3,generated_data.ptr,sizeof(expected_generation3)) == 0), "compare generated data");
|
||||||
|
|
||||||
|
allocator_free_chunk(&generated_data);
|
||||||
|
configuration->destroy(configuration);
|
||||||
|
generator->destroy(generator);
|
||||||
|
|
||||||
|
|
||||||
|
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,4 +161,15 @@ void test_generator_with_delete_payload(tester_t *tester);
|
||||||
*/
|
*/
|
||||||
void test_generator_with_vendor_id_payload(tester_t *tester);
|
void test_generator_with_vendor_id_payload(tester_t *tester);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Test function used to test the generator with CP payload.
|
||||||
|
*
|
||||||
|
* @param tester associated tester_t object
|
||||||
|
*
|
||||||
|
* @ingroup testcases
|
||||||
|
*/
|
||||||
|
void test_generator_with_cp_payload(tester_t *tester);
|
||||||
|
|
||||||
|
|
||||||
#endif /*GENERATOR_TEST_H_*/
|
#endif /*GENERATOR_TEST_H_*/
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#include <encoding/payloads/ts_payload.h>
|
#include <encoding/payloads/ts_payload.h>
|
||||||
#include <encoding/payloads/delete_payload.h>
|
#include <encoding/payloads/delete_payload.h>
|
||||||
#include <encoding/payloads/vendor_id_payload.h>
|
#include <encoding/payloads/vendor_id_payload.h>
|
||||||
|
#include <encoding/payloads/cp_payload.h>
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -855,4 +856,72 @@ void test_parser_with_vendor_id_payload(tester_t *tester)
|
||||||
vendor_id_payload->destroy(vendor_id_payload);
|
vendor_id_payload->destroy(vendor_id_payload);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Described in Header
|
||||||
|
*/
|
||||||
|
void test_parser_with_cp_payload(tester_t *tester)
|
||||||
|
{
|
||||||
|
parser_t *parser;
|
||||||
|
cp_payload_t *cp_payload;
|
||||||
|
configuration_attribute_t *attribute;
|
||||||
|
status_t status;
|
||||||
|
chunk_t cp_chunk;
|
||||||
|
iterator_t *iterator;
|
||||||
|
|
||||||
|
/* first test generic parsing functionality */
|
||||||
|
|
||||||
|
u_int8_t cp_bytes[] = {
|
||||||
|
/* cp payload header */
|
||||||
|
0x00,0x00,0x00,0x18,
|
||||||
|
0x05,0x00,0x00,0x00,
|
||||||
|
/* configuration attribute 1*/
|
||||||
|
0x00,0x03,0x00,0x04,
|
||||||
|
0x61,0x62,0x63,0x64,
|
||||||
|
/* configuration attribute 2*/
|
||||||
|
0x00,0x04,0x00,0x04,
|
||||||
|
0x65,0x66,0x67,0x68,
|
||||||
|
};
|
||||||
|
|
||||||
|
cp_chunk.ptr = cp_bytes;
|
||||||
|
cp_chunk.len = sizeof(cp_bytes);
|
||||||
|
|
||||||
|
|
||||||
|
parser = parser_create(cp_chunk);
|
||||||
|
tester->assert_true(tester,(parser != NULL), "parser create check");
|
||||||
|
status = parser->parse_payload(parser, CONFIGURATION, (payload_t**)&cp_payload);
|
||||||
|
tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
|
||||||
|
|
||||||
|
iterator = cp_payload->create_configuration_attribute_iterator(cp_payload,TRUE);
|
||||||
|
|
||||||
|
tester->assert_true(tester,(iterator->has_next(iterator)),"has_next call check");
|
||||||
|
|
||||||
|
iterator->current(iterator,(void **)&attribute);
|
||||||
|
|
||||||
|
|
||||||
|
tester->assert_true(tester,(attribute->get_attribute_type(attribute) == 3),"get type check");
|
||||||
|
tester->assert_true(tester,(attribute->get_attribute_length(attribute) == 4),"get type check");
|
||||||
|
|
||||||
|
tester->assert_true(tester,(iterator->has_next(iterator)),"has_next call check");
|
||||||
|
|
||||||
|
iterator->current(iterator,(void **)&attribute);
|
||||||
|
|
||||||
|
|
||||||
|
tester->assert_true(tester,(attribute->get_attribute_type(attribute) == 4),"get type check");
|
||||||
|
tester->assert_true(tester,(attribute->get_attribute_length(attribute) == 4),"get type check");
|
||||||
|
|
||||||
|
iterator->current(iterator,(void **)&attribute);
|
||||||
|
|
||||||
|
tester->assert_false(tester,(iterator->has_next(iterator)),"has_next call check");
|
||||||
|
|
||||||
|
|
||||||
|
iterator->destroy(iterator);
|
||||||
|
|
||||||
|
if (status != SUCCESS)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
cp_payload->destroy(cp_payload);
|
||||||
|
parser->destroy(parser);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -145,4 +145,15 @@ void test_parser_with_delete_payload(tester_t *tester);
|
||||||
*/
|
*/
|
||||||
void test_parser_with_vendor_id_payload(tester_t *tester);
|
void test_parser_with_vendor_id_payload(tester_t *tester);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Test function used to test the parser_t functionality when
|
||||||
|
* parsing a CP payload.
|
||||||
|
*
|
||||||
|
* @param tester associated tester_t object
|
||||||
|
*
|
||||||
|
* @ingroup testcases
|
||||||
|
*/
|
||||||
|
void test_parser_with_cp_payload(tester_t *tester);
|
||||||
|
|
||||||
|
|
||||||
#endif /*PARSER_TEST_H_*/
|
#endif /*PARSER_TEST_H_*/
|
||||||
|
|
|
@ -94,6 +94,7 @@ test_t generator_test12 = {test_generator_with_cert_payload,"Generator: CERT Pay
|
||||||
test_t generator_test13 = {test_generator_with_certreq_payload,"Generator: CERTREQ Payload"};
|
test_t generator_test13 = {test_generator_with_certreq_payload,"Generator: CERTREQ Payload"};
|
||||||
test_t generator_test14 = {test_generator_with_delete_payload,"Generator: DELETE Payload"};
|
test_t generator_test14 = {test_generator_with_delete_payload,"Generator: DELETE Payload"};
|
||||||
test_t generator_test15 = {test_generator_with_vendor_id_payload,"Generator: VENDOR ID Payload"};
|
test_t generator_test15 = {test_generator_with_vendor_id_payload,"Generator: VENDOR ID Payload"};
|
||||||
|
test_t generator_test16 = {test_generator_with_cp_payload,"Generator: CP Payload"};
|
||||||
test_t parser_test1 = {test_parser_with_header_payload, "Parser: header payload"};
|
test_t parser_test1 = {test_parser_with_header_payload, "Parser: header payload"};
|
||||||
test_t parser_test2 = {test_parser_with_sa_payload, "Parser: sa payload"};
|
test_t parser_test2 = {test_parser_with_sa_payload, "Parser: sa payload"};
|
||||||
test_t parser_test3 = {test_parser_with_nonce_payload, "Parser: nonce payload"};
|
test_t parser_test3 = {test_parser_with_nonce_payload, "Parser: nonce payload"};
|
||||||
|
@ -106,6 +107,7 @@ test_t parser_test9 = {test_parser_with_cert_payload, "Parser: CERT payload"};
|
||||||
test_t parser_test10 = {test_parser_with_certreq_payload, "Parser: CERTREQ payload"};
|
test_t parser_test10 = {test_parser_with_certreq_payload, "Parser: CERTREQ payload"};
|
||||||
test_t parser_test11 = {test_parser_with_delete_payload, "Parser: DELETE payload"};
|
test_t parser_test11 = {test_parser_with_delete_payload, "Parser: DELETE payload"};
|
||||||
test_t parser_test12 = {test_parser_with_vendor_id_payload, "Parser: VENDOR ID payload"};
|
test_t parser_test12 = {test_parser_with_vendor_id_payload, "Parser: VENDOR ID payload"};
|
||||||
|
test_t parser_test13 = {test_parser_with_cp_payload, "Parser: CP payload"};
|
||||||
test_t packet_test = {test_packet,"Packet"};
|
test_t packet_test = {test_packet,"Packet"};
|
||||||
test_t diffie_hellman_test = {test_diffie_hellman,"Diffie Hellman"};
|
test_t diffie_hellman_test = {test_diffie_hellman,"Diffie Hellman"};
|
||||||
test_t sha1_hasher_test = {test_sha1_hasher,"SHA1 hasher"};
|
test_t sha1_hasher_test = {test_sha1_hasher,"SHA1 hasher"};
|
||||||
|
@ -200,6 +202,7 @@ int main()
|
||||||
&parser_test10,
|
&parser_test10,
|
||||||
&parser_test11,
|
&parser_test11,
|
||||||
&parser_test12,
|
&parser_test12,
|
||||||
|
&parser_test13,
|
||||||
&generator_test3,
|
&generator_test3,
|
||||||
&generator_test4,
|
&generator_test4,
|
||||||
&generator_test5,
|
&generator_test5,
|
||||||
|
@ -213,6 +216,7 @@ int main()
|
||||||
&generator_test13,
|
&generator_test13,
|
||||||
&generator_test14,
|
&generator_test14,
|
||||||
&generator_test15,
|
&generator_test15,
|
||||||
|
&generator_test16,
|
||||||
&ike_sa_manager_test,
|
&ike_sa_manager_test,
|
||||||
&packet_test,
|
&packet_test,
|
||||||
&diffie_hellman_test,
|
&diffie_hellman_test,
|
||||||
|
@ -238,13 +242,13 @@ int main()
|
||||||
daemon_create();
|
daemon_create();
|
||||||
|
|
||||||
charon->logger_manager->disable_logger_level(charon->logger_manager,TESTER,FULL);
|
charon->logger_manager->disable_logger_level(charon->logger_manager,TESTER,FULL);
|
||||||
// charon->logger_manager->enable_logger_level(charon->logger_manager,TESTER,RAW);
|
//charon->logger_manager->enable_logger_level(charon->logger_manager,TESTER,RAW);
|
||||||
|
|
||||||
tester_t *tester = tester_create(test_output, FALSE);
|
tester_t *tester = tester_create(test_output, FALSE);
|
||||||
|
|
||||||
|
|
||||||
tester->perform_tests(tester,all_tests);
|
tester->perform_tests(tester,all_tests);
|
||||||
// tester->perform_test(tester,&parser_test12);
|
// tester->perform_test(tester,&parser_test13);
|
||||||
|
|
||||||
|
|
||||||
tester->destroy(tester);
|
tester->destroy(tester);
|
||||||
|
|
Loading…
Reference in New Issue