From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 12 Oct 2016 10:11:24 +0000 (+0200)
Subject: kernel-interface: Add interface name to local subnet enumerator
X-Git-Tag: 5.5.2dr5~23^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46c21e3cc3ee3422463362495e1ab59cd292298e;p=thirdparty%2Fstrongswan.git

kernel-interface: Add interface name to local subnet enumerator
---

diff --git a/src/libcharon/kernel/kernel_interface.h b/src/libcharon/kernel/kernel_interface.h
index dca4babadd..96c9ffa62b 100644
--- a/src/libcharon/kernel/kernel_interface.h
+++ b/src/libcharon/kernel/kernel_interface.h
@@ -320,7 +320,9 @@ struct kernel_interface_t {
 	 *
 	 * Local subnets are subnets the host is directly connected to.
 	 *
-	 * @return				enumerator over host_t*, uint8_t
+	 * The enumerator returns the network, subnet mask and interface.
+	 *
+	 * @return				enumerator over host_t*, uint8_t, char*
 	 */
 	enumerator_t *(*create_local_subnet_enumerator)(kernel_interface_t *this);
 
diff --git a/src/libcharon/kernel/kernel_net.h b/src/libcharon/kernel/kernel_net.h
index a1ced362ce..12475b1230 100644
--- a/src/libcharon/kernel/kernel_net.h
+++ b/src/libcharon/kernel/kernel_net.h
@@ -123,7 +123,9 @@ struct kernel_net_t {
 	 *
 	 * Local subnets are subnets the host is directly connected to.
 	 *
-	 * @return				enumerator over host_t*, uint8_t
+	 * The enumerator returns the network, subnet mask and interface.
+	 *
+	 * @return				enumerator over host_t*, uint8_t, char*
 	 */
 	enumerator_t *(*create_local_subnet_enumerator)(kernel_net_t *this);
 
diff --git a/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c b/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c
index 7963677bfa..3e744b96d0 100644
--- a/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c
+++ b/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c
@@ -102,6 +102,7 @@ static job_requeue_t update_bypass(private_bypass_lan_listener_t *this)
 	bypass_policy_t *found, *lookup;
 	host_t *net;
 	uint8_t mask;
+	char *iface;
 
 	seen = hashtable_create((hashtable_hash_t)policy_hash,
 							(hashtable_equals_t)policy_equals, 4);
@@ -109,7 +110,7 @@ static job_requeue_t update_bypass(private_bypass_lan_listener_t *this)
 	this->mutex->lock(this->mutex);
 
 	enumerator = charon->kernel->create_local_subnet_enumerator(charon->kernel);
-	while (enumerator->enumerate(enumerator, &net, &mask))
+	while (enumerator->enumerate(enumerator, &net, &mask, &iface))
 	{
 		INIT(lookup,
 			.net = net->clone(net),
diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
index a31f312b98..61e0292545 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
@@ -2148,7 +2148,7 @@ METHOD(enumerator_t, destroy_subnet_enumerator, void,
 }
 
 METHOD(enumerator_t, enumerate_subnets, bool,
-	subnet_enumerator_t *this, host_t **net, uint8_t *mask)
+	subnet_enumerator_t *this, host_t **net, uint8_t *mask, char **ifname)
 {
 	if (!this->current)
 	{
@@ -2204,6 +2204,7 @@ METHOD(enumerator_t, enumerate_subnets, bool,
 					this->net = host_create_from_chunk(msg->rtm_family, dst, 0);
 					*net = this->net;
 					*mask = msg->rtm_dst_len;
+					*ifname = NULL;
 					return TRUE;
 				}
 				break;