diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-21 13:21:26 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-21 13:35:31 +0200 |
| commit | 5b0bcfb1fc4aabb6535db91e70f7f262328e664f (patch) | |
| tree | 000c5588b5da0e498f74e251cd0e1aeaa6d597a9 /src/libcharon/plugins/load_tester | |
| parent | fdead26ffe1da8501a6ff5e0639a6f44c723e763 (diff) | |
| download | strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.bz2 strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.xz | |
Revert alloc_str changes
This reverts commit fdead26ffe1da8501a6ff5e0639a6f44c723e763.
This reverts commit 3e2419ebe32de72d824864eb2e0e677a7c197af1.
This reverts commit 17ce69b47a1efd6234960cf7d1f50712aee61db5.
Diffstat (limited to 'src/libcharon/plugins/load_tester')
| -rw-r--r-- | src/libcharon/plugins/load_tester/load_tester_config.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c index b522aa7f2..71391d593 100644 --- a/src/libcharon/plugins/load_tester/load_tester_config.c +++ b/src/libcharon/plugins/load_tester/load_tester_config.c @@ -279,10 +279,6 @@ static void destroy(private_load_tester_config_t *this) this->peer_cfg->destroy(this->peer_cfg); DESTROY_IF(this->proposal); DESTROY_IF(this->vip); - free(this->pool); - free(this->remote); - free(this->initiator_auth); - free(this->responder_auth); free(this); } @@ -304,9 +300,9 @@ load_tester_config_t *load_tester_config_create() { this->vip = host_create_from_string("0.0.0.0", 0); } - this->pool = lib->settings->alloc_str(lib->settings, + this->pool = lib->settings->get_str(lib->settings, "charon.plugins.load-tester.pool", NULL); - this->remote = lib->settings->alloc_str(lib->settings, + this->remote = lib->settings->get_str(lib->settings, "charon.plugins.load-tester.remote", "127.0.0.1"); this->proposal = proposal_create_from_string(PROTO_IKE, @@ -322,9 +318,9 @@ load_tester_config_t *load_tester_config_create() this->child_rekey = lib->settings->get_int(lib->settings, "charon.plugins.load-tester.child_rekey", 600); - this->initiator_auth = lib->settings->alloc_str(lib->settings, + this->initiator_auth = lib->settings->get_str(lib->settings, "charon.plugins.load-tester.initiator_auth", "pubkey"); - this->responder_auth = lib->settings->alloc_str(lib->settings, + this->responder_auth = lib->settings->get_str(lib->settings, "charon.plugins.load-tester.responder_auth", "pubkey"); this->port = lib->settings->get_int(lib->settings, |