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

merged the modularization branch (credentials) back to trunk

Browse Source
This commit is contained in:
Martin Willi
2008-03-13 14:14:44 +00:00
parent 2df655134c
commit 552cc11b1f
495 changed files with 30378 additions and 23843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/args.c
-1
View File
@@ -172,7 +172,6 @@ static const token_info_t token_info[] =
{ ARG_ENUM, offsetof(starter_config_t, setup.nat_traversal), LST_bool },
{ ARG_TIME, offsetof(starter_config_t, setup.keep_alive), NULL },
{ ARG_STR, offsetof(starter_config_t, setup.virtual_private), NULL },
{ ARG_STR, offsetof(starter_config_t, setup.eapdir), NULL },
{ ARG_STR, offsetof(starter_config_t, setup.pkcs11module), NULL },
{ ARG_STR, offsetof(starter_config_t, setup.pkcs11initargs), NULL },
{ ARG_ENUM, offsetof(starter_config_t, setup.pkcs11keepstate), LST_bool },
src/starter/confread.h
-1
View File
@@ -185,7 +185,6 @@ struct starter_config {
bool nat_traversal;
u_int keep_alive;
char *virtual_private;
char *eapdir;
char *pkcs11module;
char *pkcs11initargs;
bool pkcs11keepstate;
src/starter/invokecharon.c
-10
View File
@@ -118,11 +118,6 @@ starter_start_charon (starter_config_t *cfg, bool debug)
{
arg[argc++] = "--use-syslog";
}
if (cfg->setup.strictcrlpolicy)
{
arg[argc++] = "--strictcrlpolicy";
arg[argc++] = cfg->setup.strictcrlpolicy == STRICT_IFURI ? "2":"1";
}
if (cfg->setup.cachecrls)
{
arg[argc++] = "--cachecrls";
@@ -133,11 +128,6 @@ starter_start_charon (starter_config_t *cfg, bool debug)
arg[argc++] = "--crlcheckinterval";
arg[argc++] = buffer1;
}
if (cfg->setup.eapdir)
{
arg[argc++] = "--eapdir";
arg[argc++] = cfg->setup.eapdir;
}
{ /* parse debug string */
char *pos, *level, *buf_pos, type[4];
src/starter/keywords.h
-1
View File
@@ -40,7 +40,6 @@ typedef enum {
KW_NAT_TRAVERSAL,
KW_KEEP_ALIVE,
KW_VIRTUAL_PRIVATE,
KW_EAPDIR,
KW_PKCS11MODULE,
KW_PKCS11INITARGS,
KW_PKCS11KEEPSTATE,
src/starter/keywords.txt
-1
View File
@@ -49,7 +49,6 @@ nat_traversal, KW_NAT_TRAVERSAL
keep_alive, KW_KEEP_ALIVE
virtual_private, KW_VIRTUAL_PRIVATE
eap, KW_EAP
eapdir, KW_EAPDIR
mobike, KW_MOBIKE
forceencaps, KW_FORCEENCAPS
pkcs11module, KW_PKCS11MODULE
src/starter/starter.c
+1 -1
View File
@@ -589,7 +589,7 @@ int main (int argc, char **argv)
}
if (starter_charon_pid())
{
starter_stroke_add_conn(conn);
starter_stroke_add_conn(cfg, conn);
}
if (starter_pluto_pid())
{
src/starter/starterstroke.c
+3 -2
View File
@@ -32,7 +32,7 @@
#include <defs.h>
#include <log.h>
#include <stroke.h>
#include <stroke_msg.h>
#include "starterstroke.h"
#include "confread.h"
@@ -175,7 +175,7 @@ static void starter_stroke_add_end(stroke_msg_t *msg, stroke_end_t *msg_end, sta
msg_end->sourceip = push_string(msg, buffer);
}
int starter_stroke_add_conn(starter_conn_t *conn)
int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
{
stroke_msg_t msg;
@@ -232,6 +232,7 @@ int starter_stroke_add_conn(starter_conn_t *conn)
}
msg.add_conn.mobike = conn->policy & POLICY_MOBIKE;
msg.add_conn.force_encap = conn->policy & POLICY_FORCE_ENCAP;
msg.add_conn.crl_policy = cfg->setup.strictcrlpolicy;
msg.add_conn.algorithms.ike = push_string(&msg, conn->ike);
msg.add_conn.algorithms.esp = push_string(&msg, conn->esp);
msg.add_conn.dpd.delay = conn->dpd_delay;
src/starter/starterstroke.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include "confread.h"
extern int starter_stroke_add_conn(starter_conn_t *conn);
extern int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn);
extern int starter_stroke_del_conn(starter_conn_t *conn);
extern int starter_stroke_route_conn(starter_conn_t *conn);
extern int starter_stroke_initiate_conn(starter_conn_t *conn);