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

Made create_endpoint_notify_create() private.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 15:59:20 +02:00
parent bdc8d0aa90
commit 055a823d08
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/endpoint_notify.c
+14 -10
View File
@@ -75,6 +75,11 @@ ENUM(me_endpoint_type_names, HOST, RELAYED,
"RELAYED" "RELAYED"
); );
/**
* Forward declaration
*/
static private_endpoint_notify_t *endpoint_notify_create();
/** /**
* Helper functions to parse integer values * Helper functions to parse integer values
*/ */
@@ -273,7 +278,7 @@ METHOD(endpoint_notify_t, clone_, endpoint_notify_t*,
{ {
private_endpoint_notify_t *clone; private_endpoint_notify_t *clone;
clone = (private_endpoint_notify_t*)endpoint_notify_create(); clone = endpoint_notify_create();
clone->priority = this->priority; clone->priority = this->priority;
clone->type = this->type; clone->type = this->type;
clone->family = this->family; clone->family = this->family;
@@ -299,10 +304,10 @@ METHOD(endpoint_notify_t, destroy, void,
free(this); free(this);
} }
/* /**
* Described in header * Creates an empty endpoint notify
*/ */
endpoint_notify_t *endpoint_notify_create() static private_endpoint_notify_t *endpoint_notify_create()
{ {
private_endpoint_notify_t *this; private_endpoint_notify_t *this;
@@ -322,17 +327,16 @@ endpoint_notify_t *endpoint_notify_create()
.type = NO_TYPE, .type = NO_TYPE,
); );
return &this->public; return this;
} }
/** /**
* Described in header * Described in header
*/ */
endpoint_notify_t *endpoint_notify_create_from_host(me_endpoint_type_t type, host_t *host, host_t *base) endpoint_notify_t *endpoint_notify_create_from_host(me_endpoint_type_t type,
host_t *host, host_t *base)
{ {
private_endpoint_notify_t *this; private_endpoint_notify_t *this = endpoint_notify_create();
this = (private_endpoint_notify_t*)endpoint_notify_create();
this->type = type; this->type = type;
switch(type) switch(type)
@@ -397,7 +401,7 @@ endpoint_notify_t *endpoint_notify_create_from_payload(notify_payload_t *notify)
return NULL; return NULL;
} }
this = (private_endpoint_notify_t*)endpoint_notify_create(); this = endpoint_notify_create();
data = notify->get_notification_data(notify); data = notify->get_notification_data(notify);
if (parse_notification_data(this, data) != SUCCESS) if (parse_notification_data(this, data) != SUCCESS)
src/libcharon/encoding/payloads/endpoint_notify.h
+4 -11
View File
@@ -125,7 +125,7 @@ struct endpoint_notify_t {
/** /**
* Generates a notification payload from this endpoint. * Generates a notification payload from this endpoint.
* *
* @return built notify_payload_t * @return built notify_payload_t
*/ */
notify_payload_t *(*build_notify) (endpoint_notify_t *this); notify_payload_t *(*build_notify) (endpoint_notify_t *this);
@@ -142,20 +142,13 @@ struct endpoint_notify_t {
void (*destroy) (endpoint_notify_t *this); void (*destroy) (endpoint_notify_t *this);
}; };
/**
* Creates an empty endpoint_notify_t object.
*
* @return created endpoint_notify_t object
*/
endpoint_notify_t *endpoint_notify_create(void);
/** /**
* Creates an endpoint_notify_t object from a host. * Creates an endpoint_notify_t object from a host.
* *
* @param type the endpoint type * @param type the endpoint type
* @param host host to base the notify on (gets cloned) * @param host host to base the notify on (gets cloned)
* @param base base of the endpoint, applies only to reflexive endpoints (gets cloned) * @param base base of the endpoint, applies only to reflexive
* endpoints (gets cloned)
* @return created endpoint_notify_t object * @return created endpoint_notify_t object
*/ */
endpoint_notify_t *endpoint_notify_create_from_host(me_endpoint_type_t type, endpoint_notify_t *endpoint_notify_create_from_host(me_endpoint_type_t type,
@@ -166,7 +159,7 @@ endpoint_notify_t *endpoint_notify_create_from_host(me_endpoint_type_t type,
* *
* @param notify the notify payload * @param notify the notify payload
* @return - created endpoint_notify_t object * @return - created endpoint_notify_t object
* - NULL if invalid payload * - NULL if invalid payload
*/ */
endpoint_notify_t *endpoint_notify_create_from_payload(notify_payload_t *notify); endpoint_notify_t *endpoint_notify_create_from_payload(notify_payload_t *notify);