From c4e2b7617f471ad6b88318106eb1f71729dae7ed Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 13 Jan 2022 14:26:06 +0100
Subject: [PATCH] encoding: Remove unused TS_TYPE and ADDRESS encodings

---
 src/libcharon/encoding/generator.c          |  4 ----
 src/libcharon/encoding/parser.c             | 23 ------------------
 src/libcharon/encoding/payloads/encodings.c |  2 --
 src/libcharon/encoding/payloads/encodings.h | 26 ---------------------
 4 files changed, 55 deletions(-)

diff --git a/src/libcharon/encoding/generator.c b/src/libcharon/encoding/generator.c
index f898c87bdf..4bf0ab0cf8 100644
--- a/src/libcharon/encoding/generator.c
+++ b/src/libcharon/encoding/generator.c
@@ -205,7 +205,6 @@ static void generate_u_int_type(private_generator_t *this,
 		case U_INT_4:
 			number_of_bits = 4;
 			break;
-		case TS_TYPE:
 		case RESERVED_BYTE:
 		case SPI_SIZE:
 		case U_INT_8:
@@ -281,7 +280,6 @@ static void generate_u_int_type(private_generator_t *this,
 			}
 			break;
 		}
-		case TS_TYPE:
 		case RESERVED_BYTE:
 		case SPI_SIZE:
 		case U_INT_8:
@@ -478,7 +476,6 @@ METHOD(generator_t, generate_payload, void,
 			case IKE_SPI:
 			case RESERVED_BYTE:
 			case SPI_SIZE:
-			case TS_TYPE:
 			case ATTRIBUTE_TYPE:
 			case ATTRIBUTE_LENGTH:
 				generate_u_int_type(this, rules[i].type, rules[i].offset);
@@ -491,7 +488,6 @@ METHOD(generator_t, generate_payload, void,
 				this->header_length_offset = get_offset(this);
 				generate_u_int_type(this, U_INT_32, rules[i].offset);
 				break;
-			case ADDRESS:
 			case SPI:
 			case CHUNK_DATA:
 			case ENCRYPTED_DATA:
diff --git a/src/libcharon/encoding/parser.c b/src/libcharon/encoding/parser.c
index de66ad4677..6e2e175d8b 100644
--- a/src/libcharon/encoding/parser.c
+++ b/src/libcharon/encoding/parser.c
@@ -368,7 +368,6 @@ METHOD(parser_t, parse_payload, status_t,
 	payload_t *pld;
 	void *output;
 	int payload_length = 0, spi_size = 0, attribute_length = 0, header_length;
-	uint16_t ts_type = 0;
 	bool attribute_format = FALSE;
 	int rule_number, rule_count;
 	encoding_rule_t *rule;
@@ -588,28 +587,6 @@ METHOD(parser_t, parse_payload, status_t,
 				}
 				break;
 			}
-			case TS_TYPE:
-			{
-				if (!parse_uint8(this, rule_number, output + rule->offset))
-				{
-					pld->destroy(pld);
-					return PARSE_ERROR;
-				}
-				ts_type = *(uint8_t*)(output + rule->offset);
-				break;
-			}
-			case ADDRESS:
-			{
-				int address_length = (ts_type == TS_IPV4_ADDR_RANGE) ? 4 : 16;
-
-				if (!parse_chunk(this, rule_number, output + rule->offset,
-								 address_length))
-				{
-					pld->destroy(pld);
-					return PARSE_ERROR;
-				}
-				break;
-			}
 			default:
 			{
 				DBG1(DBG_ENC, "  no rule to parse rule %d %N",
diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c
index e81122e87f..580925c272 100644
--- a/src/libcharon/encoding/payloads/encodings.c
+++ b/src/libcharon/encoding/payloads/encodings.c
@@ -34,8 +34,6 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA,
 	"ATTRIBUTE_LENGTH_OR_VALUE",
 	"ATTRIBUTE_LENGTH",
 	"ATTRIBUTE_VALUE",
-	"TS_TYPE",
-	"ADDRESS",
 	"CHUNK_DATA",
 	"IKE_SPI",
 	"ENCRYPTED_DATA",
diff --git a/src/libcharon/encoding/payloads/encodings.h b/src/libcharon/encoding/payloads/encodings.h
index fb0e9ca3d2..e5ea62c72c 100644
--- a/src/libcharon/encoding/payloads/encodings.h
+++ b/src/libcharon/encoding/payloads/encodings.h
@@ -255,32 +255,6 @@ enum encoding_type_t {
 	 */
 	ATTRIBUTE_VALUE,
 
-	/**
-	 * Representing a Traffic selector type field.
-	 *
-	 * When generating it must be changed from host to network order.
-	 * The value is read from the associated data struct.
-	 * The current write position is moved 16 bit forward afterwards.
-	 *
-	 * When parsing it must be changed from network to host order.
-	 * The value is written to the associated data struct.
-	 * The current read pointer is moved 16 bit forward afterwards.
-	 */
-	TS_TYPE,
-
-	/**
-	 * Representing an address field in a traffic selector.
-	 *
-	 * Depending on the last field of type TS_TYPE
-	 * this field is either 4 or 16 byte long.
-	 *
-	 * When generating the content of the chunk pointing to
-	 * is written.
-	 *
-	 * When parsing 4 or 16 bytes are read and written into the chunk pointing to.
-	 */
-	ADDRESS,
-
 	/**
 	 * Representing a variable length byte field.
 	 */
-- 
2.47.2