changed [4856] to dynamically choose traffic selector family

[strongswan.git] / src / charon / config / traffic_selector.c

diff --git a/src/charon/config/traffic_selector.c b/src/charon/config/traffic_selector.c
index 9de168f..f504a00 100644 (file)
--- a/src/charon/config/traffic_selector.c
+++ b/src/charon/config/traffic_selector.c
@@ -196,8 +196,7 @@ static int print(FILE *stream, const struct printf_info *info,
                memeq(this->from, from, this->type == TS_IPV4_ADDR_RANGE ? 4 : 16) && 
                memeq(this->to, to, this->type == TS_IPV4_ADDR_RANGE ? 4 : 16))
        {
-               written += fprintf(stream, "dynamic/%d",
-                                                  this->type == TS_IPV4_ADDR_RANGE ? 32 : 128);
+               written += fprintf(stream, "dynamic");
        }
        else
        {
@@ -521,9 +520,17 @@ static void set_address(private_traffic_selector_t *this, host_t *host)
                this->type = host->get_family(host) == AF_INET ?
                                TS_IPV4_ADDR_RANGE : TS_IPV6_ADDR_RANGE;
                
-               chunk_t from = host->get_address(host);
-               memcpy(this->from, from.ptr, from.len);
-               memcpy(this->to, from.ptr, from.len);
+               if (host->is_anyaddr(host))
+               {
+                       memset(this->from6, 0x00, sizeof(this->from6));
+                       memset(this->to6, 0xFF, sizeof(this->to6));
+               }
+               else
+               {
+                       chunk_t from = host->get_address(host);
+                       memcpy(this->from, from.ptr, from.len);
+                       memcpy(this->to, from.ptr, from.len);
+               }
        }
 }
 
@@ -823,12 +830,11 @@ traffic_selector_t *traffic_selector_create_from_string(
 /*
  * see header
  */
-traffic_selector_t *traffic_selector_create_dynamic(u_int8_t protocol,
-                                                                       ts_type_t type, 
+traffic_selector_t *traffic_selector_create_dynamic(u_int8_t protocol, 
                                                                        u_int16_t from_port, u_int16_t to_port)
 {
        private_traffic_selector_t *this = traffic_selector_create(
-                                                       protocol, type, from_port, to_port);
+                                                       protocol, TS_IPV4_ADDR_RANGE, from_port, to_port);
        
        memset(this->from6, 0, sizeof(this->from6));
        memset(this->to6, 0xFF, sizeof(this->to6));