]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
moved resolve plugin from libcharon to libhydra
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 4 May 2010 21:52:44 +0000 (23:52 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 4 May 2010 21:53:08 +0000 (23:53 +0200)
configure.in
src/libcharon/Makefile.am
src/libhydra/Makefile.am
src/libhydra/plugins/resolve/Makefile.am [moved from src/libcharon/plugins/resolve/Makefile.am with 100% similarity]
src/libhydra/plugins/resolve/resolve_handler.c [moved from src/libcharon/plugins/resolve/resolve_handler.c with 98% similarity]
src/libhydra/plugins/resolve/resolve_handler.h [moved from src/libcharon/plugins/resolve/resolve_handler.h with 100% similarity]
src/libhydra/plugins/resolve/resolve_plugin.c [moved from src/libcharon/plugins/resolve/resolve_plugin.c with 100% similarity]
src/libhydra/plugins/resolve/resolve_plugin.h [moved from src/libcharon/plugins/resolve/resolve_plugin.h with 100% similarity]
src/libhydra/plugins/resolve_handler.c [new file with mode: 0644]
src/pluto/Makefile.am

index 2c78510699614765a4f8075977bf6e3c97074f75..a24a6ebe2614e60c6da8654e019d76dc7a9656f6 100644 (file)
@@ -748,11 +748,12 @@ if test x$gmp = xtrue; then
 fi
 if test x$attr = xtrue; then
        libhydra_plugins=${libhydra_plugins}" attr"
-       pluto_plugins=${pluto_plugins}" attr"
 fi
 if test x$attr_sql = xtrue -o x$sql = xtrue; then
        libhydra_plugins=${libhydra_plugins}" attr-sql"
-       pluto_plugins=${pluto_plugins}" attr-sql"
+fi
+if test x$resolve = xtrue; then
+       libhydra_plugins=${libhydra_plugins}" resolve"
 fi
 
 AC_SUBST(libstrongswan_plugins)
@@ -912,6 +913,7 @@ AC_OUTPUT(
        src/libhydra/Makefile
        src/libhydra/plugins/attr/Makefile
        src/libhydra/plugins/attr_sql/Makefile
+       src/libhydra/plugins/resolve/Makefile
        src/libfreeswan/Makefile
        src/libsimaka/Makefile
        src/pluto/Makefile
@@ -948,7 +950,6 @@ AC_OUTPUT(
        src/libcharon/plugins/stroke/Makefile
        src/libcharon/plugins/updown/Makefile
        src/libcharon/plugins/dhcp/Makefile
-       src/libcharon/plugins/resolve/Makefile
        src/libcharon/plugins/unit_tester/Makefile
        src/libcharon/plugins/load_tester/Makefile
        src/stroke/Makefile
index 0eaccf7a09a799dacf8c1047df6cc3ab2cfea92a..baf568c52cf281901426344d86a5bcf00212f430 100644 (file)
@@ -374,14 +374,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_RESOLVE
-  SUBDIRS += plugins/resolve
-  PLUGINS += resolve
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/resolve/libstrongswan-resolve.la
-endif
-endif
-
 if USE_ANDROID
   SUBDIRS += plugins/android
   PLUGINS += android
index 601a56e38d14258e4e4e2a6f08198768416db769..4e5c55d3f18f4a808ce8a869a4310e8e8ea46ef9 100644 (file)
@@ -40,3 +40,10 @@ if MONOLITHIC
 endif
 endif
 
+if USE_RESOLVE
+  SUBDIRS += plugins/resolve
+if MONOLITHIC
+  libhydra_la_LIBADD += plugins/resolve/libstrongswan-resolve.la
+endif
+endif
+
similarity index 98%
rename from src/libcharon/plugins/resolve/resolve_handler.c
rename to src/libhydra/plugins/resolve/resolve_handler.c
index 714c751a643ee97e59dde07eb1260ec35d6bde24..cdc63903836a61a7e230412302266834d9c5b791 100644 (file)
@@ -17,7 +17,8 @@
 
 #include <unistd.h>
 
-#include <daemon.h>
+#include <hydra.h>
+#include <debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_resolve_handler_t private_resolve_handler_t;
@@ -244,7 +245,7 @@ resolve_handler_t *resolve_handler_create()
 
        this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
        this->file = lib->settings->get_str(lib->settings,
-                                                               "charon.plugins.resolve.file", RESOLV_CONF);
+                                                               "%s.plugins.resolve.file", RESOLV_CONF, hydra->daemon);
 
        return &this->public;
 }
diff --git a/src/libhydra/plugins/resolve_handler.c b/src/libhydra/plugins/resolve_handler.c
new file mode 100644 (file)
index 0000000..cdc6390
--- /dev/null
@@ -0,0 +1,252 @@
+/*
+ * 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 "resolve_handler.h"
+
+#include <unistd.h>
+
+#include <hydra.h>
+#include <debug.h>
+#include <threading/mutex.h>
+
+typedef struct private_resolve_handler_t private_resolve_handler_t;
+
+/**
+ * Private data of an resolve_handler_t object.
+ */
+struct private_resolve_handler_t {
+
+       /**
+        * Public resolve_handler_t interface.
+        */
+       resolve_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_resolve_handler_t *this, identification_t *server,
+                                  configuration_attribute_type_t type, chunk_t data)
+{
+       FILE *in, *out;
+       char buf[1024];
+       host_t *addr;
+       size_t len;
+       bool handled = FALSE;
+
+       switch (type)
+       {
+               case INTERNAL_IP4_DNS:
+                       addr = host_create_from_chunk(AF_INET, data, 0);
+                       break;
+               case INTERNAL_IP6_DNS:
+                       addr = host_create_from_chunk(AF_INET6, data, 0);
+                       break;
+               default:
+                       return FALSE;
+       }
+
+       if (!addr || addr->is_anyaddr(addr))
+       {
+               DESTROY_IF(addr);
+               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)
+       {
+               fprintf(out, "nameserver %H   # by strongSwan, from %Y\n", addr, server);
+               DBG1(DBG_IKE, "installing DNS server %H to %s", addr, this->file);
+               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(out);
+       }
+       if (in)
+       {
+               fclose(in);
+       }
+       this->mutex->unlock(this->mutex);
+       addr->destroy(addr);
+
+       if (!handled)
+       {
+               DBG1(DBG_IKE, "adding DNS server failed", this->file);
+       }
+       return handled;
+}
+
+/**
+ * Implementation of attribute_handler_t.release
+ */
+static void release(private_resolve_handler_t *this, identification_t *server,
+                                       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, server);
+
+                       /* 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);
+}
+
+/**
+ * Attribute enumerator implementation
+ */
+typedef struct {
+       /** implements enumerator_t interface */
+       enumerator_t public;
+       /** virtual IP we are requesting */
+       host_t *vip;
+} attribute_enumerator_t;
+
+/**
+ * Implementation of create_attribute_enumerator().enumerate()
+ */
+static bool attribute_enumerate(attribute_enumerator_t *this,
+                                               configuration_attribute_type_t *type, chunk_t *data)
+{
+       switch (this->vip->get_family(this->vip))
+       {
+               case AF_INET:
+                       *type = INTERNAL_IP4_DNS;
+                       break;
+               case AF_INET6:
+                       *type = INTERNAL_IP6_DNS;
+                       break;
+               default:
+                       return FALSE;
+       }
+       *data = chunk_empty;
+       /* enumerate only once */
+       this->public.enumerate = (void*)return_false;
+       return TRUE;
+}
+
+/**
+ * Implementation of attribute_handler_t.create_attribute_enumerator
+ */
+static enumerator_t* create_attribute_enumerator(private_resolve_handler_t *this,
+                                                                               identification_t *server, host_t *vip)
+{
+       if (vip)
+       {
+               attribute_enumerator_t *enumerator;
+
+               enumerator = malloc_thing(attribute_enumerator_t);
+               enumerator->public.enumerate = (void*)attribute_enumerate;
+               enumerator->public.destroy = (void*)free;
+               enumerator->vip = vip;
+
+               return &enumerator->public;
+       }
+       return enumerator_create_empty();
+}
+
+/**
+ * Implementation of resolve_handler_t.destroy.
+ */
+static void destroy(private_resolve_handler_t *this)
+{
+       this->mutex->destroy(this->mutex);
+       free(this);
+}
+
+/**
+ * See header
+ */
+resolve_handler_t *resolve_handler_create()
+{
+       private_resolve_handler_t *this = malloc_thing(private_resolve_handler_t);
+
+       this->public.handler.handle = (bool(*)(attribute_handler_t*, identification_t*, configuration_attribute_type_t, chunk_t))handle;
+       this->public.handler.release = (void(*)(attribute_handler_t*, identification_t*, configuration_attribute_type_t, chunk_t))release;
+       this->public.handler.create_attribute_enumerator = (enumerator_t*(*)(attribute_handler_t*, identification_t *server, host_t *vip))create_attribute_enumerator;
+       this->public.destroy = (void(*)(resolve_handler_t*))destroy;
+
+       this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
+       this->file = lib->settings->get_str(lib->settings,
+                                                               "%s.plugins.resolve.file", RESOLV_CONF, hydra->daemon);
+
+       return &this->public;
+}
+
index a264e642e1c57afc672bc5e8d8fa168074e63824..b65c80cdb453a722d86761e0778d397fd6bd32a8 100644 (file)
@@ -72,7 +72,7 @@ AM_CFLAGS = \
 -DIPSEC_CONFDIR=\"${sysconfdir}\" \
 -DIPSEC_PIDDIR=\"${piddir}\" \
 -DSHARED_SECRETS_FILE=\"${sysconfdir}/ipsec.secrets\" \
--DPLUGINS=\""${pluto_plugins}\"" \
+-DPLUGINS=\""${pluto_plugins} ${libhydra_plugins}\"" \
 -DPKCS11_DEFAULT_LIB=\"${default_pkcs11}\" \
 -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \
 -DPLUTO -DKLIPS -DDEBUG