diff options
author | Martin Willi <martin@revosec.ch> | 2011-04-11 18:54:18 +0200 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2011-04-15 10:07:12 +0200 |
commit | 787b5884aaf873fb9fda2b0d8b7c3d54e38ae7a5 (patch) | |
tree | f8c05bcf7572117763fd50eaf315a13c2e6261d2 /src/libcharon/plugins/addrblock | |
parent | 6e2791715b7534b601ff5d5163d63d88ad7a8a5e (diff) | |
download | strongswan-787b5884aaf873fb9fda2b0d8b7c3d54e38ae7a5.tar.bz2 strongswan-787b5884aaf873fb9fda2b0d8b7c3d54e38ae7a5.tar.xz |
Added a get_name() function to plugin_t, create_plugin_enumerator enumerates over plugin_t
Diffstat (limited to 'src/libcharon/plugins/addrblock')
-rw-r--r-- | src/libcharon/plugins/addrblock/addrblock_plugin.c | 7 | ||||
-rw-r--r-- | src/libcharon/plugins/addrblock/addrblock_validator.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/libcharon/plugins/addrblock/addrblock_plugin.c b/src/libcharon/plugins/addrblock/addrblock_plugin.c index 5fdb36c5c..a64956803 100644 --- a/src/libcharon/plugins/addrblock/addrblock_plugin.c +++ b/src/libcharon/plugins/addrblock/addrblock_plugin.c @@ -43,6 +43,12 @@ struct private_addrblock_plugin_t { addrblock_narrow_t *narrower; }; +METHOD(plugin_t, get_name, char*, + private_addrblock_plugin_t *this) +{ + return "addrblock"; +} + METHOD(plugin_t, destroy, void, private_addrblock_plugin_t *this) { @@ -63,6 +69,7 @@ plugin_t *addrblock_plugin_create() INIT(this, .public = { .plugin = { + .get_name = _get_name, .destroy = _destroy, }, }, diff --git a/src/libcharon/plugins/addrblock/addrblock_validator.c b/src/libcharon/plugins/addrblock/addrblock_validator.c index 12cf0c941..1b07378f7 100644 --- a/src/libcharon/plugins/addrblock/addrblock_validator.c +++ b/src/libcharon/plugins/addrblock/addrblock_validator.c @@ -88,7 +88,7 @@ static bool check_addrblock(x509_t *subject, x509_t *issuer) METHOD(cert_validator_t, validate, bool, private_addrblock_validator_t *this, certificate_t *subject, - certificate_t *issuer, bool online, int pathlen, bool anchor, + certificate_t *issuer, bool online, u_int pathlen, bool anchor, auth_cfg_t *auth) { if (subject->get_type(subject) == CERT_X509 && @@ -114,7 +114,9 @@ addrblock_validator_t *addrblock_validator_create() INIT(this, .public = { - .validator.validate = _validate, + .validator = { + .validate = _validate, + }, .destroy = _destroy, }, ); |