denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed CONFIGURATION_ATTRIBUTE_LENGTH to streamline it with other ATTRIBUTE rules

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:38 +01:00
parent 05cb240215
commit c390569a76
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/generator.c
+3 -3
View File
@@ -214,7 +214,7 @@ static void generate_u_int_type(private_generator_t *this,
break; break;
case U_INT_16: case U_INT_16:
case PAYLOAD_LENGTH: case PAYLOAD_LENGTH:
case CONFIGURATION_ATTRIBUTE_LENGTH: case ATTRIBUTE_LENGTH:
number_of_bits = 16; number_of_bits = 16;
break; break;
case U_INT_32: case U_INT_32:
@@ -329,7 +329,7 @@ static void generate_u_int_type(private_generator_t *this,
} }
case U_INT_16: case U_INT_16:
case PAYLOAD_LENGTH: case PAYLOAD_LENGTH:
case CONFIGURATION_ATTRIBUTE_LENGTH: case ATTRIBUTE_LENGTH:
{ {
u_int16_t val = htons(*((u_int16_t*)(this->data_struct + offset))); u_int16_t val = htons(*((u_int16_t*)(this->data_struct + offset)));
if (this->debug) if (this->debug)
@@ -481,7 +481,7 @@ METHOD(generator_t, generate_payload, void,
case SPI_SIZE: case SPI_SIZE:
case TS_TYPE: case TS_TYPE:
case ATTRIBUTE_TYPE: case ATTRIBUTE_TYPE:
case CONFIGURATION_ATTRIBUTE_LENGTH: case ATTRIBUTE_LENGTH:
generate_u_int_type(this, rules[i].type, rules[i].offset); generate_u_int_type(this, rules[i].type, rules[i].offset);
break; break;
case RESERVED_BIT: case RESERVED_BIT:
src/libcharon/encoding/parser.c
+1 -1
View File
@@ -546,7 +546,7 @@ METHOD(parser_t, parse_payload, status_t,
} }
break; break;
} }
case CONFIGURATION_ATTRIBUTE_LENGTH: case ATTRIBUTE_LENGTH:
{ {
if (!parse_uint16(this, rule_number, output + rule->offset)) if (!parse_uint16(this, rule_number, output + rule->offset))
{ {
src/libcharon/encoding/payloads/configuration_attribute.c
+4 -4
View File
@@ -71,13 +71,13 @@ struct private_configuration_attribute_t {
*/ */
static encoding_rule_t encodings_v2[] = { static encoding_rule_t encodings_v2[] = {
/* 1 reserved bit */ /* 1 reserved bit */
{ RESERVED_BIT, offsetof(private_configuration_attribute_t, reserved) }, { RESERVED_BIT, offsetof(private_configuration_attribute_t, reserved) },
/* type of the attribute as 15 bit unsigned integer */ /* type of the attribute as 15 bit unsigned integer */
{ ATTRIBUTE_TYPE, offsetof(private_configuration_attribute_t, attr_type) }, { ATTRIBUTE_TYPE, offsetof(private_configuration_attribute_t, attr_type) },
/* Length of attribute value */ /* Length of attribute value */
{ CONFIGURATION_ATTRIBUTE_LENGTH, offsetof(private_configuration_attribute_t, length_or_value)}, { ATTRIBUTE_LENGTH, offsetof(private_configuration_attribute_t, length_or_value)},
/* Value of attribute if attribute format flag is zero */ /* Value of attribute if attribute format flag is zero */
{ ATTRIBUTE_VALUE, offsetof(private_configuration_attribute_t, value) }, { ATTRIBUTE_VALUE, offsetof(private_configuration_attribute_t, value) },
}; };
/* /*
src/libcharon/encoding/payloads/encodings.c
+1 -1
View File
@@ -32,7 +32,7 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA,
"ATTRIBUTE_FORMAT", "ATTRIBUTE_FORMAT",
"ATTRIBUTE_TYPE", "ATTRIBUTE_TYPE",
"ATTRIBUTE_LENGTH_OR_VALUE", "ATTRIBUTE_LENGTH_OR_VALUE",
"CONFIGURATION_ATTRIBUTE_LENGTH", "ATTRIBUTE_LENGTH",
"ATTRIBUTE_VALUE", "ATTRIBUTE_VALUE",
"TS_TYPE", "TS_TYPE",
"ADDRESS", "ADDRESS",
src/libcharon/encoding/payloads/encodings.h
+1 -1
View File
@@ -241,7 +241,7 @@ enum encoding_type_t {
* The value is written to the associated data struct. * The value is written to the associated data struct.
* The current read pointer is moved 16 bit forward afterwards. * The current read pointer is moved 16 bit forward afterwards.
*/ */
CONFIGURATION_ATTRIBUTE_LENGTH, ATTRIBUTE_LENGTH,
/** /**
* Depending on the field of type ATTRIBUTE_FORMAT * Depending on the field of type ATTRIBUTE_FORMAT