Migrated dhcp plugin to moved attribute manager

diff --git a/src/libcharon/plugins/dhcp/Makefile.am b/src/libcharon/plugins/dhcp/Makefile.am
index 74afcb48a0d0cc2faf669482a28010e6c043cfe0..45d7536be7b6218764922c1fc66fdad34584bd06 100644 (file)
--- 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 e3dae9bb63c26b499a6580b0a6e5b631889e5c28..829fd63560813b0f58fa43bc848ea918666982e6 100644 (file)
--- 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 <hydra.h>
 #include <daemon.h>
 
 #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;
 }