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

ike-cfg: remove the to be obsoleted allow any parameter in get_my/other_addr

Browse Source
This commit is contained in:
Martin Willi
2013-09-04 10:38:37 +02:00
parent 62282ec0ed
commit beffdc6ab8
7 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/smp/smp.c
+2 -2
View File
@@ -309,9 +309,9 @@ static void request_query_config(xmlTextReaderPtr reader, xmlTextWriterPtr write
ike_cfg = peer_cfg->get_ike_cfg(peer_cfg);
xmlTextWriterStartElement(writer, "ikeconfig");
xmlTextWriterWriteElement(writer, "local",
ike_cfg->get_my_addr(ike_cfg, NULL));
ike_cfg->get_my_addr(ike_cfg));
xmlTextWriterWriteElement(writer, "remote",
ike_cfg->get_other_addr(ike_cfg, NULL));
ike_cfg->get_other_addr(ike_cfg));
xmlTextWriterEndElement(writer);
/* </ikeconfig> */
src/libcharon/plugins/stroke/stroke_config.c
+1 -1
View File
@@ -824,7 +824,7 @@ static peer_cfg_t *build_peer_cfg(private_stroke_config_t *this,
}
else
{
if (strchr(ike_cfg->get_my_addr(ike_cfg, NULL), ':'))
if (strchr(ike_cfg->get_my_addr(ike_cfg), ':'))
{
vip = host_create_any(AF_INET6);
}
src/libcharon/plugins/stroke/stroke_list.c
+2 -4
View File
@@ -555,10 +555,8 @@ METHOD(stroke_list_t, status, void,
ike_version = peer_cfg->get_ike_version(peer_cfg);
my_addr = ike_cfg->get_my_addr(ike_cfg, &my_allow_any);
other_addr = ike_cfg->get_other_addr(ike_cfg, &other_allow_any);
fprintf(out, "%12s: %s%s...%s%s %N", peer_cfg->get_name(peer_cfg),
my_allow_any ? "%":"", my_addr,
other_allow_any ? "%":"", other_addr,
ike_version_names, ike_version);
fprintf(out, "%12s: %s...%s %N", peer_cfg->get_name(peer_cfg),
my_addr, other_addr, ike_version_names, ike_version);
if (ike_version == IKEV1 && peer_cfg->use_aggressive(peer_cfg))
{