Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion

1 files changed, 138 insertions, 0 deletions

diff --git a/src/libcharon/encoding/payloads/cp_payload.c b/src/libcharon/encoding/payloads/cp_payload.c
index f0a26eee2..d8779d27f 100644
--- a/src/libcharon/encoding/payloads/cp_payload.c
+++ b/src/libcharon/encoding/payloads/cp_payload.c
@@ -1,5 +1,10 @@
 /*
+<<<<<<< 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
  *
@@ -32,9 +37,15 @@ 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.
 	 */
@@ -51,6 +62,19 @@ struct private_cp_payload_t {
 	bool critical;
 
 	/**
+<<<<<<< HEAD
+=======
+	 * Reserved bits
+	 */
+	bool reserved_bit[7];
+
+	/**
+	 * Reserved bytes
+	 */
+	u_int8_t reserved_byte[3];
+
+	/**
+>>>>>>> upstream/4.5.1
 	 * Length of this payload.
 	 */
 	u_int16_t payload_length;
@@ -71,6 +95,7 @@ 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[] = {
@@ -95,6 +120,32 @@ encoding_rule_t cp_payload_encodings[] = {
 	{ 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 */
+	{ U_INT_8,					offsetof(private_cp_payload_t, next_payload)	},
+	/* the critical bit */
+	{ FLAG,						offsetof(private_cp_payload_t, critical)		},
+	/* 7 Bit reserved bits */
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[0])	},
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[1])	},
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[2])	},
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[3])	},
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[4])	},
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[5])	},
+	{ RESERVED_BIT,				offsetof(private_cp_payload_t, reserved_bit[6])	},
+	/* 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)			},
+	/* 3 reserved bytes */
+	{ RESERVED_BYTE,			offsetof(private_cp_payload_t, reserved_byte[0])},
+	{ 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
 };
 
 /*
@@ -111,10 +162,15 @@ 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;
@@ -133,6 +189,7 @@ static status_t verify(private_cp_payload_t *this)
 	return status;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.get_encoding_rules.
  */
@@ -147,22 +204,43 @@ static void get_encoding_rules(private_cp_payload_t *this,
  * 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)
+{
+	*rules = cp_payload_encodings;
+	*rule_count = countof(cp_payload_encodings);
+}
+
+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;
 }
@@ -185,44 +263,69 @@ 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));
@@ -232,6 +335,7 @@ static void destroy(private_cp_payload_t *this)
 /*
  * Described in header.
  */
+<<<<<<< HEAD
 cp_payload_t *cp_payload_create()
 {
 	private_cp_payload_t *this = malloc_thing(private_cp_payload_t);
@@ -256,12 +360,40 @@ cp_payload_t *cp_payload_create()
 	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;
+
+	INIT(this,
+		.public = {
+			.payload_interface = {
+				.verify = _verify,
+				.get_encoding_rules = _get_encoding_rules,
+				.get_length = _get_length,
+				.get_next_type = _get_next_type,
+				.set_next_type = _set_next_type,
+				.get_type = _get_type,
+				.destroy = _destroy,
+			},
+			.create_attribute_enumerator = _create_attribute_enumerator,
+			.add_attribute = _add_attribute,
+			.get_type = _get_config_type,
+			.destroy = _destroy,
+		},
+		.next_payload = NO_PAYLOAD,
+		.payload_length = CP_PAYLOAD_HEADER_LENGTH,
+		.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();
@@ -271,3 +403,9 @@ cp_payload_t *cp_payload_create_type(config_type_t type)
 	return &this->public;
 }
 
+=======
+cp_payload_t *cp_payload_create()
+{
+	return cp_payload_create_type(CFG_REQUEST);
+}
+>>>>>>> upstream/4.5.1