From: Martin Willi Date: Thu, 19 Feb 2015 17:18:51 +0000 (+0100) Subject: Merge branch 'reqid-alloc' X-Git-Tag: 5.3.0dr1~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94eb09ac354c5dfee033a62c93dabf011e9c9747;p=thirdparty%2Fstrongswan.git Merge branch 'reqid-alloc' With these changes, charon dynamically allocates reqids for CHILD_SAs. This allows the reuse of reqids for identical policies, and basically allows multiple CHILD_SAs with the same selectors. As reqids do not uniquely define a CHILD_SA, a new unique identifier for CHILD_SAs is introduced, and the kernel backends use a proto/dst/SPI tuple to identify CHILD_SAs. charon-tkm is not yet updated and expires are actually broken with this merge. As some significant refactorings are required, this is fixed using a separate merge. References #422, #431, #463. --- 94eb09ac354c5dfee033a62c93dabf011e9c9747