diff options
Diffstat (limited to 'src/charon/plugins')
| -rw-r--r-- | src/charon/plugins/load_tester/load_tester_config.c | 4 | ||||
| -rw-r--r-- | src/charon/plugins/medcli/medcli_config.c | 2 | ||||
| -rw-r--r-- | src/charon/plugins/nm/nm_service.c | 2 | ||||
| -rw-r--r-- | src/charon/plugins/sql/sql_config.c | 2 | ||||
| -rw-r--r-- | src/charon/plugins/stroke/stroke_config.c | 3 | ||||
| -rw-r--r-- | src/charon/plugins/uci/uci_config.c | 2 |
6 files changed, 6 insertions, 9 deletions
diff --git a/src/charon/plugins/load_tester/load_tester_config.c b/src/charon/plugins/load_tester/load_tester_config.c index b5d2f5815..f3cd33b61 100644 --- a/src/charon/plugins/load_tester/load_tester_config.c +++ b/src/charon/plugins/load_tester/load_tester_config.c @@ -109,9 +109,9 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num) MODE_TUNNEL, ACTION_NONE, ACTION_NONE, FALSE); proposal = proposal_create_from_string(PROTO_ESP, "aes128-sha1"); child_cfg->add_proposal(child_cfg, proposal); - ts = traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535); + ts = traffic_selector_create_dynamic(0, 0, 65535); child_cfg->add_traffic_selector(child_cfg, TRUE, ts); - ts = traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535); + ts = traffic_selector_create_dynamic(0, 0, 65535); child_cfg->add_traffic_selector(child_cfg, FALSE, ts); peer_cfg->add_child_cfg(peer_cfg, child_cfg); return peer_cfg; diff --git a/src/charon/plugins/medcli/medcli_config.c b/src/charon/plugins/medcli/medcli_config.c index 23385c7b1..d1e6c0c9e 100644 --- a/src/charon/plugins/medcli/medcli_config.c +++ b/src/charon/plugins/medcli/medcli_config.c @@ -87,7 +87,7 @@ static traffic_selector_t *ts_from_string(char *str) return traffic_selector_create_from_subnet(net, netbits, 0, 0); } } - return traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535); + return traffic_selector_create_dynamic(0, 0, 65535); } /** diff --git a/src/charon/plugins/nm/nm_service.c b/src/charon/plugins/nm/nm_service.c index d1aabe1bd..f90bfa448 100644 --- a/src/charon/plugins/nm/nm_service.c +++ b/src/charon/plugins/nm/nm_service.c @@ -319,7 +319,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection, NULL, TRUE, MODE_TUNNEL, /* updown, hostaccess */ ACTION_NONE, ACTION_RESTART, ipcomp); child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP)); - ts = traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535); + ts = traffic_selector_create_dynamic(0, 0, 65535); child_cfg->add_traffic_selector(child_cfg, TRUE, ts); ts = traffic_selector_create_from_string(0, TS_IPV4_ADDR_RANGE, "0.0.0.0", 0, diff --git a/src/charon/plugins/sql/sql_config.c b/src/charon/plugins/sql/sql_config.c index a36c01538..8efa1cb2e 100644 --- a/src/charon/plugins/sql/sql_config.c +++ b/src/charon/plugins/sql/sql_config.c @@ -78,7 +78,7 @@ static traffic_selector_t *build_traffic_selector(private_sql_config_t *this, *local = TRUE; /* FALL */ case TS_REMOTE_DYNAMIC: - ts = traffic_selector_create_dynamic(protocol, type, + ts = traffic_selector_create_dynamic(protocol, start_port, end_port); break; default: diff --git a/src/charon/plugins/stroke/stroke_config.c b/src/charon/plugins/stroke/stroke_config.c index d480eeacb..cb91ecb72 100644 --- a/src/charon/plugins/stroke/stroke_config.c +++ b/src/charon/plugins/stroke/stroke_config.c @@ -691,10 +691,7 @@ static void add_ts(private_stroke_config_t *this, if (end->tohost) { - bool is_ipv6 = strchr(end->address, ':') || streq(end->address, "%any6"); - ts = traffic_selector_create_dynamic(end->protocol, - is_ipv6? TS_IPV6_ADDR_RANGE:TS_IPV4_ADDR_RANGE, end->port ? end->port : 0, end->port ? end->port : 65535); child_cfg->add_traffic_selector(child_cfg, local, ts); } diff --git a/src/charon/plugins/uci/uci_config.c b/src/charon/plugins/uci/uci_config.c index 7872a5add..c9d54a532 100644 --- a/src/charon/plugins/uci/uci_config.c +++ b/src/charon/plugins/uci/uci_config.c @@ -131,7 +131,7 @@ static traffic_selector_t *create_ts(char *string) return traffic_selector_create_from_subnet(net, netbits, 0, 0); } } - return traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535); + return traffic_selector_create_dynamic(0, 0, 65535); } /** |