diff options
Diffstat (limited to 'src/stroke')
| -rw-r--r-- | src/stroke/Makefile.in | 14 | ||||
| -rw-r--r-- | src/stroke/stroke.c | 5 | ||||
| -rw-r--r-- | src/stroke/stroke_msg.h | 13 |
3 files changed, 19 insertions, 13 deletions
diff --git a/src/stroke/Makefile.in b/src/stroke/Makefile.in index 946bacc20..acf9d3485 100644 --- a/src/stroke/Makefile.in +++ b/src/stroke/Makefile.in @@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(ipsecdir)" @@ -60,7 +61,7 @@ am__DEPENDENCIES_1 = stroke_DEPENDENCIES = \ $(top_builddir)/src/libstrongswan/libstrongswan.la \ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -86,6 +87,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BFDLIB = @BFDLIB@ BTLIB = @BTLIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -180,11 +182,14 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ c_plugins = @c_plugins@ +charon_natt_port = @charon_natt_port@ +charon_plugins = @charon_plugins@ +charon_udp_port = @charon_udp_port@ clearsilver_LIBS = @clearsilver_LIBS@ datadir = @datadir@ datarootdir = @datarootdir@ dbusservicedir = @dbusservicedir@ -default_pkcs11 = @default_pkcs11@ +dev_headers = @dev_headers@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -201,11 +206,12 @@ imcvdir = @imcvdir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +ipsec_script = @ipsec_script@ +ipsec_script_upper = @ipsec_script_upper@ ipsecdir = @ipsecdir@ ipsecgroup = @ipsecgroup@ ipseclibdir = @ipseclibdir@ ipsecuser = @ipsecuser@ -libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ libexecdir = @libexecdir@ linux_headers = @linux_headers@ @@ -221,6 +227,7 @@ mkdir_p = @mkdir_p@ nm_CFLAGS = @nm_CFLAGS@ nm_LIBS = @nm_LIBS@ nm_ca_dir = @nm_ca_dir@ +nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ p_plugins = @p_plugins@ @@ -230,7 +237,6 @@ pdfdir = @pdfdir@ piddir = @piddir@ pki_plugins = @pki_plugins@ plugindir = @plugindir@ -pluto_plugins = @pluto_plugins@ pool_plugins = @pool_plugins@ prefix = @prefix@ program_transform_name = @program_transform_name@ diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c index bb299567b..03890b517 100644 --- a/src/stroke/stroke.c +++ b/src/stroke/stroke.c @@ -140,8 +140,7 @@ static int add_connection(char *name, msg.type = STR_ADD_CONN; msg.add_conn.name = push_string(&msg, name); - msg.add_conn.ikev2 = 1; - msg.add_conn.auth_method = 2; + msg.add_conn.version = 2; msg.add_conn.mode = 1; msg.add_conn.mobike = 1; msg.add_conn.dpd.action = 1; @@ -408,7 +407,7 @@ static void exit_usage(char *error) printf(" where: START and optional END define the clients source IP\n"); printf(" Set loglevel for a logging type:\n"); printf(" stroke loglevel TYPE LEVEL\n"); - printf(" where: TYPE is any|dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|lib\n"); + printf(" where: TYPE is any|dmn|mgr|ike|chd|job|cfg|knl|net|asn|enc|tnc|imc|imv|pts|tls|esp|lib\n"); printf(" LEVEL is -1|0|1|2|3|4\n"); printf(" Show connection status:\n"); printf(" stroke status\n"); diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h index 434122511..662feed69 100644 --- a/src/stroke/stroke_msg.h +++ b/src/stroke/stroke_msg.h @@ -152,16 +152,18 @@ struct stroke_end_t { char *ca; char *ca2; char *groups; + char *groups2; char *cert_policy; char *updown; char *address; u_int16_t ikeport; char *sourceip; - int sourceip_mask; + char *dns; char *subnets; int sendcert; int hostaccess; int tohost; + int allow_any; u_int8_t protocol; u_int16_t port; }; @@ -242,15 +244,13 @@ struct stroke_msg_t { /* data for STR_ADD_CONN */ struct { char *name; - int ikev2; - /* next three are deprecated, use stroke_end_t.auth instead */ - int auth_method; - u_int32_t eap_type; - u_int32_t eap_vendor; + int version; char *eap_identity; char *aaa_identity; + char *xauth_identity; int mode; int mobike; + int aggressive; int force_encap; int ipcomp; time_t inactivity; @@ -280,6 +280,7 @@ struct stroke_msg_t { } rekey; struct { time_t delay; + time_t timeout; int action; } dpd; struct { |