[svn-upgrade] Integrating new upstream version, strongswan (4.1.3)

1 files changed, 20 insertions, 0 deletions

diff --git a/src/charon/config/traffic_selector.c b/src/charon/config/traffic_selector.c
index 2fb012e16..b399074d1 100644
--- a/src/charon/config/traffic_selector.c
+++ b/src/charon/config/traffic_selector.c
@@ -167,6 +167,8 @@ static int print(FILE *stream, const struct printf_info *info,
 				 const void *const *args)
 {
 	private_traffic_selector_t *this = *((private_traffic_selector_t**)(args[0]));
+	linked_list_t *list = *((linked_list_t**)(args[0]));
+	iterator_t *iterator;
 	char addr_str[INET6_ADDRSTRLEN] = "";
 	char *serv_proto = NULL;
 	u_int8_t mask;
@@ -179,6 +181,24 @@ static int print(FILE *stream, const struct printf_info *info,
 		return fprintf(stream, "(null)");
 	}
 	
+	if (info->alt)
+	{
+		iterator = list->create_iterator(list, TRUE);
+		while (iterator->iterate(iterator, (void**)&this))
+		{
+			/* call recursivly */
+			written += fprintf(stream, "%R ", this);
+		}
+		iterator->destroy(iterator);
+		return written;
+	}
+	
+	if (this->dynamic)
+	{
+		return fprintf(stream, "dynamic/%d",
+					   this->type == TS_IPV4_ADDR_RANGE ? 32 : 128);
+	}
+	
 	if (this->type == TS_IPV4_ADDR_RANGE)
 	{
 		inet_ntop(AF_INET, &this->from4, addr_str, sizeof(addr_str));