libcharon: Use lib->ns instead of charon->name
This commit is contained in:
@@ -293,7 +293,7 @@ static void schedule_inactivity_timeout(private_child_create_t *this)
|
||||
if (timeout)
|
||||
{
|
||||
close_ike = lib->settings->get_bool(lib->settings,
|
||||
"%s.inactivity_close_ike", FALSE, charon->name);
|
||||
"%s.inactivity_close_ike", FALSE, lib->ns);
|
||||
lib->scheduler->schedule_job(lib->scheduler, (job_t*)
|
||||
inactivity_job_create(this->child_sa->get_reqid(this->child_sa),
|
||||
timeout, close_ike), timeout);
|
||||
@@ -1072,7 +1072,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,
|
||||
"%s.close_ike_on_child_failure", FALSE, charon->name))
|
||||
"%s.close_ike_on_child_failure", FALSE, lib->ns))
|
||||
{
|
||||
/* we delay the delete for 100ms, as the IKE_AUTH response must arrive
|
||||
* first */
|
||||
|
||||
@@ -120,7 +120,7 @@ struct private_ike_auth_t {
|
||||
static bool multiple_auth_enabled()
|
||||
{
|
||||
return lib->settings->get_bool(lib->settings,
|
||||
"%s.multiple_authentication", TRUE, charon->name);
|
||||
"%s.multiple_authentication", TRUE, lib->ns);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -428,7 +428,7 @@ 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,
|
||||
"%s.hash_and_url", FALSE, charon->name))
|
||||
"%s.hash_and_url", FALSE, lib->ns))
|
||||
{
|
||||
message->add_notify(message, FALSE, HTTP_CERT_LOOKUP_SUPPORTED,
|
||||
chunk_empty);
|
||||
|
||||
@@ -86,7 +86,7 @@ METHOD(task_t, build, status_t,
|
||||
int i;
|
||||
|
||||
strongswan = lib->settings->get_bool(lib->settings,
|
||||
"%s.send_vendor_id", FALSE, charon->name);
|
||||
"%s.send_vendor_id", FALSE, lib->ns);
|
||||
for (i = 0; i < countof(vids); i++)
|
||||
{
|
||||
if (vids[i].extension == EXT_STRONGSWAN && strongswan)
|
||||
|
||||
Reference in New Issue
Block a user