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

Migrated traffic_selector to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-10-02 11:52:52 +02:00
parent b59fd53fe2
commit 79838a7205
1 changed files with 51 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/selectors/traffic_selector.c
+51 -76
View File
@@ -413,10 +413,8 @@ static bool equals(private_traffic_selector_t *this, private_traffic_selector_t
return FALSE; return FALSE;
} }
/** METHOD(traffic_selector_t, get_from_address, chunk_t,
* Implements traffic_selector_t.get_from_address. private_traffic_selector_t *this)
*/
static chunk_t get_from_address(private_traffic_selector_t *this)
{ {
switch (this->type) switch (this->type)
{ {
@@ -429,10 +427,8 @@ static chunk_t get_from_address(private_traffic_selector_t *this)
} }
} }
/** METHOD(traffic_selector_t, get_to_address, chunk_t,
* Implements traffic_selector_t.get_to_address. private_traffic_selector_t *this)
*/
static chunk_t get_to_address(private_traffic_selector_t *this)
{ {
switch (this->type) switch (this->type)
{ {
@@ -445,42 +441,32 @@ static chunk_t get_to_address(private_traffic_selector_t *this)
} }
} }
/** METHOD(traffic_selector_t, get_from_port, u_int16_t,
* Implements traffic_selector_t.get_from_port. private_traffic_selector_t *this)
*/
static u_int16_t get_from_port(private_traffic_selector_t *this)
{ {
return this->from_port; return this->from_port;
} }
/** METHOD(traffic_selector_t, get_to_port, u_int16_t,
* Implements traffic_selector_t.get_to_port. private_traffic_selector_t *this)
*/
static u_int16_t get_to_port(private_traffic_selector_t *this)
{ {
return this->to_port; return this->to_port;
} }
/** METHOD(traffic_selector_t, get_type, ts_type_t,
* Implements traffic_selector_t.get_type. private_traffic_selector_t *this)
*/
static ts_type_t get_type(private_traffic_selector_t *this)
{ {
return this->type; return this->type;
} }
/** METHOD(traffic_selector_t, get_protocol, u_int8_t,
* Implements traffic_selector_t.get_protocol. private_traffic_selector_t *this)
*/
static u_int8_t get_protocol(private_traffic_selector_t *this)
{ {
return this->protocol; return this->protocol;
} }
/** METHOD(traffic_selector_t, is_host, bool,
* Implements traffic_selector_t.is_host. private_traffic_selector_t *this, host_t *host)
*/
static bool is_host(private_traffic_selector_t *this, host_t *host)
{ {
if (host) if (host)
{ {
@@ -515,18 +501,14 @@ static bool is_host(private_traffic_selector_t *this, host_t *host)
return FALSE; return FALSE;
} }
/** METHOD(traffic_selector_t, is_dynamic, bool,
* Implementation of traffic_selector_t.is_dynamic private_traffic_selector_t *this)
*/
static bool is_dynamic(private_traffic_selector_t *this)
{ {
return this->dynamic; return this->dynamic;
} }
/** METHOD(traffic_selector_t, set_address, void,
* Implements traffic_selector_t.set_address. private_traffic_selector_t *this, host_t *host)
*/
static void set_address(private_traffic_selector_t *this, host_t *host)
{ {
if (this->dynamic) if (this->dynamic)
{ {
@@ -571,10 +553,8 @@ static bool is_contained_in(private_traffic_selector_t *this,
return contained_in; return contained_in;
} }
/** METHOD(traffic_selector_t, includes, bool,
* Implements traffic_selector_t.includes. private_traffic_selector_t *this, host_t *host)
*/
static bool includes(private_traffic_selector_t *this, host_t *host)
{ {
chunk_t addr; chunk_t addr;
int family = host->get_family(host); int family = host->get_family(host);
@@ -591,10 +571,8 @@ static bool includes(private_traffic_selector_t *this, host_t *host)
return FALSE; return FALSE;
} }
/** METHOD(traffic_selector_t, to_subnet, void,
* Implements traffic_selector_t.to_subnet. private_traffic_selector_t *this, host_t **net, u_int8_t *mask)
*/
static void to_subnet(private_traffic_selector_t *this, host_t **net, u_int8_t *mask)
{ {
/* there is no way to do this cleanly, as the address range may /* there is no way to do this cleanly, as the address range may
* be anything else but a subnet. We use from_addr as subnet * be anything else but a subnet. We use from_addr as subnet
@@ -640,10 +618,8 @@ static void to_subnet(private_traffic_selector_t *this, host_t **net, u_int8_t *
chunk_free(&net_chunk); chunk_free(&net_chunk);
} }
/** METHOD(traffic_selector_t, clone_, traffic_selector_t*,
* Implements traffic_selector_t.clone. private_traffic_selector_t *this)
*/
static traffic_selector_t *clone_(private_traffic_selector_t *this)
{ {
private_traffic_selector_t *clone; private_traffic_selector_t *clone;
@@ -668,10 +644,8 @@ static traffic_selector_t *clone_(private_traffic_selector_t *this)
} }
} }
/** METHOD(traffic_selector_t, destroy, void,
* Implements traffic_selector_t.destroy. private_traffic_selector_t *this)
*/
static void destroy(private_traffic_selector_t *this)
{ {
free(this); free(this);
} }
@@ -888,31 +862,32 @@ traffic_selector_t *traffic_selector_create_dynamic(u_int8_t protocol,
static private_traffic_selector_t *traffic_selector_create(u_int8_t protocol, static private_traffic_selector_t *traffic_selector_create(u_int8_t protocol,
ts_type_t type, u_int16_t from_port, u_int16_t to_port) ts_type_t type, u_int16_t from_port, u_int16_t to_port)
{ {
private_traffic_selector_t *this = malloc_thing(private_traffic_selector_t); private_traffic_selector_t *this;
/* public functions */ INIT(this,
this->public.get_subset = (traffic_selector_t*(*)(traffic_selector_t*,traffic_selector_t*))get_subset; .public = {
this->public.equals = (bool(*)(traffic_selector_t*,traffic_selector_t*))equals; .get_subset = (traffic_selector_t*(*)(traffic_selector_t*,traffic_selector_t*))get_subset,
this->public.get_from_address = (chunk_t(*)(traffic_selector_t*))get_from_address; .equals = (bool(*)(traffic_selector_t*,traffic_selector_t*))equals,
this->public.get_to_address = (chunk_t(*)(traffic_selector_t*))get_to_address; .get_from_address = _get_from_address,
this->public.get_from_port = (u_int16_t(*)(traffic_selector_t*))get_from_port; .get_to_address = _get_to_address,
this->public.get_to_port = (u_int16_t(*)(traffic_selector_t*))get_to_port; .get_from_port = _get_from_port,
this->public.get_type = (ts_type_t(*)(traffic_selector_t*))get_type; .get_to_port = _get_to_port,
this->public.get_protocol = (u_int8_t(*)(traffic_selector_t*))get_protocol; .get_type = _get_type,
this->public.is_host = (bool(*)(traffic_selector_t*,host_t*))is_host; .get_protocol = _get_protocol,
this->public.is_dynamic = (bool(*)(traffic_selector_t*))is_dynamic; .is_host = _is_host,
this->public.is_contained_in = (bool(*)(traffic_selector_t*,traffic_selector_t*))is_contained_in; .is_dynamic = _is_dynamic,
this->public.includes = (bool(*)(traffic_selector_t*,host_t*))includes; .is_contained_in = (bool(*)(traffic_selector_t*,traffic_selector_t*))is_contained_in,
this->public.set_address = (void(*)(traffic_selector_t*,host_t*))set_address; .includes = _includes,
this->public.to_subnet = (void(*)(traffic_selector_t*,host_t**,u_int8_t*))to_subnet; .set_address = _set_address,
this->public.clone = (traffic_selector_t*(*)(traffic_selector_t*))clone_; .to_subnet = _to_subnet,
this->public.destroy = (void(*)(traffic_selector_t*))destroy; .clone = _clone_,
.destroy = _destroy,
this->from_port = from_port; },
this->to_port = to_port; .from_port = from_port,
this->protocol = protocol; .to_port = to_port,
this->type = type; .protocol = protocol,
this->dynamic = FALSE; .type = type,
);
return this; return this;
} }