[svn-upgrade] new version strongswan (4.4.1)

2 files changed, 33 insertions, 5 deletions

diff --git a/src/libhydra/plugins/attr/Makefile.in b/src/libhydra/plugins/attr/Makefile.in
index 54aa64beb..71402fc7f 100644
--- a/src/libhydra/plugins/attr/Makefile.in
+++ b/src/libhydra/plugins/attr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c
index 9d6daa892..b3c0cc076 100644
--- a/src/libhydra/plugins/attr/attr_provider.c
+++ b/src/libhydra/plugins/attr/attr_provider.c
@@ -65,7 +65,7 @@ static bool attr_enum_filter(void *null, attribute_entry_t **in,
  * Implementation of attribute_provider_t.create_attribute_enumerator
  */
 static enumerator_t* create_attribute_enumerator(private_attr_provider_t *this,
-											identification_t *id, host_t *vip)
+								char *pool, identification_t *id, host_t *vip)
 {
 	if (vip)
 	{
@@ -148,6 +148,7 @@ static struct {
 	{"dhcp",		INTERNAL_IP4_DHCP,		INTERNAL_IP6_DHCP},
 	{"netmask",		INTERNAL_IP4_NETMASK,	INTERNAL_IP6_NETMASK},
 	{"server",		INTERNAL_IP4_SERVER,	INTERNAL_IP6_SERVER},
+	{"subnet",		INTERNAL_IP4_SUBNET,	INTERNAL_IP6_SUBNET},
 };
 
 /**
@@ -165,12 +166,19 @@ static void load_entries(private_attr_provider_t *this)
 		configuration_attribute_type_t type;
 		attribute_entry_t *entry;
 		host_t *host;
-		int i;
+		char *pos;
+		int i, mask = -1;
 
 		type = atoi(key);
 		tokens = enumerator_create_token(value, ",", " ");
 		while (tokens->enumerate(tokens, &token))
 		{
+			pos = strchr(token, '/');
+			if (pos)
+			{
+				*(pos++) = '\0';
+				mask = atoi(pos);
+			}
 			host = host_create_from_string(token, 0);
 			if (!host)
 			{
@@ -201,7 +209,27 @@ static void load_entries(private_attr_provider_t *this)
 			}
 			entry = malloc_thing(attribute_entry_t);
 			entry->type = type;
-			entry->value = chunk_clone(host->get_address(host));
+			if (mask == -1)
+			{
+				entry->value = chunk_clone(host->get_address(host));
+			}
+			else
+			{
+				if (host->get_family(host) == AF_INET)
+				{	/* IPv4 attributes contain a subnet mask */
+					u_int32_t netmask;
+
+					mask = 32 - mask;
+					netmask = htonl((0xFFFFFFFF >> mask) << mask);
+					entry->value = chunk_cat("cc", host->get_address(host),
+											 chunk_from_thing(netmask));
+				}
+				else
+				{	/* IPv6 addresses the prefix only */
+					entry->value = chunk_cat("cc", host->get_address(host),
+											 chunk_from_chars(mask));
+				}
+			}
 			host->destroy(host);
 			this->attributes->insert_last(this->attributes, entry);
 		}
@@ -222,7 +250,7 @@ attr_provider_t *attr_provider_create(database_t *db)
 
 	this->public.provider.acquire_address = (host_t*(*)(attribute_provider_t *this, char*, identification_t *, host_t *))return_null;
 	this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *, identification_t*))return_false;
-	this->public.provider.create_attribute_enumerator = (enumerator_t*(*)(attribute_provider_t*, identification_t *id, host_t *vip))create_attribute_enumerator;
+	this->public.provider.create_attribute_enumerator = (enumerator_t*(*)(attribute_provider_t*, char *names, identification_t *id, host_t *vip))create_attribute_enumerator;
 	this->public.destroy = (void(*)(attr_provider_t*))destroy;
 
 	this->attributes = linked_list_create();