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

starter: Use custom type to mark seen keywords.

Browse Source
This commit is contained in:
Tobias Brunner
2012-06-11 17:33:30 +02:00
parent 57323f6259
commit f82365ad27
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/args.c
+3 -4
View File
@@ -360,21 +360,20 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
int index = -1; /* used for enumeration arguments */ int index = -1; /* used for enumeration arguments */
lset_t *seen = (lset_t *)base; /* seen flags are at the top of the struct */ seen_t *seen = (seen_t*)base; /* seen flags are at the top of the struct */
lset_t f = LELEM(token - first); /* compute flag position of argument */
*assigned = FALSE; *assigned = FALSE;
DBG3(DBG_APP, " %s=%s", kw->entry->name, kw->value); DBG3(DBG_APP, " %s=%s", kw->entry->name, kw->value);
if (*seen & f) if (*seen & SEEN_KW(token, first))
{ {
DBG1(DBG_APP, "# duplicate '%s' option", kw->entry->name); DBG1(DBG_APP, "# duplicate '%s' option", kw->entry->name);
return FALSE; return FALSE;
} }
/* set flag that this argument has been seen */ /* set flag that this argument has been seen */
*seen |= f; *seen |= SEEN_KW(token, first);
/* is there a keyword list? */ /* is there a keyword list? */
if (list != NULL && token_info[token].type != ARG_LST) if (list != NULL && token_info[token].type != ARG_LST)
src/starter/confread.c
+15 -15
View File
@@ -57,7 +57,7 @@ static void default_values(starter_config_t *cfg)
memset(cfg, 0, sizeof(struct starter_config)); memset(cfg, 0, sizeof(struct starter_config));
/* is there enough space for all seen flags? */ /* is there enough space for all seen flags? */
assert(KW_SETUP_LAST - KW_SETUP_FIRST < assert(KW_SETUP_LAST - KW_SETUP_FIRST <
sizeof(cfg->setup.seen) * BITS_PER_BYTE); sizeof(cfg->setup.seen) * BITS_PER_BYTE);
assert(KW_CONN_LAST - KW_CONN_FIRST < assert(KW_CONN_LAST - KW_CONN_FIRST <
@@ -67,7 +67,7 @@ static void default_values(starter_config_t *cfg)
assert(KW_CA_LAST - KW_CA_FIRST < assert(KW_CA_LAST - KW_CA_FIRST <
sizeof(cfg->ca_default.seen) * BITS_PER_BYTE); sizeof(cfg->ca_default.seen) * BITS_PER_BYTE);
cfg->setup.seen = LEMPTY; cfg->setup.seen = SEEN_NONE;
cfg->setup.fragicmp = TRUE; cfg->setup.fragicmp = TRUE;
cfg->setup.hidetos = TRUE; cfg->setup.hidetos = TRUE;
cfg->setup.uniqueids = TRUE; cfg->setup.uniqueids = TRUE;
@@ -80,7 +80,7 @@ static void default_values(starter_config_t *cfg)
cfg->setup.plutostart = TRUE; cfg->setup.plutostart = TRUE;
#endif #endif
cfg->conn_default.seen = LEMPTY; cfg->conn_default.seen = SEEN_NONE;
cfg->conn_default.startup = STARTUP_NO; cfg->conn_default.startup = STARTUP_NO;
cfg->conn_default.state = STATE_IGNORE; cfg->conn_default.state = STATE_IGNORE;
cfg->conn_default.policy = POLICY_ENCRYPT | POLICY_TUNNEL | POLICY_PUBKEY | cfg->conn_default.policy = POLICY_ENCRYPT | POLICY_TUNNEL | POLICY_PUBKEY |
@@ -95,12 +95,12 @@ static void default_values(starter_config_t *cfg)
cfg->conn_default.sa_keying_tries = SA_REPLACEMENT_RETRIES_DEFAULT; cfg->conn_default.sa_keying_tries = SA_REPLACEMENT_RETRIES_DEFAULT;
cfg->conn_default.addr_family = AF_INET; cfg->conn_default.addr_family = AF_INET;
cfg->conn_default.tunnel_addr_family = AF_INET; cfg->conn_default.tunnel_addr_family = AF_INET;
cfg->conn_default.install_policy = TRUE; cfg->conn_default.install_policy = TRUE;
cfg->conn_default.dpd_delay = 30; /* seconds */ cfg->conn_default.dpd_delay = 30; /* seconds */
cfg->conn_default.dpd_timeout = 150; /* seconds */ cfg->conn_default.dpd_timeout = 150; /* seconds */
cfg->conn_default.left.seen = LEMPTY; cfg->conn_default.left.seen = SEEN_NONE;
cfg->conn_default.right.seen = LEMPTY; cfg->conn_default.right.seen = SEEN_NONE;
cfg->conn_default.left.sendcert = CERT_SEND_IF_ASKED; cfg->conn_default.left.sendcert = CERT_SEND_IF_ASKED;
cfg->conn_default.right.sendcert = CERT_SEND_IF_ASKED; cfg->conn_default.right.sendcert = CERT_SEND_IF_ASKED;
@@ -110,7 +110,7 @@ static void default_values(starter_config_t *cfg)
cfg->conn_default.left.ikeport = 500; cfg->conn_default.left.ikeport = 500;
cfg->conn_default.right.ikeport = 500; cfg->conn_default.right.ikeport = 500;
cfg->ca_default.seen = LEMPTY; cfg->ca_default.seen = SEEN_NONE;
} }
#define KW_POLICY_FLAG(sy, sn, fl) \ #define KW_POLICY_FLAG(sy, sn, fl) \
@@ -412,7 +412,7 @@ static void handle_dns_failure(const char *label, starter_end_t *end,
static void handle_firewall(const char *label, starter_end_t *end, static void handle_firewall(const char *label, starter_end_t *end,
starter_config_t *cfg) starter_config_t *cfg)
{ {
if (end->firewall && (end->seen & LELEM(KW_FIREWALL - KW_END_FIRST))) if (end->firewall && (end->seen & SEEN_KW(KW_FIREWALL, KW_END_FIRST)))
{ {
if (end->updown != NULL) if (end->updown != NULL)
{ {
@@ -955,7 +955,7 @@ starter_config_t* confread_load(const char *file)
} }
/* parameters defined in ca %default sections can be overloads */ /* parameters defined in ca %default sections can be overloads */
cfg->ca_default.seen = LEMPTY; cfg->ca_default.seen = SEEN_NONE;
/* load other ca sections */ /* load other ca sections */
for (sca = cfgp->ca_first; sca; sca = sca->next) for (sca = cfgp->ca_first; sca; sca = sca->next)
@@ -1019,10 +1019,10 @@ starter_config_t* confread_load(const char *file)
} }
} }
/* parameter defined in conn %default sections can be overloaded */ /* parameters defined in conn %default sections can be overloaded */
cfg->conn_default.seen = LEMPTY; cfg->conn_default.seen = SEEN_NONE;
cfg->conn_default.right.seen = LEMPTY; cfg->conn_default.right.seen = SEEN_NONE;
cfg->conn_default.left.seen = LEMPTY; cfg->conn_default.left.seen = SEEN_NONE;
/* load other conn sections */ /* load other conn sections */
for (sconn = cfgp->conn_first; sconn; sconn = sconn->next) for (sconn = cfgp->conn_first; sconn; sconn = sconn->next)
src/starter/confread.h
+9 -4
View File
@@ -21,6 +21,11 @@
#include "ipsec-parser.h" #include "ipsec-parser.h"
/** to mark seen keywords */
typedef u_int64_t seen_t;
#define SEEN_NONE 0;
#define SEEN_KW(kw, base) ((seen_t)1 << ((kw) - (base)))
typedef enum { typedef enum {
STARTUP_NO, STARTUP_NO,
STARTUP_ADD, STARTUP_ADD,
@@ -52,7 +57,7 @@ typedef enum {
typedef struct starter_end starter_end_t; typedef struct starter_end starter_end_t;
struct starter_end { struct starter_end {
lset_t seen; seen_t seen;
char *auth; char *auth;
char *auth2; char *auth2;
char *id; char *id;
@@ -98,7 +103,7 @@ struct also {
typedef struct starter_conn starter_conn_t; typedef struct starter_conn starter_conn_t;
struct starter_conn { struct starter_conn {
lset_t seen; seen_t seen;
char *name; char *name;
also_t *also; also_t *also;
kw_list_t *kw; kw_list_t *kw;
@@ -156,7 +161,7 @@ struct starter_conn {
typedef struct starter_ca starter_ca_t; typedef struct starter_ca starter_ca_t;
struct starter_ca { struct starter_ca {
lset_t seen; seen_t seen;
char *name; char *name;
also_t *also; also_t *also;
kw_list_t *kw; kw_list_t *kw;
@@ -182,7 +187,7 @@ typedef struct starter_config starter_config_t;
struct starter_config { struct starter_config {
struct { struct {
lset_t seen; seen_t seen;
char **interfaces; char **interfaces;
char *dumpdir; char *dumpdir;
bool charonstart; bool charonstart;