denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ikev1-clean' into ikev1-master

Browse Source 
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.
This commit is contained in:
Martin Willi
2012-03-20 17:57:53 +01:00
parent 3cea55b0c8 d112a7e1fe
commit b1f2f05c92
295 changed files with 21948 additions and 5444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_radius/eap_radius.h
+1 -1
View File
@@ -23,7 +23,7 @@
typedef struct eap_radius_t eap_radius_t;
#include <sa/authenticators/eap/eap_method.h>
#include <sa/eap/eap_method.h>
/**
* Implementation of the eap_method_t interface using a RADIUS server.
src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+2 -2
View File
@@ -271,10 +271,10 @@ METHOD(listener_t, ike_updown, bool,
METHOD(listener_t, message_hook, bool,
private_eap_radius_accounting_t *this, ike_sa_t *ike_sa,
message_t *message, bool incoming)
message_t *message, bool incoming, bool plain)
{
/* start accounting here, virtual IP now is set */
if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED &&
if (plain && ike_sa->get_state(ike_sa) == IKE_ESTABLISHED &&
message->get_exchange_type(message) == IKE_AUTH &&
!incoming && !message->get_request(message))
{
src/libcharon/plugins/eap_radius/eap_radius_forward.c
+2 -2
View File
@@ -319,11 +319,11 @@ void eap_radius_forward_to_ike(radius_message_t *response)
METHOD(listener_t, message, bool,
private_eap_radius_forward_t *this,
ike_sa_t *ike_sa, message_t *message, bool incoming)
ike_sa_t *ike_sa, message_t *message, bool incoming, bool plain)
{
linked_list_t *queue;
if (message->get_exchange_type(message) == IKE_AUTH)
if (plain && message->get_exchange_type(message) == IKE_AUTH)
{
if (incoming)
{