From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 21 May 2012 11:19:57 +0000 (+0200)
Subject: Destroy Netlink socket only after deleting remaining source routes.
X-Git-Tag: 5.0.0~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e19cb912de885f86205f5d06a2bf8cf89ca4294;p=thirdparty%2Fstrongswan.git

Destroy Netlink socket only after deleting remaining source routes.
---

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
index 8a5eaa0f72..c64a66be2c 100644
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
@@ -1762,8 +1762,6 @@ METHOD(kernel_net_t, destroy, void,
 	{
 		close(this->socket_events);
 	}
-	DESTROY_IF(this->socket);
-
 	enumerator = this->routes->create_enumerator(this->routes);
 	while (enumerator->enumerate(enumerator, NULL, (void**)&route))
 	{
@@ -1773,6 +1771,7 @@ METHOD(kernel_net_t, destroy, void,
 	}
 	enumerator->destroy(enumerator);
 	this->routes->destroy(this->routes);
+	DESTROY_IF(this->socket);
 
 	net_changes_clear(this);
 	this->net_changes->destroy(this->net_changes);