From 0e1689e98f5297a650392e10275331d676cf1572 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 25 Mar 2010 14:33:05 +0100 Subject: [PATCH] Migrated dhcp plugin to moved attribute manager --- src/libcharon/plugins/dhcp/Makefile.am | 3 ++- src/libcharon/plugins/dhcp/dhcp_plugin.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libcharon/plugins/dhcp/Makefile.am b/src/libcharon/plugins/dhcp/Makefile.am index 74afcb48a..45d7536be 100644 --- a/src/libcharon/plugins/dhcp/Makefile.am +++ b/src/libcharon/plugins/dhcp/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon +INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/libcharon AM_CFLAGS = -rdynamic diff --git a/src/libcharon/plugins/dhcp/dhcp_plugin.c b/src/libcharon/plugins/dhcp/dhcp_plugin.c index e3dae9bb6..829fd6356 100644 --- a/src/libcharon/plugins/dhcp/dhcp_plugin.c +++ b/src/libcharon/plugins/dhcp/dhcp_plugin.c @@ -15,6 +15,7 @@ #include "dhcp_plugin.h" +#include #include #include "dhcp_socket.h" @@ -46,7 +47,8 @@ struct private_dhcp_plugin_t { METHOD(plugin_t, destroy, void, private_dhcp_plugin_t *this) { - lib->attributes->remove_provider(lib->attributes, &this->provider->provider); + hydra->attributes->remove_provider(hydra->attributes, + &this->provider->provider); this->provider->destroy(this->provider); this->socket->destroy(this->socket); free(this); @@ -71,7 +73,8 @@ plugin_t *dhcp_plugin_create() } this->provider = dhcp_provider_create(this->socket); - lib->attributes->add_provider(lib->attributes, &this->provider->provider); + hydra->attributes->add_provider(hydra->attributes, + &this->provider->provider); return &this->public.plugin; }