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

Migrated host to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-10-02 12:09:33 +02:00
parent 79838a7205
commit 4915be11e8
1 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/host.c
+40 -52
View File
@@ -59,26 +59,20 @@ struct private_host_t {
}; };
/** METHOD(host_t, get_sockaddr, sockaddr_t*,
* implements host_t.get_sockaddr private_host_t *this)
*/
static sockaddr_t *get_sockaddr(private_host_t *this)
{ {
return &(this->address); return &(this->address);
} }
/** METHOD(host_t, get_sockaddr_len, socklen_t*,
* implements host_t.get_sockaddr_len private_host_t *this)
*/
static socklen_t *get_sockaddr_len(private_host_t *this)
{ {
return &(this->socklen); return &(this->socklen);
} }
/** METHOD(host_t, is_anyaddr, bool,
* Implementation of host_t.is_anyaddr. private_host_t *this)
*/
static bool is_anyaddr(private_host_t *this)
{ {
switch (this->address.sa_family) switch (this->address.sa_family)
{ {
@@ -163,10 +157,8 @@ int host_printf_hook(char *dst, size_t dstlen, printf_hook_spec_t *spec,
return print_in_hook(dst, dstlen, "%*s", spec->width, buffer); return print_in_hook(dst, dstlen, "%*s", spec->width, buffer);
} }
/** METHOD(host_t, get_address, chunk_t,
* Implementation of host_t.get_address. private_host_t *this)
*/
static chunk_t get_address(private_host_t *this)
{ {
chunk_t address = chunk_empty; chunk_t address = chunk_empty;
@@ -192,18 +184,14 @@ static chunk_t get_address(private_host_t *this)
} }
} }
/** METHOD(host_t, get_family, int,
* implements host_t.get_family private_host_t *this)
*/
static int get_family(private_host_t *this)
{ {
return this->address.sa_family; return this->address.sa_family;
} }
/** METHOD(host_t, get_port, u_int16_t,
* implements host_t.get_port private_host_t *this)
*/
static u_int16_t get_port(private_host_t *this)
{ {
switch (this->address.sa_family) switch (this->address.sa_family)
{ {
@@ -222,10 +210,8 @@ static u_int16_t get_port(private_host_t *this)
} }
} }
/** METHOD(host_t, set_port, void,
* implements host_t.set_port private_host_t *this, u_int16_t port)
*/
static void set_port(private_host_t *this, u_int16_t port)
{ {
switch (this->address.sa_family) switch (this->address.sa_family)
{ {
@@ -246,19 +232,19 @@ static void set_port(private_host_t *this, u_int16_t port)
} }
} }
/** METHOD(host_t, clone_, host_t*,
* Implements host_t.clone. private_host_t *this)
*/
static private_host_t *clone_(private_host_t *this)
{ {
private_host_t *new = malloc_thing(private_host_t); private_host_t *new;
new = malloc_thing(private_host_t);
memcpy(new, this, sizeof(private_host_t)); memcpy(new, this, sizeof(private_host_t));
return new;
return &new->public;
} }
/** /**
* Impelements host_t.ip_equals * Implements host_t.ip_equals
*/ */
static bool ip_equals(private_host_t *this, private_host_t *other) static bool ip_equals(private_host_t *this, private_host_t *other)
{ {
@@ -332,10 +318,8 @@ static bool equals(private_host_t *this, private_host_t *other)
return FALSE; return FALSE;
} }
/** METHOD(host_t, destroy, void,
* Implements host_t.destroy private_host_t *this)
*/
static void destroy(private_host_t *this)
{ {
free(this); free(this);
} }
@@ -345,20 +329,24 @@ static void destroy(private_host_t *this)
*/ */
static private_host_t *host_create_empty(void) static private_host_t *host_create_empty(void)
{ {
private_host_t *this = malloc_thing(private_host_t); private_host_t *this;
this->public.get_sockaddr = (sockaddr_t* (*) (host_t*))get_sockaddr; INIT(this,
this->public.get_sockaddr_len = (socklen_t*(*) (host_t*))get_sockaddr_len; .public = {
this->public.clone = (host_t* (*) (host_t*))clone_; .get_sockaddr = _get_sockaddr,
this->public.get_family = (int (*) (host_t*))get_family; .get_sockaddr_len = _get_sockaddr_len,
this->public.get_address = (chunk_t (*) (host_t *)) get_address; .clone = _clone_,
this->public.get_port = (u_int16_t (*) (host_t *))get_port; .get_family = _get_family,
this->public.set_port = (void (*) (host_t *,u_int16_t))set_port; .get_address = _get_address,
this->public.get_differences = get_differences; .get_port = _get_port,
this->public.ip_equals = (bool (*) (host_t *,host_t *)) ip_equals; .set_port = _set_port,
this->public.equals = (bool (*) (host_t *,host_t *)) equals; .get_differences = get_differences,
this->public.is_anyaddr = (bool (*) (host_t *)) is_anyaddr; .ip_equals = (bool (*)(host_t *,host_t *))ip_equals,
this->public.destroy = (void (*) (host_t*))destroy; .equals = (bool (*)(host_t *,host_t *)) equals,
.is_anyaddr = _is_anyaddr,
.destroy = _destroy,
},
);
return this; return this;
} }