aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/p_cscf/p_cscf_handler.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-05-11 09:17:02 +0200
committerTobias Brunner <tobias@strongswan.org>2017-05-26 13:56:44 +0200
commit95a63bf2813cd6ecad912237688526bbcc3481ee (patch)
treeab656955ac9380b54fe6becaca3ca97a9c7549c4 /src/libcharon/plugins/p_cscf/p_cscf_handler.c
parent16bffa8b55542ba7c29fa8b856b26cdcdf2de869 (diff)
downloadstrongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.bz2
strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.xz
Migrate all enumerators to venumerate() interface change
Diffstat (limited to 'src/libcharon/plugins/p_cscf/p_cscf_handler.c')
-rw-r--r--src/libcharon/plugins/p_cscf/p_cscf_handler.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libcharon/plugins/p_cscf/p_cscf_handler.c b/src/libcharon/plugins/p_cscf/p_cscf_handler.c
index 76633845e..880e80a56 100644
--- a/src/libcharon/plugins/p_cscf/p_cscf_handler.c
+++ b/src/libcharon/plugins/p_cscf/p_cscf_handler.c
@@ -83,9 +83,12 @@ typedef struct {
} attr_enumerator_t;
METHOD(enumerator_t, enumerate_attrs, bool,
- attr_enumerator_t *this, configuration_attribute_type_t *type,
- chunk_t *data)
+ attr_enumerator_t *this, va_list args)
{
+ configuration_attribute_type_t *type;
+ chunk_t *data;
+
+ VA_ARGS_VGET(args, type, data);
if (this->request_ipv4)
{
*type = P_CSCF_IP4_ADDRESS;
@@ -132,7 +135,8 @@ METHOD(attribute_handler_t, create_attribute_enumerator, enumerator_t *,
INIT(enumerator,
.public = {
- .enumerate = (void*)_enumerate_attrs,
+ .enumerate = enumerator_enumerate_default,
+ .venumerate = _enumerate_attrs,
.destroy = (void*)free,
},
);