From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 28 May 2018 15:36:03 +0000 (+0200)
Subject: vici: Maintain connection order when replacing one
X-Git-Tag: 5.7.0dr5~30
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=91640baf6dd55cd62b0184348a7bc76522a29264;p=thirdparty%2Fstrongswan.git

vici: Maintain connection order when replacing one
---

diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
index 78a77d271a..dfb4c84f38 100644
--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
@@ -2212,8 +2212,8 @@ static void merge_config(private_vici_config_t *this, peer_cfg_t *peer_cfg)
 			{
 				DBG1(DBG_CFG, "replaced vici connection: %s",
 					 peer_cfg->get_name(peer_cfg));
+				this->conns->insert_before(this->conns, enumerator, peer_cfg);
 				this->conns->remove_at(this->conns, enumerator);
-				this->conns->insert_last(this->conns, peer_cfg);
 				handle_start_actions(this, current, TRUE);
 				handle_start_actions(this, peer_cfg, FALSE);
 				current->destroy(current);