From: Tobias Brunner Date: Mon, 27 Jul 2015 12:00:23 +0000 (+0200) Subject: Merge branch 'trap-shunt-updates' X-Git-Tag: 5.3.3dr2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5af74bcb8482e432c5abf6a53c3f53ee93af577f;p=thirdparty%2Fstrongswan.git Merge branch 'trap-shunt-updates' Changes how acquires are tracked in the trap manager, which fixes several race conditions. Also fixes races between threads installing trap policies and the main thread trying to flush the trap policies. Similar changes were added to the shunt manager which previously used no locking at all. Fixes #1014. --- 5af74bcb8482e432c5abf6a53c3f53ee93af577f