diff options
| author | Martin Willi <martin@revosec.ch> | 2013-02-21 11:04:35 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-02-21 11:52:33 +0100 |
| commit | a1db77de7c90bb80beaf2f7a1c6c3d8a1bba12c0 (patch) | |
| tree | 2c517d4287b953c1b81350f67d786f44484988d6 /src/libstrongswan/selectors/traffic_selector.c | |
| parent | c572b5c8c1c81756477a6df6148fd47c6f427020 (diff) | |
| download | strongswan-a1db77de7c90bb80beaf2f7a1c6c3d8a1bba12c0.tar.bz2 strongswan-a1db77de7c90bb80beaf2f7a1c6c3d8a1bba12c0.tar.xz | |
Use a complete port range in traffic_selector_create_from_{subnet,cidr}
Diffstat (limited to 'src/libstrongswan/selectors/traffic_selector.c')
| -rw-r--r-- | src/libstrongswan/selectors/traffic_selector.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c index fd8bfe1a2..ff8285f8c 100644 --- a/src/libstrongswan/selectors/traffic_selector.c +++ b/src/libstrongswan/selectors/traffic_selector.c @@ -776,12 +776,13 @@ traffic_selector_t *traffic_selector_create_from_rfc3779_format(ts_type_t type, * see header */ traffic_selector_t *traffic_selector_create_from_subnet(host_t *net, - u_int8_t netbits, u_int8_t protocol, u_int16_t port) + u_int8_t netbits, u_int8_t protocol, + u_int16_t from_port, u_int16_t to_port) { private_traffic_selector_t *this; chunk_t from; - this = traffic_selector_create(protocol, 0, 0, 65535); + this = traffic_selector_create(protocol, 0, from_port, to_port); switch (net->get_family(net)) { @@ -800,11 +801,6 @@ traffic_selector_t *traffic_selector_create_from_subnet(host_t *net, memcpy(this->from, from.ptr, from.len); netbits = min(netbits, this->type == TS_IPV4_ADDR_RANGE ? 32 : 128); calc_range(this, netbits); - if (port) - { - this->from_port = port; - this->to_port = port; - } net->destroy(net); return &this->public; @@ -855,8 +851,9 @@ traffic_selector_t *traffic_selector_create_from_string( /* * see header */ -traffic_selector_t *traffic_selector_create_from_cidr(char *string, - u_int8_t protocol, u_int16_t port) +traffic_selector_t *traffic_selector_create_from_cidr( + char *string, u_int8_t protocol, + u_int16_t from_port, u_int16_t to_port) { host_t *net; int bits; @@ -864,7 +861,8 @@ traffic_selector_t *traffic_selector_create_from_cidr(char *string, net = host_create_from_subnet(string, &bits); if (net) { - return traffic_selector_create_from_subnet(net, bits, protocol, port); + return traffic_selector_create_from_subnet(net, bits, protocol, + from_port, to_port); } return NULL; } |