New commits: commit 0bc840993637c6368786eefab5de9758cd91fab6 Merge: 44e5ea6 105b240 Author: Paul Wouters <pwout...@redhat.com> Date: Sun Feb 9 17:29:11 2014 -0500
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan Conflicts: testing/pluto/ikev2-liveness-01/westrun.sh commit 44e5ea6fd1084fcfe0bcda6b3544cd120aa3eab3 Author: Paul Wouters <pwout...@redhat.com> Date: Sun Feb 9 17:16:23 2014 -0500 dpd: say DPD=passive instead of DPD=none Since we always "do" DPD. The DPD= really means whether we actively send out probes. So "enable" means sending probes, "passive" means we will only answer the remote's probes. Do not include dpd.h for ikev2*c as dpd.h (and dpd.c is IKEv1-only) commit f0dc2daa2a98e8ae8790a4cb655b8abfac5dbf7e Author: Paul Wouters <pwout...@redhat.com> Date: Sun Feb 9 17:05:57 2014 -0500 changed a comment commit 3d39867e307577e77ccb520b69389d1f04a3a202 Author: Paul Wouters <pwout...@redhat.com> Date: Sun Feb 9 17:05:09 2014 -0500 ikev2: log with DBG_DPD when policy set to send liveness checks commit 9f50f53c76ee48210577af55c0204dc205f5286a Author: Paul Wouters <pwout...@redhat.com> Date: Sun Feb 9 17:02:31 2014 -0500 testing: minor change to ikev2-liveness-01 _______________________________________________ Swan-commit mailing list Swan-commit@lists.libreswan.org https://lists.libreswan.org/mailman/listinfo/swan-commit