diff options
Diffstat (limited to 'Source/charon/encoding')
| -rw-r--r-- | Source/charon/encoding/generator.c | 32 | ||||
| -rw-r--r-- | Source/charon/encoding/message.c | 84 | ||||
| -rw-r--r-- | Source/charon/encoding/parser.c | 44 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/encryption_payload.c | 30 |
4 files changed, 95 insertions, 95 deletions
diff --git a/Source/charon/encoding/generator.c b/Source/charon/encoding/generator.c index 56719c995..f1d7462b0 100644 --- a/Source/charon/encoding/generator.c +++ b/Source/charon/encoding/generator.c @@ -341,7 +341,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t u_int8_t low_val = *(this->out_position) & 0x0F; /* highval is set, low_val is not changed */ *(this->out_position) = high_val | low_val; - this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position)); + this->logger->log(this->logger, RAW|LEVEL2, " => 0x%x", *(this->out_position)); /* write position is not changed, just bit position is moved */ this->current_bit = 4; } @@ -352,7 +352,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t /* lowval of current byte in buffer has to be set to the new value*/ u_int low_val = *((u_int8_t *)(this->data_struct + offset)) & 0x0F; *(this->out_position) = high_val | low_val; - this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position)); + this->logger->log(this->logger, RAW|LEVEL2, " => 0x%x", *(this->out_position)); this->out_position++; this->current_bit = 0; @@ -370,7 +370,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t { /* 8 bit values are written as they are */ *this->out_position = *((u_int8_t *)(this->data_struct + offset)); - this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position)); + this->logger->log(this->logger, RAW|LEVEL2, " => 0x%x", *(this->out_position)); this->out_position++; break; @@ -392,7 +392,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t int16_val = int16_val & 0xFF7F; int16_val = int16_val | attribute_format_flag; - this->logger->log(this->logger, RAW|MOST, " => 0x%x", int16_val); + this->logger->log(this->logger, RAW|LEVEL2, " => 0x%x", int16_val); /* write bytes to buffer (set bit is overwritten)*/ this->write_bytes_to_buffer(this,&int16_val,sizeof(u_int16_t)); this->current_bit = 0; @@ -403,14 +403,14 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t case CONFIGURATION_ATTRIBUTE_LENGTH: { 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|LEVEL2, " =>", (void*)&int16_val, sizeof(int16_val)); this->write_bytes_to_buffer(this,&int16_val,sizeof(u_int16_t)); break; } case U_INT_32: { u_int32_t int32_val = htonl(*((u_int32_t*)(this->data_struct + offset))); - this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int32_val, sizeof(int32_val)); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " =>", (void*)&int32_val, sizeof(int32_val)); this->write_bytes_to_buffer(this,&int32_val,sizeof(u_int32_t)); break; } @@ -419,8 +419,8 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t /* 64 bit integers are written as two 32 bit integers */ u_int32_t int32_val_low = htonl(*((u_int32_t*)(this->data_struct + offset))); u_int32_t int32_val_high = htonl(*((u_int32_t*)(this->data_struct + offset) + 1)); - this->logger->log_bytes(this->logger, RAW|MOST, " => (low)", (void*)&int32_val_low, sizeof(int32_val_low)); - this->logger->log_bytes(this->logger, RAW|MOST, " => (high)", (void*)&int32_val_high, sizeof(int32_val_high)); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " => (low)", (void*)&int32_val_low, sizeof(int32_val_low)); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " => (high)", (void*)&int32_val_high, sizeof(int32_val_high)); /* TODO add support for big endian machines */ this->write_bytes_to_buffer(this,&int32_val_high,sizeof(u_int32_t)); this->write_bytes_to_buffer(this,&int32_val_low,sizeof(u_int32_t)); @@ -431,7 +431,7 @@ static void generate_u_int_type (private_generator_t *this,encoding_type_t int_t { /* 64 bit are written as they come :-) */ this->write_bytes_to_buffer(this,(this->data_struct + offset),sizeof(u_int64_t)); - this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)(this->data_struct + offset), sizeof(u_int64_t)); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " =>", (void*)(this->data_struct + offset), sizeof(u_int64_t)); break; } default: @@ -516,7 +516,7 @@ static void generate_flag (private_generator_t *this,u_int32_t offset) *(this->out_position) = *(this->out_position) | flag; - this->logger->log(this->logger, RAW|MOST, " => 0x0%x", *(this->out_position)); + this->logger->log(this->logger, RAW|LEVEL2, " => 0x0%x", *(this->out_position)); this->current_bit++; if (this->current_bit >= 8) @@ -540,7 +540,7 @@ static void generate_from_chunk (private_generator_t *this,u_int32_t offset) /* position in buffer */ chunk_t *attribute_value = (chunk_t *)(this->data_struct + offset); - this->logger->log_chunk(this->logger, RAW|MOST, " =>", attribute_value); + this->logger->log_chunk(this->logger, RAW|LEVEL2, " =>", attribute_value); /* use write_bytes_to_buffer function to do the job */ this->write_bytes_to_buffer(this,attribute_value->ptr,attribute_value->len); @@ -558,7 +558,7 @@ static void make_space_available (private_generator_t *this, size_t bits) size_t new_buffer_size = old_buffer_size + GENERATOR_DATA_BUFFER_INCREASE_VALUE; size_t out_position_offset = ((this->out_position) - (this->buffer)); - this->logger->log(this->logger, CONTROL|ALL, "increased gen buffer from %d to %d byte", + this->logger->log(this->logger, CONTROL|LEVEL3, "increased gen buffer from %d to %d byte", old_buffer_size, new_buffer_size); /* Reallocate space for new buffer */ @@ -655,7 +655,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) payload_start = this->out_position; - this->logger->log(this->logger, CONTROL|MORE, "generating payload of type %s", + this->logger->log(this->logger, CONTROL|LEVEL1, "generating payload of type %s", mapping_find(payload_type_m,payload_type)); /* each payload has its own encoding rules */ @@ -663,7 +663,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) for (i = 0; i < rule_count;i++) { - this->logger->log(this->logger, CONTROL|MOST, " generating rule %d %s", + this->logger->log(this->logger, CONTROL|LEVEL2, " generating rule %d %s", i, mapping_find(encoding_type_m,rules[i].type)); switch (rules[i].type) { @@ -964,7 +964,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) { if (this->attribute_format == FALSE) { - this->logger->log(this->logger, CONTROL|ALL, "attribute value has not fixed size"); + this->logger->log(this->logger, CONTROL|LEVEL3, "attribute value has not fixed size"); /* the attribute value is generated */ this->generate_from_chunk(this,rules[i].offset); } @@ -1017,7 +1017,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) return; } } - this->logger->log_bytes(this->logger, RAW|MORE, "generated data for this payload", + this->logger->log_bytes(this->logger, RAW|LEVEL1, "generated data for this payload", payload_start, this->out_position-payload_start); } diff --git a/Source/charon/encoding/message.c b/Source/charon/encoding/message.c index 7506bcde7..cb4db5ba9 100644 --- a/Source/charon/encoding/message.c +++ b/Source/charon/encoding/message.c @@ -479,7 +479,7 @@ static void add_payload(private_message_t *this, payload_t *payload) payload->set_next_type(payload, NO_PAYLOAD); this->payloads->insert_last(this->payloads, (void*)payload); - this->logger->log(this->logger, CONTROL|MORE, "Added payload of type %s to message", + this->logger->log(this->logger, CONTROL|LEVEL1, "Added payload of type %s to message", mapping_find(payload_type_m, payload->get_type(payload))); } @@ -543,7 +543,7 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* if (this->exchange_type == EXCHANGE_TYPE_UNDEFINED) { - this->logger->log(this->logger, ERROR | MORE, "Exchange type %s is not defined", + this->logger->log(this->logger, ERROR | LEVEL1, "Exchange type %s is not defined", mapping_find(exchange_type_m,this->exchange_type)); return INVALID_STATE; } @@ -551,7 +551,7 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* if (this->packet->get_source(this->packet) == NULL || this->packet->get_destination(this->packet) == NULL) { - this->logger->log(this->logger, ERROR|MORE, "%s not defined", + this->logger->log(this->logger, ERROR|LEVEL1, "%s not defined", !this->packet->get_source(this->packet) ? "source" : "destination"); return INVALID_STATE; } @@ -571,7 +571,7 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* status = this->encrypt_payloads(this, crypter, signer); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | MORE, "Could not encrypt payloads"); + this->logger->log(this->logger, ERROR | LEVEL1, "Could not encrypt payloads"); return status; } @@ -615,7 +615,7 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* /* if last payload is of type encrypted, integrity checksum if necessary */ if (payload->get_type(payload) == ENCRYPTED) { - this->logger->log(this->logger, CONTROL | MORE, "Build signature on whole message"); + this->logger->log(this->logger, CONTROL | LEVEL1, "Build signature on whole message"); encryption_payload_t *encryption_payload = (encryption_payload_t*)payload; status = encryption_payload->build_signature(encryption_payload, packet_data); if (status != SUCCESS) @@ -659,13 +659,13 @@ static status_t parse_header(private_message_t *this) status_t status; - this->logger->log(this->logger, CONTROL|MORE, "parsing Header of message"); + this->logger->log(this->logger, CONTROL|LEVEL1, "parsing Header of message"); this->parser->reset_context(this->parser); status = this->parser->parse_payload(this->parser,HEADER,(payload_t **) &ike_header); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | MORE, "Header could not be parsed"); + this->logger->log(this->logger, ERROR | LEVEL1, "Header could not be parsed"); return status; } @@ -674,7 +674,7 @@ static status_t parse_header(private_message_t *this) status = ike_header->payload_interface.verify(&(ike_header->payload_interface)); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | MORE, "Header verification failed"); + this->logger->log(this->logger, ERROR | LEVEL1, "Header verification failed"); ike_header->destroy(ike_header); return status; } @@ -723,7 +723,7 @@ static status_t parse_body(private_message_t *this, crypter_t *crypter, signer_t current_payload_type = this->first_payload; - this->logger->log(this->logger, CONTROL|MORE, "Parsing body of message, first payload %s", + this->logger->log(this->logger, CONTROL|LEVEL1, "Parsing body of message, first payload %s", mapping_find(payload_type_m, current_payload_type)); /* parse payload for payload, while there are more available */ @@ -731,7 +731,7 @@ static status_t parse_body(private_message_t *this, crypter_t *crypter, signer_t { payload_t *current_payload; - this->logger->log(this->logger, CONTROL|MOST, "Start parsing payload of type %s", + this->logger->log(this->logger, CONTROL|LEVEL2, "Start parsing payload of type %s", mapping_find(payload_type_m, current_payload_type)); /* parse current payload */ @@ -743,7 +743,7 @@ static status_t parse_body(private_message_t *this, crypter_t *crypter, signer_t return status; } - this->logger->log(this->logger, CONTROL|MOST, "Verify payload of type %s", + this->logger->log(this->logger, CONTROL|LEVEL2, "Verify payload of type %s", mapping_find(payload_type_m, current_payload_type)); /* verify it, stop parsig if its invalid */ @@ -757,14 +757,14 @@ static status_t parse_body(private_message_t *this, crypter_t *crypter, signer_t return status; } - this->logger->log(this->logger, CONTROL|MOST, "Payload verified. Adding to payload list", + this->logger->log(this->logger, CONTROL|LEVEL2, "Payload verified. Adding to payload list", mapping_find(payload_type_m, current_payload_type)); this->payloads->insert_last(this->payloads,current_payload); /* an encryption payload is the last one, so STOP here. decryption is done later */ if (current_payload_type == ENCRYPTED) { - this->logger->log(this->logger, CONTROL|MOST, "Payload of type encrypted found. Stop parsing", + this->logger->log(this->logger, CONTROL|LEVEL2, "Payload of type encrypted found. Stop parsing", mapping_find(payload_type_m, current_payload_type)); break; } @@ -804,7 +804,7 @@ static status_t verify(private_message_t *this) iterator_t *iterator; size_t total_found_payloads = 0; - this->logger->log(this->logger, CONTROL|MORE, "Verifying message structure"); + this->logger->log(this->logger, CONTROL|LEVEL1, "Verifying message structure"); iterator = this->payloads->create_iterator(this->payloads,TRUE); /* check for payloads with wrong count*/ @@ -829,7 +829,7 @@ static status_t verify(private_message_t *this) unknown_payload_t *unknown_payload = (unknown_payload_t*)current_payload; if (unknown_payload->is_critical(unknown_payload)) { - this->logger->log(this->logger, ERROR|MORE, "%s (%d) is not supported, but its critical!", + this->logger->log(this->logger, ERROR|LEVEL1, "%s (%d) is not supported, but its critical!", mapping_find(payload_type_m, current_payload_type), current_payload_type); iterator->destroy(iterator); return NOT_SUPPORTED; @@ -839,13 +839,13 @@ static status_t verify(private_message_t *this) { found_payloads++; total_found_payloads++; - this->logger->log(this->logger, CONTROL|MOST, "Found payload of type %s", + this->logger->log(this->logger, CONTROL|LEVEL2, "Found payload of type %s", mapping_find(payload_type_m, this->message_rule->payload_rules[i].payload_type)); /* as soon as ohe payload occures more then specified, the verification fails */ if (found_payloads > this->message_rule->payload_rules[i].max_occurence) { - this->logger->log(this->logger, ERROR|MORE, "Payload of type %s more than %d times (%d) occured in current message", + this->logger->log(this->logger, ERROR|LEVEL1, "Payload of type %s more than %d times (%d) occured in current message", mapping_find(payload_type_m, current_payload_type), this->message_rule->payload_rules[i].max_occurence, found_payloads); iterator->destroy(iterator); @@ -856,7 +856,7 @@ static status_t verify(private_message_t *this) if (found_payloads < this->message_rule->payload_rules[i].min_occurence) { - this->logger->log(this->logger, ERROR|MORE, "Payload of type %s not occured %d times (%d)", + this->logger->log(this->logger, ERROR|LEVEL1, "Payload of type %s not occured %d times (%d)", mapping_find(payload_type_m, this->message_rule->payload_rules[i].payload_type), this->message_rule->payload_rules[i].min_occurence, found_payloads); iterator->destroy(iterator); @@ -899,7 +899,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig /* needed to check */ current_payload_type = current_payload->get_type(current_payload); - this->logger->log(this->logger, CONTROL|MOST, "Process payload of type %s", + this->logger->log(this->logger, CONTROL|LEVEL2, "Process payload of type %s", mapping_find(payload_type_m,current_payload_type)); if (current_payload_type == ENCRYPTED) @@ -909,30 +909,30 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig encryption_payload = (encryption_payload_t*)current_payload; - this->logger->log(this->logger, CONTROL | MOST, "Found an encryption payload"); + this->logger->log(this->logger, CONTROL | LEVEL2, "Found an encryption payload"); if (payload_number != this->payloads->get_count(this->payloads)) { /* encrypted payload is not last one */ - this->logger->log(this->logger, ERROR | MORE, "Encrypted payload is not last payload"); + this->logger->log(this->logger, ERROR | LEVEL1, "Encrypted payload is not last payload"); iterator->destroy(iterator); return FAILED; } /* decrypt */ encryption_payload->set_transforms(encryption_payload, crypter, signer); - this->logger->log(this->logger, CONTROL | MORE, "Verify signature of encryption payload"); + this->logger->log(this->logger, CONTROL | LEVEL1, "Verify signature of encryption payload"); status = encryption_payload->verify_signature(encryption_payload, this->packet->get_data(this->packet)); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | MORE, "encryption payload signature invalid"); + this->logger->log(this->logger, ERROR | LEVEL1, "encryption payload signature invalid"); iterator->destroy(iterator); return status; } - this->logger->log(this->logger, CONTROL | MOST, "Decrypt content of encryption payload"); + this->logger->log(this->logger, CONTROL | LEVEL2, "Decrypt content of encryption payload"); status = encryption_payload->decrypt(encryption_payload); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | MORE, "Encrypted payload could not be decrypted and parsed: %s", + this->logger->log(this->logger, ERROR | LEVEL1, "Encrypted payload could not be decrypted and parsed: %s", mapping_find(status_m, status)); iterator->destroy(iterator); return status; @@ -944,7 +944,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig /* check if there are payloads contained in the encryption payload */ if (encryption_payload->get_payload_count(encryption_payload) == 0) { - this->logger->log(this->logger, CONTROL|MOST, "Encrypted payload is empty"); + this->logger->log(this->logger, CONTROL|LEVEL2, "Encrypted payload is empty"); /* remove the encryption payload, is not needed anymore */ iterator->remove(iterator); /* encrypted payload contains no other payload */ @@ -974,7 +974,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig while (encryption_payload->get_payload_count(encryption_payload) > 0) { encryption_payload->remove_first_payload(encryption_payload, ¤t_encrypted_payload); - this->logger->log(this->logger, CONTROL | MORE, "Insert unencrypted payload of type %s at end of list.", + this->logger->log(this->logger, CONTROL | LEVEL1, "Insert unencrypted payload of type %s at end of list.", mapping_find(payload_type_m,current_encrypted_payload->get_type(current_encrypted_payload))); this->payloads->insert_last(this->payloads,current_encrypted_payload); } @@ -991,7 +991,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig if (status != SUCCESS) { /* payload is not allowed */ - this->logger->log(this->logger, ERROR | MORE, "Payload type %s not allowed",mapping_find(payload_type_m,current_payload_type)); + this->logger->log(this->logger, ERROR | LEVEL1, "Payload type %s not allowed",mapping_find(payload_type_m,current_payload_type)); iterator->destroy(iterator); return status; } @@ -1000,7 +1000,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig if (payload_rule->encrypted != current_payload_was_encrypted) { /* payload was not encrypted, but should have been. or vice-versa */ - this->logger->log(this->logger, ERROR | MORE, "Payload type %s should be %s!", + this->logger->log(this->logger, ERROR | LEVEL1, "Payload type %s should be %s!", mapping_find(payload_type_m,current_payload_type), (payload_rule->encrypted) ? "encrypted" : "not encrypted"); iterator->destroy(iterator); @@ -1027,12 +1027,12 @@ static status_t encrypt_payloads (private_message_t *this,crypter_t *crypter, si if (!this->message_rule->encrypted_content) { - this->logger->log(this->logger, CONTROL | MORE, "Message doesn't have to be encrypted"); + this->logger->log(this->logger, CONTROL | LEVEL1, "Message doesn't have to be encrypted"); /* message contains no content to encrypt */ return SUCCESS; } - this->logger->log(this->logger, CONTROL | MOST, "Copy all payloads to a temporary list"); + this->logger->log(this->logger, CONTROL | LEVEL2, "Copy all payloads to a temporary list"); all_payloads = linked_list_create(); /* first copy all payloads in a temporary list */ @@ -1043,7 +1043,7 @@ static status_t encrypt_payloads (private_message_t *this,crypter_t *crypter, si all_payloads->insert_last(all_payloads,current_payload); } - this->logger->log(this->logger, CONTROL | MOST, "Check each payloads if they have to get encrypted"); + this->logger->log(this->logger, CONTROL | LEVEL2, "Check each payloads if they have to get encrypted"); while (all_payloads->get_count(all_payloads) > 0) { payload_rule_t *payload_rule; @@ -1051,7 +1051,7 @@ static status_t encrypt_payloads (private_message_t *this,crypter_t *crypter, si bool to_encrypt = FALSE; all_payloads->remove_first(all_payloads,(void **)¤t_payload); - this->logger->log(this->logger, CONTROL | ALL, "Get rule for payload %s", + this->logger->log(this->logger, CONTROL | LEVEL3, "Get rule for payload %s", mapping_find(payload_type_m,current_payload->get_type(current_payload))); status = this->get_payload_rule(this,current_payload->get_type(current_payload),&payload_rule); @@ -1059,13 +1059,13 @@ static status_t encrypt_payloads (private_message_t *this,crypter_t *crypter, si * that they don't have to be encrypted */ if ((status == SUCCESS) && (payload_rule->encrypted)) { - this->logger->log(this->logger, CONTROL | MOST, "Payload %s has to get encrypted", + this->logger->log(this->logger, CONTROL | LEVEL2, "Payload %s has to get encrypted", mapping_find(payload_type_m,current_payload->get_type(current_payload))); to_encrypt = TRUE; } else if (status != SUCCESS) { - this->logger->log(this->logger, CONTROL | MOST, "Payload %s not defined for exchange type %s. Handle it anyway", + this->logger->log(this->logger, CONTROL | LEVEL2, "Payload %s not defined for exchange type %s. Handle it anyway", mapping_find(payload_type_m,current_payload->get_type(current_payload)), mapping_find(exchange_type_m,this->exchange_type)); } @@ -1076,14 +1076,14 @@ static status_t encrypt_payloads (private_message_t *this,crypter_t *crypter, si { encryption_payload = encryption_payload_create(); } - this->logger->log(this->logger, CONTROL | MOST, "Insert payload %s to encryption payload", + this->logger->log(this->logger, CONTROL | LEVEL2, "Insert payload %s to encryption payload", mapping_find(payload_type_m,current_payload->get_type(current_payload))); encryption_payload->add_payload(encryption_payload,current_payload); } else { - this->logger->log(this->logger, CONTROL | MOST, "Insert payload %s as payload wich does not have to be encrypted", + this->logger->log(this->logger, CONTROL | LEVEL2, "Insert payload %s as payload wich does not have to be encrypted", mapping_find(payload_type_m,current_payload->get_type(current_payload))); this->public.add_payload(&(this->public), (payload_t*)encryption_payload); } @@ -1092,11 +1092,11 @@ static status_t encrypt_payloads (private_message_t *this,crypter_t *crypter, si status = SUCCESS; if (encryption_payload != NULL) { - this->logger->log(this->logger, CONTROL | MOST, "Set transforms for encryption payload "); + this->logger->log(this->logger, CONTROL | LEVEL2, "Set transforms for encryption payload "); encryption_payload->set_transforms(encryption_payload,crypter,signer); - this->logger->log(this->logger, CONTROL | MORE, "Encrypt all payloads of encrypted payload"); + this->logger->log(this->logger, CONTROL | LEVEL1, "Encrypt all payloads of encrypted payload"); status = encryption_payload->encrypt(encryption_payload); - this->logger->log(this->logger, CONTROL | MOST, "Add encrypted payload to payload list"); + this->logger->log(this->logger, CONTROL | LEVEL2, "Add encrypted payload to payload list"); this->public.add_payload(&(this->public), (payload_t*)encryption_payload); } @@ -1113,7 +1113,7 @@ static void destroy (private_message_t *this) { iterator_t *iterator; - this->logger->log(this->logger, CONTROL|ALL, "Going to destroy message_t object"); + this->logger->log(this->logger, CONTROL|LEVEL3, "Going to destroy message_t object"); this->packet->destroy(this->packet); @@ -1127,7 +1127,7 @@ static void destroy (private_message_t *this) { payload_t *payload; iterator->current(iterator, (void**)&payload); - this->logger->log(this->logger, CONTROL|ALL, "Destroying payload of type %s", + this->logger->log(this->logger, CONTROL|LEVEL3, "Destroying payload of type %s", mapping_find(payload_type_m, payload->get_type(payload))); payload->destroy(payload); } diff --git a/Source/charon/encoding/parser.c b/Source/charon/encoding/parser.c index 06a7cade7..83643bf6b 100644 --- a/Source/charon/encoding/parser.c +++ b/Source/charon/encoding/parser.c @@ -246,7 +246,7 @@ static status_t parse_uint4(private_parser_t *this, int rule_number, u_int8_t *o { if (this->byte_pos + sizeof(u_int8_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; @@ -279,7 +279,7 @@ static status_t parse_uint4(private_parser_t *this, int rule_number, u_int8_t *o if (output_pos != NULL) { - this->logger->log(this->logger, RAW|MOST, " => %d", *output_pos); + this->logger->log(this->logger, RAW|LEVEL2, " => %d", *output_pos); } return SUCCESS; @@ -292,7 +292,7 @@ static status_t parse_uint8(private_parser_t *this, int rule_number, u_int8_t *o { if (this->byte_pos + sizeof(u_int8_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; @@ -309,7 +309,7 @@ static status_t parse_uint8(private_parser_t *this, int rule_number, u_int8_t *o if (output_pos != NULL) { *output_pos = *(this->byte_pos); - this->logger->log(this->logger, RAW|MOST, " => %d", *output_pos); + this->logger->log(this->logger, RAW|LEVEL2, " => %d", *output_pos); } this->byte_pos++; @@ -323,7 +323,7 @@ static status_t parse_uint15(private_parser_t *this, int rule_number, u_int16_t { if (this->byte_pos + sizeof(u_int16_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; @@ -339,7 +339,7 @@ static status_t parse_uint15(private_parser_t *this, int rule_number, u_int16_t if (output_pos != NULL) { *output_pos = ntohs(*((u_int16_t*)this->byte_pos)) & ~0x8000; - this->logger->log(this->logger, RAW|MOST, " => %d", *output_pos); + this->logger->log(this->logger, RAW|LEVEL2, " => %d", *output_pos); } this->byte_pos += 2; this->bit_pos = 0; @@ -354,7 +354,7 @@ static status_t parse_uint16(private_parser_t *this, int rule_number, u_int16_t { if (this->byte_pos + sizeof(u_int16_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; } @@ -370,7 +370,7 @@ static status_t parse_uint16(private_parser_t *this, int rule_number, u_int16_t { *output_pos = ntohs(*((u_int16_t*)this->byte_pos)); - this->logger->log(this->logger, RAW|MOST, " => %d", *output_pos); + this->logger->log(this->logger, RAW|LEVEL2, " => %d", *output_pos); } this->byte_pos += 2; @@ -383,7 +383,7 @@ static status_t parse_uint32(private_parser_t *this, int rule_number, u_int32_t { if (this->byte_pos + sizeof(u_int32_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; } @@ -399,7 +399,7 @@ static status_t parse_uint32(private_parser_t *this, int rule_number, u_int32_t { *output_pos = ntohl(*((u_int32_t*)this->byte_pos)); - this->logger->log(this->logger, RAW|MOST, " => %d", *output_pos); + this->logger->log(this->logger, RAW|LEVEL2, " => %d", *output_pos); } this->byte_pos += 4; @@ -413,7 +413,7 @@ static status_t parse_uint64(private_parser_t *this, int rule_number, u_int64_t { if (this->byte_pos + sizeof(u_int64_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; } @@ -431,7 +431,7 @@ static status_t parse_uint64(private_parser_t *this, int rule_number, u_int64_t *(output_pos + 1) = ntohl(*((u_int32_t*)this->byte_pos)); *output_pos = ntohl(*(((u_int32_t*)this->byte_pos) + 1)); - this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)output_pos, 8); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " =>", (void*)output_pos, 8); } this->byte_pos += 8; @@ -445,7 +445,7 @@ static status_t parse_bytes (private_parser_t *this, int rule_number, u_int8_t * { if (this->byte_pos + bytes > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; } @@ -462,7 +462,7 @@ static status_t parse_bytes (private_parser_t *this, int rule_number, u_int8_t * { memcpy(output_pos,this->byte_pos,bytes); - this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)output_pos, bytes); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " =>", (void*)output_pos, bytes); } this->byte_pos += bytes; @@ -476,7 +476,7 @@ static status_t parse_bit(private_parser_t *this, int rule_number, bool *output_ { if (this->byte_pos + sizeof(u_int8_t) > this->input_roof) { - this->logger->log(this->logger, ERROR|MORE, " not enough input to parse rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " not enough input to parse rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; } @@ -493,7 +493,7 @@ static status_t parse_bit(private_parser_t *this, int rule_number, bool *output_ *output_pos = TRUE; } - this->logger->log(this->logger, RAW|MOST, " => %d", *output_pos); + this->logger->log(this->logger, RAW|LEVEL2, " => %d", *output_pos); } this->bit_pos = (this->bit_pos + 1) % 8; if (this->bit_pos == 0) @@ -513,7 +513,7 @@ static status_t parse_list(private_parser_t *this, int rule_number, linked_list_ if (length < 0) { - this->logger->log(this->logger, ERROR|MORE, " invalid length for rule %d %s", + this->logger->log(this->logger, ERROR|LEVEL1, " invalid length for rule %d %s", rule_number, mapping_find(encoding_type_m, this->rules[rule_number].type)); return PARSE_ERROR; } @@ -530,7 +530,7 @@ static status_t parse_list(private_parser_t *this, int rule_number, linked_list_ u_int8_t *pos_before = this->byte_pos; payload_t *payload; status_t status; - this->logger->log(this->logger, CONTROL|MORE, " %d bytes left, parsing recursivly %s", + this->logger->log(this->logger, CONTROL|LEVEL1, " %d bytes left, parsing recursivly %s", length, mapping_find(payload_type_m, payload_type)); status = this->public.parse_payload((parser_t*)this, payload_type, &payload); if (status != SUCCESS) @@ -570,7 +570,7 @@ static status_t parse_chunk(private_parser_t *this, int rule_number, chunk_t *ou memcpy(output_pos->ptr, this->byte_pos, length); } this->byte_pos += length; - this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)output_pos->ptr, length); + this->logger->log_bytes(this->logger, RAW|LEVEL2, " =>", (void*)output_pos->ptr, length); return SUCCESS; } @@ -591,7 +591,7 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ /* create instance of the payload to parse */ pld = payload_create(payload_type); - this->logger->log(this->logger, CONTROL|MORE, "parsing %s payload, %d bytes left", + this->logger->log(this->logger, CONTROL|LEVEL1, "parsing %s payload, %d bytes left", mapping_find(payload_type_m, payload_type), this->input_roof-this->byte_pos); @@ -600,7 +600,7 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ if (pld->get_type(pld) == UNKNOWN_PAYLOAD) { - this->logger->log(this->logger, ERROR|MORE, " payload type %d is unknown, handling as %s", + this->logger->log(this->logger, ERROR|LEVEL1, " payload type %d is unknown, handling as %s", payload_type, mapping_find(payload_type_m, UNKNOWN_PAYLOAD)); } @@ -612,7 +612,7 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ for (rule_number = 0; rule_number < rule_count; rule_number++) { rule = &(this->rules[rule_number]); - this->logger->log(this->logger, CONTROL|MOST, " parsing rule %d %s", + this->logger->log(this->logger, CONTROL|LEVEL2, " parsing rule %d %s", rule_number, mapping_find(encoding_type_m, rule->type)); switch (rule->type) { diff --git a/Source/charon/encoding/payloads/encryption_payload.c b/Source/charon/encoding/payloads/encryption_payload.c index 5ae44acc5..52918df04 100644 --- a/Source/charon/encoding/payloads/encryption_payload.c +++ b/Source/charon/encoding/payloads/encryption_payload.c @@ -288,7 +288,7 @@ static status_t encrypt(private_encryption_payload_t *this) /* build payload chunk */ this->generate(this); - this->logger->log(this->logger, CONTROL|MOST, "encrypting payloads"); + this->logger->log(this->logger, CONTROL|LEVEL2, "encrypting payloads"); /* build padding */ block_size = this->crypter->get_block_size(this->crypter); @@ -315,7 +315,7 @@ static status_t encrypt(private_encryption_payload_t *this) allocator_free(to_crypt.ptr); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR|MORE, "encryption failed"); + this->logger->log(this->logger, ERROR|LEVEL1, "encryption failed"); allocator_free(iv.ptr); return status; } @@ -344,7 +344,7 @@ static status_t decrypt(private_encryption_payload_t *this) status_t status; - this->logger->log(this->logger, CONTROL|MOST, "decrypting encryption payload"); + this->logger->log(this->logger, CONTROL|LEVEL2, "decrypting encryption payload"); if (this->signer == NULL || this->crypter == NULL) { @@ -366,7 +366,7 @@ static status_t decrypt(private_encryption_payload_t *this) */ if (concatenated.len < iv.len) { - this->logger->log(this->logger, ERROR|MORE, "could not decrypt, invalid input"); + this->logger->log(this->logger, ERROR|LEVEL1, "could not decrypt, invalid input"); return FAILED; } @@ -376,7 +376,7 @@ static status_t decrypt(private_encryption_payload_t *this) status = this->crypter->decrypt(this->crypter, concatenated, iv, &(this->decrypted)); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR|MORE, "could not decrypt, decryption failed"); + this->logger->log(this->logger, ERROR|LEVEL1, "could not decrypt, decryption failed"); return FAILED; } @@ -389,14 +389,14 @@ static status_t decrypt(private_encryption_payload_t *this) /* check size again */ if (padding_length > concatenated.len || this->decrypted.len < 0) { - this->logger->log(this->logger, ERROR|MORE, "decryption failed, invalid padding length found. Invalid key?"); + this->logger->log(this->logger, ERROR|LEVEL1, "decryption failed, invalid padding length found. Invalid key?"); /* decryption failed :-/ */ return FAILED; } /* free padding */ this->decrypted.ptr = allocator_realloc(this->decrypted.ptr, this->decrypted.len); - this->logger->log(this->logger, CONTROL|MOST, "decryption successful, trying to parse content"); + this->logger->log(this->logger, CONTROL|LEVEL2, "decryption successful, trying to parse content"); return (this->parse(this)); } @@ -426,7 +426,7 @@ static status_t build_signature(private_encryption_payload_t *this, chunk_t data sig.len = this->signer->get_block_size(this->signer); data_without_sig.len -= sig.len; sig.ptr = data.ptr + data_without_sig.len; - this->logger->log(this->logger, CONTROL|MOST, "building signature"); + this->logger->log(this->logger, CONTROL|LEVEL2, "building signature"); this->signer->get_signature(this->signer, data_without_sig, sig.ptr); return SUCCESS; } @@ -448,7 +448,7 @@ static status_t verify_signature(private_encryption_payload_t *this, chunk_t dat sig.len = this->signer->get_block_size(this->signer); if (data.len <= sig.len) { - this->logger->log(this->logger, ERROR|MORE, "unable to verify signature, invalid input"); + this->logger->log(this->logger, ERROR|LEVEL1, "unable to verify signature, invalid input"); return FAILED; } sig.ptr = data.ptr + data.len - sig.len; @@ -460,11 +460,11 @@ static status_t verify_signature(private_encryption_payload_t *this, chunk_t dat if (!valid) { - this->logger->log(this->logger, ERROR|MORE, "signature verification failed"); + this->logger->log(this->logger, ERROR|LEVEL1, "signature verification failed"); return FAILED; } - this->logger->log(this->logger, CONTROL|MOST, "signature verification successful"); + this->logger->log(this->logger, CONTROL|LEVEL2, "signature verification successful"); return SUCCESS; } @@ -492,7 +492,7 @@ static void generate(private_encryption_payload_t *this) else { /* no paylads? */ - this->logger->log(this->logger, CONTROL|MORE, "generating contained payloads, but no available"); + this->logger->log(this->logger, CONTROL|LEVEL1, "generating contained payloads, but no available"); allocator_free(this->decrypted.ptr); this->decrypted = CHUNK_INITIALIZER; iterator->destroy(iterator); @@ -520,7 +520,7 @@ static void generate(private_encryption_payload_t *this) generator->write_to_chunk(generator, &(this->decrypted)); generator->destroy(generator); - this->logger->log(this->logger, CONTROL|MORE, "successfully generated content in encrpytion payload"); + this->logger->log(this->logger, CONTROL|LEVEL1, "successfully generated content in encrpytion payload"); } /** @@ -559,7 +559,7 @@ static status_t parse(private_encryption_payload_t *this) status = current_payload->verify(current_payload); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR|MORE, "%s verification failed: %s", + this->logger->log(this->logger, ERROR|LEVEL1, "%s verification failed: %s", mapping_find(payload_type_m,current_payload->get_type(current_payload)), mapping_find(status_m, status)); current_payload->destroy(current_payload); @@ -573,7 +573,7 @@ static status_t parse(private_encryption_payload_t *this) this->payloads->insert_last(this->payloads,current_payload); } parser->destroy(parser); - this->logger->log(this->logger, CONTROL|MORE, "succesfully parsed content of encryption payload"); + this->logger->log(this->logger, CONTROL|LEVEL1, "succesfully parsed content of encryption payload"); return SUCCESS; } |