sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

starter: Remove left|rightsubnetwithin option (charon narrows left|rightsubnet down accordingly).

Browse Source
This commit is contained in:
Tobias Brunner 2012-05-15 15:00:15 +02:00
parent 8dd094e185
commit 0ac29be793
6 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/starter/args.c
View File

@ -254,7 +254,6 @@ static const token_info_t token_info[] =
{ ARG_STR, offsetof(starter_end_t, host), NULL },
{ ARG_UINT, offsetof(starter_end_t, ikeport), NULL },
{ ARG_STR, offsetof(starter_end_t, subnet), NULL },
{ ARG_MISC, 0, NULL /* KW_SUBNETWITHIN */ },
{ ARG_MISC, 0, NULL /* KW_PROTOPORT */ },
{ ARG_STR, offsetof(starter_end_t, sourceip), NULL },
{ ARG_MISC, 0, NULL /* KW_NATIP */ },

1
src/starter/cmp.c
View File

@ -36,7 +36,6 @@ starter_cmp_end(starter_end_t *c1, starter_end_t *c2)
VARCMP(ikeport);
VARCMP(has_client);
VARCMP(has_client_wildcard);
VARCMP(has_port_wildcard);
VARCMP(has_natip);
VARCMP(has_virt);

17
src/starter/confread.c
View File

@ -294,23 +294,6 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
/* individual processing of keywords that were not assigned automatically */
switch (token)
{
case KW_SUBNETWITHIN:
{
ip_subnet net;
end->has_client = TRUE;
end->has_client_wildcard = TRUE;
conn->tunnel_addr_family = ip_version(value);
ugh = ttosubnet(value, 0, ip_version(value), &net);
if (ugh != NULL)
{
DBG1(DBG_APP, "# bad subnet: %s=%s [%s]", name, value, ugh);
goto err;
}
end->subnet = strdupnull(value);
break;
}
case KW_PROTOPORT:
ugh = ttoprotoport(value, 0, &end->protocol, &end->port, &has_port_wildcard);
end->has_port_wildcard = has_port_wildcard;

1
src/starter/confread.h
View File

@ -74,7 +74,6 @@ struct starter_end {
u_int ikeport;
char *subnet;
bool has_client;
bool has_client_wildcard;
bool has_port_wildcard;
bool has_natip;
bool has_virt;

3
src/starter/keywords.h
View File

@ -125,7 +125,6 @@ typedef enum {
KW_HOST,
KW_IKEPORT,
KW_SUBNET,
KW_SUBNETWITHIN,
KW_PROTOPORT,
KW_SOURCEIP,
KW_NATIP,
@ -153,7 +152,6 @@ typedef enum {
KW_LEFT,
KW_LEFTIKEPORT,
KW_LEFTSUBNET,
KW_LEFTSUBNETWITHIN,
KW_LEFTPROTOPORT,
KW_LEFTSOURCEIP,
KW_LEFTNATIP,
@ -181,7 +179,6 @@ typedef enum {
KW_RIGHT,
KW_RIGHTIKEPORT,
KW_RIGHTSUBNET,
KW_RIGHTSUBNETWITHIN,
KW_RIGHTPROTOPORT,
KW_RIGHTSOURCEIP,
KW_RIGHTNATIP,

2
src/starter/keywords.txt
View File

@ -106,7 +106,6 @@ certuribase, KW_CERTURIBASE
left, KW_LEFT
leftikeport, KW_LEFTIKEPORT
leftsubnet, KW_LEFTSUBNET
leftsubnetwithin, KW_LEFTSUBNETWITHIN
leftprotoport, KW_LEFTPROTOPORT
leftsourceip, KW_LEFTSOURCEIP
leftnatip, KW_LEFTNATIP
@ -129,7 +128,6 @@ leftgroups, KW_LEFTGROUPS
right, KW_RIGHT
rightikeport, KW_RIGHTIKEPORT
rightsubnet, KW_RIGHTSUBNET
rightsubnetwithin, KW_RIGHTSUBNETWITHIN
rightprotoport, KW_RIGHTPROTOPORT
rightsourceip, KW_RIGHTSOURCEIP
rightnatip, KW_RIGHTNATIP