DHCP plugin framework, send DHCP Discover upon IP request

1 files changed, 26 insertions, 0 deletions

diff --git a/src/libcharon/plugins/dhcp/dhcp_plugin.c b/src/libcharon/plugins/dhcp/dhcp_plugin.c
index 0f7ab041d..e3dae9bb6 100644
--- a/src/libcharon/plugins/dhcp/dhcp_plugin.c
+++ b/src/libcharon/plugins/dhcp/dhcp_plugin.c
@@ -17,6 +17,9 @@
 
 #include <daemon.h>
 
+#include "dhcp_socket.h"
+#include "dhcp_provider.h"
+
 typedef struct private_dhcp_plugin_t private_dhcp_plugin_t;
 
 /**
@@ -28,11 +31,24 @@ struct private_dhcp_plugin_t {
 	 * implements plugin interface
 	 */
 	dhcp_plugin_t public;
+
+	/**
+	 * DHCP communication socket
+	 */
+	dhcp_socket_t *socket;
+
+	/**
+	 * Attribute provider
+	 */
+	dhcp_provider_t *provider;
 };
 
 METHOD(plugin_t, destroy, void,
 	private_dhcp_plugin_t *this)
 {
+	lib->attributes->remove_provider(lib->attributes, &this->provider->provider);
+	this->provider->destroy(this->provider);
+	this->socket->destroy(this->socket);
 	free(this);
 }
 
@@ -45,8 +61,18 @@ plugin_t *dhcp_plugin_create()
 
 	INIT(this,
 		.public.plugin.destroy = _destroy,
+		.socket = dhcp_socket_create(),
 	);
 
+	if (!this->socket)
+	{
+		free(this);
+		return NULL;
+	}
+
+	this->provider = dhcp_provider_create(this->socket);
+	lib->attributes->add_provider(lib->attributes, &this->provider->provider);
+
 	return &this->public.plugin;
 }