- moved hasher_*_t to *_hasher_t

- some logging improvements
This commit is contained in:
Martin Willi
2005-11-27 14:04:16 +00:00
parent 9d086b79f6
commit b241048084
18 changed files with 180 additions and 238 deletions
+2 -2
View File
@@ -220,7 +220,7 @@ static status_t process_message (private_ike_sa_t *this, message_t *message)
is_request = message->get_request(message);
exchange_type = message->get_exchange_type(message);
this->logger->log(this->logger, CONTROL|MORE, "Process %s message of exchange type %s",(is_request) ? "REQUEST" : "RESPONSE",mapping_find(exchange_type_m,exchange_type));
this->logger->log(this->logger, CONTROL, "Process %s message of exchange type %s",(is_request) ? "REQUEST" : "RESPONSE",mapping_find(exchange_type_m,exchange_type));
message_id = message->get_message_id(message);
@@ -270,7 +270,7 @@ static status_t build_message(private_ike_sa_t *this, exchange_type_t type, bool
message_t *new_message;
host_t *source, *destination;
this ->logger->log(this->logger, CONTROL|MORE, "build empty message");
this->logger->log(this->logger, CONTROL|MORE, "build empty message");
new_message = message_create();
if (new_message == NULL)
{
+5 -5
View File
@@ -238,7 +238,7 @@ static status_t initiate_connection (private_initiator_init_t *this, char *name)
}
/* generate packet */
this ->logger->log(this->logger, CONTROL|MOST, "generate packet from message");
this->logger->log(this->logger, CONTROL|MOST, "generate packet from message");
status = message->generate(message, &packet);
if (status != SUCCESS)
{
@@ -247,7 +247,7 @@ static status_t initiate_connection (private_initiator_init_t *this, char *name)
return status;
}
this ->logger->log(this->logger, CONTROL|MOST, "Add packet to global send queue");
this->logger->log(this->logger, CONTROL|MOST, "Add packet to global send queue");
status = global_send_queue->add(global_send_queue, packet);
if (status != SUCCESS)
{
@@ -258,7 +258,7 @@ static status_t initiate_connection (private_initiator_init_t *this, char *name)
}
/* state can now be changed */
this ->logger->log(this->logger, CONTROL|MOST, "Create next state object");
this->logger->log(this->logger, CONTROL|MOST, "Create next state object");
next_state = ike_sa_init_requested_create(this->ike_sa, this->dh_group_number, this->diffie_hellman, this->sent_nonce);
if (next_state == NULL)
{
@@ -282,9 +282,9 @@ static status_t initiate_connection (private_initiator_init_t *this, char *name)
this->ike_sa->set_new_state(this->ike_sa,(state_t *) next_state);
/* state has NOW changed :-) */
this ->logger->log(this->logger, CONTROL|MORE, "Changed state of IKE_SA from %s to %s",mapping_find(ike_sa_state_m,INITIATOR_INIT),mapping_find(ike_sa_state_m,IKE_SA_INIT_REQUESTED) );
this->logger->log(this->logger, CONTROL|MORE, "Changed state of IKE_SA from %s to %s",mapping_find(ike_sa_state_m,INITIATOR_INIT),mapping_find(ike_sa_state_m,IKE_SA_INIT_REQUESTED) );
this ->logger->log(this->logger, CONTROL|MOST, "Destroy old sate object");
this->logger->log(this->logger, CONTROL|MOST, "Destroy old sate object");
this->destroy_after_state_change(this);
return SUCCESS;