diff options
author | Martin Willi <martin@revosec.ch> | 2012-03-20 17:56:18 +0100 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:57:53 +0100 |
commit | b1f2f05c926f3e36755bb3b2711bd1732c062047 (patch) | |
tree | 27f491ad55217d40051eb45db4de5a8a9217817a /src/libhydra/kernel | |
parent | 3cea55b0c819f90045a7ae5657ed476834b74746 (diff) | |
parent | d112a7e1feb583d011ba7868bb3b27b147dc2f68 (diff) | |
download | strongswan-b1f2f05c926f3e36755bb3b2711bd1732c062047.tar.bz2 strongswan-b1f2f05c926f3e36755bb3b2711bd1732c062047.tar.xz |
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.
Diffstat (limited to 'src/libhydra/kernel')
-rw-r--r-- | src/libhydra/kernel/kernel_ipsec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libhydra/kernel/kernel_ipsec.h b/src/libhydra/kernel/kernel_ipsec.h index ddb63283c..7af76a321 100644 --- a/src/libhydra/kernel/kernel_ipsec.h +++ b/src/libhydra/kernel/kernel_ipsec.h @@ -43,6 +43,8 @@ typedef struct mark_t mark_t; * Mode of an IPsec SA. */ enum ipsec_mode_t { + /** not using any encapsulation */ + MODE_NONE = 0, /** transport mode, no inner address */ MODE_TRANSPORT = 1, /** tunnel mode, inner and outer addresses */ |