denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support of dynamic/128 and %any6

Browse Source
This commit is contained in:
Andreas Steffen
2009-02-05 22:13:48 +00:00
parent 49971c4ce5
commit c59825fbfc
12 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/load_tester/load_tester_config.c
+2 -2
View File
@@ -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, 0, 65535);
ts = traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535);
child_cfg->add_traffic_selector(child_cfg, TRUE, ts);
ts = traffic_selector_create_dynamic(0, 0, 65535);
ts = traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535);
child_cfg->add_traffic_selector(child_cfg, FALSE, ts);
peer_cfg->add_child_cfg(peer_cfg, child_cfg);
return peer_cfg;
src/charon/plugins/medcli/medcli_config.c
+1 -1
View File
@@ -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, 0, 65535);
return traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535);
}
/**
src/charon/plugins/nm/nm_service.c
+1 -1
View File
@@ -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, 0, 65535);
ts = traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 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,
src/charon/plugins/sql/sql_config.c
+1 -1
View File
@@ -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,
ts = traffic_selector_create_dynamic(protocol, type,
start_port, end_port);
break;
default:
src/charon/plugins/stroke/stroke_config.c
+3
View File
@@ -691,7 +691,10 @@ 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);
}
src/charon/plugins/uci/uci_config.c
+1 -1
View File
@@ -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, 0, 65535);
return traffic_selector_create_dynamic(0, TS_IPV4_ADDR_RANGE, 0, 65535);
}
/**