p-cscf: Make sending requests configurable and disable it by default

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 72d9f258d2ac19c823b0544024bc6bc10b6f4dfe..b7edaa8eec472970890338584340199726896114 100644 (file)
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -73,6 +73,7 @@ plugins = \
        plugins/ntru.opt \
        plugins/openssl.opt \
        plugins/osx-attr.opt \
+       plugins/p-cscf.opt \
        plugins/pkcs11.opt \
        plugins/radattr.opt \
        plugins/random.opt \

diff --git a/conf/plugins/p-cscf.opt b/conf/plugins/p-cscf.opt
new file mode 100644 (file)
index 0000000..ec7f815
--- /dev/null
+++ b/conf/plugins/p-cscf.opt
@@ -0,0 +1,11 @@
+charon.plugins.p-cscf.enable {}
+       Section to enable requesting P-CSCF server addresses for individual
+       connections.
+
+charon.plugins.p-cscf.enable.<conn> = no
+       <conn> is the name of a connection with an ePDG from which to request
+       P-CSCF server addresses.
+
+       <conn> is the name of a connection with an ePDG from which to request
+       P-CSCF server addresses.  Requests will be sent for addresses of the same
+       families for which internal IPs are requested.

diff --git a/src/libcharon/plugins/p_cscf/p_cscf_handler.c b/src/libcharon/plugins/p_cscf/p_cscf_handler.c
index f122f9ac4193565b21f13ba79278c061fab268e3..76633845eedabd268458260cdd982dae7b285a33 100644 (file)
--- a/src/libcharon/plugins/p_cscf/p_cscf_handler.c
+++ b/src/libcharon/plugins/p_cscf/p_cscf_handler.c
@@ -135,9 +135,13 @@ METHOD(attribute_handler_t, create_attribute_enumerator, enumerator_t *,
                        .enumerate = (void*)_enumerate_attrs,
                        .destroy = (void*)free,
                },
-               .request_ipv4 = has_host_family(vips, AF_INET),
-               .request_ipv6 = has_host_family(vips, AF_INET6),
        );
+       if (lib->settings->get_bool(lib->settings, "%s.plugins.p-cscf.enable.%s",
+                                                               FALSE, lib->ns, ike_sa->get_name(ike_sa)))
+       {
+               enumerator->request_ipv4 = has_host_family(vips, AF_INET);
+               enumerator->request_ipv6 = has_host_family(vips, AF_INET6);
+       }
        return &enumerator->public;
 }