- reworked configuration framework completly
- configuration is now split up in: connections, policies, credentials and daemon config - further alloc/free fixes needed!
This commit is contained in:
Martin Willi
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2005 Jan Hutter, Martin Willi
|
||||
* Copyright (C) 2006 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
@@ -24,22 +24,12 @@
|
||||
#define CONFIGURATION_H_
|
||||
|
||||
#include <types.h>
|
||||
#include <config/init_config.h>
|
||||
#include <config/sa_config.h>
|
||||
#include <transforms/rsa/rsa_private_key.h>
|
||||
#include <transforms/rsa/rsa_public_key.h>
|
||||
|
||||
|
||||
typedef struct configuration_t configuration_t;
|
||||
|
||||
/**
|
||||
* @brief The interface for a configuration backend.
|
||||
*
|
||||
* Multiple backends for the configuration are conceivable:
|
||||
* - ipsec starter from pluto
|
||||
* - own file backend
|
||||
* - multiple database backends
|
||||
* - LDAP backend?
|
||||
* @brief The interface for various daemon related configs.
|
||||
*
|
||||
* @b Constructors:
|
||||
* - configuration_create()
|
||||
@@ -48,81 +38,11 @@ typedef struct configuration_t configuration_t;
|
||||
*/
|
||||
struct configuration_t {
|
||||
|
||||
/**
|
||||
* @brief Returns the configuration information needed for IKE_SA_INIT exchange
|
||||
* for a specific configuration name.
|
||||
*
|
||||
* The returned init_config_t object MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param name name of the configuration
|
||||
* @param[out] init_config the init_config_t object is stored at this location
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_init_config_for_name) (configuration_t *this, char *name, init_config_t **init_config);
|
||||
|
||||
/**
|
||||
* @brief Returns the configuration information needed for IKE_SA_INIT exchange
|
||||
* for specific host informations.
|
||||
*
|
||||
* The returned init_config_t object MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param my_host my host informations
|
||||
* @param other_host other host informations
|
||||
* @param[out] init_config the init_config_t object is stored at this location
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_init_config_for_host) (configuration_t *this, host_t *my_host, host_t *other_host,init_config_t **init_config);
|
||||
|
||||
/**
|
||||
* @brief Returns the configuration information needed after IKE_SA_INIT exchange
|
||||
* for a specific configuration name.
|
||||
*
|
||||
* The returned sa_config_t object MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param name name of the configuration
|
||||
* @param[out] sa_config the sa_config_t object is stored at this location
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_sa_config_for_name) (configuration_t *this, char *name, sa_config_t **sa_config);
|
||||
|
||||
/**
|
||||
* @brief Returns the configuration information needed after IKE_SA_INIT exchange
|
||||
* for specific init_config_t and ID data.
|
||||
*
|
||||
* The returned sa_config_t object MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param init_config init_config_t object
|
||||
* @param other_id identification of other one
|
||||
* @param my_id my identification (can be NULL)
|
||||
* @param[out] sa_config the sa_config_t object is stored at this location
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_sa_config_for_init_config_and_id) (configuration_t *this, init_config_t *init_config, identification_t *other_id, identification_t *my_id,sa_config_t **sa_config);
|
||||
|
||||
/**
|
||||
* @brief Returns the retransmit timeout.
|
||||
*
|
||||
* The timeout values are managed by the configuration.
|
||||
* The timeout values are managed by the configuration, so
|
||||
* another backoff algorithm may be implemented here.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param retransmit_count number of times a message was retransmitted so far
|
||||
@@ -148,54 +68,6 @@ struct configuration_t {
|
||||
* @return timeout in milliseconds (ms)
|
||||
*/
|
||||
u_int32_t (*get_half_open_ike_sa_timeout) (configuration_t *this);
|
||||
|
||||
/**
|
||||
* @brief Returns the preshared secret of a specific ID.
|
||||
*
|
||||
* The returned preshared secret MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param identification identification_t object identifiying the ID.
|
||||
* @param[out] preshared_secret the preshared secret will be written there.
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND if no preshared secrets for specific ID could be found
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_shared_secret) (configuration_t *this, identification_t *identification, chunk_t *preshared_secret);
|
||||
|
||||
/**
|
||||
* @brief Returns the RSA public key of a specific ID.
|
||||
*
|
||||
* The returned rsa_public_key_t object MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param identification identification_t object identifiying the ID.
|
||||
* @param[out] public_key the public key will be written there
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND if no key is configured for specific id
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_rsa_public_key) (configuration_t *this, identification_t *identification, rsa_public_key_t **public_key);
|
||||
|
||||
/**
|
||||
* @brief Returns the RSA private key of a specific ID.
|
||||
*
|
||||
* The returned rsa_private_key_t object MUST NOT be destroyed cause it's managed by
|
||||
* this configuration_t object.
|
||||
*
|
||||
* @param this calling object
|
||||
* @param identification identification_t object identifiying the ID.
|
||||
* @param[out] private_key the private key will be written there
|
||||
*
|
||||
* @return
|
||||
* - NOT_FOUND if no key is configured for specific id
|
||||
* - SUCCESS
|
||||
*/
|
||||
status_t (*get_rsa_private_key) (configuration_t *this, identification_t *identification, rsa_private_key_t **private_key);
|
||||
|
||||
/**
|
||||
* @brief Destroys a configuration_t object.
|
||||
@@ -205,4 +77,13 @@ struct configuration_t {
|
||||
void (*destroy) (configuration_t *this);
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Creates a configuration backend.
|
||||
*
|
||||
* @return static_configuration_t object
|
||||
*
|
||||
* @ingroup config
|
||||
*/
|
||||
configuration_t *configuration_create();
|
||||
|
||||
#endif /*CONFIGURATION_H_*/
|
||||
|
||||
Reference in New Issue
Block a user