time values in strongswan.conf can be optionally specified in days (d), hours (h), minutes (m), or seconds (s)

This commit is contained in:
Andreas Steffen
2008-09-04 16:19:46 +00:00
parent e376d75f96
commit 07d7f9a402
7 changed files with 57 additions and 13 deletions
+2 -3
View File
@@ -354,9 +354,8 @@ medcli_config_t *medcli_config_create(database_t *db)
this->public.destroy = (void(*)(medcli_config_t*))destroy;
this->db = db;
this->rekey = lib->settings->get_int(lib->settings,
"medcli.rekey", 20) * 60;
this->dpd = lib->settings->get_int(lib->settings, "medcli.dpd", 300);
this->rekey = lib->settings->get_time(lib->settings, "medcli.rekey", 1200);
this->dpd = lib->settings->get_time(lib->settings, "medcli.dpd", 300);
this->ike = ike_cfg_create(FALSE, FALSE, "0.0.0.0", "0.0.0.0");
this->ike->add_proposal(this->ike, proposal_create_default(PROTO_IKE));
+2 -3
View File
@@ -135,9 +135,8 @@ medsrv_config_t *medsrv_config_create(database_t *db)
this->public.destroy = (void(*)(medsrv_config_t*))destroy;
this->db = db;
this->rekey = lib->settings->get_int(lib->settings,
"medsrv.rekey", 20) * 60;
this->dpd = lib->settings->get_int(lib->settings, "medsrv.dpd", 300);
this->rekey = lib->settings->get_time(lib->settings, "medsrv.rekey", 1200);
this->dpd = lib->settings->get_time(lib->settings, "medsrv.dpd", 300);
this->ike = ike_cfg_create(FALSE, FALSE, "0.0.0.0", "0.0.0.0");
this->ike->add_proposal(this->ike, proposal_create_default(PROTO_IKE));