From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 25 Apr 2014 16:58:55 +0000 (+0200)
Subject: child-cfg: Fix removal of redundant traffic selectors
X-Git-Tag: 5.2.0dr2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c478dfe6171424db1599601ff29c6d85b67fad86;p=thirdparty%2Fstrongswan.git

child-cfg: Fix removal of redundant traffic selectors

We have to make sure we compare every selected traffic selector with every
other in the list.

Fixes #577.
---

diff --git a/src/libcharon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
index 6fe7d44b8f..8d8214ebe1 100644
--- a/src/libcharon/config/child_cfg.c
+++ b/src/libcharon/config/child_cfg.c
@@ -354,11 +354,11 @@ METHOD(child_cfg_t, get_traffic_selectors, linked_list_t*,
 				{
 					result->remove_at(result, e1);
 					ts1->destroy(ts1);
-					result->reset_enumerator(result, e2);
 					break;
 				}
 			}
 		}
+		result->reset_enumerator(result, e2);
 	}
 	e1->destroy(e1);
 	e2->destroy(e2);