Use name from initialization to access settings in libcharon.

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
+10 -9
View File
@@ -529,25 +529,26 @@ receiver_t *receiver_create()
.secret_offset = random() % now,
);
if (lib->settings->get_bool(lib->settings, "charon.dos_protection", TRUE))
if (lib->settings->get_bool(lib->settings,
"%s.dos_protection", TRUE, charon->name))
{
this->cookie_threshold = lib->settings->get_int(lib->settings,
"charon.cookie_threshold", COOKIE_THRESHOLD_DEFAULT);
"%s.cookie_threshold", COOKIE_THRESHOLD_DEFAULT, charon->name);
this->block_threshold = lib->settings->get_int(lib->settings,
"charon.block_threshold", BLOCK_THRESHOLD_DEFAULT);
"%s.block_threshold", BLOCK_THRESHOLD_DEFAULT, charon->name);
}
this->init_limit_job_load = lib->settings->get_int(lib->settings,
"charon.init_limit_job_load", 0);
"%s.init_limit_job_load", 0, charon->name);
this->init_limit_half_open = lib->settings->get_int(lib->settings,
"charon.init_limit_half_open", 0);
"%s.init_limit_half_open", 0, charon->name);
this->receive_delay = lib->settings->get_int(lib->settings,
"charon.receive_delay", 0);
"%s.receive_delay", 0, charon->name);
this->receive_delay_type = lib->settings->get_int(lib->settings,
"charon.receive_delay_type", 0),
"%s.receive_delay_type", 0, charon->name),
this->receive_delay_request = lib->settings->get_bool(lib->settings,
"charon.receive_delay_request", TRUE),
"%s.receive_delay_request", TRUE, charon->name),
this->receive_delay_response = lib->settings->get_int(lib->settings,
"charon.receive_delay_response", TRUE),
"%s.receive_delay_response", TRUE, charon->name),
this->hasher = lib->crypto->create_hasher(lib->crypto, HASH_PREFERRED);
if (this->hasher == NULL)
+4 -4
View File
@@ -192,13 +192,13 @@ sender_t * sender_create()
.job = callback_job_create_with_prio((callback_job_cb_t)send_packets,
this, NULL, NULL, JOB_PRIO_CRITICAL),
.send_delay = lib->settings->get_int(lib->settings,
"charon.send_delay", 0),
"%s.send_delay", 0, charon->name),
.send_delay_type = lib->settings->get_int(lib->settings,
"charon.send_delay_type", 0),
"%s.send_delay_type", 0, charon->name),
.send_delay_request = lib->settings->get_bool(lib->settings,
"charon.send_delay_request", TRUE),
"%s.send_delay_request", TRUE, charon->name),
.send_delay_response = lib->settings->get_int(lib->settings,
"charon.send_delay_response", TRUE),
"%s.send_delay_response", TRUE, charon->name),
);
lib->processor->queue_job(lib->processor, (job_t*)this->job);