removed NAT_TRAVERSAL and VIRTUAL_IP compile options

src/pluto/kernel_pfkey.c

@@ -41,11 +41,8 @@
 #include "kernel_pfkey.h"
 #include "log.h"
 #include "whack.h"	/* for RC_LOG_SERIOUS */
-#ifdef NAT_TRAVERSAL
 #include "demux.h"
 #include "nat_traversal.h"
-#endif
-
 #include "alg_info.h"
 #include "kernel_alg.h"
 
@@ -77,9 +74,7 @@ static sparse_names pfkey_type_names = {
 	NE(SADB_X_ADDFLOW),
 	NE(SADB_X_DELFLOW),
 	NE(SADB_X_DEBUG),
-#ifdef NAT_TRAVERSAL
 	NE(SADB_X_NAT_T_NEW_MAPPING),
-#endif
 	NE(SADB_MAX),	
 	{ 0, sparse_end }
 };
@@ -250,10 +245,7 @@ pfkey_get(pfkey_buf *buf)
 	else if (!(buf->msg.sadb_msg_pid == (unsigned)pid
 	|| (buf->msg.sadb_msg_pid == 0 && buf->msg.sadb_msg_type == SADB_ACQUIRE)
 	|| (buf->msg.sadb_msg_type == SADB_REGISTER)
-#ifdef NAT_TRAVERSAL
-	|| (buf->msg.sadb_msg_pid == 0 && buf->msg.sadb_msg_type == SADB_X_NAT_T_NEW_MAPPING)
-#endif
-	))
+	|| (buf->msg.sadb_msg_pid == 0 && buf->msg.sadb_msg_type == SADB_X_NAT_T_NEW_MAPPING)))
 	{
 	    /* not for us: ignore */
 	    DBG(DBG_KLIPS,
@@ -435,11 +427,9 @@ pfkey_async(pfkey_buf *buf)
 	    /* to simulate loss of ACQUIRE, delete this call */
 	    process_pfkey_acquire(buf, extensions);
 	    break;
-#ifdef NAT_TRAVERSAL
 	case SADB_X_NAT_T_NEW_MAPPING:
 	    process_pfkey_nat_t_new_mapping(&(buf->msg), extensions);
 	    break;
-#endif
 	default:
 	    /* ignored */
 	    break;
@@ -821,8 +811,7 @@ pfkey_add_sa(const struct kernel_sa *sa, bool replace)
 		, SADB_EXT_KEY_ENCRYPT, sa->enckeylen * BITS_PER_BYTE
 		, sa->enckey)
 	    , "pfkey_key_e Add SA", sa->text_said, extensions))
-        
-#ifdef NAT_TRAVERSAL
+
     && (sa->natt_type == 0
 	|| pfkey_build(pfkey_x_nat_t_type_build(
 		&extensions[SADB_X_EXT_NAT_T_TYPE], sa->natt_type),
@@ -840,10 +829,9 @@ pfkey_add_sa(const struct kernel_sa *sa, bool replace)
     && (sa->natt_type == 0 || isanyaddr(sa->natt_oa)
 	|| pfkeyext_address(SADB_X_EXT_NAT_T_OA, sa->natt_oa
 	    , "pfkey_nat_t_oa Add ESP SA", sa->text_said, extensions))
-#endif
 
     && finish_pfkey_msg(extensions, "Add SA", sa->text_said, NULL);
-    
+
 }
 
 static bool