diff options
Diffstat (limited to 'Source/charon/encoding/message.c')
| -rw-r--r-- | Source/charon/encoding/message.c | 84 |
1 files changed, 42 insertions, 42 deletions
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); } |