diff options
| author | Martin Willi <martin@revosec.ch> | 2013-07-25 14:07:40 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-09-04 10:38:37 +0200 |
| commit | beffdc6ab8cb5139c9e0b0ee2e7585c5262e702f (patch) | |
| tree | 4651a6bfabd64582495c84a31fd94f76ddb53002 /src/libcharon/plugins | |
| parent | 62282ec0ed3c55a28aaa10ec8ed9682ac34f8c5d (diff) | |
| download | strongswan-beffdc6ab8cb5139c9e0b0ee2e7585c5262e702f.tar.bz2 strongswan-beffdc6ab8cb5139c9e0b0ee2e7585c5262e702f.tar.xz | |
ike-cfg: remove the to be obsoleted allow any parameter in get_my/other_addr
Diffstat (limited to 'src/libcharon/plugins')
| -rw-r--r-- | src/libcharon/plugins/smp/smp.c | 4 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_config.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_list.c | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c index a92e571de..7bc17008b 100644 --- a/src/libcharon/plugins/smp/smp.c +++ b/src/libcharon/plugins/smp/smp.c @@ -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> */ diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index 2e36ce3a3..1ab32afb1 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -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); } diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c index 7431514b6..a788ce581 100644 --- a/src/libcharon/plugins/stroke/stroke_list.c +++ b/src/libcharon/plugins/stroke/stroke_list.c @@ -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)) { |