aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * ikev2: Trigger make-before-break reauthentication instead of reauth taskMartin Willi2015-02-203-2/+89
| * ike-sa-manager: Use IKEv1 uniqueness reauthentication detection for IKEv2, tooMartin Willi2015-02-201-12/+8
|/
* Merge branch 'attr-migrate'Martin Willi2015-02-2078-1266/+382
|\
| * attribute-handler: Pass full IKE_SA to handler backendsMartin Willi2015-02-2010-79/+61
| * attribute-provider: Pass full IKE_SA to provider backendsMartin Willi2015-02-2010-65/+55
| * attribute-manager: Pass full IKE_SA to handler methodsMartin Willi2015-02-205-23/+28
| * attribute-manager: Pass the full IKE_SA to provider methodsMartin Willi2015-02-205-23/+32
| * unit-tester: Drop the old unit-tester libcharon pluginMartin Willi2015-02-2014-957/+0
| * attributes: Move the configuration attributes framework to libcharonMartin Willi2015-02-2040-129/+119
| * libcharon: Add a test runnerMartin Willi2015-02-206-0/+97
| * attr-sql: Move plugin to libcharonMartin Willi2015-02-209-13/+16
| * attr: Move plugin to libcharonMartin Willi2015-02-209-15/+13
| * resolve: Move plugin back to libcharonMartin Willi2015-02-208-12/+11
|/
* Merge branch 'tkm-reqid-alloc'Martin Willi2015-02-2022-46/+266
|\
| * testing: Add tkm xfrmproxy-expire testReto Buerki2015-02-2011-0/+121
| * testing: Assert ees acquire messages in xfrmproxy testsReto Buerki2015-02-202-0/+2
| * charon-tkm: Use get_dst_host getter in EES callbackReto Buerki2015-02-201-4/+14
| * charon-tkm: Add get_dst_host getter to SADReto Buerki2015-02-203-0/+79
| * charon-tkm: Improve SAD get_esa_id log messagesReto Buerki2015-02-201-4/+4
| * charon-tkm: Store reqid in SADReto Buerki2015-02-204-15/+26
| * charon-tkm: Store remote SPI in SADReto Buerki2015-02-201-1/+1
| * charon-tkm: Make CHILD/ESP SA database publicReto Buerki2015-02-203-22/+15
| * charon-tkm: Fix logger entity name in tests.cReto Buerki2015-02-201-2/+2
| * testing: Assert proper ESA deletionReto Buerki2015-02-201-0/+4
|/
* Merge branch 'reqid-alloc'Martin Willi2015-02-2073-529/+1798
|\
| * ike: Consistently log CHILD_SAs with their unique_id instead of their reqidMartin Willi2015-02-208-11/+13
| * unity: Reference IKE_SAs by the IKEv1 COOKIEs, improving lookup performanceMartin Willi2015-02-203-14/+17
| * ike-sa-manager: Remove IKE_SA checkout by CHILD_SA reqidMartin Willi2015-02-205-40/+16
| * migrate-job: Do CHILD_SA reqid lookup locallyMartin Willi2015-02-202-26/+21
| * kernel-interface: Raise mapping event with a proto/SPI/dst tupleMartin Willi2015-02-208-41/+75
| * inactivity-job: Schedule job by CHILD_SA unique ID instead of reqidMartin Willi2015-02-204-23/+17
| * charon-tkm: Fix compilation of ees_callback.cReto Buerki2015-02-201-3/+5
| * kernel-interface: Raise expires with a proto/SPI/dst tuple instead of reqidMartin Willi2015-02-2020-118/+124
| * controller: Use the CHILD_SA unique_id to terminate CHILD_SAsMartin Willi2015-02-206-38/+24
| * swanctl: List CHILD_SA unique ID as the primary identifier, but print reqid, tooMartin Willi2015-02-201-2/+2
| * stroke: List CHILD_SA unique ID as the primary identifier, but print reqid, tooMartin Willi2015-02-201-5/+6
| * vici: Include the CHILD_SA unique ID in list-sa eventMartin Willi2015-02-202-0/+2
| * ike: Maintain per-IKE_SA CHILD_SAs in the global CHILD_SA managerMartin Willi2015-02-203-19/+92
| * child-sa-manager: Add a global manager storing CHILD_SA relationsMartin Willi2015-02-206-1/+432
| * child-sa: Replace reqid based marks by "unique" marksMartin Willi2015-02-2013-74/+126
| * child-sa: Introduce a unique CHILD_SA identifierMartin Willi2015-02-202-0/+24
| * child-sa: Delegate reqid allocation to the kernel interfaceMartin Willi2015-02-201-15/+46
| * kernel-interface: Add reqid allocation and release functionsMartin Willi2015-02-202-1/+329
| * traffic-selector: Add a hash() methodMartin Willi2015-02-202-0/+20
| * child-sa: Sort traffic selectors after adding CHILD_SA policiesMartin Willi2015-02-201-0/+3
| * unit-tests: Add an initial set of traffic selector unit testsMartin Willi2015-02-203-0/+281
| * traffic-selector: Add a compare function to sort traffic selectorsMartin Willi2015-02-202-34/+86
| * child-sa: Remove the obsolete update logicMartin Willi2015-02-201-6/+1
| * kernel-interface: Pass full list of traffic selectors to add_sa()Martin Willi2015-02-2011-34/+28
| * libipsec: Remove unused src/dst_ts parameters from ipsec_sa_mgr_t.add_sa()Martin Willi2015-02-206-18/+7