summaryrefslogtreecommitdiff
path: root/src/libcharon/encoding/payloads/id_payload.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcharon/encoding/payloads/id_payload.c')
-rw-r--r--src/libcharon/encoding/payloads/id_payload.c129
1 files changed, 129 insertions, 0 deletions
diff --git a/src/libcharon/encoding/payloads/id_payload.c b/src/libcharon/encoding/payloads/id_payload.c
index 4158c3e07..58250e766 100644
--- a/src/libcharon/encoding/payloads/id_payload.c
+++ b/src/libcharon/encoding/payloads/id_payload.c
@@ -1,6 +1,12 @@
/*
+<<<<<<< HEAD
* Copyright (C) 2007 Tobias Brunner
* Copyright (C) 2005-2006 Martin Willi
+=======
+ * Copyright (C) 2005-2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ * Copyright (C) 2007 Tobias Brunner
+>>>>>>> upstream/4.5.1
* Copyright (C) 2005 Jan Hutter
*
* Hochschule fuer Technik Rapperswil
@@ -51,6 +57,19 @@ struct private_id_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,13 +90,17 @@ struct private_id_payload_t {
*
* The defined offsets are the positions in a object of type
* private_id_payload_t.
+<<<<<<< HEAD
*
+=======
+>>>>>>> upstream/4.5.1
*/
encoding_rule_t id_payload_encodings[] = {
/* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_id_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_id_payload_t, critical) },
+<<<<<<< HEAD
/* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
@@ -86,16 +109,34 @@ encoding_rule_t id_payload_encodings[] = {
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
+=======
+ /* 7 Bit reserved bits */
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[0]) },
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[1]) },
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[2]) },
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[3]) },
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[4]) },
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[5]) },
+ { RESERVED_BIT, offsetof(private_id_payload_t, reserved_bit[6]) },
+>>>>>>> upstream/4.5.1
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_id_payload_t, payload_length) },
/* 1 Byte ID type*/
{ U_INT_8, offsetof(private_id_payload_t, id_type) },
/* 3 reserved bytes */
+<<<<<<< HEAD
{ RESERVED_BYTE, 0 },
{ RESERVED_BYTE, 0 },
{ RESERVED_BYTE, 0 },
/* some id data bytes, length is defined in PAYLOAD_LENGTH */
{ ID_DATA, offsetof(private_id_payload_t, id_data) }
+=======
+ { RESERVED_BYTE, offsetof(private_id_payload_t, reserved_byte[0])},
+ { RESERVED_BYTE, offsetof(private_id_payload_t, reserved_byte[1])},
+ { RESERVED_BYTE, offsetof(private_id_payload_t, reserved_byte[2])},
+ /* some id data bytes, length is defined in PAYLOAD_LENGTH */
+ { ID_DATA, offsetof(private_id_payload_t, id_data) }
+>>>>>>> upstream/4.5.1
};
/*
@@ -112,6 +153,7 @@ encoding_rule_t id_payload_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
+<<<<<<< HEAD
/**
* Implementation of payload_t.verify.
*/
@@ -121,11 +163,18 @@ static status_t verify(private_id_payload_t *this)
(this->id_type == 4) ||
((this->id_type >= 6) && (this->id_type <= 8)) ||
((this->id_type >= 12) && (this->id_type <= 200)))
+=======
+METHOD(payload_t, verify, status_t,
+ private_id_payload_t *this)
+{
+ if (this->id_type == 0 || this->id_type == 4)
+>>>>>>> upstream/4.5.1
{
/* reserved IDs */
DBG1(DBG_ENC, "received ID with reserved type %d", this->id_type);
return FAILED;
}
+<<<<<<< HEAD
return SUCCESS;
}
@@ -143,34 +192,64 @@ static void get_encoding_rules(private_id_payload_t *this, encoding_rule_t **rul
* Implementation of payload_t.get_type.
*/
static payload_type_t get_payload_type(private_id_payload_t *this)
+=======
+ return SUCCESS;
+}
+
+METHOD(payload_t, get_encoding_rules, void,
+ private_id_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
+{
+ *rules = id_payload_encodings;
+ *rule_count = countof(id_payload_encodings);
+}
+
+METHOD(payload_t, get_type, payload_type_t,
+ private_id_payload_t *this)
+>>>>>>> upstream/4.5.1
{
return this->payload_type;
}
+<<<<<<< HEAD
/**
* Implementation of payload_t.get_next_type.
*/
static payload_type_t get_next_type(private_id_payload_t *this)
+=======
+METHOD(payload_t, get_next_type, payload_type_t,
+ private_id_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_id_payload_t *this,payload_type_t type)
+=======
+METHOD(payload_t, set_next_type, void,
+ private_id_payload_t *this, payload_type_t type)
+>>>>>>> upstream/4.5.1
{
this->next_payload = type;
}
+<<<<<<< HEAD
/**
* Implementation of payload_t.get_length.
*/
static size_t get_length(private_id_payload_t *this)
+=======
+METHOD(payload_t, get_length, size_t,
+ private_id_payload_t *this)
+>>>>>>> upstream/4.5.1
{
return this->payload_length;
}
+<<<<<<< HEAD
/**
* Implementation of id_payload_t.set_type.
*/
@@ -242,6 +321,18 @@ static void destroy(private_id_payload_t *this)
{
chunk_free(&(this->id_data));
}
+=======
+METHOD(id_payload_t, get_identification, identification_t*,
+ private_id_payload_t *this)
+{
+ return identification_create_from_encoding(this->id_type, this->id_data);
+}
+
+METHOD2(payload_t, id_payload_t, destroy, void,
+ private_id_payload_t *this)
+{
+ free(this->id_data.ptr);
+>>>>>>> upstream/4.5.1
free(this);
}
@@ -250,6 +341,7 @@ static void destroy(private_id_payload_t *this)
*/
id_payload_t *id_payload_create(payload_type_t payload_type)
{
+<<<<<<< HEAD
private_id_payload_t *this = malloc_thing(private_id_payload_t);
/* interface functions */
@@ -279,15 +371,52 @@ id_payload_t *id_payload_create(payload_type_t payload_type)
this->payload_type = payload_type;
return (&(this->public));
+=======
+ private_id_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,
+ },
+ .get_identification = _get_identification,
+ .destroy = _destroy,
+ },
+ .next_payload = NO_PAYLOAD,
+ .payload_length = ID_PAYLOAD_HEADER_LENGTH,
+ .payload_type = payload_type,
+ );
+ return &this->public;
+>>>>>>> upstream/4.5.1
}
/*
* Described in header.
*/
+<<<<<<< HEAD
id_payload_t *id_payload_create_from_identification(payload_type_t payload_type, identification_t *identification)
{
id_payload_t *this= id_payload_create(payload_type);
this->set_data(this,identification->get_encoding(identification));
this->set_id_type(this,identification->get_type(identification));
return this;
+=======
+id_payload_t *id_payload_create_from_identification(payload_type_t payload_type,
+ identification_t *id)
+{
+ private_id_payload_t *this;
+
+ this = (private_id_payload_t*)id_payload_create(payload_type);
+ this->id_data = chunk_clone(id->get_encoding(id));
+ this->id_type = id->get_type(id);
+ this->payload_length += this->id_data.len;
+
+ return &this->public;
+>>>>>>> upstream/4.5.1
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 12:02:22 +0000