implementation of an CFG attribute framework, currently supporting virtual IPs
updated ipsec.conf sourceip parameter to support CIDR notatation to serve from a pool %poolname to query a separate (database?) pool
This commit is contained in:
Martin Willi
@@ -0,0 +1,145 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "attribute_manager.h"
|
||||
|
||||
#include <utils/linked_list.h>
|
||||
#include <utils/mutex.h>
|
||||
|
||||
typedef struct private_attribute_manager_t private_attribute_manager_t;
|
||||
|
||||
/**
|
||||
* private data of attribute_manager
|
||||
*/
|
||||
struct private_attribute_manager_t {
|
||||
|
||||
/**
|
||||
* public functions
|
||||
*/
|
||||
attribute_manager_t public;
|
||||
|
||||
/**
|
||||
* list of registered providers
|
||||
*/
|
||||
linked_list_t *providers;
|
||||
|
||||
/**
|
||||
* mutex to lock provider list
|
||||
*/
|
||||
mutex_t *mutex;
|
||||
};
|
||||
|
||||
/**
|
||||
* Implementation of attribute_manager_t.acquire_address.
|
||||
*/
|
||||
static host_t* acquire_address(private_attribute_manager_t *this,
|
||||
char *pool, identification_t *id,
|
||||
auth_info_t *auth, host_t *requested)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
attribute_provider_t *current;
|
||||
host_t *host = NULL;
|
||||
|
||||
this->mutex->lock(this->mutex);
|
||||
enumerator = this->providers->create_enumerator(this->providers);
|
||||
while (enumerator->enumerate(enumerator, ¤t))
|
||||
{
|
||||
host = current->acquire_address(current, pool, id, auth, requested);
|
||||
if (host)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
this->mutex->unlock(this->mutex);
|
||||
|
||||
return host;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of attribute_manager_t.release_address.
|
||||
*/
|
||||
static void release_address(private_attribute_manager_t *this,
|
||||
char *pool, host_t *address)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
attribute_provider_t *current;
|
||||
|
||||
this->mutex->lock(this->mutex);
|
||||
enumerator = this->providers->create_enumerator(this->providers);
|
||||
while (enumerator->enumerate(enumerator, ¤t))
|
||||
{
|
||||
if (current->release_address(current, pool, address))
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
this->mutex->unlock(this->mutex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of attribute_manager_t.add_provider.
|
||||
*/
|
||||
static void add_provider(private_attribute_manager_t *this,
|
||||
attribute_provider_t *provider)
|
||||
{
|
||||
this->mutex->lock(this->mutex);
|
||||
this->providers->insert_last(this->providers, provider);
|
||||
this->mutex->unlock(this->mutex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of attribute_manager_t.remove_provider.
|
||||
*/
|
||||
static void remove_provider(private_attribute_manager_t *this,
|
||||
attribute_provider_t *provider)
|
||||
{
|
||||
this->mutex->lock(this->mutex);
|
||||
this->providers->remove(this->providers, provider, NULL);
|
||||
this->mutex->unlock(this->mutex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of attribute_manager_t.destroy
|
||||
*/
|
||||
static void destroy(private_attribute_manager_t *this)
|
||||
{
|
||||
this->providers->destroy(this->providers);
|
||||
this->mutex->destroy(this->mutex);
|
||||
free(this);
|
||||
}
|
||||
|
||||
/*
|
||||
* see header file
|
||||
*/
|
||||
attribute_manager_t *attribute_manager_create()
|
||||
{
|
||||
private_attribute_manager_t *this = malloc_thing(private_attribute_manager_t);
|
||||
|
||||
this->public.acquire_address = (host_t*(*)(attribute_manager_t*, char*, identification_t*,auth_info_t*,host_t*))acquire_address;
|
||||
this->public.release_address = (void(*)(attribute_manager_t*, char *, host_t*))release_address;
|
||||
this->public.add_provider = (void(*)(attribute_manager_t*, attribute_provider_t *provider))add_provider;
|
||||
this->public.remove_provider = (void(*)(attribute_manager_t*, attribute_provider_t *provider))remove_provider;
|
||||
this->public.destroy = (void(*)(attribute_manager_t*))destroy;
|
||||
|
||||
this->providers = linked_list_create();
|
||||
this->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
|
||||
return &this->public;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup attribute_manager attribute_manager
|
||||
* @{ @ingroup attributes
|
||||
*/
|
||||
|
||||
#ifndef ATTRIBUTE_MANAGER_H_
|
||||
#define ATTRIBUTE_MANAGER_H_
|
||||
|
||||
#include <config/attributes/attribute_provider.h>
|
||||
|
||||
typedef struct attribute_manager_t attribute_manager_t;
|
||||
|
||||
/**
|
||||
* Provide configuration attributes to include in CFG Payloads.
|
||||
*/
|
||||
struct attribute_manager_t {
|
||||
|
||||
/**
|
||||
* Acquire a virtual IP address to assign to a peer.
|
||||
*
|
||||
* @param pool pool name to acquire address from
|
||||
* @param id peer identity to get address for
|
||||
* @param auth authorization infos of peer
|
||||
* @param requested IP in configuration request
|
||||
* @return allocated address, NULL to serve none
|
||||
*/
|
||||
host_t* (*acquire_address)(attribute_manager_t *this,
|
||||
char *pool, identification_t *id,
|
||||
auth_info_t *auth, host_t *requested);
|
||||
|
||||
/**
|
||||
* Release a previously acquired address.
|
||||
*
|
||||
* @param pool pool name from which the address was acquired
|
||||
* @param address address to release
|
||||
*/
|
||||
void (*release_address)(attribute_manager_t *this,
|
||||
char *pool, host_t *address);
|
||||
|
||||
/**
|
||||
* Register an attribute provider to the manager.
|
||||
*
|
||||
* @param provider attribute provider to register
|
||||
*/
|
||||
void (*add_provider)(attribute_manager_t *this,
|
||||
attribute_provider_t *provider);
|
||||
/**
|
||||
* Unregister an attribute provider from the manager.
|
||||
*
|
||||
* @param provider attribute provider to unregister
|
||||
*/
|
||||
void (*remove_provider)(attribute_manager_t *this,
|
||||
attribute_provider_t *provider);
|
||||
/**
|
||||
* Destroy a attribute_manager instance.
|
||||
*/
|
||||
void (*destroy)(attribute_manager_t *this);
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a attribute_manager instance.
|
||||
*/
|
||||
attribute_manager_t *attribute_manager_create();
|
||||
|
||||
#endif /* ATTRIBUTE_MANAGER_H_ @}*/
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup attribute_provider attribute_provider
|
||||
* @{ @ingroup attributes
|
||||
*/
|
||||
|
||||
#ifndef ATTRIBUTE_PROVIDER_H_
|
||||
#define ATTRIBUTE_PROVIDER_H_
|
||||
|
||||
#include <library.h>
|
||||
#include <utils/host.h>
|
||||
#include <credentials/auth_info.h>
|
||||
|
||||
typedef struct attribute_provider_t attribute_provider_t;
|
||||
|
||||
/**
|
||||
* Interface to provide attributes to peers through attribute manager.
|
||||
*/
|
||||
struct attribute_provider_t {
|
||||
|
||||
/**
|
||||
* Acquire a virtual IP address to assign to a peer.
|
||||
*
|
||||
* @param pool name of the pool to acquire address from
|
||||
* @param id peer ID
|
||||
* @param auth authorization infos
|
||||
* @param requested IP in configuration request
|
||||
* @return allocated address, NULL to serve none
|
||||
*/
|
||||
host_t* (*acquire_address)(attribute_provider_t *this,
|
||||
char *pool, identification_t *id,
|
||||
auth_info_t *auth, host_t *requested);
|
||||
/**
|
||||
* Release a previously acquired address.
|
||||
*
|
||||
* @param pool name of the pool this address was acquired from
|
||||
* @param address address to release
|
||||
* @return TRUE if the address has been released by the provider
|
||||
*/
|
||||
bool (*release_address)(attribute_provider_t *this,
|
||||
char *pool, host_t *address);
|
||||
};
|
||||
|
||||
#endif /* ATTRIBUTE_PROVIDER_H_ @}*/
|
||||
Reference in New Issue
Block a user