- show connection templates in status & statusall

- don't complain on termination of IKEv1 connections
This commit is contained in:
Martin Willi
2006-05-23 13:25:57 +00:00
parent 3572b3b689
commit 8b5be79d83
6 changed files with 106 additions and 17 deletions
+2 -2
View File
@@ -479,7 +479,7 @@ static void log_status(private_child_sa_t *this, logger_t *logger, char* name)
{
logger = this->logger;
}
logger->log(logger, CONTROL|LEVEL1, "\"%s\": protected with ESP (0x%x/0x%x), AH (0x%x,0x%x):",
logger->log(logger, CONTROL|LEVEL1, " \"%s\": protected with ESP (0x%x/0x%x), AH (0x%x,0x%x):",
name,
htonl(this->my_esp_spi), htonl(this->other_esp_spi),
htonl(this->my_ah_spi), htonl(this->other_ah_spi));
@@ -499,7 +499,7 @@ static void log_status(private_child_sa_t *this, logger_t *logger, char* name)
snprintf(proto_buf, sizeof(proto_buf), "<%d>", policy->upper_proto);
}
}
logger->log(logger, CONTROL, "\"%s\": %s/%d==%s==%s/%d",
logger->log(logger, CONTROL, " \"%s\": %s/%d==%s==%s/%d",
name,
policy->my_net->get_address(policy->my_net), policy->my_net_mask,
proto_name,
+2 -2
View File
@@ -944,12 +944,12 @@ static void log_status(private_ike_sa_t *this, logger_t *logger, char *name)
{
logger = this->logger;
}
logger->log(logger, CONTROL|LEVEL1, "\"%s\": IKE_SA in state %s, SPIs: 0x%.16llx 0x%.16llx",
logger->log(logger, CONTROL|LEVEL1, " \"%s\": IKE_SA in state %s, SPIs: 0x%.16llx 0x%.16llx",
name,
mapping_find(ike_sa_state_m, this->current_state->get_state(this->current_state)),
this->ike_sa_id->get_initiator_spi(this->ike_sa_id),
this->ike_sa_id->get_responder_spi(this->ike_sa_id));
logger->log(logger, CONTROL, "\"%s\": %s[%s]...%s[%s]",
logger->log(logger, CONTROL, " \"%s\": %s[%s]...%s[%s]",
name,
my_host->get_address(my_host),
my_id->get_string(my_id),
+2
View File
@@ -610,6 +610,8 @@ static void log_status(private_ike_sa_manager_t* this, logger_t* logger, char* n
{
iterator_t *iterator;
logger->log(logger, CONTROL, "instances:");
pthread_mutex_lock(&(this->mutex));
iterator = this->ike_sa_list->create_iterator(this->ike_sa_list, TRUE);