denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attribute-handler: Pass full IKE_SA to handler backends

Browse Source
This commit is contained in:
Martin Willi
2015-02-20 13:34:56 +01:00
parent bc9ded9dbf
commit b9be25ea39
10 changed files with 61 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/attributes/attribute_handler.h
+12 -8
View File
@@ -21,14 +21,14 @@
#ifndef ATTRIBUTE_HANDLER_H_
#define ATTRIBUTE_HANDLER_H_
typedef struct attribute_handler_t attribute_handler_t;
#include <sa/ike_sa.h>
#include <utils/chunk.h>
#include <utils/identification.h>
#include <collections/linked_list.h>
#include "attributes.h"
typedef struct attribute_handler_t attribute_handler_t;
/**
* Interface to handle configuration payload attributes.
*/
@@ -40,12 +40,12 @@ struct attribute_handler_t {
* After receiving a configuration attriubte, it is passed to each
* attribute handler until it is handled.
*
* @param server server from which the attribute was received
* @param ike_sa IKE_SA under which attribute is received
* @param type type of configuration attribute to handle
* @param data associated attribute data
* @return TRUE if attribute handled
*/
bool (*handle)(attribute_handler_t *this, identification_t *server,
bool (*handle)(attribute_handler_t *this, ike_sa_t *ike_sa,
configuration_attribute_type_t type, chunk_t data);
/**
@@ -54,19 +54,23 @@ struct attribute_handler_t {
* A handler that handle()d an attribute gets a call to release() when the
* connection gets closed. Depending on the implementation, this is required
* to remove the attribute.
*
* @param ike_sa IKE_SA which releases attribute
* @param type type of configuration attribute to release
* @param data associated attribute data
*/
void (*release)(attribute_handler_t *this, identification_t *server,
void (*release)(attribute_handler_t *this, ike_sa_t *ike_sa,
configuration_attribute_type_t type, chunk_t data);
/**
* Enumerate attributes to request from a server.
*
* @param server server identity to request attributes from
* @param ike_sa IKE_SA to request attributes for
* @param vips list of virtual IPs (host_t*) we are requesting
* @return enumerator (configuration_attribute_type_t, chunk_t)
*/
enumerator_t* (*create_attribute_enumerator)(attribute_handler_t *this,
identification_t *server, linked_list_t *vips);
ike_sa_t *ike_sa, linked_list_t *vips);
};
#endif /** ATTRIBUTE_HANDLER_H_ @}*/
src/libcharon/attributes/attribute_manager.c
+4 -14
View File
@@ -158,18 +158,15 @@ METHOD(attribute_manager_t, handle, attribute_handler_t*,
chunk_t data)
{
enumerator_t *enumerator;
identification_t *server;
attribute_handler_t *current, *handled = NULL;
server = ike_sa->get_other_id(ike_sa);
this->lock->read_lock(this->lock);
/* try to find the passed handler */
enumerator = this->handlers->create_enumerator(this->handlers);
while (enumerator->enumerate(enumerator, &current))
{
if (current == handler && current->handle(current, server, type, data))
if (current == handler && current->handle(current, ike_sa, type, data))
{
handled = current;
break;
@@ -181,7 +178,7 @@ METHOD(attribute_manager_t, handle, attribute_handler_t*,
enumerator = this->handlers->create_enumerator(this->handlers);
while (enumerator->enumerate(enumerator, &current))
{
if (current->handle(current, server, type, data))
if (current->handle(current, ike_sa, type, data))
{
handled = current;
break;
@@ -205,9 +202,6 @@ METHOD(attribute_manager_t, release, void,
{
enumerator_t *enumerator;
attribute_handler_t *current;
identification_t *server;
server = ike_sa->get_other_id(ike_sa);
this->lock->read_lock(this->lock);
enumerator = this->handlers->create_enumerator(this->handlers);
@@ -215,7 +209,7 @@ METHOD(attribute_manager_t, release, void,
{
if (current == handler)
{
current->release(current, server, type, data);
current->release(current, ike_sa, type, data);
break;
}
}
@@ -251,10 +245,6 @@ static bool initiator_enumerate(initiator_enumerator_t *this,
configuration_attribute_type_t *type,
chunk_t *value)
{
identification_t *id;
id = this->ike_sa->get_other_id(this->ike_sa);
/* enumerate inner attributes using outer handler enumerator */
while (!this->inner || !this->inner->enumerate(this->inner, type, value))
{
@@ -264,7 +254,7 @@ static bool initiator_enumerate(initiator_enumerator_t *this,
}
DESTROY_IF(this->inner);
this->inner = this->handler->create_attribute_enumerator(this->handler,
id, this->vips);
this->ike_sa, this->vips);
}
/* inject the handler as additional attribute */
*handler = this->handler;