diff options
Diffstat (limited to 'src/libfreeswan/pfkey_v2_parse.c')
| -rw-r--r-- | src/libfreeswan/pfkey_v2_parse.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/libfreeswan/pfkey_v2_parse.c b/src/libfreeswan/pfkey_v2_parse.c index 9025654a2..a1cc6d956 100644 --- a/src/libfreeswan/pfkey_v2_parse.c +++ b/src/libfreeswan/pfkey_v2_parse.c @@ -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 |