load-tester can dynamically install a dedicated external IP for each IKE_SA
For consistency, the local/remote parameters have been replaced by the initiator/responder options. As initiator, the initiator option can be overriden by an addrs section taking key/value pairs with address pools to use on a specific interface.
This commit is contained in:
Martin Willi
parent
50bd755871
commit
0a54d3e1a1
|
|
@ -16,6 +16,8 @@
|
|||
#include "load_tester_config.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <attributes/mem_pool.h>
|
||||
|
||||
typedef struct private_load_tester_config_t private_load_tester_config_t;
|
||||
|
||||
|
|
@ -40,14 +42,14 @@ struct private_load_tester_config_t {
|
|||
host_t *vip;
|
||||
|
||||
/**
|
||||
* Remote address
|
||||
* Initiator address
|
||||
*/
|
||||
char *remote;
|
||||
char *initiator;
|
||||
|
||||
/**
|
||||
* Local address
|
||||
* Responder address
|
||||
*/
|
||||
char *local;
|
||||
char *responder;
|
||||
|
||||
/**
|
||||
* IP address pool
|
||||
|
|
@ -138,8 +140,52 @@ struct private_load_tester_config_t {
|
|||
* IKE version to use for load testing
|
||||
*/
|
||||
ike_version_t version;
|
||||
|
||||
/**
|
||||
* List of pools to allocate external addresses dynamically, as mem_pool_t
|
||||
*/
|
||||
linked_list_t *pools;
|
||||
|
||||
/**
|
||||
* Address prefix to use when installing dynamic addresses
|
||||
*/
|
||||
int prefix;
|
||||
};
|
||||
|
||||
/**
|
||||
* Load external addresses to use, if any
|
||||
*/
|
||||
static void load_addrs(private_load_tester_config_t *this)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
host_t *net;
|
||||
int bits;
|
||||
char *iface, *cidr;
|
||||
mem_pool_t *pool;
|
||||
|
||||
|
||||
this->prefix = lib->settings->get_int(lib->settings,
|
||||
"%s.plugins.load-tester.addrs_prefix", 16, charon->name);
|
||||
enumerator = lib->settings->create_key_value_enumerator(lib->settings,
|
||||
"%s.plugins.load-tester.addrs", charon->name);
|
||||
while (enumerator->enumerate(enumerator, &iface, &cidr))
|
||||
{
|
||||
net = host_create_from_subnet(cidr, &bits);
|
||||
if (net)
|
||||
{
|
||||
DBG1(DBG_CFG, "loaded load-tester addresses %s", cidr);
|
||||
pool = mem_pool_create(iface, net, bits);
|
||||
net->destroy(net);
|
||||
this->pools->insert_last(this->pools, pool);
|
||||
}
|
||||
else
|
||||
{
|
||||
DBG1(DBG_CFG, "parsing load-tester addresses %s failed", cidr);
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate auth config from string
|
||||
*/
|
||||
|
|
@ -291,6 +337,66 @@ static void add_ts(char *string, child_cfg_t *cfg, bool local)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Allocate and install a dynamic external address to use
|
||||
*/
|
||||
static host_t *allocate_addr(private_load_tester_config_t *this, uint num)
|
||||
{
|
||||
enumerator_t *pools, *addrs;
|
||||
mem_pool_t *pool;
|
||||
host_t *addr, *iface = NULL, *found = NULL, *requested;
|
||||
identification_t *id;
|
||||
char *name, buf[32];
|
||||
|
||||
requested = host_create_any(AF_INET);
|
||||
snprintf(buf, sizeof(buf), "ext-%d", num);
|
||||
id = identification_create_from_string(buf);
|
||||
pools = this->pools->create_enumerator(this->pools);
|
||||
while (!found && pools->enumerate(pools, &pool))
|
||||
{
|
||||
addrs = hydra->kernel_interface->create_address_enumerator(
|
||||
hydra->kernel_interface, ADDR_TYPE_REGULAR);
|
||||
while (!found && addrs->enumerate(addrs, &addr))
|
||||
{
|
||||
if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
|
||||
addr, &name))
|
||||
{
|
||||
if (streq(pool->get_name(pool), name))
|
||||
{
|
||||
found = pool->acquire_address(pool, id, requested,
|
||||
MEM_POOL_NEW);
|
||||
if (found)
|
||||
{
|
||||
iface = addr->clone(addr);
|
||||
}
|
||||
}
|
||||
free(name);
|
||||
}
|
||||
}
|
||||
addrs->destroy(addrs);
|
||||
}
|
||||
pools->destroy(pools);
|
||||
requested->destroy(requested);
|
||||
id->destroy(id);
|
||||
|
||||
if (!found)
|
||||
{
|
||||
DBG1(DBG_CFG, "no interface found to install load-tester IP");
|
||||
return NULL;
|
||||
}
|
||||
if (hydra->kernel_interface->add_ip(hydra->kernel_interface,
|
||||
found, this->prefix, iface) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_CFG, "installing load-tester IP %H failed", found);
|
||||
iface->destroy(iface);
|
||||
found->destroy(found);
|
||||
return NULL;
|
||||
}
|
||||
DBG1(DBG_CFG, "installed load-tester IP %H", found);
|
||||
iface->destroy(iface);
|
||||
return found;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a new initiator config, num = 0 for responder config
|
||||
*/
|
||||
|
|
@ -300,6 +406,8 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
|
|||
child_cfg_t *child_cfg;
|
||||
peer_cfg_t *peer_cfg;
|
||||
proposal_t *proposal;
|
||||
char local[32], *remote;
|
||||
host_t *addr;
|
||||
lifetime_cfg_t lifetime = {
|
||||
.time = {
|
||||
.life = this->child_rekey * 2,
|
||||
|
|
@ -308,18 +416,43 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
|
|||
}
|
||||
};
|
||||
|
||||
if (num)
|
||||
{ /* initiator */
|
||||
if (this->pools->get_count(this->pools))
|
||||
{ /* using dynamically installed external addresses */
|
||||
addr = allocate_addr(this, num);
|
||||
if (!addr)
|
||||
{
|
||||
DBG1(DBG_CFG, "allocating external address failed");
|
||||
return NULL;
|
||||
}
|
||||
snprintf(local, sizeof(local), "%H", addr);
|
||||
addr->destroy(addr);
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(local, sizeof(local), "%s", this->initiator);
|
||||
}
|
||||
remote = this->responder;
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(local, sizeof(local), "%s", this->responder);
|
||||
remote = this->initiator;
|
||||
}
|
||||
|
||||
if (this->port && num)
|
||||
{
|
||||
ike_cfg = ike_cfg_create(this->version, TRUE, FALSE,
|
||||
this->local, FALSE, this->port + num - 1,
|
||||
this->remote, FALSE, IKEV2_NATT_PORT);
|
||||
local, FALSE, this->port + num - 1,
|
||||
remote, FALSE, IKEV2_NATT_PORT);
|
||||
}
|
||||
else
|
||||
{
|
||||
ike_cfg = ike_cfg_create(this->version, TRUE, FALSE,
|
||||
this->local, FALSE,
|
||||
local, FALSE,
|
||||
charon->socket->get_port(charon->socket, FALSE),
|
||||
this->remote, FALSE, IKEV2_UDP_PORT);
|
||||
remote, FALSE, IKEV2_UDP_PORT);
|
||||
}
|
||||
ike_cfg->add_proposal(ike_cfg, this->proposal->clone(this->proposal));
|
||||
peer_cfg = peer_cfg_create("load-test", ike_cfg,
|
||||
|
|
@ -395,9 +528,47 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
METHOD(load_tester_config_t, delete_ip, void,
|
||||
private_load_tester_config_t *this, host_t *ip)
|
||||
{
|
||||
mem_pool_t *pool;
|
||||
enumerator_t *pools, *leases;
|
||||
identification_t *id, *found = FALSE;
|
||||
host_t *host;
|
||||
bool online;
|
||||
|
||||
/* find identity for this IP, so we can call release_address() */
|
||||
pools = this->pools->create_enumerator(this->pools);
|
||||
while (pools->enumerate(pools, &pool))
|
||||
{
|
||||
leases = pool->create_lease_enumerator(pool);
|
||||
while (leases->enumerate(leases, &id, &host, &online))
|
||||
{
|
||||
if (online && host->ip_equals(host, ip))
|
||||
{
|
||||
found = id->clone(id);
|
||||
}
|
||||
}
|
||||
leases->destroy(leases);
|
||||
if (found)
|
||||
{
|
||||
if (pool->release_address(pool, ip, found))
|
||||
{
|
||||
hydra->kernel_interface->del_ip(hydra->kernel_interface,
|
||||
ip, this->prefix);
|
||||
}
|
||||
found->destroy(found);
|
||||
break;
|
||||
}
|
||||
}
|
||||
pools->destroy(pools);
|
||||
}
|
||||
|
||||
|
||||
METHOD(load_tester_config_t, destroy, void,
|
||||
private_load_tester_config_t *this)
|
||||
{
|
||||
this->pools->destroy_offset(this->pools, offsetof(mem_pool_t, destroy));
|
||||
this->peer_cfg->destroy(this->peer_cfg);
|
||||
DESTROY_IF(this->proposal);
|
||||
DESTROY_IF(this->vip);
|
||||
|
|
@ -418,8 +589,10 @@ load_tester_config_t *load_tester_config_create()
|
|||
.create_ike_cfg_enumerator = _create_ike_cfg_enumerator,
|
||||
.get_peer_cfg_by_name = _get_peer_cfg_by_name,
|
||||
},
|
||||
.delete_ip = _delete_ip,
|
||||
.destroy = _destroy,
|
||||
},
|
||||
.pools = linked_list_create(),
|
||||
.num = 1,
|
||||
);
|
||||
|
||||
|
|
@ -430,10 +603,10 @@ load_tester_config_t *load_tester_config_create()
|
|||
}
|
||||
this->pool = lib->settings->get_str(lib->settings,
|
||||
"%s.plugins.load-tester.pool", NULL, charon->name);
|
||||
this->remote = lib->settings->get_str(lib->settings,
|
||||
"%s.plugins.load-tester.remote", "127.0.0.1", charon->name);
|
||||
this->local = lib->settings->get_str(lib->settings,
|
||||
"%s.plugins.load-tester.local", "0.0.0.0", charon->name);
|
||||
this->initiator = lib->settings->get_str(lib->settings,
|
||||
"%s.plugins.load-tester.initiator", "0.0.0.0", charon->name);
|
||||
this->responder = lib->settings->get_str(lib->settings,
|
||||
"%s.plugins.load-tester.responder", "127.0.0.1", charon->name);
|
||||
|
||||
this->proposal = proposal_create_from_string(PROTO_IKE,
|
||||
lib->settings->get_str(lib->settings,
|
||||
|
|
@ -480,6 +653,8 @@ load_tester_config_t *load_tester_config_create()
|
|||
this->version = lib->settings->get_int(lib->settings,
|
||||
"%s.plugins.load-tester.version", IKE_ANY, charon->name);
|
||||
|
||||
load_addrs(this);
|
||||
|
||||
this->peer_cfg = generate_config(this, 0);
|
||||
|
||||
return &this->public;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,13 @@ struct load_tester_config_t {
|
|||
*/
|
||||
backend_t backend;
|
||||
|
||||
/**
|
||||
* Delete external IP if it was dynamically installed.
|
||||
*
|
||||
* @param ip external IP
|
||||
*/
|
||||
void (*delete_ip)(load_tester_config_t *this, host_t *ip);
|
||||
|
||||
/**
|
||||
* Destroy the backend.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -50,6 +50,11 @@ struct private_load_tester_listener_t {
|
|||
* Shutdown the daemon if we have established this SA count
|
||||
*/
|
||||
u_int shutdown_on;
|
||||
|
||||
/**
|
||||
* Configuration backend
|
||||
*/
|
||||
load_tester_config_t *config;
|
||||
};
|
||||
|
||||
METHOD(listener_t, ike_updown, bool,
|
||||
|
|
@ -83,6 +88,16 @@ METHOD(listener_t, ike_updown, bool,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
METHOD(listener_t, ike_state_change, bool,
|
||||
private_load_tester_listener_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
|
||||
{
|
||||
if (state == IKE_DESTROYING)
|
||||
{
|
||||
this->config->delete_ip(this->config, ike_sa->get_my_host(ike_sa));
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
METHOD(load_tester_listener_t, get_established, u_int,
|
||||
private_load_tester_listener_t *this)
|
||||
{
|
||||
|
|
@ -95,7 +110,8 @@ METHOD(load_tester_listener_t, destroy, void,
|
|||
free(this);
|
||||
}
|
||||
|
||||
load_tester_listener_t *load_tester_listener_create(u_int shutdown_on)
|
||||
load_tester_listener_t *load_tester_listener_create(u_int shutdown_on,
|
||||
load_tester_config_t *config)
|
||||
{
|
||||
private_load_tester_listener_t *this;
|
||||
|
||||
|
|
@ -103,6 +119,7 @@ load_tester_listener_t *load_tester_listener_create(u_int shutdown_on)
|
|||
.public = {
|
||||
.listener = {
|
||||
.ike_updown = _ike_updown,
|
||||
.ike_state_change = _ike_state_change,
|
||||
},
|
||||
.get_established = _get_established,
|
||||
.destroy = _destroy,
|
||||
|
|
@ -111,6 +128,7 @@ load_tester_listener_t *load_tester_listener_create(u_int shutdown_on)
|
|||
"%s.plugins.load-tester.delete_after_established", FALSE,
|
||||
charon->name),
|
||||
.shutdown_on = shutdown_on,
|
||||
.config = config,
|
||||
);
|
||||
|
||||
return &this->public;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
|
||||
#include <bus/bus.h>
|
||||
|
||||
#include "load_tester_config.h"
|
||||
|
||||
typedef struct load_tester_listener_t load_tester_listener_t;
|
||||
|
||||
/**
|
||||
|
|
@ -52,8 +54,10 @@ struct load_tester_listener_t {
|
|||
* Create a listener to handle special events during load test
|
||||
*
|
||||
* @param shutdown_on shut down the daemon after this many SAs are established
|
||||
* @param config configuration backend
|
||||
* @return listener
|
||||
*/
|
||||
load_tester_listener_t *load_tester_listener_create(u_int shutdown_on);
|
||||
load_tester_listener_t *load_tester_listener_create(u_int shutdown_on,
|
||||
load_tester_config_t *config);
|
||||
|
||||
#endif /** LOAD_TESTER_LISTENER_H_ @}*/
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ static bool register_load_tester(private_load_tester_plugin_t *this,
|
|||
{
|
||||
shutdown_on = this->iterations * this->initiators;
|
||||
}
|
||||
this->listener = load_tester_listener_create(shutdown_on);
|
||||
this->listener = load_tester_listener_create(shutdown_on, this->config);
|
||||
charon->bus->add_listener(charon->bus, &this->listener->listener);
|
||||
|
||||
for (i = 0; i < this->initiators; i++)
|
||||
|
|
@ -236,6 +236,7 @@ METHOD(plugin_t, get_features, int,
|
|||
PLUGIN_DEPENDS(CUSTOM, "load-tester"),
|
||||
PLUGIN_CALLBACK((plugin_feature_callback_t)register_load_tester, NULL),
|
||||
PLUGIN_PROVIDE(CUSTOM, "load-tester"),
|
||||
PLUGIN_DEPENDS(CUSTOM, "kernel-net"),
|
||||
PLUGIN_SDEPEND(PRIVKEY, KEY_RSA),
|
||||
PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
|
||||
PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
|
||||
|
|
|
|||
Loading…
Reference in New Issue