Renamed CONFIGURATION_ATTRIBUTE_LENGTH to streamline it with other ATTRIBUTE rules
This commit is contained in:
parent
05cb240215
commit
c390569a76
|
@ -214,7 +214,7 @@ static void generate_u_int_type(private_generator_t *this,
|
|||
break;
|
||||
case U_INT_16:
|
||||
case PAYLOAD_LENGTH:
|
||||
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||
case ATTRIBUTE_LENGTH:
|
||||
number_of_bits = 16;
|
||||
break;
|
||||
case U_INT_32:
|
||||
|
@ -329,7 +329,7 @@ static void generate_u_int_type(private_generator_t *this,
|
|||
}
|
||||
case U_INT_16:
|
||||
case PAYLOAD_LENGTH:
|
||||
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||
case ATTRIBUTE_LENGTH:
|
||||
{
|
||||
u_int16_t val = htons(*((u_int16_t*)(this->data_struct + offset)));
|
||||
if (this->debug)
|
||||
|
@ -481,7 +481,7 @@ METHOD(generator_t, generate_payload, void,
|
|||
case SPI_SIZE:
|
||||
case TS_TYPE:
|
||||
case ATTRIBUTE_TYPE:
|
||||
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||
case ATTRIBUTE_LENGTH:
|
||||
generate_u_int_type(this, rules[i].type, rules[i].offset);
|
||||
break;
|
||||
case RESERVED_BIT:
|
||||
|
|
|
@ -546,7 +546,7 @@ METHOD(parser_t, parse_payload, status_t,
|
|||
}
|
||||
break;
|
||||
}
|
||||
case CONFIGURATION_ATTRIBUTE_LENGTH:
|
||||
case ATTRIBUTE_LENGTH:
|
||||
{
|
||||
if (!parse_uint16(this, rule_number, output + rule->offset))
|
||||
{
|
||||
|
|
|
@ -71,13 +71,13 @@ struct private_configuration_attribute_t {
|
|||
*/
|
||||
static encoding_rule_t encodings_v2[] = {
|
||||
/* 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 */
|
||||
{ ATTRIBUTE_TYPE, offsetof(private_configuration_attribute_t, attr_type) },
|
||||
{ ATTRIBUTE_TYPE, offsetof(private_configuration_attribute_t, attr_type) },
|
||||
/* 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 */
|
||||
{ ATTRIBUTE_VALUE, offsetof(private_configuration_attribute_t, value) },
|
||||
{ ATTRIBUTE_VALUE, offsetof(private_configuration_attribute_t, value) },
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -32,7 +32,7 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA,
|
|||
"ATTRIBUTE_FORMAT",
|
||||
"ATTRIBUTE_TYPE",
|
||||
"ATTRIBUTE_LENGTH_OR_VALUE",
|
||||
"CONFIGURATION_ATTRIBUTE_LENGTH",
|
||||
"ATTRIBUTE_LENGTH",
|
||||
"ATTRIBUTE_VALUE",
|
||||
"TS_TYPE",
|
||||
"ADDRESS",
|
||||
|
|
|
@ -241,7 +241,7 @@ enum encoding_type_t {
|
|||
* The value is written to the associated data struct.
|
||||
* The current read pointer is moved 16 bit forward afterwards.
|
||||
*/
|
||||
CONFIGURATION_ATTRIBUTE_LENGTH,
|
||||
ATTRIBUTE_LENGTH,
|
||||
|
||||
/**
|
||||
* Depending on the field of type ATTRIBUTE_FORMAT
|
||||
|
|
Loading…
Reference in New Issue