delete resolv_conf_* files
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 20 Sep 2009 19:59:36 +0000 (21:59 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 20 Sep 2009 19:59:36 +0000 (21:59 +0200)
src/charon/plugins/resolve/resolv_conf_handler.c [deleted file]
src/charon/plugins/resolve/resolv_conf_handler.h [deleted file]
src/charon/plugins/resolve/resolv_conf_plugin.c [deleted file]
src/charon/plugins/resolve/resolv_conf_plugin.h [deleted file]

diff --git a/src/charon/plugins/resolve/resolv_conf_handler.c b/src/charon/plugins/resolve/resolv_conf_handler.c
deleted file mode 100644 (file)
index 47e0441..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2009 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "resolv_conf_handler.h"
-
-#include <unistd.h>
-
-#include <daemon.h>
-#include <utils/mutex.h>
-
-typedef struct private_resolv_conf_handler_t private_resolv_conf_handler_t;
-
-/**
- * Private data of an resolv_conf_handler_t object.
- */
-struct private_resolv_conf_handler_t {
-
-       /**
-        * Public resolv_conf_handler_t interface.
-        */
-       resolv_conf_handler_t public;
-
-       /**
-        * resolv.conf file to use
-        */
-       char *file;
-
-       /**
-        * Mutex to access file exclusively
-        */
-       mutex_t *mutex;
-};
-
-/**
- * Implementation of attribute_handler_t.handle
- */
-static bool handle(private_resolv_conf_handler_t *this, ike_sa_t *ike_sa,
-                                  configuration_attribute_type_t type, chunk_t data)
-{
-       FILE *in, *out;
-       char buf[1024];
-       host_t *addr;
-       int family;
-       size_t len;
-       bool handled = FALSE;
-
-       switch (type)
-       {
-               case INTERNAL_IP4_DNS:
-                       family = AF_INET;
-                       break;
-               case INTERNAL_IP6_DNS:
-                       family = AF_INET6;
-                       break;
-               default:
-                       return FALSE;
-       }
-
-       this->mutex->lock(this->mutex);
-
-       in = fopen(this->file, "r");
-       /* allows us to stream from in to out */
-       unlink(this->file);
-       out = fopen(this->file, "w");
-       if (out)
-       {
-               addr = host_create_from_chunk(family, data, 0);
-               fprintf(out, "nameserver %H   # by strongSwan, from %Y\n",
-                               addr, ike_sa->get_other_id(ike_sa));
-               DBG1(DBG_IKE, "installing DNS server %H to %s", addr, this->file);
-               addr->destroy(addr);
-               handled = TRUE;
-
-               /* copy rest of the file */
-               if (in)
-               {
-                       while ((len = fread(buf, 1, sizeof(buf), in)))
-                       {
-                               ignore_result(fwrite(buf, 1, len, out));
-                       }
-                       fclose(in);
-               }
-               fclose(out);
-       }
-
-       if (!handled)
-       {
-               DBG1(DBG_IKE, "adding DNS server failed", this->file);
-       }
-       this->mutex->unlock(this->mutex);
-       return handled;
-}
-
-/**
- * Implementation of attribute_handler_t.release
- */
-static void release(private_resolv_conf_handler_t *this, ike_sa_t *ike_sa,
-                                       configuration_attribute_type_t type, chunk_t data)
-{
-       FILE *in, *out;
-       char line[1024], matcher[512], *pos;
-       host_t *addr;
-       int family;
-
-       switch (type)
-       {
-               case INTERNAL_IP4_DNS:
-                       family = AF_INET;
-                       break;
-               case INTERNAL_IP6_DNS:
-                       family = AF_INET6;
-                       break;
-               default:
-                       return;
-       }
-
-       this->mutex->lock(this->mutex);
-
-       in = fopen(this->file, "r");
-       if (in)
-       {
-               /* allows us to stream from in to out */
-               unlink(this->file);
-               out = fopen(this->file, "w");
-               if (out)
-               {
-                       addr = host_create_from_chunk(family, data, 0);
-                       snprintf(matcher, sizeof(matcher),
-                                        "nameserver %H   # by strongSwan, from %Y\n",
-                                        addr, ike_sa->get_other_id(ike_sa));
-
-                       /* copy all, but matching line */
-                       while ((pos = fgets(line, sizeof(line), in)))
-                       {
-                               if (strneq(line, matcher, strlen(matcher)))
-                               {
-                                       DBG1(DBG_IKE, "removing DNS server %H from %s",
-                                                addr, this->file);
-                               }
-                               else
-                               {
-                                       fputs(line, out);
-                               }
-                       }
-                       addr->destroy(addr);
-                       fclose(out);
-               }
-               fclose(in);
-       }
-
-       this->mutex->unlock(this->mutex);
-}
-
-/**
- * Implementation of resolv_conf_handler_t.destroy.
- */
-static void destroy(private_resolv_conf_handler_t *this)
-{
-       this->mutex->destroy(this->mutex);
-       free(this);
-}
-
-/**
- * See header
- */
-resolv_conf_handler_t *resolv_conf_handler_create()
-{
-       private_resolv_conf_handler_t *this = malloc_thing(private_resolv_conf_handler_t);
-
-       this->public.handler.handle = (bool(*)(attribute_handler_t*, ike_sa_t*, configuration_attribute_type_t, chunk_t))handle;
-       this->public.handler.release = (void(*)(attribute_handler_t*, ike_sa_t*, configuration_attribute_type_t, chunk_t))release;
-       this->public.destroy = (void(*)(resolv_conf_handler_t*))destroy;
-
-       this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
-       this->file = lib->settings->get_str(lib->settings,
-                                                               "charon.plugins.resolv-conf.file", RESOLV_CONF);
-
-       return &this->public;
-}
-
diff --git a/src/charon/plugins/resolve/resolv_conf_handler.h b/src/charon/plugins/resolve/resolv_conf_handler.h
deleted file mode 100644 (file)
index 5aa17ca..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2009 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup resolv_conf_handler resolv_conf_handler
- * @{ @ingroup resolv_conf
- */
-
-#ifndef RESOLV_CONF_HANDLER_H_
-#define RESOLV_CONF_HANDLER_H_
-
-#include <config/attributes/attribute_handler.h>
-
-typedef struct resolv_conf_handler_t resolv_conf_handler_t;
-
-/**
- * Handle DNS configuration attributes by mangling a resolv.conf file.
- */
-struct resolv_conf_handler_t {
-
-       /**
-        * Implements the attribute_handler_t interface
-        */
-       attribute_handler_t handler;
-
-       /**
-        * Destroy a resolv_conf_handler_t.
-        */
-       void (*destroy)(resolv_conf_handler_t *this);
-};
-
-/**
- * Create a resolv_conf_handler instance.
- */
-resolv_conf_handler_t *resolv_conf_handler_create();
-
-#endif /* RESOLV_CONF_HANDLER_ @}*/
diff --git a/src/charon/plugins/resolve/resolv_conf_plugin.c b/src/charon/plugins/resolve/resolv_conf_plugin.c
deleted file mode 100644 (file)
index 4188201..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2009 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "resolv_conf_plugin.h"
-#include "resolv_conf_handler.h"
-
-#include <daemon.h>
-
-typedef struct private_resolv_conf_plugin_t private_resolv_conf_plugin_t;
-
-/**
- * private data of resolv_conf plugin
- */
-struct private_resolv_conf_plugin_t {
-
-       /**
-        * implements plugin interface
-        */
-       resolv_conf_plugin_t public;
-
-       /**
-        * The registerd DNS attribute handler
-        */
-       resolv_conf_handler_t *handler;
-};
-
-/**
- * Implementation of plugin_t.destroy
- */
-static void destroy(private_resolv_conf_plugin_t *this)
-{
-       charon->attributes->remove_handler(charon->attributes,
-                                                                          &this->handler->handler);
-       this->handler->destroy(this->handler);
-       free(this);
-}
-
-/*
- * see header file
- */
-plugin_t *plugin_create()
-{
-       private_resolv_conf_plugin_t *this = malloc_thing(private_resolv_conf_plugin_t);
-
-       this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
-
-       this->handler = resolv_conf_handler_create();
-       charon->attributes->add_handler(charon->attributes, &this->handler->handler);
-
-       return &this->public.plugin;
-}
-
diff --git a/src/charon/plugins/resolve/resolv_conf_plugin.h b/src/charon/plugins/resolve/resolv_conf_plugin.h
deleted file mode 100644 (file)
index 7cbeab8..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2009 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup resolv_conf resolv_conf
- * @ingroup cplugins
- *
- * @defgroup resolv_conf_plugin resolv_conf_plugin
- * @{ @ingroup resolv_conf
- */
-
-#ifndef RESOLV_CONF_PLUGIN_H_
-#define RESOLV_CONF_PLUGIN_H_
-
-#include <plugins/plugin.h>
-
-typedef struct resolv_conf_plugin_t resolv_conf_plugin_t;
-
-/**
- * Plugin that writes received DNS servers in a resolv.conf file.
- */
-struct resolv_conf_plugin_t {
-
-       /**
-        * implements plugin interface
-        */
-       plugin_t plugin;
-};
-
-/**
- * Create a resolv_conf_plugin instance.
- */
-plugin_t *plugin_create();
-
-#endif /** RESOLV_CONF_PLUGIN_H_ @}*/