summaryrefslogtreecommitdiff
path: root/src/libcharon/encoding/payloads/cp_payload.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcharon/encoding/payloads/cp_payload.c')
-rw-r--r--src/libcharon/encoding/payloads/cp_payload.c153
1 files changed, 0 insertions, 153 deletions
diff --git a/src/libcharon/encoding/payloads/cp_payload.c b/src/libcharon/encoding/payloads/cp_payload.c
index d8779d27f..82e9e51b7 100644
--- a/src/libcharon/encoding/payloads/cp_payload.c
+++ b/src/libcharon/encoding/payloads/cp_payload.c
@@ -1,10 +1,6 @@
/*
-<<<<<<< HEAD
- * Copyright (C) 2005-2009 Martin Willi
-=======
* Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2010 revosec AG
->>>>>>> upstream/4.5.1
* Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil
*
@@ -37,15 +33,9 @@ typedef struct private_cp_payload_t private_cp_payload_t;
/**
* Private data of an cp_payload_t object.
-<<<<<<< HEAD
- *
- */
-struct private_cp_payload_t {
-=======
*/
struct private_cp_payload_t {
->>>>>>> upstream/4.5.1
/**
* Public cp_payload_t interface.
*/
@@ -62,8 +52,6 @@ struct private_cp_payload_t {
bool critical;
/**
-<<<<<<< HEAD
-=======
* Reserved bits
*/
bool reserved_bit[7];
@@ -74,7 +62,6 @@ struct private_cp_payload_t {
u_int8_t reserved_byte[3];
/**
->>>>>>> upstream/4.5.1
* Length of this payload.
*/
u_int16_t payload_length;
@@ -95,32 +82,6 @@ struct private_cp_payload_t {
*
* The defined offsets are the positions in a object of type
* private_cp_payload_t.
-<<<<<<< HEAD
- *
- */
-encoding_rule_t cp_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
- { U_INT_8, offsetof(private_cp_payload_t, next_payload) },
- /* the critical bit */
- { FLAG, offsetof(private_cp_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- /* Length of the whole CP payload*/
- { PAYLOAD_LENGTH, offsetof(private_cp_payload_t, payload_length) },
- /* Proposals are stored in a proposal substructure,
- offset points to a linked_list_t pointer */
- { U_INT_8, offsetof(private_cp_payload_t, type) },
- { RESERVED_BYTE,0 },
- { RESERVED_BYTE,0 },
- { RESERVED_BYTE,0 },
- { CONFIGURATION_ATTRIBUTES, offsetof(private_cp_payload_t, attributes) }
-=======
*/
encoding_rule_t cp_payload_encodings[] = {
/* 1 Byte next payload type, stored in the field next_payload */
@@ -145,7 +106,6 @@ encoding_rule_t cp_payload_encodings[] = {
{ RESERVED_BYTE, offsetof(private_cp_payload_t, reserved_byte[1])},
{ RESERVED_BYTE, offsetof(private_cp_payload_t, reserved_byte[2])},
{ CONFIGURATION_ATTRIBUTES, offsetof(private_cp_payload_t, attributes) }
->>>>>>> upstream/4.5.1
};
/*
@@ -162,15 +122,8 @@ encoding_rule_t cp_payload_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
-<<<<<<< HEAD
-/**
- * Implementation of payload_t.verify.
- */
-static status_t verify(private_cp_payload_t *this)
-=======
METHOD(payload_t, verify, status_t,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
status_t status = SUCCESS;
enumerator_t *enumerator;
@@ -189,22 +142,6 @@ METHOD(payload_t, verify, status_t,
return status;
}
-<<<<<<< HEAD
-/**
- * Implementation of payload_t.get_encoding_rules.
- */
-static void get_encoding_rules(private_cp_payload_t *this,
- encoding_rule_t **rules, size_t *rule_count)
-{
- *rules = cp_payload_encodings;
- *rule_count = sizeof(cp_payload_encodings) / sizeof(encoding_rule_t);
-}
-
-/**
- * Implementation of payload_t.get_type.
- */
-static payload_type_t get_type(private_cp_payload_t *this)
-=======
METHOD(payload_t, get_encoding_rules, void,
private_cp_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
{
@@ -214,33 +151,18 @@ METHOD(payload_t, get_encoding_rules, void,
METHOD(payload_t, get_type, payload_type_t,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
return CONFIGURATION;
}
-<<<<<<< HEAD
-/**
- * Implementation of payload_t.get_next_type.
- */
-static payload_type_t get_next_type(private_cp_payload_t *this)
-=======
METHOD(payload_t, get_next_type, payload_type_t,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
return this->next_payload;
}
-<<<<<<< HEAD
-/**
- * Implementation of payload_t.set_next_type.
- */
-static void set_next_type(private_cp_payload_t *this,payload_type_t type)
-=======
METHOD(payload_t, set_next_type, void,
private_cp_payload_t *this,payload_type_t type)
->>>>>>> upstream/4.5.1
{
this->next_payload = type;
}
@@ -263,69 +185,33 @@ static void compute_length(private_cp_payload_t *this)
enumerator->destroy(enumerator);
}
-<<<<<<< HEAD
-/**
- * Implementation of payload_t.get_length.
- */
-static size_t get_length(private_cp_payload_t *this)
-=======
METHOD(payload_t, get_length, size_t,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
return this->payload_length;
}
-<<<<<<< HEAD
-/**
- * Implementation of cp_payload_t.create_attribute_enumerator.
- */
-static enumerator_t *create_attribute_enumerator(private_cp_payload_t *this)
-=======
METHOD(cp_payload_t, create_attribute_enumerator, enumerator_t*,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
return this->attributes->create_enumerator(this->attributes);
}
-<<<<<<< HEAD
-/**
- * Implementation of cp_payload_t.add_attribute.
- */
-static void add_attribute(private_cp_payload_t *this,
- configuration_attribute_t *attribute)
-=======
METHOD(cp_payload_t, add_attribute, void,
private_cp_payload_t *this, configuration_attribute_t *attribute)
->>>>>>> upstream/4.5.1
{
this->attributes->insert_last(this->attributes, attribute);
compute_length(this);
}
-<<<<<<< HEAD
-/**
- * Implementation of cp_payload_t.get_type.
- */
-static config_type_t get_config_type(private_cp_payload_t *this)
-=======
METHOD(cp_payload_t, get_config_type, config_type_t,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
return this->type;
}
-<<<<<<< HEAD
-/**
- * Implementation of payload_t.destroy and cp_payload_t.destroy.
- */
-static void destroy(private_cp_payload_t *this)
-=======
METHOD2(payload_t, cp_payload_t, destroy, void,
private_cp_payload_t *this)
->>>>>>> upstream/4.5.1
{
this->attributes->destroy_offset(this->attributes,
offsetof(configuration_attribute_t, destroy));
@@ -335,32 +221,6 @@ METHOD2(payload_t, cp_payload_t, destroy, void,
/*
* Described in header.
*/
-<<<<<<< HEAD
-cp_payload_t *cp_payload_create()
-{
- private_cp_payload_t *this = malloc_thing(private_cp_payload_t);
-
- this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
- this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
- this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
- this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
- this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
- this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
- this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
-
- this->public.create_attribute_enumerator = (enumerator_t*(*)(cp_payload_t *))create_attribute_enumerator;
- this->public.add_attribute = (void (*) (cp_payload_t *,configuration_attribute_t*))add_attribute;
- this->public.get_type = (config_type_t (*) (cp_payload_t *))get_config_type;
- this->public.destroy = (void (*)(cp_payload_t *))destroy;
-
- /* set default values of the fields */
- this->critical = FALSE;
- this->next_payload = NO_PAYLOAD;
- this->payload_length = CP_PAYLOAD_HEADER_LENGTH;
- this->attributes = linked_list_create();
- this->type = CFG_REQUEST;
-
-=======
cp_payload_t *cp_payload_create_type(config_type_t type)
{
private_cp_payload_t *this;
@@ -386,26 +246,13 @@ cp_payload_t *cp_payload_create_type(config_type_t type)
.attributes = linked_list_create(),
.type = type,
);
->>>>>>> upstream/4.5.1
return &this->public;
}
/*
* Described in header.
*/
-<<<<<<< HEAD
-cp_payload_t *cp_payload_create_type(config_type_t type)
-{
- private_cp_payload_t *this = (private_cp_payload_t*)cp_payload_create();
-
- this->type = type;
-
- return &this->public;
-}
-
-=======
cp_payload_t *cp_payload_create()
{
return cp_payload_create_type(CFG_REQUEST);
}
->>>>>>> upstream/4.5.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 16:12:43 +0000