New upstream version 5.7.0

3 files changed, 154 insertions, 1 deletions

diff --git a/src/libcharon/tests/utils/exchange_test_helper.c b/src/libcharon/tests/utils/exchange_test_helper.c
index fce0ccedf..bebf33463 100644
--- a/src/libcharon/tests/utils/exchange_test_helper.c
+++ b/src/libcharon/tests/utils/exchange_test_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Tobias Brunner
+ * Copyright (C) 2016-2018 Tobias Brunner
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -16,6 +16,7 @@
 #include "exchange_test_helper.h"
 #include "mock_dh.h"
 #include "mock_ipsec.h"
+#include "mock_net.h"
 #include "mock_nonce_gen.h"
 
 #include <collections/array.h>
@@ -333,6 +334,7 @@ void exchange_test_helper_init(char *plugins)
 	/* and there is no kernel plugin loaded
 	 * TODO: we'd have more control if we'd implement kernel_interface_t */
 	charon->kernel->add_ipsec_interface(charon->kernel, mock_ipsec_create);
+	charon->kernel->add_net_interface(charon->kernel, mock_net_create);
 	/* like SPIs for IPsec SAs, make IKE SPIs predictable */
 	charon->ike_sa_manager->set_spi_cb(charon->ike_sa_manager, get_ike_spi,
 									   this);
diff --git a/src/libcharon/tests/utils/mock_net.c b/src/libcharon/tests/utils/mock_net.c
new file mode 100644
index 000000000..5b560871e
--- /dev/null
+++ b/src/libcharon/tests/utils/mock_net.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2018 Tobias Brunner
+ * HSR 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 "mock_net.h"
+
+#include <daemon.h>
+
+#include <assert.h>
+
+typedef struct private_kernel_net_t private_kernel_net_t;
+
+/**
+ * Private data
+ */
+struct private_kernel_net_t {
+
+	/**
+	 * Public interface
+	 */
+	kernel_net_t public;
+
+	/**
+	 * Local IP address
+	 */
+	host_t *host;
+};
+
+/**
+ * Global instance
+ */
+static private_kernel_net_t *instance;
+
+METHOD(kernel_net_t, get_source_addr, host_t*,
+	private_kernel_net_t *this, host_t *dest, host_t *src)
+{
+	return this->host->clone(this->host);
+}
+
+METHOD(kernel_net_t, get_nexthop, host_t*,
+	private_kernel_net_t *this, host_t *dest, int prefix, host_t *src,
+	char **iface)
+{
+	if (iface)
+	{
+		*iface = strdup("lo");
+	}
+	return this->host->clone(this->host);
+}
+
+METHOD(kernel_net_t, get_interface, bool,
+	private_kernel_net_t *this, host_t *host, char **name)
+{
+	if (host->ip_equals(host, this->host))
+	{
+		if (name)
+		{
+			*name = strdup("lo");
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
+METHOD(kernel_net_t, create_address_enumerator, enumerator_t*,
+	private_kernel_net_t *this, kernel_address_type_t which)
+{
+	return enumerator_create_single(this->host, NULL);
+}
+
+METHOD(kernel_net_t, destroy, void,
+	private_kernel_net_t *this)
+{
+	this->host->destroy(this->host);
+	free(this);
+}
+
+/*
+ * Described in header
+ */
+kernel_net_t *mock_net_create()
+{
+	private_kernel_net_t *this;
+
+	INIT(this,
+		.public = {
+			.get_source_addr = _get_source_addr,
+			.get_nexthop = _get_nexthop,
+			.get_interface = _get_interface,
+			.create_address_enumerator = _create_address_enumerator,
+			.create_local_subnet_enumerator = (void*)enumerator_create_empty,
+			.add_ip = (void*)return_failed,
+			.del_ip = (void*)return_failed,
+			.add_route = (void*)return_failed,
+			.del_route = (void*)return_failed,
+			.destroy = _destroy,
+		},
+		.host = host_create_from_string("127.0.0.1", 500),
+	);
+
+	instance = this;
+
+	return &this->public;
+}
diff --git a/src/libcharon/tests/utils/mock_net.h b/src/libcharon/tests/utils/mock_net.h
new file mode 100644
index 000000000..15ad1ac0c
--- /dev/null
+++ b/src/libcharon/tests/utils/mock_net.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 Tobias Brunner
+ * HSR 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.
+ */
+
+/**
+ * kernel_net_t implementation used for exchange unit tests.  Simply returns
+ * an IP address so it seems we're connected.
+ *
+ * @defgroup mock_net mock_net
+ * @{ @ingroup test_utils_c
+ */
+
+#ifndef MOCK_NET_H_
+#define MOCK_NET_H_
+
+#include <kernel/kernel_net.h>
+
+/**
+ * Create an instance of kernel_net_t
+ *
+ * @return		created object
+ */
+kernel_net_t *mock_net_create();
+
+#endif /** MOCK_NET_H_ @}*/