denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use name from initialization to access settings in libcharon.

Browse Source 
Also fixes several whitespace errors.
This commit is contained in:
Tobias Brunner
2012-05-03 13:57:04 +02:00
parent 18758e3d2e
commit 42500c274a
56 changed files with 279 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+2 -2
View File
@@ -2090,9 +2090,9 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator,
.peer_addresses = linked_list_create(),
.attributes = linked_list_create(),
.keepalive_interval = lib->settings->get_time(lib->settings,
"charon.keep_alive", KEEPALIVE_INTERVAL),
"%s.keep_alive", KEEPALIVE_INTERVAL, charon->name),
.flush_auth_cfg = lib->settings->get_bool(lib->settings,
"charon.flush_auth_cfg", FALSE),
"%s.flush_auth_cfg", FALSE, charon->name),
);
if (version == IKEV2)
src/libcharon/sa/ike_sa_manager.c
+7 -5
View File
@@ -1982,13 +1982,15 @@ ike_sa_manager_t *ike_sa_manager_create()
return NULL;
}
this->table_size = get_nearest_powerof2(lib->settings->get_int(lib->settings,
"charon.ikesa_table_size", DEFAULT_HASHTABLE_SIZE));
this->table_size = get_nearest_powerof2(lib->settings->get_int(
lib->settings, "%s.ikesa_table_size",
DEFAULT_HASHTABLE_SIZE, charon->name));
this->table_size = max(1, min(this->table_size, MAX_HASHTABLE_SIZE));
this->table_mask = this->table_size - 1;
this->segment_count = get_nearest_powerof2(lib->settings->get_int(lib->settings,
"charon.ikesa_table_segments", DEFAULT_SEGMENT_COUNT));
this->segment_count = get_nearest_powerof2(lib->settings->get_int(
lib->settings, "%s.ikesa_table_segments",
DEFAULT_SEGMENT_COUNT, charon->name));
this->segment_count = max(1, min(this->segment_count, this->table_size));
this->segment_mask = this->segment_count - 1;
@@ -2028,6 +2030,6 @@ ike_sa_manager_t *ike_sa_manager_create()
}
this->reuse_ikesa = lib->settings->get_bool(lib->settings,
"charon.reuse_ikesa", TRUE);
"%s.reuse_ikesa", TRUE, charon->name);
return &this->public;
}
src/libcharon/sa/ikev1/task_manager_v1.c
+5 -4
View File
@@ -1140,7 +1140,8 @@ METHOD(task_manager_t, process_message, status_t,
job = (job_t*)delete_ike_sa_job_create(ike_sa_id, FALSE);
lib->scheduler->schedule_job(lib->scheduler, job,
lib->settings->get_int(lib->settings,
"charon.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT));
"%s.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT,
charon->name));
}
this->ike_sa->update_hosts(this->ike_sa, me, other, TRUE);
charon->bus->message(charon->bus, msg, TRUE, TRUE);
@@ -1511,11 +1512,11 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
.active_tasks = linked_list_create(),
.passive_tasks = linked_list_create(),
.retransmit_tries = lib->settings->get_int(lib->settings,
"charon.retransmit_tries", RETRANSMIT_TRIES),
"%s.retransmit_tries", RETRANSMIT_TRIES, charon->name),
.retransmit_timeout = lib->settings->get_double(lib->settings,
"charon.retransmit_timeout", RETRANSMIT_TIMEOUT),
"%s.retransmit_timeout", RETRANSMIT_TIMEOUT, charon->name),
.retransmit_base = lib->settings->get_double(lib->settings,
"charon.retransmit_base", RETRANSMIT_BASE),
"%s.retransmit_base", RETRANSMIT_BASE, charon->name),
);
if (!this->rng)
src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
+1 -1
View File
@@ -121,7 +121,7 @@ METHOD(task_t, build, status_t,
int i;
strongswan = lib->settings->get_bool(lib->settings,
"charon.send_vendor_id", FALSE);
"%s.send_vendor_id", FALSE, charon->name);
for (i = 0; i < countof(vendor_ids); i++)
{
if (vendor_ids[i].send ||
src/libcharon/sa/ikev1/tasks/quick_mode.c
+1 -1
View File
@@ -154,7 +154,7 @@ static void schedule_inactivity_timeout(private_quick_mode_t *this)
if (timeout)
{
close_ike = lib->settings->get_bool(lib->settings,
"charon.inactivity_close_ike", FALSE);
"%s.inactivity_close_ike", FALSE, charon->name);
lib->scheduler->schedule_job(lib->scheduler, (job_t*)
inactivity_job_create(this->child_sa->get_reqid(this->child_sa),
timeout, close_ike), timeout);
src/libcharon/sa/ikev2/task_manager_v2.c
+5 -4
View File
@@ -1078,7 +1078,8 @@ METHOD(task_manager_t, process_message, status_t,
job = (job_t*)delete_ike_sa_job_create(ike_sa_id, FALSE);
lib->scheduler->schedule_job(lib->scheduler, job,
lib->settings->get_int(lib->settings,
"charon.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT));
"%s.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT,
charon->name));
}
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
@@ -1473,11 +1474,11 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
.active_tasks = linked_list_create(),
.passive_tasks = linked_list_create(),
.retransmit_tries = lib->settings->get_int(lib->settings,
"charon.retransmit_tries", RETRANSMIT_TRIES),
"%s.retransmit_tries", RETRANSMIT_TRIES, charon->name),
.retransmit_timeout = lib->settings->get_double(lib->settings,
"charon.retransmit_timeout", RETRANSMIT_TIMEOUT),
"%s.retransmit_timeout", RETRANSMIT_TIMEOUT, charon->name),
.retransmit_base = lib->settings->get_double(lib->settings,
"charon.retransmit_base", RETRANSMIT_BASE),
"%s.retransmit_base", RETRANSMIT_BASE, charon->name),
);
return &this->public;
src/libcharon/sa/ikev2/tasks/child_create.c
+2 -2
View File
@@ -266,7 +266,7 @@ static void schedule_inactivity_timeout(private_child_create_t *this)
if (timeout)
{
close_ike = lib->settings->get_bool(lib->settings,
"charon.inactivity_close_ike", FALSE);
"%s.inactivity_close_ike", FALSE, charon->name);
lib->scheduler->schedule_job(lib->scheduler, (job_t*)
inactivity_job_create(this->child_sa->get_reqid(this->child_sa),
timeout, close_ike), timeout);
@@ -881,7 +881,7 @@ static void handle_child_sa_failure(private_child_create_t *this,
{
if (message->get_exchange_type(message) == IKE_AUTH &&
lib->settings->get_bool(lib->settings,
"charon.close_ike_on_child_failure", FALSE))
"%s.close_ike_on_child_failure", FALSE, charon->name))
{
/* we delay the delete for 100ms, as the IKE_AUTH response must arrive
* first */
src/libcharon/sa/ikev2/tasks/ike_auth.c
+1 -1
View File
@@ -120,7 +120,7 @@ struct private_ike_auth_t {
static bool multiple_auth_enabled()
{
return lib->settings->get_bool(lib->settings,
"charon.multiple_authentication", TRUE);
"%s.multiple_authentication", TRUE, charon->name);
}
/**
src/libcharon/sa/ikev2/tasks/ike_cert_pre.c
+2 -1
View File
@@ -398,7 +398,8 @@ static void build_certreqs(private_ike_cert_pre_t *this, message_t *message)
{
message->add_payload(message, (payload_t*)req);
if (lib->settings->get_bool(lib->settings, "charon.hash_and_url", FALSE))
if (lib->settings->get_bool(lib->settings,
"%s.hash_and_url", FALSE, charon->name))
{
message->add_notify(message, FALSE, HTTP_CERT_LOOKUP_SUPPORTED,
chunk_empty);
src/libcharon/sa/ikev2/tasks/ike_vendor.c
+1 -1
View File
@@ -53,7 +53,7 @@ METHOD(task_t, build, status_t,
private_ike_vendor_t *this, message_t *message)
{
if (lib->settings->get_bool(lib->settings,
"charon.send_vendor_id", FALSE))
"%s.send_vendor_id", FALSE, charon->name))
{
vendor_id_payload_t *vid;