Martin Willi b1f2f05c92 Merge branch 'ikev1-clean' into ikev1-master ...

Conflicts:
	configure.in
	man/ipsec.conf.5.in
	src/libcharon/daemon.c
	src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
	src/libcharon/plugins/eap_radius/eap_radius_accounting.c
	src/libcharon/plugins/eap_radius/eap_radius_forward.c
	src/libcharon/plugins/farp/farp_listener.c
	src/libcharon/sa/ike_sa.c
	src/libcharon/sa/keymat.c
	src/libcharon/sa/task_manager.c
	src/libcharon/sa/trap_manager.c
	src/libstrongswan/plugins/x509/x509_cert.c
	src/libstrongswan/utils.h

Applied lost changes of moved files keymat.c and task_manager.c.
Updated listener_t.message hook signature in new plugins.

2012-03-20 17:57:53 +01:00

..

ha_attribute.c

…

ha_attribute.h

…

ha_cache.c

Added support for Phase1 IV synchronization to HA plugin

2012-03-20 17:31:37 +01:00

ha_cache.h

…

ha_child.c

Synchronize ESN support in HA plugin

2011-04-20 12:26:58 +02:00

ha_child.h

…

ha_ctl.c

Use CRITICAL job priority class for long running dispatcher jobs

2011-05-16 15:24:15 +02:00

ha_ctl.h

…

ha_dispatcher.c

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

ha_dispatcher.h

…

ha_ike.c

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

ha_ike.h

…

ha_kernel.c

Check if ClusterIP directory could be opened before enumerating it

2012-02-06 10:51:39 +01:00

ha_kernel.h

…

ha_message.c

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

ha_message.h

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

ha_plugin.c

Added a (not yet implemented) plugin_t method to reload plugin configuration

2011-04-15 10:07:13 +02:00

ha_plugin.h

…

ha_segments.c

Use CRITICAL job priority class for long running dispatcher jobs

2011-05-16 15:24:15 +02:00

ha_segments.h

Fixed additional typos in comments and log messages.

2012-01-12 11:42:42 +01:00

ha_socket.c

Use CRITICAL job priority class for long running dispatcher jobs

2011-05-16 15:24:15 +02:00

ha_socket.h

…

ha_tunnel.c

Added an aggressive mode peer_cfg option

2012-03-20 17:31:34 +01:00

ha_tunnel.h

…

Makefile.am

ha plugin does not need Linux headers anymore

2011-08-02 17:08:41 +02:00