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/starter/confread.h
+5 -5
View File
@@ -39,9 +39,10 @@ typedef enum {
} starter_state_t;
typedef enum {
KEY_EXCHANGE_IKE,
KEY_EXCHANGE_IKEV1,
KEY_EXCHANGE_IKEV2
/* shared with ike_version_t */
KEY_EXCHANGE_IKE = 0,
KEY_EXCHANGE_IKEV1 = 1,
KEY_EXCHANGE_IKEV2 = 2,
} keyexchange_t;
typedef enum {
@@ -109,8 +110,6 @@ struct starter_conn {
starter_state_t state;
keyexchange_t keyexchange;
u_int32_t eap_type;
u_int32_t eap_vendor;
char *eap_identity;
char *aaa_identity;
char *xauth_identity;
@@ -131,6 +130,7 @@ struct starter_conn {
sa_family_t addr_family;
sa_family_t tunnel_addr_family;
bool install_policy;
bool aggressive;
starter_end_t left, right;
unsigned long id;