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

removed NAT_TRAVERSAL compile option

Browse Source
This commit is contained in:
Andreas Steffen
2006-07-07 05:51:20 +00:00
parent dc33fee770
commit 34ee2a46f4
8 changed files with 26 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libfreeswan/pfkey_v2_parse.c
+2 -10
View File
@@ -387,9 +387,7 @@ pfkey_address_parse(struct sadb_ext *pfkey_ext)
case SADB_X_EXT_ADDRESS_DST_FLOW:
case SADB_X_EXT_ADDRESS_SRC_MASK:
case SADB_X_EXT_ADDRESS_DST_MASK:
#ifdef NAT_TRAVERSAL
case SADB_X_EXT_NAT_T_OA:
#endif
break;
default:
DEBUGGING(PF_KEY_DEBUG_PARSE_PROBLEM,
@@ -1156,18 +1154,17 @@ pfkey_x_ext_protocol_parse(struct sadb_ext *pfkey_ext)
return error;
}
#ifdef NAT_TRAVERSAL
DEBUG_NO_STATIC int
pfkey_x_ext_nat_t_type_parse(struct sadb_ext *pfkey_ext)
{
return 0;
}
DEBUG_NO_STATIC int
pfkey_x_ext_nat_t_port_parse(struct sadb_ext *pfkey_ext)
{
return 0;
}
#endif
#define DEFINEPARSER(NAME) static struct pf_key_ext_parsers_def NAME##_def={NAME, #NAME};
@@ -1184,10 +1181,8 @@ DEFINEPARSER(pfkey_x_kmprivate_parse);
DEFINEPARSER(pfkey_x_satype_parse);
DEFINEPARSER(pfkey_x_ext_debug_parse);
DEFINEPARSER(pfkey_x_ext_protocol_parse);
#ifdef NAT_TRAVERSAL
DEFINEPARSER(pfkey_x_ext_nat_t_type_parse);
DEFINEPARSER(pfkey_x_ext_nat_t_port_parse);
#endif
struct pf_key_ext_parsers_def *ext_default_parsers[]=
{
@@ -1217,14 +1212,11 @@ struct pf_key_ext_parsers_def *ext_default_parsers[]=
&pfkey_address_parse_def,
&pfkey_address_parse_def,
&pfkey_x_ext_debug_parse_def,
&pfkey_x_ext_protocol_parse_def
#ifdef NAT_TRAVERSAL
,
&pfkey_x_ext_protocol_parse_def ,
&pfkey_x_ext_nat_t_type_parse_def,
&pfkey_x_ext_nat_t_port_parse_def,
&pfkey_x_ext_nat_t_port_parse_def,
&pfkey_address_parse_def
#endif
};
int