diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-05-11 09:17:02 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-26 13:56:44 +0200 |
| commit | 95a63bf2813cd6ecad912237688526bbcc3481ee (patch) | |
| tree | ab656955ac9380b54fe6becaca3ca97a9c7549c4 /src/libcharon/plugins/vici/vici_message.c | |
| parent | 16bffa8b55542ba7c29fa8b856b26cdcdf2de869 (diff) | |
| download | strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.bz2 strongswan-95a63bf2813cd6ecad912237688526bbcc3481ee.tar.xz | |
Migrate all enumerators to venumerate() interface change
Diffstat (limited to 'src/libcharon/plugins/vici/vici_message.c')
| -rw-r--r-- | src/libcharon/plugins/vici/vici_message.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libcharon/plugins/vici/vici_message.c b/src/libcharon/plugins/vici/vici_message.c index 58b896773..91d344994 100644 --- a/src/libcharon/plugins/vici/vici_message.c +++ b/src/libcharon/plugins/vici/vici_message.c @@ -135,11 +135,16 @@ typedef struct { } parse_enumerator_t; METHOD(enumerator_t, parse_enumerate, bool, - parse_enumerator_t *this, vici_type_t *out, char **name, chunk_t *value) + parse_enumerator_t *this, va_list args) { + vici_type_t *out; + chunk_t *value; + char **name; uint8_t type; chunk_t data; + VA_ARGS_VGET(args, out, name, value); + if (!this->reader->remaining(this->reader) || !this->reader->read_uint8(this->reader, &type)) { @@ -218,7 +223,8 @@ METHOD(vici_message_t, create_enumerator, enumerator_t*, INIT(enumerator, .public = { - .enumerate = (void*)_parse_enumerate, + .enumerate = enumerator_enumerate_default, + .venumerate = _parse_enumerate, .destroy = _parse_destroy, }, .reader = bio_reader_create(this->encoding), |