From e23b3bae41ea47b69a145892909492a59acae30c Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 15 Nov 2005 15:26:27 +0000 Subject: - nonce payload added - tested --- Source/charon/parser.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'Source/charon/parser.c') diff --git a/Source/charon/parser.c b/Source/charon/parser.c index bbb4bc689..e65f88ff6 100644 --- a/Source/charon/parser.c +++ b/Source/charon/parser.c @@ -304,7 +304,7 @@ static status_t parse_uint15(private_parser_t *this, int rule_number, u_int16_t /* caller interested in result ? */ if (output_pos != NULL) { - *output_pos = ntohs(*((u_int16_t*)this->byte_pos)) & 0xEFFF; + *output_pos = ntohs(*((u_int16_t*)this->byte_pos)) & ~0x8000; this->logger->log(this->logger, RAW, " => %d", *output_pos); } this->byte_pos += 2; @@ -507,8 +507,6 @@ static status_t parse_chunk(private_parser_t *this, int rule_number, chunk_t *ou return OUT_OF_RES; } memcpy(output_pos->ptr, this->byte_pos, length); - - this->logger->log_bytes(this->logger, RAW, " =>", output_pos->ptr, length); } this->byte_pos += length; @@ -712,16 +710,12 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ } case ATTRIBUTE_LENGTH_OR_VALUE: { - this->logger->log_bytes(this->logger, RAW, "ATTRIBUTE_LENGTH_OR_VALUE", this->byte_pos, 2); - 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); - this->logger->log_bytes(this->logger, RAW, "ATTRIBUTE_LENGTH_OR_VALUE", output + rule->offset, 2); - break; } case ATTRIBUTE_VALUE: @@ -736,6 +730,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ } break; } + case NONCE_DATA: + { + size_t nonce_length = payload_length - 4; + if (this->parse_chunk(this, rule_number, output + rule->offset, nonce_length) != SUCCESS) + { + pld->destroy(pld); + return PARSE_ERROR; + } + break; + } default: { this->logger->log(this->logger, ERROR, " no rule to parse rule %d %s (%d)", rule_number, mapping_find(encoding_type_t_mappings, rule->type), rule->type); -- cgit v1.2.3