diff options
Diffstat (limited to 'src/charon/config/attributes')
-rw-r--r-- | src/charon/config/attributes/attribute_handler.h | 4 | ||||
-rw-r--r-- | src/charon/config/attributes/attribute_manager.c | 26 | ||||
-rw-r--r-- | src/charon/config/attributes/attribute_manager.h | 18 | ||||
-rw-r--r-- | src/charon/config/attributes/attribute_provider.h | 4 |
4 files changed, 26 insertions, 26 deletions
diff --git a/src/charon/config/attributes/attribute_handler.h b/src/charon/config/attributes/attribute_handler.h index de1c4414d..d752d512e 100644 --- a/src/charon/config/attributes/attribute_handler.h +++ b/src/charon/config/attributes/attribute_handler.h @@ -30,7 +30,7 @@ typedef struct attribute_handler_t attribute_handler_t; * Interface to handle configuration payload attributes. */ struct attribute_handler_t { - + /** * Handle a configuration attribute. * @@ -43,7 +43,7 @@ struct attribute_handler_t { */ bool (*handle)(attribute_handler_t *this, ike_sa_t *ike_sa, configuration_attribute_type_t type, chunk_t data); - + /** * Release an attribute handled during handle(). * diff --git a/src/charon/config/attributes/attribute_manager.c b/src/charon/config/attributes/attribute_manager.c index bf45fdb42..86d7d0759 100644 --- a/src/charon/config/attributes/attribute_manager.c +++ b/src/charon/config/attributes/attribute_manager.c @@ -30,17 +30,17 @@ struct private_attribute_manager_t { * public functions */ attribute_manager_t public; - + /** * list of registered providers */ linked_list_t *providers; - + /** * list of registered handlers */ linked_list_t *handlers; - + /** * rwlock provider list */ @@ -57,7 +57,7 @@ static host_t* acquire_address(private_attribute_manager_t *this, enumerator_t *enumerator; attribute_provider_t *current; host_t *host = NULL; - + this->lock->read_lock(this->lock); enumerator = this->providers->create_enumerator(this->providers); while (enumerator->enumerate(enumerator, ¤t)) @@ -70,7 +70,7 @@ static host_t* acquire_address(private_attribute_manager_t *this, } enumerator->destroy(enumerator); this->lock->unlock(this->lock); - + if (!host) { DBG1(DBG_CFG, "acquiring address from pool '%s' failed", pool); @@ -87,7 +87,7 @@ static void release_address(private_attribute_manager_t *this, enumerator_t *enumerator; attribute_provider_t *current; bool found = FALSE; - + this->lock->read_lock(this->lock); enumerator = this->providers->create_enumerator(this->providers); while (enumerator->enumerate(enumerator, ¤t)) @@ -100,7 +100,7 @@ static void release_address(private_attribute_manager_t *this, } enumerator->destroy(enumerator); this->lock->unlock(this->lock); - + if (!found) { DBG1(DBG_CFG, "releasing address to pool '%s' failed", pool); @@ -161,7 +161,7 @@ static attribute_handler_t* handle(private_attribute_manager_t *this, { enumerator_t *enumerator; attribute_handler_t *current, *handled = NULL; - + this->lock->read_lock(this->lock); enumerator = this->handlers->create_enumerator(this->handlers); while (enumerator->enumerate(enumerator, ¤t)) @@ -174,7 +174,7 @@ static attribute_handler_t* handle(private_attribute_manager_t *this, } enumerator->destroy(enumerator); this->lock->unlock(this->lock); - + if (!handled) { DBG1(DBG_CFG, "handling %N attribute failed", @@ -192,7 +192,7 @@ static void release(private_attribute_manager_t *this, { enumerator_t *enumerator; attribute_handler_t *current; - + this->lock->read_lock(this->lock); enumerator = this->handlers->create_enumerator(this->handlers); while (enumerator->enumerate(enumerator, ¤t)) @@ -246,7 +246,7 @@ static void destroy(private_attribute_manager_t *this) 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*,host_t*))acquire_address; this->public.release_address = (void(*)(attribute_manager_t*, char *, host_t*, identification_t*))release_address; this->public.create_attribute_enumerator = (enumerator_t*(*)(attribute_manager_t*, identification_t *id))create_attribute_enumerator; @@ -257,11 +257,11 @@ attribute_manager_t *attribute_manager_create() this->public.add_handler = (void(*)(attribute_manager_t*, attribute_handler_t *handler))add_handler; this->public.remove_handler = (void(*)(attribute_manager_t*, attribute_handler_t *handler))remove_handler; this->public.destroy = (void(*)(attribute_manager_t*))destroy; - + this->providers = linked_list_create(); this->handlers = linked_list_create(); this->lock = rwlock_create(RWLOCK_TYPE_DEFAULT); - + return &this->public; } diff --git a/src/charon/config/attributes/attribute_manager.h b/src/charon/config/attributes/attribute_manager.h index ceea06581..68eb8b1bf 100644 --- a/src/charon/config/attributes/attribute_manager.h +++ b/src/charon/config/attributes/attribute_manager.h @@ -35,7 +35,7 @@ typedef struct attribute_manager_t attribute_manager_t; * are received on the requesting peer. */ struct attribute_manager_t { - + /** * Acquire a virtual IP address to assign to a peer. * @@ -47,7 +47,7 @@ struct attribute_manager_t { host_t* (*acquire_address)(attribute_manager_t *this, char *pool, identification_t *id, host_t *requested); - + /** * Release a previously acquired address. * @@ -57,7 +57,7 @@ struct attribute_manager_t { */ void (*release_address)(attribute_manager_t *this, char *pool, host_t *address, identification_t *id); - + /** * Create an enumerator over attributes to hand out to a peer. * @@ -66,7 +66,7 @@ struct attribute_manager_t { */ enumerator_t* (*create_attribute_enumerator)(attribute_manager_t *this, identification_t *id); - + /** * Register an attribute provider to the manager. * @@ -81,7 +81,7 @@ struct attribute_manager_t { */ void (*remove_provider)(attribute_manager_t *this, attribute_provider_t *provider); - + /** * Handle a configuration attribute by passing them to the handlers. * @@ -92,7 +92,7 @@ struct attribute_manager_t { */ attribute_handler_t* (*handle)(attribute_manager_t *this, ike_sa_t *ike_sa, configuration_attribute_type_t type, chunk_t data); - + /** * Release an attribute previously handle()d by a handler. * @@ -104,7 +104,7 @@ struct attribute_manager_t { void (*release)(attribute_manager_t *this, attribute_handler_t *handler, ike_sa_t *ike_sa, configuration_attribute_type_t type, chunk_t data); - + /** * Register an attribute handler to the manager. * @@ -112,7 +112,7 @@ struct attribute_manager_t { */ void (*add_handler)(attribute_manager_t *this, attribute_handler_t *handler); - + /** * Unregister an attribute handler from the manager. * @@ -120,7 +120,7 @@ struct attribute_manager_t { */ void (*remove_handler)(attribute_manager_t *this, attribute_handler_t *handler); - + /** * Destroy a attribute_manager instance. */ diff --git a/src/charon/config/attributes/attribute_provider.h b/src/charon/config/attributes/attribute_provider.h index 0f1057af4..b8825723d 100644 --- a/src/charon/config/attributes/attribute_provider.h +++ b/src/charon/config/attributes/attribute_provider.h @@ -41,7 +41,7 @@ struct attribute_provider_t { * @return allocated address, NULL to serve none */ host_t* (*acquire_address)(attribute_provider_t *this, - char *pool, identification_t *id, + char *pool, identification_t *id, host_t *requested); /** * Release a previously acquired address. @@ -53,7 +53,7 @@ struct attribute_provider_t { */ bool (*release_address)(attribute_provider_t *this, char *pool, host_t *address, identification_t *id); - + /** * Create an enumerator over attributes to hand out to a peer. * |