ikev2: support responder hostname
[vpp.git] / src / plugins / ikev2 / ikev2.c
index 173323b..fa65376 100644 (file)
@@ -18,7 +18,6 @@
 #include <vlibmemory/api.h>
 #include <vpp/app/version.h>
 #include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
 #include <vppinfra/random.h>
 #include <vnet/udp/udp.h>
 #include <vnet/ipip/ipip.h>
 #include <plugins/ikev2/ikev2.h>
 #include <plugins/ikev2/ikev2_priv.h>
+#include <plugins/dns/dns.h>
 #include <openssl/sha.h>
 #include <vnet/ipsec/ipsec_punt.h>
+#include <plugins/ikev2/ikev2.api_enum.h>
 
 #define IKEV2_LIVENESS_RETRIES 3
 #define IKEV2_LIVENESS_PERIOD_CHECK 30
@@ -39,9 +40,9 @@ static int ikev2_delete_tunnel_interface (vnet_main_t * vnm,
                                          ikev2_sa_t * sa,
                                          ikev2_child_sa_t * child);
 
-#define ikev2_set_state(sa, v) do { \
+#define ikev2_set_state(sa, v, ...) do { \
     (sa)->state = v; \
-    ikev2_elog_sa_state("ispi %lx SA state changed to " #v, sa->ispi); \
+    ikev2_elog_sa_state("ispi %lx SA state changed to " #v __VA_ARGS__, sa->ispi); \
   } while(0);
 
 typedef struct
@@ -62,43 +63,57 @@ format_ikev2_trace (u8 * s, va_list * args)
   return s;
 }
 
-static vlib_node_registration_t ikev2_node;
-
-#define foreach_ikev2_error \
-_(PROCESSED, "IKEv2 packets processed") \
-_(IKE_SA_INIT_RETRANSMIT, "IKE_SA_INIT retransmit ") \
-_(IKE_SA_INIT_IGNORE, "IKE_SA_INIT ignore (IKE SA already auth)") \
-_(IKE_REQ_RETRANSMIT, "IKE request retransmit") \
-_(IKE_REQ_IGNORE, "IKE request ignore (old msgid)") \
-_(NOT_IKEV2, "Non IKEv2 packets received")
+#define IKEV2_GENERATE_SA_INIT_OK_str ""
+#define IKEV2_GENERATE_SA_INIT_OK_ERR_NO_DH_STR \
+  "no DH group configured for IKE proposals!"
+#define IKEV2_GENERATE_SA_INIT_OK_ERR_UNSUPP_STR \
+  "DH group not supported!"
 
 typedef enum
 {
-#define _(sym,str) IKEV2_ERROR_##sym,
-  foreach_ikev2_error
-#undef _
-    IKEV2_N_ERROR,
-} ikev2_error_t;
+  IKEV2_GENERATE_SA_INIT_OK,
+  IKEV2_GENERATE_SA_INIT_ERR_NO_DH,
+  IKEV2_GENERATE_SA_INIT_ERR_UNSUPPORTED_DH,
+} ikev2_generate_sa_error_t;
 
-static char *ikev2_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ikev2_error
-#undef _
-};
+static u8 *
+format_ikev2_gen_sa_error (u8 * s, va_list * args)
+{
+  ikev2_generate_sa_error_t e = va_arg (*args, ikev2_generate_sa_error_t);
+  switch (e)
+    {
+    case IKEV2_GENERATE_SA_INIT_OK:
+      break;
+    case IKEV2_GENERATE_SA_INIT_ERR_NO_DH:
+      s = format (s, IKEV2_GENERATE_SA_INIT_OK_ERR_NO_DH_STR);
+      break;
+    case IKEV2_GENERATE_SA_INIT_ERR_UNSUPPORTED_DH:
+      s = format (s, IKEV2_GENERATE_SA_INIT_OK_ERR_UNSUPP_STR);
+      break;
+    }
+  return s;
+}
 
 typedef enum
 {
   IKEV2_NEXT_IP4_LOOKUP,
-  IKEV2_NEXT_ERROR_DROP,
-  IKEV2_N_NEXT,
-} ikev2_next_t;
+  IKEV2_NEXT_IP4_ERROR_DROP,
+  IKEV2_IP4_N_NEXT,
+} ikev2_ip4_next_t;
+
+typedef enum
+{
+  IKEV2_NEXT_IP6_LOOKUP,
+  IKEV2_NEXT_IP6_ERROR_DROP,
+  IKEV2_IP6_N_NEXT,
+} ikev2_ip6_next_t;
 
 typedef u32 ikev2_non_esp_marker;
 
 static_always_inline u16
 ikev2_get_port (ikev2_sa_t * sa)
 {
-  return sa->natt ? IKEV2_PORT_NATT : IKEV2_PORT;
+  return ikev2_natt_active (sa) ? IKEV2_PORT_NATT : IKEV2_PORT;
 }
 
 static_always_inline int
@@ -260,7 +275,7 @@ ikev2_sa_free_proposal_vector (ikev2_sa_proposal_t ** v)
     vec_free (p->transforms);
   }
   vec_free (*v);
-};
+}
 
 static void
 ikev2_sa_free_child_sa (ikev2_child_sa_t * c)
@@ -295,9 +310,12 @@ static void
 ikev2_sa_free_all_vec (ikev2_sa_t * sa)
 {
   vec_free (sa->i_nonce);
-  vec_free (sa->i_dh_data);
+  vec_free (sa->r_nonce);
+
   vec_free (sa->dh_shared_key);
   vec_free (sa->dh_private_key);
+  vec_free (sa->i_dh_data);
+  vec_free (sa->r_dh_data);
 
   ikev2_sa_free_proposal_vector (&sa->r_proposals);
   ikev2_sa_free_proposal_vector (&sa->i_proposals);
@@ -311,44 +329,50 @@ ikev2_sa_free_all_vec (ikev2_sa_t * sa)
   vec_free (sa->sk_pr);
 
   vec_free (sa->i_id.data);
-  vec_free (sa->i_auth.data);
   vec_free (sa->r_id.data);
+
+  vec_free (sa->i_auth.data);
+  if (sa->i_auth.key)
+    EVP_PKEY_free (sa->i_auth.key);
   vec_free (sa->r_auth.data);
   if (sa->r_auth.key)
     EVP_PKEY_free (sa->r_auth.key);
 
   vec_free (sa->del);
 
+  vec_free (sa->rekey);
+
+  vec_free (sa->last_sa_init_req_packet_data);
+  vec_free (sa->last_sa_init_res_packet_data);
+
+  vec_free (sa->last_res_packet_data);
+
   ikev2_sa_free_all_child_sa (&sa->childs);
 }
 
 static void
-ikev2_delete_sa (ikev2_sa_t * sa)
+ikev2_delete_sa (ikev2_main_per_thread_data_t * ptd, ikev2_sa_t * sa)
 {
-  ikev2_main_t *km = &ikev2_main;
-  u32 thread_index = vlib_get_thread_index ();
   uword *p;
 
   ikev2_sa_free_all_vec (sa);
 
-  p = hash_get (km->per_thread_data[thread_index].sa_by_rspi, sa->rspi);
+  p = hash_get (ptd->sa_by_rspi, sa->rspi);
   if (p)
     {
-      hash_unset (km->per_thread_data[thread_index].sa_by_rspi, sa->rspi);
-      pool_put (km->per_thread_data[thread_index].sas, sa);
+      hash_unset (ptd->sa_by_rspi, sa->rspi);
+      pool_put (ptd->sas, sa);
     }
 }
 
-static void
+static ikev2_generate_sa_error_t
 ikev2_generate_sa_init_data (ikev2_sa_t * sa)
 {
   ikev2_sa_transform_t *t = 0, *t2;
   ikev2_main_t *km = &ikev2_main;
 
   if (sa->dh_group == IKEV2_TRANSFORM_DH_TYPE_NONE)
-    {
-      return;
-    }
+    return IKEV2_GENERATE_SA_INIT_ERR_NO_DH;
 
   /* check if received DH group is on our list of supported groups */
   vec_foreach (t2, km->supported_transforms)
@@ -363,7 +387,7 @@ ikev2_generate_sa_init_data (ikev2_sa_t * sa)
   if (!t)
     {
       sa->dh_group = IKEV2_TRANSFORM_DH_TYPE_NONE;
-      return;
+      return IKEV2_GENERATE_SA_INIT_ERR_UNSUPPORTED_DH;
     }
 
   if (sa->is_initiator)
@@ -388,6 +412,7 @@ ikev2_generate_sa_init_data (ikev2_sa_t * sa)
   /* generate dh keys */
   ikev2_generate_dh (sa, t);
 
+  return IKEV2_GENERATE_SA_INIT_OK;
 }
 
 static void
@@ -401,14 +426,16 @@ ikev2_complete_sa_data (ikev2_sa_t * sa, ikev2_sa_t * sai)
   sa->i_nonce = _(sai->i_nonce);
   sa->i_dh_data = _(sai->i_dh_data);
   sa->dh_private_key = _(sai->dh_private_key);
-  sa->iaddr.as_u32 = sai->iaddr.as_u32;
-  sa->raddr.as_u32 = sai->raddr.as_u32;
+  ip_address_copy (&sa->iaddr, &sai->iaddr);
+  ip_address_copy (&sa->raddr, &sai->raddr);
   sa->is_initiator = sai->is_initiator;
   sa->i_id.type = sai->i_id.type;
   sa->r_id.type = sai->r_id.type;
   sa->profile_index = sai->profile_index;
   sa->tun_itf = sai->tun_itf;
   sa->is_tun_itf_set = sai->is_tun_itf_set;
+  if (sai->natt_state == IKEV2_NATT_DISABLED)
+    sa->natt_state = IKEV2_NATT_DISABLED;
   sa->i_id.data = _(sai->i_id.data);
   sa->r_id.data = _(sai->r_id.data);
   sa->i_auth.method = sai->i_auth.method;
@@ -416,6 +443,7 @@ ikev2_complete_sa_data (ikev2_sa_t * sa, ikev2_sa_t * sai)
   sa->i_auth.data = _(sai->i_auth.data);
   sa->i_auth.key = _(sai->i_auth.key);
   sa->last_sa_init_req_packet_data = _(sai->last_sa_init_req_packet_data);
+  sa->last_init_msg_id = sai->last_init_msg_id;
   sa->childs = _(sai->childs);
   sa->udp_encap = sai->udp_encap;
   sa->ipsec_over_udp_port = sai->ipsec_over_udp_port;
@@ -536,6 +564,7 @@ ikev2_calc_keys (ikev2_sa_t * sa)
   pos += tr_prf->key_len;
 
   vec_free (keymat);
+  sa->keys_generated = 1;
 }
 
 static void
@@ -610,77 +639,122 @@ ikev2_calc_child_keys (ikev2_sa_t * sa, ikev2_child_sa_t * child)
 }
 
 static_always_inline u8 *
-ikev2_compute_nat_sha1 (u64 ispi, u64 rspi, u32 ip, u16 port)
+ikev2_compute_nat_sha1 (u64 ispi, u64 rspi, ip_address_t * ia, u16 port)
 {
-  /* ispi, rspi, ip, port */
-  u8 buf[8 + 8 + 4 + 2];
+  const u32 max_buf_size =
+    sizeof (ispi) + sizeof (rspi) + sizeof (ip6_address_t) + sizeof (u16);
+  u8 buf[max_buf_size];
   u8 *res = vec_new (u8, 20);
 
   clib_memcpy_fast (&buf[0], &ispi, sizeof (ispi));
   clib_memcpy_fast (&buf[8], &rspi, sizeof (rspi));
-  clib_memcpy_fast (&buf[8 + 8], &ip, sizeof (ip));
-  clib_memcpy_fast (&buf[8 + 8 + 4], &port, sizeof (port));
-  SHA1 (buf, sizeof (buf), res);
+  clib_memcpy_fast (&buf[8 + 8], ip_addr_bytes (ia), ip_address_size (ia));
+  clib_memcpy_fast (&buf[8 + 8 + ip_address_size (ia)], &port, sizeof (port));
+  SHA1 (buf, 2 * sizeof (ispi) + sizeof (port) + ip_address_size (ia), res);
   return res;
 }
 
-static void
-ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
-                          ike_header_t * ike, udp_header_t * udp)
+static int
+ikev2_parse_ke_payload (const void *p, u32 rlen, ikev2_sa_t * sa,
+                       u8 ** ke_data)
+{
+  const ike_ke_payload_header_t *ke = p;
+  u16 plen = clib_net_to_host_u16 (ke->length);
+  ASSERT (plen >= sizeof (*ke) && plen <= rlen);
+  if (sizeof (*ke) > rlen)
+    return 0;
+
+  sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
+  vec_reset_length (ke_data[0]);
+  vec_add (ke_data[0], ke->payload, plen - sizeof (*ke));
+  return 1;
+}
+
+static int
+ikev2_parse_nonce_payload (const void *p, u32 rlen, u8 * nonce)
+{
+  const ike_payload_header_t *ikep = p;
+  u16 plen = clib_net_to_host_u16 (ikep->length);
+  ASSERT (plen >= sizeof (*ikep) && plen <= rlen);
+  clib_memcpy_fast (nonce, ikep->payload, plen - sizeof (*ikep));
+  return 1;
+}
+
+static int
+ikev2_check_payload_length (const ike_payload_header_t * ikep, int rlen,
+                           u16 * plen)
+{
+  if (sizeof (*ikep) > rlen)
+    return 0;
+  *plen = clib_net_to_host_u16 (ikep->length);
+  if (*plen < sizeof (*ikep) || *plen > rlen)
+    return 0;
+  return 1;
+}
+
+static int
+ikev2_process_sa_init_req (vlib_main_t *vm, ikev2_sa_t *sa, ike_header_t *ike,
+                          udp_header_t *udp, u32 len, u32 sw_if_index)
 {
+  u8 nonce[IKEV2_NONCE_SIZE];
   int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
+  ike_payload_header_t *ikep;
+  u16 plen;
 
   ikev2_elog_exchange ("ispi %lx rspi %lx IKE_INIT request received "
-                      "from %d.%d.%d.%d",
-                      clib_net_to_host_u64 (ike->ispi),
-                      clib_net_to_host_u64 (ike->rspi), sa->iaddr.as_u32);
+                      "from ", clib_net_to_host_u64 (ike->ispi),
+                      clib_net_to_host_u64 (ike->rspi),
+                      ip_addr_v4 (&sa->iaddr).as_u32,
+                      ip_addr_version (&sa->iaddr) == AF_IP4);
 
   sa->ispi = clib_net_to_host_u64 (ike->ispi);
+  sa->sw_if_index = sw_if_index;
 
   /* store whole IKE payload - needed for PSK auth */
-  vec_free (sa->last_sa_init_req_packet_data);
+  vec_reset_length (sa->last_sa_init_req_packet_data);
   vec_add (sa->last_sa_init_req_packet_data, ike, len);
 
+  if (len < sizeof (*ike))
+    return 0;
+
+  len -= sizeof (*ike);
   while (p < len && payload != IKEV2_PAYLOAD_NONE)
     {
-      ike_payload_header_t *ikep = (ike_payload_header_t *) & ike->payload[p];
-      u32 plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
-       return;
+      ikep = (ike_payload_header_t *) & ike->payload[p];
+      int current_length = len - p;
+      if (!ikev2_check_payload_length (ikep, current_length, &plen))
+       return 0;
 
       if (payload == IKEV2_PAYLOAD_SA)
        {
          ikev2_sa_free_proposal_vector (&sa->i_proposals);
-         sa->i_proposals = ikev2_parse_sa_payload (ikep);
+         sa->i_proposals = ikev2_parse_sa_payload (ikep, current_length);
        }
       else if (payload == IKEV2_PAYLOAD_KE)
        {
-         ike_ke_payload_header_t *ke = (ike_ke_payload_header_t *) ikep;
-         sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
-         vec_free (sa->i_dh_data);
-         vec_add (sa->i_dh_data, ke->payload, plen - sizeof (*ke));
+         if (!ikev2_parse_ke_payload (ikep, current_length, sa,
+                                      &sa->i_dh_data))
+           return 0;
        }
       else if (payload == IKEV2_PAYLOAD_NONCE)
        {
-         vec_free (sa->i_nonce);
-         vec_add (sa->i_nonce, ikep->payload, plen - sizeof (*ikep));
+         vec_reset_length (sa->i_nonce);
+         if (ikev2_parse_nonce_payload (ikep, current_length, nonce))
+           vec_add (sa->i_nonce, nonce, plen - sizeof (*ikep));
        }
       else if (payload == IKEV2_PAYLOAD_NOTIFY)
        {
-         ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+         ikev2_notify_t *n =
+           ikev2_parse_notify_payload (ikep, current_length);
          if (n->msg_type == IKEV2_NOTIFY_MSG_NAT_DETECTION_SOURCE_IP)
            {
-             u8 *src_sha =
-               ikev2_compute_nat_sha1 (clib_net_to_host_u64 (ike->ispi), 0,
-                                       clib_net_to_host_u32 (sa->
-                                                             iaddr.as_u32),
-                                       udp->src_port);
+             u8 *src_sha = ikev2_compute_nat_sha1 (ike->ispi, 0, &sa->iaddr,
+                                                   udp->src_port);
              if (clib_memcmp (src_sha, n->data, vec_len (src_sha)))
                {
-                 sa->natt = 1;
+                 if (sa->natt_state == IKEV2_NATT_ENABLED)
+                   sa->natt_state = IKEV2_NATT_ACTIVE;
                  ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx initiator"
                                   " behind NAT", sa->ispi);
                }
@@ -689,14 +763,12 @@ ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
          else if (n->msg_type ==
                   IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP)
            {
-             u8 *dst_sha =
-               ikev2_compute_nat_sha1 (clib_net_to_host_u64 (ike->ispi), 0,
-                                       clib_net_to_host_u32 (sa->
-                                                             raddr.as_u32),
-                                       udp->dst_port);
+             u8 *dst_sha = ikev2_compute_nat_sha1 (ike->ispi, 0, &sa->raddr,
+                                                   udp->dst_port);
              if (clib_memcmp (dst_sha, n->data, vec_len (dst_sha)))
                {
-                 sa->natt = 1;
+                 if (sa->natt_state == IKEV2_NATT_ENABLED)
+                   sa->natt_state = IKEV2_NATT_ACTIVE;
                  ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx responder"
                                   " (self) behind NAT", sa->ispi);
                }
@@ -716,7 +788,7 @@ ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
            {
              ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
              sa->unsupported_cp = payload;
-             return;
+             return 0;
            }
        }
 
@@ -725,39 +797,47 @@ ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
     }
 
   ikev2_set_state (sa, IKEV2_STATE_SA_INIT);
+  return 1;
 }
 
 static void
-ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
-                           ike_header_t * ike, udp_header_t * udp)
+ikev2_process_sa_init_resp (vlib_main_t * vm,
+                           ikev2_sa_t * sa, ike_header_t * ike,
+                           udp_header_t * udp, u32 len)
 {
+  u8 nonce[IKEV2_NONCE_SIZE];
   int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
+  ike_payload_header_t *ikep;
+  u16 plen;
 
   sa->ispi = clib_net_to_host_u64 (ike->ispi);
   sa->rspi = clib_net_to_host_u64 (ike->rspi);
 
   ikev2_elog_exchange ("ispi %lx rspi %lx IKE_INIT response received "
-                      "from %d.%d.%d.%d", sa->ispi, sa->rspi,
-                      sa->raddr.as_u32);
+                      "from ", sa->ispi, sa->rspi,
+                      ip_addr_v4 (&sa->raddr).as_u32,
+                      ip_addr_version (&sa->raddr) == AF_IP4);
 
   /* store whole IKE payload - needed for PSK auth */
-  vec_free (sa->last_sa_init_res_packet_data);
+  vec_reset_length (sa->last_sa_init_res_packet_data);
   vec_add (sa->last_sa_init_res_packet_data, ike, len);
 
+  if (sizeof (*ike) > len)
+    return;
+
+  len -= sizeof (*ike);
   while (p < len && payload != IKEV2_PAYLOAD_NONE)
     {
-      ike_payload_header_t *ikep = (ike_payload_header_t *) & ike->payload[p];
-      u32 plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
+      int current_length = len - p;
+      ikep = (ike_payload_header_t *) & ike->payload[p];
+      if (!ikev2_check_payload_length (ikep, current_length, &plen))
        return;
 
       if (payload == IKEV2_PAYLOAD_SA)
        {
          ikev2_sa_free_proposal_vector (&sa->r_proposals);
-         sa->r_proposals = ikev2_parse_sa_payload (ikep);
+         sa->r_proposals = ikev2_parse_sa_payload (ikep, current_length);
          if (sa->r_proposals)
            {
              ikev2_set_state (sa, IKEV2_STATE_SA_INIT);
@@ -767,25 +847,24 @@ ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else if (payload == IKEV2_PAYLOAD_KE)
        {
-         ike_ke_payload_header_t *ke = (ike_ke_payload_header_t *) ikep;
-         sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
-         vec_free (sa->r_dh_data);
-         vec_add (sa->r_dh_data, ke->payload, plen - sizeof (*ke));
+         if (!ikev2_parse_ke_payload (ikep, current_length, sa,
+                                      &sa->r_dh_data))
+           return;
        }
       else if (payload == IKEV2_PAYLOAD_NONCE)
        {
-         vec_free (sa->r_nonce);
-         vec_add (sa->r_nonce, ikep->payload, plen - sizeof (*ikep));
+         vec_reset_length (sa->r_nonce);
+         if (ikev2_parse_nonce_payload (ikep, current_length, nonce))
+           vec_add (sa->r_nonce, nonce, plen - sizeof (*ikep));
        }
       else if (payload == IKEV2_PAYLOAD_NOTIFY)
        {
-         ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+         ikev2_notify_t *n =
+           ikev2_parse_notify_payload (ikep, current_length);
          if (n->msg_type == IKEV2_NOTIFY_MSG_NAT_DETECTION_SOURCE_IP)
            {
-             u8 *src_sha = ikev2_compute_nat_sha1 (ike->ispi,
-                                                   ike->rspi,
-                                                   clib_net_to_host_u32
-                                                   (sa->raddr.as_u32),
+             u8 *src_sha = ikev2_compute_nat_sha1 (ike->ispi, ike->rspi,
+                                                   &sa->raddr,
                                                    udp->src_port);
              if (clib_memcmp (src_sha, n->data, vec_len (src_sha)))
                {
@@ -797,13 +876,13 @@ ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
          else if (n->msg_type ==
                   IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP)
            {
-             u8 *dst_sha = ikev2_compute_nat_sha1 (ike->ispi,
-                                                   ike->rspi,
-                                                   sa->iaddr.as_u32,
+             u8 *dst_sha = ikev2_compute_nat_sha1 (ike->ispi, ike->rspi,
+                                                   &sa->iaddr,
                                                    udp->dst_port);
              if (clib_memcmp (dst_sha, n->data, vec_len (dst_sha)))
                {
-                 sa->natt = 1;
+                 if (sa->natt_state == IKEV2_NATT_ENABLED)
+                   sa->natt_state = IKEV2_NATT_ACTIVE;
                  ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx initiator"
                                   " (self) behind NAT", sa->ispi);
                }
@@ -833,15 +912,15 @@ ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
 }
 
 static u8 *
-ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
+ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike,
+                         u8 * payload, u32 rlen, u32 * out_len)
 {
   ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
   int p = 0;
-  u8 last_payload = 0, *plaintext = 0;
-  u8 *hmac = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
+  u8 last_payload = 0, *hmac = 0, *plaintext = 0;
   ike_payload_header_t *ikep = 0;
-  u32 plen = 0;
+  u16 plen = 0;
+  u32 dlen = 0;
   ikev2_sa_transform_t *tr_integ;
   ikev2_sa_transform_t *tr_encr;
   tr_integ =
@@ -850,16 +929,19 @@ ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
     ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
   int is_aead = tr_encr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_GCM_16;
 
-  if ((!sa->sk_ar || !sa->sk_ai) && !is_aead)
+  if (((!sa->sk_ar || !sa->sk_ai) && !is_aead) || (!sa->sk_ei || !sa->sk_er))
+    return 0;
+
+  if (rlen <= sizeof (*ike))
     return 0;
 
+  int len = rlen - sizeof (*ike);
   while (p < len &&
         *payload != IKEV2_PAYLOAD_NONE && last_payload != IKEV2_PAYLOAD_SK)
     {
       ikep = (ike_payload_header_t *) & ike->payload[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (*ikep))
+      int current_length = len - p;
+      if (!ikev2_check_payload_length (ikep, current_length, &plen))
        return 0;
 
       if (*payload == IKEV2_PAYLOAD_SK)
@@ -897,24 +979,29 @@ ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
       u32 aad_len = ikep->payload - aad;
       u8 *tag = ikep->payload + plen;
 
-      plaintext = ikev2_decrypt_aead_data (ptd, sa, tr_encr, ikep->payload,
-                                          plen, aad, aad_len, tag);
+      int rc = ikev2_decrypt_aead_data (ptd, sa, tr_encr, ikep->payload,
+                                       plen, aad, aad_len, tag, &dlen);
+      if (rc)
+       {
+         *out_len = dlen;
+         plaintext = ikep->payload + IKEV2_GCM_IV_SIZE;
+       }
     }
   else
     {
-      if (len < tr_integ->key_trunc)
+      if (rlen < tr_integ->key_trunc)
        return 0;
 
       hmac =
        ikev2_calc_integr (tr_integ, sa->is_initiator ? sa->sk_ar : sa->sk_ai,
-                          (u8 *) ike, len - tr_integ->key_trunc);
+                          (u8 *) ike, rlen - tr_integ->key_trunc);
 
       if (plen < sizeof (*ikep) + tr_integ->key_trunc)
        return 0;
 
       plen = plen - sizeof (*ikep) - tr_integ->key_trunc;
 
-      if (memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
+      if (clib_memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
        {
          ikev2_elog_error ("message integrity check failed");
          vec_free (hmac);
@@ -922,7 +1009,13 @@ ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
        }
       vec_free (hmac);
 
-      plaintext = ikev2_decrypt_data (ptd, sa, tr_encr, ikep->payload, plen);
+      int rc = ikev2_decrypt_data (ptd, sa, tr_encr, ikep->payload, plen,
+                                  &dlen);
+      if (rc)
+       {
+         *out_len = dlen;
+         plaintext = ikep->payload + tr_encr->block_size;
+       }
     }
 
   return plaintext;
@@ -937,44 +1030,41 @@ ikev2_is_id_equal (ikev2_id_t * i1, ikev2_id_t * i2)
   if (vec_len (i1->data) != vec_len (i2->data))
     return 0;
 
-  if (memcmp (i1->data, i2->data, vec_len (i1->data)))
+  if (clib_memcmp (i1->data, i2->data, vec_len (i1->data)))
     return 0;
 
   return 1;
 }
 
 static void
-ikev2_initial_contact_cleanup (ikev2_sa_t * sa)
+ikev2_initial_contact_cleanup_internal (ikev2_main_per_thread_data_t * ptd,
+                                       ikev2_sa_t * sa)
 {
   ikev2_main_t *km = &ikev2_main;
   ikev2_sa_t *tmp;
   u32 i, *delete = 0;
   ikev2_child_sa_t *c;
-  u32 thread_index = vlib_get_thread_index ();
-
-  if (!sa->initial_contact)
-    return;
 
   /* find old IKE SAs with the same authenticated identity */
   /* *INDENT-OFF* */
-  pool_foreach (tmp, km->per_thread_data[thread_index].sas, ({
-        if (!ikev2_is_id_equal (&tmp->i_id, &sa->i_id)
-            || !ikev2_is_id_equal(&tmp->r_id, &sa->r_id))
-          continue;
+  pool_foreach (tmp, ptd->sas)  {
+    if (!ikev2_is_id_equal (&tmp->i_id, &sa->i_id)
+        || !ikev2_is_id_equal(&tmp->r_id, &sa->r_id))
+      continue;
 
-        if (sa->rspi != tmp->rspi)
-          vec_add1(delete, tmp - km->per_thread_data[thread_index].sas);
-  }));
+    if (sa->rspi != tmp->rspi)
+      vec_add1(delete, tmp - ptd->sas);
+  }
   /* *INDENT-ON* */
 
   for (i = 0; i < vec_len (delete); i++)
     {
-      tmp =
-       pool_elt_at_index (km->per_thread_data[thread_index].sas, delete[i]);
-      vec_foreach (c,
-                  tmp->childs) ikev2_delete_tunnel_interface (km->vnet_main,
-                                                              tmp, c);
-      ikev2_delete_sa (tmp);
+      tmp = pool_elt_at_index (ptd->sas, delete[i]);
+      vec_foreach (c, tmp->childs)
+      {
+       ikev2_delete_tunnel_interface (km->vnet_main, tmp, c);
+      }
+      ikev2_delete_sa (ptd, tmp);
     }
 
   vec_free (delete);
@@ -982,30 +1072,85 @@ ikev2_initial_contact_cleanup (ikev2_sa_t * sa)
 }
 
 static void
-ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
+ikev2_initial_contact_cleanup (ikev2_main_per_thread_data_t * ptd,
+                              ikev2_sa_t * sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+
+  if (!sa->initial_contact)
+    return;
+
+  if (ptd)
+    {
+      ikev2_initial_contact_cleanup_internal (ptd, sa);
+    }
+  else
+    {
+      vec_foreach (ptd, km->per_thread_data)
+       ikev2_initial_contact_cleanup_internal (ptd, sa);
+    }
+  sa->initial_contact = 0;
+}
+
+static int
+ikev2_parse_id_payload (const void *p, u16 rlen, ikev2_id_t * sa_id)
+{
+  const ike_id_payload_header_t *id = p;
+  u16 plen = clib_net_to_host_u16 (id->length);
+  if (plen < sizeof (*id) || plen > rlen)
+    return 0;
+
+  sa_id->type = id->id_type;
+  vec_reset_length (sa_id->data);
+  vec_add (sa_id->data, id->payload, plen - sizeof (*id));
+
+  return 1;
+}
+
+static int
+ikev2_parse_auth_payload (const void *p, u32 rlen, ikev2_auth_t * a)
+{
+  const ike_auth_payload_header_t *ah = p;
+  u16 plen = clib_net_to_host_u16 (ah->length);
+
+  a->method = ah->auth_method;
+  vec_reset_length (a->data);
+  vec_add (a->data, ah->payload, plen - sizeof (*ah));
+  return 1;
+}
+
+static int
+ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa,
+                       ike_header_t * ike, u32 len)
 {
-  ikev2_child_sa_t *first_child_sa;
   int p = 0;
+  ikev2_child_sa_t *first_child_sa;
   u8 payload = ike->nextpayload;
   u8 *plaintext = 0;
   ike_payload_header_t *ikep;
-  u32 plen;
+  u16 plen;
+  u32 dlen = 0;
 
   ikev2_elog_exchange ("ispi %lx rspi %lx EXCHANGE_IKE_AUTH received "
-                      "from %d.%d.%d.%d", clib_host_to_net_u64 (ike->ispi),
+                      "from ", clib_host_to_net_u64 (ike->ispi),
                       clib_host_to_net_u64 (ike->rspi),
-                      sa->is_initiator ? sa->raddr.as_u32 : sa->
-                      iaddr.as_u32);
+                      sa->is_initiator ?
+                      ip_addr_v4 (&sa->raddr).as_u32 :
+                      ip_addr_v4 (&sa->iaddr).as_u32,
+                      ip_addr_version (&sa->raddr) == AF_IP4);
 
   ikev2_calc_keys (sa);
 
-  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len, &dlen);
 
   if (!plaintext)
     {
       if (sa->unsupported_cp)
-       ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-      goto cleanup_and_exit;
+       {
+         ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+         return 0;
+       }
+      goto malformed;
     }
 
   /* select or create 1st child SA */
@@ -1021,64 +1166,57 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
 
 
   /* process encrypted payload */
-  p = 0;
-  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
+  while (p < dlen && payload != IKEV2_PAYLOAD_NONE)
     {
       ikep = (ike_payload_header_t *) & plaintext[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
-       goto cleanup_and_exit;
+      int current_length = dlen - p;
+      if (!ikev2_check_payload_length (ikep, current_length, &plen))
+       goto malformed;
 
       if (payload == IKEV2_PAYLOAD_SA) /* 33 */
        {
          if (sa->is_initiator)
            {
              ikev2_sa_free_proposal_vector (&first_child_sa->r_proposals);
-             first_child_sa->r_proposals = ikev2_parse_sa_payload (ikep);
+             first_child_sa->r_proposals = ikev2_parse_sa_payload (ikep,
+                                                                   current_length);
            }
          else
            {
              ikev2_sa_free_proposal_vector (&first_child_sa->i_proposals);
-             first_child_sa->i_proposals = ikev2_parse_sa_payload (ikep);
+             first_child_sa->i_proposals = ikev2_parse_sa_payload (ikep,
+                                                                   current_length);
            }
        }
       else if (payload == IKEV2_PAYLOAD_IDI)   /* 35 */
        {
-         ike_id_payload_header_t *id = (ike_id_payload_header_t *) ikep;
-
-         sa->i_id.type = id->id_type;
-         vec_free (sa->i_id.data);
-         vec_add (sa->i_id.data, id->payload, plen - sizeof (*id));
+         if (!ikev2_parse_id_payload (ikep, current_length, &sa->i_id))
+           goto malformed;
        }
       else if (payload == IKEV2_PAYLOAD_IDR)   /* 36 */
        {
-         ike_id_payload_header_t *id = (ike_id_payload_header_t *) ikep;
-
-         sa->r_id.type = id->id_type;
-         vec_free (sa->r_id.data);
-         vec_add (sa->r_id.data, id->payload, plen - sizeof (*id));
+         if (!ikev2_parse_id_payload (ikep, current_length, &sa->r_id))
+           goto malformed;
        }
       else if (payload == IKEV2_PAYLOAD_AUTH)  /* 39 */
        {
-         ike_auth_payload_header_t *a = (ike_auth_payload_header_t *) ikep;
-
          if (sa->is_initiator)
            {
-             sa->r_auth.method = a->auth_method;
-             vec_free (sa->r_auth.data);
-             vec_add (sa->r_auth.data, a->payload, plen - sizeof (*a));
+             if (!ikev2_parse_auth_payload (ikep, current_length,
+                                            &sa->r_auth))
+               goto malformed;
            }
          else
            {
-             sa->i_auth.method = a->auth_method;
-             vec_free (sa->i_auth.data);
-             vec_add (sa->i_auth.data, a->payload, plen - sizeof (*a));
+             if (!ikev2_parse_auth_payload (ikep, current_length,
+                                            &sa->i_auth))
+               goto malformed;
            }
        }
       else if (payload == IKEV2_PAYLOAD_NOTIFY)        /* 41 */
        {
-         ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+         ikev2_notify_t *n =
+           ikev2_parse_notify_payload (ikep, current_length);
          if (n->msg_type == IKEV2_NOTIFY_MSG_INITIAL_CONTACT)
            {
              sa->initial_contact = 1;
@@ -1092,12 +1230,12 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
       else if (payload == IKEV2_PAYLOAD_TSI)   /* 44 */
        {
          vec_free (first_child_sa->tsi);
-         first_child_sa->tsi = ikev2_parse_ts_payload (ikep);
+         first_child_sa->tsi = ikev2_parse_ts_payload (ikep, current_length);
        }
       else if (payload == IKEV2_PAYLOAD_TSR)   /* 45 */
        {
          vec_free (first_child_sa->tsr);
-         first_child_sa->tsr = ikev2_parse_ts_payload (ikep);
+         first_child_sa->tsr = ikev2_parse_ts_payload (ikep, current_length);
        }
       else
        {
@@ -1108,7 +1246,7 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
            {
              ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
              sa->unsupported_cp = payload;
-             return;
+             return 0;
            }
        }
 
@@ -1116,50 +1254,62 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
       p += plen;
     }
 
-cleanup_and_exit:
-  vec_free (plaintext);
+  return 1;
+
+malformed:
+  ikev2_set_state (sa, IKEV2_STATE_DELETED, ": malformed IKE_AUTH");
+  return 0;
 }
 
-static void
-ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
-                                ike_header_t * ike)
+static int
+ikev2_process_informational_req (vlib_main_t * vm,
+                                ikev2_sa_t * sa, ike_header_t * ike, u32 len)
 {
   int p = 0;
   u8 payload = ike->nextpayload;
   u8 *plaintext = 0;
   ike_payload_header_t *ikep;
-  u32 plen;
+  u32 dlen = 0;
+  ikev2_notify_t *n = 0;
 
   sa->liveness_retries = 0;
   ikev2_elog_exchange ("ispi %lx rspi %lx INFORMATIONAL received "
-                      "from %d.%d.%d.%d", clib_host_to_net_u64 (ike->ispi),
-                      clib_host_to_net_u64 (ike->rspi), sa->iaddr.as_u32);
+                      "from ", clib_host_to_net_u64 (ike->ispi),
+                      clib_host_to_net_u64 (ike->rspi),
+                      ip_addr_v4 (&sa->iaddr).as_u32,
+                      ip_addr_version (&sa->iaddr) == AF_IP4);
 
-  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len, &dlen);
 
   if (!plaintext)
-    goto cleanup_and_exit;
+    return 0;
 
   /* process encrypted payload */
   p = 0;
-  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
+  while (p < dlen && payload != IKEV2_PAYLOAD_NONE)
     {
+      u32 current_length = dlen - p;
+      if (p + sizeof (*ikep) > dlen)
+       return 0;
+
       ikep = (ike_payload_header_t *) & plaintext[p];
-      plen = clib_net_to_host_u16 (ikep->length);
+      u16 plen = clib_net_to_host_u16 (ikep->length);
 
-      if (plen < sizeof (ike_payload_header_t))
-       goto cleanup_and_exit;
+      if (plen < sizeof (*ikep) || plen > current_length)
+       return 0;
 
       if (payload == IKEV2_PAYLOAD_NOTIFY)     /* 41 */
        {
-         ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+         n = ikev2_parse_notify_payload (ikep, current_length);
+         if (!n)
+           return 0;
          if (n->msg_type == IKEV2_NOTIFY_MSG_AUTHENTICATION_FAILED)
            ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
          vec_free (n);
        }
       else if (payload == IKEV2_PAYLOAD_DELETE)        /* 42 */
        {
-         sa->del = ikev2_parse_delete_payload (ikep);
+         sa->del = ikev2_parse_delete_payload (ikep, current_length);
        }
       else if (payload == IKEV2_PAYLOAD_VENDOR)        /* 43 */
        {
@@ -1172,62 +1322,66 @@ ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
              sa->unsupported_cp = payload;
-             return;
+             return 0;
            }
        }
-
       payload = ikep->nextpayload;
       p += plen;
     }
-
-cleanup_and_exit:
-  vec_free (plaintext);
+  return 1;
 }
 
-static void
-ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
-                                  ike_header_t * ike)
+static int
+ikev2_process_create_child_sa_req (vlib_main_t * vm,
+                                  ikev2_sa_t * sa, ike_header_t * ike,
+                                  u32 len)
 {
   int p = 0;
   u8 payload = ike->nextpayload;
   u8 *plaintext = 0;
   u8 rekeying = 0;
   u8 nonce[IKEV2_NONCE_SIZE];
-
+  ikev2_rekey_t *rekey;
   ike_payload_header_t *ikep;
-  u32 plen;
   ikev2_notify_t *n = 0;
   ikev2_ts_t *tsi = 0;
   ikev2_ts_t *tsr = 0;
   ikev2_sa_proposal_t *proposal = 0;
   ikev2_child_sa_t *child_sa;
+  u32 dlen = 0, src;
+  u16 plen;
+
+  if (sa->is_initiator)
+    src = ip_addr_v4 (&sa->raddr).as_u32;
+  else
+    src = ip_addr_v4 (&sa->iaddr).as_u32;
 
-  ikev2_elog_exchange ("ispi %lx rspi %lx CREATE_CHILD_SA received "
-                      "from %d.%d.%d.%d", clib_host_to_net_u64 (ike->ispi),
-                      clib_host_to_net_u64 (ike->rspi), sa->raddr.as_u32);
+  ikev2_elog_exchange ("ispi %lx rspi %lx CREATE_CHILD_SA received from",
+                      clib_host_to_net_u64 (ike->ispi),
+                      clib_host_to_net_u64 (ike->rspi), src,
+                      ip_addr_version (&sa->raddr) == AF_IP4);
 
-  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len, &dlen);
 
   if (!plaintext)
     goto cleanup_and_exit;
 
   /* process encrypted payload */
   p = 0;
-  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
+  while (payload != IKEV2_PAYLOAD_NONE)
     {
       ikep = (ike_payload_header_t *) & plaintext[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
+      int current_length = dlen - p;
+      if (!ikev2_check_payload_length (ikep, current_length, &plen))
        goto cleanup_and_exit;
 
-      else if (payload == IKEV2_PAYLOAD_SA)
+      if (payload == IKEV2_PAYLOAD_SA)
        {
-         proposal = ikev2_parse_sa_payload (ikep);
+         proposal = ikev2_parse_sa_payload (ikep, current_length);
        }
       else if (payload == IKEV2_PAYLOAD_NOTIFY)
        {
-         n = ikev2_parse_notify_payload (ikep);
+         n = ikev2_parse_notify_payload (ikep, current_length);
          if (n->msg_type == IKEV2_NOTIFY_MSG_REKEY_SA)
            {
              rekeying = 1;
@@ -1235,7 +1389,7 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else if (payload == IKEV2_PAYLOAD_DELETE)
        {
-         sa->del = ikev2_parse_delete_payload (ikep);
+         sa->del = ikev2_parse_delete_payload (ikep, current_length);
        }
       else if (payload == IKEV2_PAYLOAD_VENDOR)
        {
@@ -1243,15 +1397,15 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else if (payload == IKEV2_PAYLOAD_NONCE)
        {
-         clib_memcpy_fast (nonce, ikep->payload, plen - sizeof (*ikep));
+         ikev2_parse_nonce_payload (ikep, current_length, nonce);
        }
       else if (payload == IKEV2_PAYLOAD_TSI)
        {
-         tsi = ikev2_parse_ts_payload (ikep);
+         tsi = ikev2_parse_ts_payload (ikep, current_length);
        }
       else if (payload == IKEV2_PAYLOAD_TSR)
        {
-         tsr = ikev2_parse_ts_payload (ikep);
+         tsr = ikev2_parse_ts_payload (ikep, current_length);
        }
       else
        {
@@ -1263,14 +1417,18 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
              goto cleanup_and_exit;
            }
        }
-
       payload = ikep->nextpayload;
       p += plen;
     }
 
-  if (sa->is_initiator && proposal->protocol_id == IKEV2_PROTOCOL_ESP)
+  if (!proposal || proposal->protocol_id != IKEV2_PROTOCOL_ESP)
+    goto cleanup_and_exit;
+
+  if (sa->is_initiator)
     {
-      ikev2_rekey_t *rekey = &sa->rekey[0];
+      rekey = sa->rekey;
+      if (vec_len (rekey) == 0)
+       goto cleanup_and_exit;
       rekey->protocol_id = proposal->protocol_id;
       rekey->i_proposal =
        ikev2_select_proposal (proposal, IKEV2_PROTOCOL_ESP);
@@ -1279,7 +1437,7 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
       rekey->tsi = tsi;
       rekey->tsr = tsr;
       /* update Nr */
-      vec_free (sa->r_nonce);
+      vec_reset_length (sa->r_nonce);
       vec_add (sa->r_nonce, nonce, IKEV2_NONCE_SIZE);
       child_sa = ikev2_sa_get_child (sa, rekey->ispi, IKEV2_PROTOCOL_ESP, 1);
       if (child_sa)
@@ -1287,36 +1445,56 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
          child_sa->rekey_retries = 0;
        }
     }
-  else if (rekeying)
+  else
     {
-      ikev2_rekey_t *rekey;
-      child_sa = ikev2_sa_get_child (sa, n->spi, n->protocol_id, 1);
-      if (!child_sa)
+      if (rekeying)
        {
-         ikev2_elog_uint (IKEV2_LOG_ERROR, "child SA spi %lx not found",
-                          n->spi);
-         goto cleanup_and_exit;
+         child_sa = ikev2_sa_get_child (sa, n->spi, n->protocol_id, 1);
+         if (!child_sa)
+           {
+             ikev2_elog_uint (IKEV2_LOG_ERROR, "child SA spi %lx not found",
+                              n->spi);
+             goto cleanup_and_exit;
+           }
+         vec_add2 (sa->rekey, rekey, 1);
+         rekey->protocol_id = n->protocol_id;
+         rekey->spi = n->spi;
+         rekey->i_proposal = proposal;
+         rekey->r_proposal =
+           ikev2_select_proposal (proposal, IKEV2_PROTOCOL_ESP);
+         /* update Ni */
+         vec_reset_length (sa->i_nonce);
+         vec_add (sa->i_nonce, nonce, IKEV2_NONCE_SIZE);
+         /* generate new Nr */
+         vec_validate (sa->r_nonce, IKEV2_NONCE_SIZE - 1);
+         RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
+       }
+      else
+       {
+         /* create new child SA */
+         vec_add2 (sa->new_child, rekey, 1);
+         rekey->i_proposal = proposal;
+         rekey->r_proposal =
+           ikev2_select_proposal (proposal, IKEV2_PROTOCOL_ESP);
+         /* update Ni */
+         vec_reset_length (sa->i_nonce);
+         vec_add (sa->i_nonce, nonce, IKEV2_NONCE_SIZE);
+         /* generate new Nr */
+         vec_validate (sa->r_nonce, IKEV2_NONCE_SIZE - 1);
+         RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
        }
-      vec_add2 (sa->rekey, rekey, 1);
-      rekey->protocol_id = n->protocol_id;
-      rekey->spi = n->spi;
-      rekey->i_proposal = proposal;
-      rekey->r_proposal =
-       ikev2_select_proposal (proposal, IKEV2_PROTOCOL_ESP);
       rekey->tsi = tsi;
       rekey->tsr = tsr;
-      /* update Ni */
-      vec_free (sa->i_nonce);
-      vec_add (sa->i_nonce, nonce, IKEV2_NONCE_SIZE);
-      /* generate new Nr */
-      vec_free (sa->r_nonce);
-      sa->r_nonce = vec_new (u8, IKEV2_NONCE_SIZE);
-      RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
     }
+  vec_free (n);
+  return 1;
 
 cleanup_and_exit:
-  vec_free (plaintext);
   vec_free (n);
+  vec_free (proposal);
+  vec_free (tsr);
+  vec_free (tsi);
+  return 0;
 }
 
 static u8 *
@@ -1367,8 +1545,8 @@ ikev2_ts_cmp (ikev2_ts_t * ts1, ikev2_ts_t * ts2)
 {
   if (ts1->ts_type == ts2->ts_type && ts1->protocol_id == ts2->protocol_id &&
       ts1->start_port == ts2->start_port && ts1->end_port == ts2->end_port &&
-      ts1->start_addr.as_u32 == ts2->start_addr.as_u32 &&
-      ts1->end_addr.as_u32 == ts2->end_addr.as_u32)
+      !ip_address_cmp (&ts1->start_addr, &ts2->start_addr) &&
+      !ip_address_cmp (&ts1->end_addr, &ts2->end_addr))
     return 1;
 
   return 0;
@@ -1383,7 +1561,7 @@ ikev2_sa_match_ts (ikev2_sa_t * sa)
   ikev2_id_t *id_rem, *id_loc;
 
   /* *INDENT-OFF* */
-  pool_foreach (p, km->profiles, ({
+  pool_foreach (p, km->profiles)  {
 
     if (sa->is_initiator)
       {
@@ -1426,7 +1604,7 @@ ikev2_sa_match_ts (ikev2_sa_t * sa)
       }
 
     break;
-  }));
+  }
   /* *INDENT-ON* */
 
   if (tsi && tsr)
@@ -1444,33 +1622,16 @@ ikev2_sa_match_ts (ikev2_sa_t * sa)
     }
 }
 
-static void
-ikev2_sa_auth (ikev2_sa_t * sa)
+static ikev2_profile_t *
+ikev2_select_profile (ikev2_main_t *km, ikev2_sa_t *sa,
+                     ikev2_sa_transform_t *tr_prf, u8 *key_pad)
 {
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_profile_t *p, *sel_p = 0;
-  u8 *authmsg, *key_pad, *psk = 0, *auth = 0;
-  ikev2_sa_transform_t *tr_prf;
-
-  tr_prf =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
-
-  /* only shared key and rsa signature */
-  if (!(sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC ||
-       sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG))
-    {
-      ikev2_elog_uint (IKEV2_LOG_ERROR,
-                      "unsupported authentication method %u",
-                      sa->i_auth.method);
-      ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
-      return;
-    }
-
-  key_pad = format (0, "%s", IKEV2_KEY_PAD);
-  authmsg = ikev2_sa_generate_authmsg (sa, sa->is_initiator);
-
+  ikev2_profile_t *ret = 0, *p;
   ikev2_id_t *id_rem, *id_loc;
   ikev2_auth_t *sa_auth;
+  u8 *authmsg, *psk = 0, *auth = 0;
+
+  authmsg = ikev2_sa_generate_authmsg (sa, sa->is_initiator);
 
   if (sa->is_initiator)
     {
@@ -1485,59 +1646,87 @@ ikev2_sa_auth (ikev2_sa_t * sa)
       sa_auth = &sa->i_auth;
     }
 
-  /* *INDENT-OFF* */
-  pool_foreach (p, km->profiles, ({
+  pool_foreach (p, km->profiles)
+    {
+      /* check id */
+      if (!ikev2_is_id_equal (&p->rem_id, id_rem) ||
+         !ikev2_is_id_equal (&p->loc_id, id_loc))
+       continue;
 
-    /* check id */
-    if (!ikev2_is_id_equal (&p->rem_id, id_rem)
-          || !ikev2_is_id_equal (&p->loc_id, id_loc))
-      continue;
+      if (sa_auth->method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
+       {
+         if (!p->auth.data ||
+             p->auth.method != IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
+           continue;
 
-    if (sa_auth->method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
-      {
-        if (!p->auth.data ||
-             p->auth.method != IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
-          continue;
+         psk = ikev2_calc_prf (tr_prf, p->auth.data, key_pad);
+         auth = ikev2_calc_prf (tr_prf, psk, authmsg);
 
-        psk = ikev2_calc_prf(tr_prf, p->auth.data, key_pad);
-        auth = ikev2_calc_prf(tr_prf, psk, authmsg);
+         if (!clib_memcmp (auth, sa_auth->data, vec_len (sa_auth->data)))
+           {
+             ikev2_set_state (sa, IKEV2_STATE_AUTHENTICATED);
+             vec_free (auth);
+             ret = p;
+             break;
+           }
+         else
+           {
+             ikev2_elog_uint (IKEV2_LOG_ERROR,
+                              "shared key mismatch! ispi %lx", sa->ispi);
+           }
+       }
+      else if (sa_auth->method == IKEV2_AUTH_METHOD_RSA_SIG)
+       {
+         if (p->auth.method != IKEV2_AUTH_METHOD_RSA_SIG)
+           continue;
 
-        if (!memcmp(auth, sa_auth->data, vec_len(sa_auth->data)))
-          {
-            ikev2_set_state(sa, IKEV2_STATE_AUTHENTICATED);
-            vec_free(auth);
-            sel_p = p;
-            break;
-          }
+         if (ikev2_verify_sign (p->auth.key, sa_auth->data, authmsg) == 1)
+           {
+             ikev2_set_state (sa, IKEV2_STATE_AUTHENTICATED);
+             ret = p;
+             break;
+           }
+         else
+           {
+             ikev2_elog_uint (IKEV2_LOG_ERROR,
+                              "cert verification failed! ispi %lx", sa->ispi);
+           }
+       }
+    }
+  vec_free (authmsg);
+  return ret;
+}
 
-      }
-    else if (sa_auth->method == IKEV2_AUTH_METHOD_RSA_SIG)
-      {
-        if (p->auth.method != IKEV2_AUTH_METHOD_RSA_SIG)
-          continue;
+static void
+ikev2_sa_auth (ikev2_sa_t *sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *sel_p = 0;
+  ikev2_sa_transform_t *tr_prf;
+  u8 *psk, *authmsg, *key_pad;
 
-        if (ikev2_verify_sign(p->auth.key, sa_auth->data, authmsg) == 1)
-          {
-            ikev2_set_state(sa, IKEV2_STATE_AUTHENTICATED);
-            sel_p = p;
-            break;
-          }
-      }
+  tr_prf =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
 
-    vec_free(auth);
-    vec_free(psk);
-  }));
-  /* *INDENT-ON* */
+  /* only shared key and rsa signature */
+  if (!(sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC ||
+       sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG))
+    {
+      ikev2_elog_uint (IKEV2_LOG_ERROR, "unsupported authentication method %u",
+                      sa->i_auth.method);
+      ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
+      return;
+    }
+
+  key_pad = format (0, "%s", IKEV2_KEY_PAD);
+  sel_p = ikev2_select_profile (km, sa, tr_prf, key_pad);
 
   if (sel_p)
     {
+      ASSERT (sa->state == IKEV2_STATE_AUTHENTICATED);
       sa->udp_encap = sel_p->udp_encap;
       sa->ipsec_over_udp_port = sel_p->ipsec_over_udp_port;
-    }
-  vec_free (authmsg);
 
-  if (sa->state == IKEV2_STATE_AUTHENTICATED)
-    {
       if (!sa->is_initiator)
        {
          vec_free (sa->r_id.data);
@@ -1550,11 +1739,15 @@ ikev2_sa_auth (ikev2_sa_t * sa)
          authmsg = ikev2_sa_generate_authmsg (sa, 1);
          if (sel_p->auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
            {
+             vec_free (sa->r_auth.data);
+             psk = ikev2_calc_prf (tr_prf, sel_p->auth.data, key_pad);
              sa->r_auth.data = ikev2_calc_prf (tr_prf, psk, authmsg);
              sa->r_auth.method = IKEV2_AUTH_METHOD_SHARED_KEY_MIC;
+             vec_free (psk);
            }
          else if (sel_p->auth.method == IKEV2_AUTH_METHOD_RSA_SIG)
            {
+             vec_free (sa->r_auth.data);
              sa->r_auth.data = ikev2_calc_sign (km->pkey, authmsg);
              sa->r_auth.method = IKEV2_AUTH_METHOD_RSA_SIG;
            }
@@ -1579,11 +1772,9 @@ ikev2_sa_auth (ikev2_sa_t * sa)
                       "profile found! ispi %lx", sa->ispi);
       ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
     }
-  vec_free (psk);
   vec_free (key_pad);
 }
 
-
 static void
 ikev2_sa_auth_init (ikev2_sa_t * sa)
 {
@@ -1605,23 +1796,24 @@ ikev2_sa_auth_init (ikev2_sa_t * sa)
       return;
     }
 
-  key_pad = format (0, "%s", IKEV2_KEY_PAD);
   authmsg = ikev2_sa_generate_authmsg (sa, 0);
-  psk = ikev2_calc_prf (tr_prf, sa->i_auth.data, key_pad);
 
   if (sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
     {
+      key_pad = format (0, "%s", IKEV2_KEY_PAD);
+      psk = ikev2_calc_prf (tr_prf, sa->i_auth.data, key_pad);
+      vec_free (sa->i_auth.data);
       sa->i_auth.data = ikev2_calc_prf (tr_prf, psk, authmsg);
       sa->i_auth.method = IKEV2_AUTH_METHOD_SHARED_KEY_MIC;
+      vec_free (psk);
+      vec_free (key_pad);
     }
   else if (sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG)
     {
+      vec_free (sa->i_auth.data);
       sa->i_auth.data = ikev2_calc_sign (km->pkey, authmsg);
       sa->i_auth.method = IKEV2_AUTH_METHOD_RSA_SIG;
     }
-
-  vec_free (psk);
-  vec_free (key_pad);
   vec_free (authmsg);
 }
 
@@ -1649,8 +1841,8 @@ typedef struct
   u32 remote_spi;
   ipsec_crypto_alg_t encr_type;
   ipsec_integ_alg_t integ_type;
-  ip46_address_t local_ip;
-  ip46_address_t remote_ip;
+  ip_address_t local_ip;
+  ip_address_t remote_ip;
   ipsec_key_t loc_ckey, rem_ckey, loc_ikey, rem_ikey;
   u8 is_rekey;
   u32 old_remote_sa_id;
@@ -1665,12 +1857,32 @@ ikev2_add_tunnel_from_main (ikev2_add_ipsec_tunnel_args_t * a)
   ikev2_main_t *km = &ikev2_main;
   u32 sw_if_index;
   int rv = 0;
+  tunnel_t tun_in = {
+    .t_flags = TUNNEL_FLAG_NONE,
+    .t_encap_decap_flags = TUNNEL_ENCAP_DECAP_FLAG_NONE,
+    .t_dscp = 0,
+    .t_mode = TUNNEL_MODE_P2P,
+    .t_table_id = 0,
+    .t_hop_limit = 255,
+    .t_src = a->local_ip,
+    .t_dst = a->remote_ip,
+  };
+  tunnel_t tun_out = {
+    .t_flags = TUNNEL_FLAG_NONE,
+    .t_encap_decap_flags = TUNNEL_ENCAP_DECAP_FLAG_NONE,
+    .t_dscp = 0,
+    .t_mode = TUNNEL_MODE_P2P,
+    .t_table_id = 0,
+    .t_hop_limit = 255,
+    .t_src = a->remote_ip,
+    .t_dst = a->local_ip,
+  };
 
   if (~0 == a->sw_if_index)
     {
       /* no tunnel associated with the SA/profile - create a new one */
-      rv = ipip_add_tunnel (IPIP_TRANSPORT_IP4, ~0,
-                           &a->local_ip, &a->remote_ip, 0,
+      rv = ipip_add_tunnel (IPIP_TRANSPORT_IP4, ~0, &ip_addr_46 (&a->local_ip),
+                           &ip_addr_46 (&a->remote_ip), 0,
                            TUNNEL_ENCAP_DECAP_FLAG_NONE, IP_DSCP_CS0,
                            TUNNEL_MODE_P2P, &sw_if_index);
 
@@ -1690,9 +1902,9 @@ ikev2_add_tunnel_from_main (ikev2_add_ipsec_tunnel_args_t * a)
 
   if (rv)
     {
-      ikev2_elog_peers (IKEV2_LOG_ERROR, "installing ipip tunnel failed! "
-                       "loc:%d.%d.%d.%d rem:%d.%d.%d.%d",
-                       a->local_ip.ip4.as_u32, a->remote_ip.ip4.as_u32);
+      ikev2_elog_uint (IKEV2_LOG_ERROR,
+                      "installing ipip tunnel failed! local spi: %x",
+                      a->local_spi);
       return;
     }
 
@@ -1709,30 +1921,42 @@ ikev2_add_tunnel_from_main (ikev2_add_ipsec_tunnel_args_t * a)
       vec_add1 (sas_in, a->old_remote_sa_id);
     }
 
-  rv |= ipsec_sa_add_and_lock (a->local_sa_id,
-                              a->local_spi,
-                              IPSEC_PROTOCOL_ESP, a->encr_type,
-                              &a->loc_ckey, a->integ_type, &a->loc_ikey,
-                              a->flags, 0, a->salt_local, &a->local_ip,
-                              &a->remote_ip, NULL, a->src_port, a->dst_port);
-  rv |= ipsec_sa_add_and_lock (a->remote_sa_id, a->remote_spi,
-                              IPSEC_PROTOCOL_ESP, a->encr_type, &a->rem_ckey,
-                              a->integ_type, &a->rem_ikey,
-                              (a->flags | IPSEC_SA_FLAG_IS_INBOUND), 0,
-                              a->salt_remote, &a->remote_ip,
-                              &a->local_ip, NULL, a->ipsec_over_udp_port,
-                              a->ipsec_over_udp_port);
-
-  rv |= ipsec_tun_protect_update (sw_if_index, NULL, a->local_sa_id, sas_in);
+  rv = ipsec_sa_add_and_lock (a->local_sa_id, a->local_spi, IPSEC_PROTOCOL_ESP,
+                             a->encr_type, &a->loc_ckey, a->integ_type,
+                             &a->loc_ikey, a->flags, a->salt_local,
+                             a->src_port, a->dst_port, &tun_out, NULL);
+  if (rv)
+    goto err0;
+
+  rv = ipsec_sa_add_and_lock (
+    a->remote_sa_id, a->remote_spi, IPSEC_PROTOCOL_ESP, a->encr_type,
+    &a->rem_ckey, a->integ_type, &a->rem_ikey,
+    (a->flags | IPSEC_SA_FLAG_IS_INBOUND), a->salt_remote,
+    a->ipsec_over_udp_port, a->ipsec_over_udp_port, &tun_in, NULL);
+  if (rv)
+    goto err1;
+
+  rv = ipsec_tun_protect_update (sw_if_index, NULL, a->local_sa_id, sas_in);
+  if (rv)
+    goto err2;
+
+  return;
+
+err2:
+  ipsec_sa_unlock_id (a->remote_sa_id);
+err1:
+  ipsec_sa_unlock_id (a->local_sa_id);
+err0:
+  vec_free (sas_in);
 }
 
 static int
 ikev2_create_tunnel_interface (vlib_main_t * vm,
-                              u32 thread_index,
                               ikev2_sa_t * sa,
                               ikev2_child_sa_t * child, u32 sa_index,
                               u32 child_index, u8 is_rekey)
 {
+  u32 thread_index = vlib_get_thread_index ();
   ikev2_main_t *km = &ikev2_main;
   ipsec_crypto_alg_t encr_type;
   ipsec_integ_alg_t integ_type;
@@ -1752,16 +1976,16 @@ ikev2_create_tunnel_interface (vlib_main_t * vm,
 
   if (sa->is_initiator)
     {
-      ip46_address_set_ip4 (&a.local_ip, &sa->iaddr);
-      ip46_address_set_ip4 (&a.remote_ip, &sa->raddr);
+      ip_address_copy (&a.local_ip, &sa->iaddr);
+      ip_address_copy (&a.remote_ip, &sa->raddr);
       proposals = child->r_proposals;
       a.local_spi = child->r_proposals[0].spi;
       a.remote_spi = child->i_proposals[0].spi;
     }
   else
     {
-      ip46_address_set_ip4 (&a.local_ip, &sa->raddr);
-      ip46_address_set_ip4 (&a.remote_ip, &sa->iaddr);
+      ip_address_copy (&a.local_ip, &sa->raddr);
+      ip_address_copy (&a.remote_ip, &sa->iaddr);
       proposals = child->i_proposals;
       a.local_spi = child->i_proposals[0].spi;
       a.remote_spi = child->r_proposals[0].spi;
@@ -1773,7 +1997,7 @@ ikev2_create_tunnel_interface (vlib_main_t * vm,
       a.flags |= IPSEC_SA_FLAG_IS_TUNNEL;
       a.flags |= IPSEC_SA_FLAG_UDP_ENCAP;
     }
-  if (sa->natt)
+  if (ikev2_natt_active (sa))
     a.flags |= IPSEC_SA_FLAG_UDP_ENCAP;
   a.is_rekey = is_rekey;
 
@@ -1899,7 +2123,8 @@ ikev2_create_tunnel_interface (vlib_main_t * vm,
          a.salt_remote = child->salt_ei;
          a.salt_local = child->salt_er;
        }
-      a.dst_port = sa->natt ? sa->dst_port : sa->ipsec_over_udp_port;
+      a.dst_port =
+       ikev2_natt_active (sa) ? sa->dst_port : sa->ipsec_over_udp_port;
       a.src_port = sa->ipsec_over_udp_port;
     }
 
@@ -2041,13 +2266,13 @@ ikev2_delete_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
 
   if (sa->is_initiator)
     {
-      ip46_address_set_ip4 (&a.local_ip, &sa->iaddr);
-      ip46_address_set_ip4 (&a.remote_ip, &sa->raddr);
+      ip_address_to_46 (&sa->iaddr, &a.local_ip);
+      ip_address_to_46 (&sa->raddr, &a.remote_ip);
     }
   else
     {
-      ip46_address_set_ip4 (&a.local_ip, &sa->raddr);
-      ip46_address_set_ip4 (&a.remote_ip, &sa->iaddr);
+      ip_address_to_46 (&sa->raddr, &a.local_ip);
+      ip_address_to_46 (&sa->iaddr, &a.remote_ip);
     }
 
   a.remote_sa_id = child->remote_sa_id;
@@ -2060,9 +2285,11 @@ ikev2_delete_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
 }
 
 static u32
-ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
-                       udp_header_t * udp)
+ikev2_generate_message (vlib_buffer_t *b, ikev2_sa_t *sa, ike_header_t *ike,
+                       void *user, udp_header_t *udp, ikev2_stats_t *stats)
 {
+  ikev2_main_t *km = &ikev2_main;
+  u16 buffer_data_size = vlib_buffer_get_default_data_size (km->vlib_main);
   v8 *integ = 0;
   ike_payload_header_t *ph;
   u16 plen;
@@ -2125,8 +2352,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
          u8 *nat_detection_sha1 =
            ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa->ispi),
                                    clib_host_to_net_u64 (sa->rspi),
-                                   clib_host_to_net_u32 (sa->raddr.as_u32),
-                                   udp->dst_port);
+                                   &sa->raddr, udp->dst_port);
          ikev2_payload_add_notify (chain,
                                    IKEV2_NOTIFY_MSG_NAT_DETECTION_SOURCE_IP,
                                    nat_detection_sha1);
@@ -2134,7 +2360,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
          nat_detection_sha1 =
            ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa->ispi),
                                    clib_host_to_net_u64 (sa->rspi),
-                                   sa->iaddr.as_u32, udp->src_port);
+                                   &sa->iaddr, udp->src_port);
          ikev2_payload_add_notify (chain,
                                    IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP,
                                    nat_detection_sha1);
@@ -2198,7 +2424,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
        }
       else
        {
-         ikev2_set_state (sa, IKEV2_STATE_DELETED);
+         ikev2_set_state (sa, IKEV2_STATE_DELETED, ": unexpected IKE_AUTH");
          goto done;
        }
     }
@@ -2209,7 +2435,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
        {
          if (sa->del[0].protocol_id == IKEV2_PROTOCOL_IKE)
            {
-             if (sa->is_initiator)
+             if (ike_hdr_is_request (ike))
                ikev2_payload_add_delete (chain, sa->del);
 
              /* The response to a request that deletes the IKE SA is an empty
@@ -2228,7 +2454,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
       /* received N(AUTHENTICATION_FAILED) */
       else if (sa->state == IKEV2_STATE_AUTH_FAILED)
        {
-         ikev2_set_state (sa, IKEV2_STATE_DELETED);
+         ikev2_set_state (sa, IKEV2_STATE_DELETED, ": auth failed");
          goto done;
        }
       /* received unsupported critical payload */
@@ -2243,7 +2469,16 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
          vec_free (data);
          sa->unsupported_cp = 0;
        }
-      /* else send empty response */
+      else
+       /* else send empty response */
+       {
+         if (ike_hdr_is_response (ike))
+           {
+             ASSERT (stats != 0);
+             stats->n_keepalives++;
+             sa->stats.n_keepalives++;
+           }
+       }
     }
   else if (ike->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
     {
@@ -2267,35 +2502,38 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
 
          vec_free (data);
        }
+      else if (vec_len (sa->rekey) > 0)
+       {
+         ikev2_payload_add_sa (chain, sa->rekey[0].r_proposal);
+         ikev2_payload_add_nonce (chain, sa->r_nonce);
+         ikev2_payload_add_ts (chain, sa->rekey[0].tsi, IKEV2_PAYLOAD_TSI);
+         ikev2_payload_add_ts (chain, sa->rekey[0].tsr, IKEV2_PAYLOAD_TSR);
+         vec_del1 (sa->rekey, 0);
+       }
+      else if (vec_len (sa->new_child) > 0)
+       {
+         ikev2_payload_add_sa (chain, sa->new_child[0].r_proposal);
+         ikev2_payload_add_nonce (chain, sa->r_nonce);
+         ikev2_payload_add_ts (chain, sa->new_child[0].tsi,
+                               IKEV2_PAYLOAD_TSI);
+         ikev2_payload_add_ts (chain, sa->new_child[0].tsr,
+                               IKEV2_PAYLOAD_TSR);
+         vec_del1 (sa->new_child, 0);
+       }
+      else if (sa->unsupported_cp)
+       {
+         u8 *data = vec_new (u8, 1);
+
+         data[0] = sa->unsupported_cp;
+         ikev2_payload_add_notify (
+           chain, IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD, data);
+         vec_free (data);
+         sa->unsupported_cp = 0;
+       }
       else
        {
-         if (vec_len (sa->rekey) > 0)
-           {
-             ikev2_payload_add_sa (chain, sa->rekey[0].r_proposal);
-             ikev2_payload_add_nonce (chain, sa->r_nonce);
-             ikev2_payload_add_ts (chain, sa->rekey[0].tsi,
-                                   IKEV2_PAYLOAD_TSI);
-             ikev2_payload_add_ts (chain, sa->rekey[0].tsr,
-                                   IKEV2_PAYLOAD_TSR);
-             vec_del1 (sa->rekey, 0);
-           }
-         else if (sa->unsupported_cp)
-           {
-             u8 *data = vec_new (u8, 1);
-
-             data[0] = sa->unsupported_cp;
-             ikev2_payload_add_notify (chain,
-                                       IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
-                                       data);
-             vec_free (data);
-             sa->unsupported_cp = 0;
-           }
-         else
-           {
-             ikev2_payload_add_notify (chain,
-                                       IKEV2_NOTIFY_MSG_NO_ADDITIONAL_SAS,
-                                       0);
-           }
+         ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_NO_ADDITIONAL_SAS,
+                                   0);
        }
     }
 
@@ -2303,26 +2541,26 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
   ike->version = IKE_VERSION_2;
   ike->nextpayload = IKEV2_PAYLOAD_SK;
   tlen = sizeof (*ike);
-  if (sa->is_initiator)
-    {
-      ike->flags = IKEV2_HDR_FLAG_INITIATOR;
-      sa->last_init_msg_id = clib_net_to_host_u32 (ike->msgid);
-    }
-  else
-    {
-      ike->flags = IKEV2_HDR_FLAG_RESPONSE;
-    }
 
+  if (sa->is_initiator)
+    ike->flags |= IKEV2_HDR_FLAG_INITIATOR;
 
   if (ike->exchange == IKEV2_EXCHANGE_SA_INIT)
     {
       tlen += vec_len (chain->data);
       ike->nextpayload = chain->first_payload_type;
       ike->length = clib_host_to_net_u32 (tlen);
+
+      if (tlen + b->current_length + b->current_data > buffer_data_size)
+       {
+         tlen = ~0;
+         goto done;
+       }
+
       clib_memcpy_fast (ike->payload, chain->data, vec_len (chain->data));
 
       /* store whole IKE payload - needed for PSK auth */
-      vec_free (sa->last_sa_init_res_packet_data);
+      vec_reset_length (sa->last_sa_init_res_packet_data);
       vec_add (sa->last_sa_init_res_packet_data, ike, tlen);
     }
   else
@@ -2347,21 +2585,36 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
        plen += IKEV2_GCM_ICV_SIZE;
       tlen += plen;
 
+      if (tlen + b->current_length + b->current_data > buffer_data_size)
+       {
+         tlen = ~0;
+         goto done;
+       }
+
       /* payload and total length */
       ph->length = clib_host_to_net_u16 (plen);
       ike->length = clib_host_to_net_u32 (tlen);
 
       if (is_aead)
        {
-         ikev2_encrypt_aead_data (ptd, sa, tr_encr, chain->data,
-                                  ph->payload, (u8 *) ike,
-                                  sizeof (*ike) + sizeof (*ph),
-                                  ph->payload + plen - sizeof (*ph) -
-                                  IKEV2_GCM_ICV_SIZE);
+         if (!ikev2_encrypt_aead_data (ptd, sa, tr_encr, chain->data,
+                                       ph->payload, (u8 *) ike,
+                                       sizeof (*ike) + sizeof (*ph),
+                                       ph->payload + plen - sizeof (*ph) -
+                                       IKEV2_GCM_ICV_SIZE))
+           {
+             tlen = ~0;
+             goto done;
+           }
        }
       else
        {
-         ikev2_encrypt_data (ptd, sa, tr_encr, chain->data, ph->payload);
+         if (!ikev2_encrypt_data
+             (ptd, sa, tr_encr, chain->data, ph->payload))
+           {
+             tlen = ~0;
+             goto done;
+           }
          integ =
            ikev2_calc_integr (tr_integ,
                               sa->is_initiator ? sa->sk_ai : sa->sk_ar,
@@ -2371,7 +2624,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
        }
 
       /* store whole IKE payload - needed for retransmit */
-      vec_free (sa->last_res_packet_data);
+      vec_reset_length (sa->last_res_packet_data);
       vec_add (sa->last_res_packet_data, ike, tlen);
     }
 
@@ -2381,96 +2634,117 @@ done:
   return tlen;
 }
 
-static int
-ikev2_retransmit_sa_init (ike_header_t * ike,
-                         ip4_address_t iaddr, ip4_address_t raddr)
+static u32
+ikev2_retransmit_sa_init_one (ikev2_sa_t * sa, ike_header_t * ike,
+                             ip_address_t iaddr, ip_address_t raddr,
+                             u32 rlen)
 {
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_sa_t *sa;
-  u32 thread_index = vlib_get_thread_index ();
+  int p = 0;
+  ike_header_t *tmp;
+  u8 payload = ike->nextpayload;
 
-  /* *INDENT-OFF* */
-  pool_foreach (sa, km->per_thread_data[thread_index].sas, ({
-    if (sa->ispi == clib_net_to_host_u64(ike->ispi) &&
-        sa->iaddr.as_u32 == iaddr.as_u32 &&
-        sa->raddr.as_u32 == raddr.as_u32)
-      {
-        int p = 0;
-        u32 len = clib_net_to_host_u32(ike->length);
-        u8 payload = ike->nextpayload;
+  if (sa->ispi != clib_net_to_host_u64 (ike->ispi) ||
+      ip_address_cmp (&sa->iaddr, &iaddr) ||
+      ip_address_cmp (&sa->raddr, &raddr))
+    {
+      return 0;
+    }
+
+  while (p < rlen && payload != IKEV2_PAYLOAD_NONE)
+    {
+      ike_payload_header_t *ikep = (ike_payload_header_t *) & ike->payload[p];
+      u32 plen = clib_net_to_host_u16 (ikep->length);
 
-        while (p < len && payload!= IKEV2_PAYLOAD_NONE) {
-          ike_payload_header_t * ikep = (ike_payload_header_t *) &ike->payload[p];
-          u32 plen = clib_net_to_host_u16(ikep->length);
+      if (plen < sizeof (ike_payload_header_t))
+       return ~0;
 
-          if (plen < sizeof(ike_payload_header_t))
-            return -1;
+      if (payload == IKEV2_PAYLOAD_NONCE &&
+         !clib_memcmp (sa->i_nonce, ikep->payload, plen - sizeof (*ikep)))
+       {
+         /* req is retransmit */
+         if (sa->state == IKEV2_STATE_SA_INIT)
+           {
+             sa->stats.n_init_retransmit++;
+             tmp = (ike_header_t *) sa->last_sa_init_res_packet_data;
+             u32 slen = clib_net_to_host_u32 (tmp->length);
+             ike->ispi = tmp->ispi;
+             ike->rspi = tmp->rspi;
+             ike->nextpayload = tmp->nextpayload;
+             ike->version = tmp->version;
+             ike->exchange = tmp->exchange;
+             ike->flags = tmp->flags;
+             ike->msgid = tmp->msgid;
+             ike->length = tmp->length;
+             clib_memcpy_fast (ike->payload, tmp->payload,
+                               slen - sizeof (*ike));
+             ikev2_elog_uint_peers (IKEV2_LOG_DEBUG,
+                                    "ispi %lx IKE_SA_INIT retransmit "
+                                    "from %d.%d.%d.%d to %d.%d.%d.%d",
+                                    ike->ispi,
+                                    ip_addr_v4 (&raddr).as_u32,
+                                    ip_addr_v4 (&iaddr).as_u32);
+             return slen;
+           }
+         /* else ignore req */
+         else
+           {
+             ikev2_elog_uint_peers (IKEV2_LOG_DEBUG,
+                                    "ispi %lx IKE_SA_INIT ignore "
+                                    "from %d.%d.%d.%d to %d.%d.%d.%d",
+                                    ike->ispi,
+                                    ip_addr_v4 (&raddr).as_u32,
+                                    ip_addr_v4 (&iaddr).as_u32);
+             return ~0;
+           }
+       }
+      payload = ikep->nextpayload;
+      p += plen;
+    }
 
-          if (payload == IKEV2_PAYLOAD_NONCE)
-            {
-              if (!memcmp(sa->i_nonce, ikep->payload, plen - sizeof(*ikep)))
-                {
-                  /* req is retransmit */
-                  if (sa->state == IKEV2_STATE_SA_INIT)
-                    {
-                      ike_header_t * tmp;
-                      tmp = (ike_header_t*)sa->last_sa_init_res_packet_data;
-                      ike->ispi = tmp->ispi;
-                      ike->rspi = tmp->rspi;
-                      ike->nextpayload = tmp->nextpayload;
-                      ike->version = tmp->version;
-                      ike->exchange = tmp->exchange;
-                      ike->flags = tmp->flags;
-                      ike->msgid = tmp->msgid;
-                      ike->length = tmp->length;
-                      clib_memcpy_fast(ike->payload, tmp->payload,
-                             clib_net_to_host_u32(tmp->length) - sizeof(*ike));
-                      ikev2_elog_uint_peers (IKEV2_LOG_DEBUG,
-                                             "ispi %lx IKE_SA_INIT retransmit "
-                                             "from %d.%d.%d.%d to %d.%d.%d.%d",
-                                             ike->ispi,
-                                             raddr.as_u32, iaddr.as_u32);
-                      return 1;
-                    }
-                  /* else ignore req */
-                  else
-                    {
-                      ikev2_elog_uint_peers (IKEV2_LOG_DEBUG,
-                                             "ispi %lx IKE_SA_INIT ignore "
-                                             "from %d.%d.%d.%d to %d.%d.%d.%d",
-                                             ike->ispi,
-                                             raddr.as_u32, iaddr.as_u32);
-                      return -1;
-                    }
-                }
-            }
-          payload = ikep->nextpayload;
-          p+=plen;
-        }
-      }
-  }));
+  return 0;
+}
+
+static u32
+ikev2_retransmit_sa_init (ike_header_t * ike, ip_address_t iaddr,
+                         ip_address_t raddr, u32 rlen)
+{
+  ikev2_sa_t *sa;
+  u32 res;
+  ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
+
+  /* *INDENT-OFF* */
+  pool_foreach (sa, ptd->sas)  {
+    res = ikev2_retransmit_sa_init_one (sa, ike, iaddr, raddr, rlen);
+    if (res)
+      return res;
+  }
   /* *INDENT-ON* */
 
   /* req is not retransmit */
   return 0;
 }
 
-static int
+static u32
 ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
 {
+  if (ike_hdr_is_response (ike))
+    return 0;
+
   u32 msg_id = clib_net_to_host_u32 (ike->msgid);
 
   /* new req */
-  if (msg_id > sa->last_msg_id)
+  if (msg_id > sa->last_msg_id || sa->last_msg_id == ~0)
     {
       sa->last_msg_id = msg_id;
       return 0;
     }
+
   /* retransmitted req */
-  else if (msg_id == sa->last_msg_id)
+  if (msg_id == sa->last_msg_id)
     {
-      ike_header_t *tmp;
-      tmp = (ike_header_t *) sa->last_res_packet_data;
+      sa->stats.n_retransmit++;
+      ike_header_t *tmp = (ike_header_t *) sa->last_res_packet_data;
+      u32 slen = clib_net_to_host_u32 (tmp->length);
       ike->ispi = tmp->ispi;
       ike->rspi = tmp->rspi;
       ike->nextpayload = tmp->nextpayload;
@@ -2479,19 +2753,18 @@ ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
       ike->flags = tmp->flags;
       ike->msgid = tmp->msgid;
       ike->length = tmp->length;
-      clib_memcpy_fast (ike->payload, tmp->payload,
-                       clib_net_to_host_u32 (tmp->length) - sizeof (*ike));
+      clib_memcpy_fast (ike->payload, tmp->payload, slen - sizeof (*ike));
       ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE retransmit msgid %d",
-                            msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
-      return 1;
+                            msg_id, ip_addr_v4 (&sa->raddr).as_u32,
+                            ip_addr_v4 (&sa->iaddr).as_u32);
+      return slen;
     }
+
   /* old req ignore */
-  else
-    {
-      ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE req ignore msgid %d",
-                            msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
-    }
-  return -1;
+  ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE req ignore msgid %d",
+                        msg_id, ip_addr_v4 (&sa->raddr).as_u32,
+                        ip_addr_v4 (&sa->iaddr).as_u32);
+  return ~0;
 }
 
 static void
@@ -2523,189 +2796,252 @@ ikev2_del_sa_init (u64 ispi)
                               sizeof (ispi));
 }
 
-static uword
-ikev2_node_fn (vlib_main_t * vm,
-              vlib_node_runtime_t * node, vlib_frame_t * frame)
+static_always_inline void
+ikev2_rewrite_v6_addrs (ikev2_sa_t * sa, ip6_header_t * ih)
 {
-  u32 n_left_from, *from, *to_next;
-  ikev2_next_t next_index;
-  ikev2_main_t *km = &ikev2_main;
-  u32 thread_index = vlib_get_thread_index ();
+  if (sa->is_initiator)
+    {
+      ip_address_copy_addr (&ih->dst_address, &sa->raddr);
+      ip_address_copy_addr (&ih->src_address, &sa->iaddr);
+    }
+  else
+    {
+      ip_address_copy_addr (&ih->dst_address, &sa->iaddr);
+      ip_address_copy_addr (&ih->src_address, &sa->raddr);
+    }
+}
 
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
+static_always_inline void
+ikev2_rewrite_v4_addrs (ikev2_sa_t * sa, ip4_header_t * ih)
+{
+  if (sa->is_initiator)
+    {
+      ip_address_copy_addr (&ih->dst_address, &sa->raddr);
+      ip_address_copy_addr (&ih->src_address, &sa->iaddr);
+    }
+  else
+    {
+      ip_address_copy_addr (&ih->dst_address, &sa->iaddr);
+      ip_address_copy_addr (&ih->src_address, &sa->raddr);
+    }
+}
 
-  while (n_left_from > 0)
+static_always_inline void
+ikev2_set_ip_address (ikev2_sa_t *sa, const void *iaddr, const void *raddr,
+                     const ip_address_family_t af)
+{
+  ip_address_set (&sa->raddr, raddr, af);
+  ip_address_set (&sa->iaddr, iaddr, af);
+}
+
+static void
+ikev2_elog_uint_peers_addr (u32 exchange, ip4_header_t * ip4,
+                           ip6_header_t * ip6, u8 is_ip4)
+{
+  u32 src, dst;
+  if (is_ip4)
+    {
+      src = ip4->src_address.as_u32;
+      dst = ip4->dst_address.as_u32;
+    }
+  else
     {
-      u32 n_left_to_next;
+      src = ip6->src_address.as_u32[3];
+      dst = ip6->dst_address.as_u32[3];
+    }
+  ikev2_elog_uint_peers (IKEV2_LOG_WARNING, "IKEv2 exchange %d "
+                        "received from %d.%d.%d.%d to %d.%d.%d.%d",
+                        exchange, src, dst);
+}
+
+static void
+ikev2_generate_sa_init_data_and_log (ikev2_sa_t * sa)
+{
+  ikev2_generate_sa_error_t rc = ikev2_generate_sa_init_data (sa);
+
+  if (PREDICT_TRUE (rc == IKEV2_GENERATE_SA_INIT_OK))
+    return;
+
+  if (rc == IKEV2_GENERATE_SA_INIT_ERR_NO_DH)
+    ikev2_elog_error (IKEV2_GENERATE_SA_INIT_OK_ERR_NO_DH_STR);
+  else if (rc == IKEV2_GENERATE_SA_INIT_ERR_UNSUPPORTED_DH)
+    ikev2_elog_error (IKEV2_GENERATE_SA_INIT_OK_ERR_UNSUPP_STR);
+}
+
+static void
+ikev2_update_stats (vlib_main_t *vm, u32 node_index, ikev2_stats_t *s)
+{
+  vlib_node_increment_counter (vm, node_index, IKEV2_ERROR_KEEPALIVE,
+                              s->n_keepalives);
+  vlib_node_increment_counter (vm, node_index, IKEV2_ERROR_REKEY_REQ,
+                              s->n_rekey_req);
+  vlib_node_increment_counter (vm, node_index, IKEV2_ERROR_INIT_SA_REQ,
+                              s->n_sa_init_req);
+  vlib_node_increment_counter (vm, node_index, IKEV2_ERROR_IKE_AUTH_REQ,
+                              s->n_sa_auth_req);
+}
+
+static_always_inline uword
+ikev2_node_internal (vlib_main_t *vm, vlib_node_runtime_t *node,
+                    vlib_frame_t *frame, u8 is_ip4, u8 natt)
+{
+  u32 n_left = frame->n_vectors, *from;
+  ikev2_main_t *km = &ikev2_main;
+  vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
+  u16 nexts[VLIB_FRAME_SIZE], *next = nexts;
+  ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
+  ikev2_stats_t _stats, *stats = &_stats;
+  int res;
 
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+  /* no NAT traversal for ip6 */
+  ASSERT (!natt || is_ip4);
 
-      while (n_left_from > 0 && n_left_to_next > 0)
+  clib_memset_u16 (stats, 0, sizeof (stats[0]) / sizeof (u16));
+  from = vlib_frame_vector_args (frame);
+  vlib_get_buffers (vm, from, bufs, n_left);
+  b = bufs;
+
+  while (n_left > 0)
+    {
+      vlib_buffer_t *b0 = b[0];
+      next[0] = is_ip4 ? IKEV2_NEXT_IP4_ERROR_DROP
+       : IKEV2_NEXT_IP6_ERROR_DROP;
+      ip4_header_t *ip40 = 0;
+      ip6_header_t *ip60 = 0;
+      udp_header_t *udp0;
+      ike_header_t *ike0;
+      ikev2_sa_t *sa0 = 0;
+      ikev2_sa_t sa;           /* temporary store for SA */
+      u32 rlen, slen = 0;
+      int ip_hdr_sz = 0;
+      int is_req = 0;
+
+      if (natt)
        {
-         u32 bi0;
-         vlib_buffer_t *b0;
-         u32 next0 = IKEV2_NEXT_ERROR_DROP;
-         u32 sw_if_index0;
-         ip4_header_t *ip40;
-         udp_header_t *udp0;
-         ike_header_t *ike0;
-         ikev2_sa_t *sa0 = 0;
-         ikev2_sa_t sa;        /* temporary store for SA */
-         int len = 0;
-         int r, is_req = 0, has_non_esp_marker = 0;
-
-         /* speculatively enqueue b0 to the current next frame */
-         bi0 = from[0];
-         to_next[0] = bi0;
-         from += 1;
-         to_next += 1;
-         n_left_from -= 1;
-         n_left_to_next -= 1;
-
-         b0 = vlib_get_buffer (vm, bi0);
-
-         if (b0->punt_reason == ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0])
+         u8 *ptr = vlib_buffer_get_current (b0);
+         ip40 = (ip4_header_t *) ptr;
+         ptr += sizeof (*ip40);
+         udp0 = (udp_header_t *) ptr;
+         ptr += sizeof (*udp0);
+         ike0 = (ike_header_t *) ptr;
+         ip_hdr_sz = sizeof (*ip40);
+       }
+      else
+       {
+         u8 *ipx_hdr = b0->data + vnet_buffer (b0)->l3_hdr_offset;
+         ike0 = vlib_buffer_get_current (b0);
+         vlib_buffer_advance (b0, -sizeof (*udp0));
+         udp0 = vlib_buffer_get_current (b0);
+
+         if (is_ip4)
            {
-             u8 *ptr = vlib_buffer_get_current (b0);
-             ip40 = (ip4_header_t *) ptr;
-             ptr += sizeof (*ip40);
-             udp0 = (udp_header_t *) ptr;
-             ptr += sizeof (*udp0);
-             ike0 = (ike_header_t *) ptr;
+             ip40 = (ip4_header_t *) ipx_hdr;
+             ip_hdr_sz = sizeof (*ip40);
            }
          else
            {
-             ike0 = vlib_buffer_get_current (b0);
-             vlib_buffer_advance (b0, -sizeof (*udp0));
-             udp0 = vlib_buffer_get_current (b0);
-             vlib_buffer_advance (b0, -sizeof (*ip40));
-             ip40 = vlib_buffer_get_current (b0);
-           }
-
-         /* check for non-esp marker */
-         if (*((u32 *) ike0) == 0)
-           {
-             ike0 = (ike_header_t *) ((u8 *) ike0 + sizeof (u32));
-             has_non_esp_marker = 1;
+             ip60 = (ip6_header_t *) ipx_hdr;
+             ip_hdr_sz = sizeof (*ip60);
            }
+         vlib_buffer_advance (b0, -ip_hdr_sz);
+       }
 
-         if (ike0->version != IKE_VERSION_2)
-           {
-             vlib_node_increment_counter (vm, ikev2_node.index,
-                                          IKEV2_ERROR_NOT_IKEV2, 1);
-             goto dispatch0;
-           }
+      rlen = b0->current_length - ip_hdr_sz - sizeof (*udp0);
 
-         if (ike0->exchange == IKEV2_EXCHANGE_SA_INIT)
-           {
-             sa0 = &sa;
-             clib_memset (sa0, 0, sizeof (*sa0));
+      /* check for non-esp marker */
+      if (natt)
+       {
+         ASSERT (*((u32 *) ike0) == 0);
+         ike0 =
+           (ike_header_t *) ((u8 *) ike0 + sizeof (ikev2_non_esp_marker));
+         rlen -= sizeof (ikev2_non_esp_marker);
+       }
 
-             if (ike0->flags & IKEV2_HDR_FLAG_INITIATOR)
-               {
-                 if (ike0->rspi == 0)
-                   {
-                     sa0->raddr.as_u32 = ip40->dst_address.as_u32;
-                     sa0->iaddr.as_u32 = ip40->src_address.as_u32;
-                     sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
+      if (clib_net_to_host_u32 (ike0->length) != rlen)
+       {
+         vlib_node_increment_counter (vm, node->node_index,
+                                      IKEV2_ERROR_BAD_LENGTH, 1);
+         goto dispatch0;
+       }
 
-                     r = ikev2_retransmit_sa_init (ike0, sa0->iaddr,
-                                                   sa0->raddr);
-                     if (r == 1)
-                       {
-                         vlib_node_increment_counter (vm, ikev2_node.index,
-                                                      IKEV2_ERROR_IKE_SA_INIT_RETRANSMIT,
-                                                      1);
-                         len = clib_net_to_host_u32 (ike0->length);
-                         goto dispatch0;
-                       }
-                     else if (r == -1)
-                       {
-                         vlib_node_increment_counter (vm, ikev2_node.index,
-                                                      IKEV2_ERROR_IKE_SA_INIT_IGNORE,
-                                                      1);
-                         goto dispatch0;
-                       }
+      if (ike0->version != IKE_VERSION_2)
+       {
+         vlib_node_increment_counter (vm, node->node_index,
+                                      IKEV2_ERROR_NOT_IKEV2, 1);
+         goto dispatch0;
+       }
 
-                     ikev2_process_sa_init_req (vm, sa0, ike0, udp0);
+      if (ike0->exchange == IKEV2_EXCHANGE_SA_INIT)
+       {
+         sa0 = &sa;
+         clib_memset (sa0, 0, sizeof (*sa0));
 
-                     if (sa0->state == IKEV2_STATE_SA_INIT)
-                       {
-                         ikev2_sa_free_proposal_vector (&sa0->r_proposals);
-                         sa0->r_proposals =
-                           ikev2_select_proposal (sa0->i_proposals,
-                                                  IKEV2_PROTOCOL_IKE);
-                         ikev2_generate_sa_init_data (sa0);
-                       }
+         if (ike_hdr_is_initiator (ike0))
+           {
+             sa0->stats.n_sa_init_req++;
+             stats->n_sa_init_req++;
+             if (ike0->rspi == 0)
+               {
+                 if (is_ip4)
+                   ikev2_set_ip_address (sa0, &ip40->src_address,
+                                         &ip40->dst_address, AF_IP4);
+                 else
+                   ikev2_set_ip_address (sa0, &ip60->src_address,
+                                         &ip60->dst_address, AF_IP6);
 
-                     if (sa0->state == IKEV2_STATE_SA_INIT
-                         || sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE)
-                       {
-                         len = ikev2_generate_message (sa0, ike0, 0, udp0);
-                       }
+                 sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
 
-                     if (sa0->state == IKEV2_STATE_SA_INIT)
-                       {
-                         /* add SA to the pool */
-                         pool_get (km->per_thread_data[thread_index].sas,
-                                   sa0);
-                         clib_memcpy_fast (sa0, &sa, sizeof (*sa0));
-                         ikev2_init_sa (vm, sa0);
-                         hash_set (km->
-                                   per_thread_data[thread_index].sa_by_rspi,
-                                   sa0->rspi,
-                                   sa0 -
-                                   km->per_thread_data[thread_index].sas);
-                       }
-                     else
-                       {
-                         ikev2_sa_free_all_vec (sa0);
-                       }
+                 slen =
+                   ikev2_retransmit_sa_init (ike0, sa0->iaddr,
+                                             sa0->raddr, rlen);
+                 if (slen)
+                   {
+                     vlib_node_increment_counter (vm, node->node_index,
+                                                  ~0 ==
+                                                  slen ?
+                                                  IKEV2_ERROR_IKE_SA_INIT_IGNORE
+                                                  :
+                                                  IKEV2_ERROR_IKE_SA_INIT_RETRANSMIT,
+                                                  1);
+                     goto dispatch0;
                    }
-               }
-             else              //received sa_init without initiator flag
-               {
-                 sa0->raddr.as_u32 = ip40->src_address.as_u32;
-                 sa0->iaddr.as_u32 = ip40->dst_address.as_u32;
-                 ikev2_process_sa_init_resp (vm, sa0, ike0, udp0);
+
+                 res = ikev2_process_sa_init_req (
+                   vm, sa0, ike0, udp0, rlen,
+                   vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+                 if (!res)
+                   vlib_node_increment_counter (vm, node->node_index,
+                                                IKEV2_ERROR_MALFORMED_PACKET,
+                                                1);
 
                  if (sa0->state == IKEV2_STATE_SA_INIT)
                    {
-                     is_req = 1;
-                     ike0->exchange = IKEV2_EXCHANGE_IKE_AUTH;
-                     uword *p = hash_get (km->sa_by_ispi, ike0->ispi);
-                     if (p)
-                       {
-                         ikev2_sa_t *sai =
-                           pool_elt_at_index (km->sais, p[0]);
-
-                         if (clib_atomic_bool_cmp_and_swap
-                             (&sai->init_response_received, 0, 1))
-                           {
-                             ikev2_complete_sa_data (sa0, sai);
-                             ikev2_calc_keys (sa0);
-                             ikev2_sa_auth_init (sa0);
-                             len =
-                               ikev2_generate_message (sa0, ike0, 0, udp0);
-                           }
-                         else
-                           {
-                             /* we've already processed sa-init response */
-                             sa0->state = IKEV2_STATE_UNKNOWN;
-                           }
-                       }
+                     ikev2_sa_free_proposal_vector (&sa0->r_proposals);
+                     sa0->r_proposals =
+                       ikev2_select_proposal (sa0->i_proposals,
+                                              IKEV2_PROTOCOL_IKE);
+                     ikev2_generate_sa_init_data_and_log (sa0);
+                   }
+
+                 if (sa0->state == IKEV2_STATE_SA_INIT
+                     || sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE)
+                   {
+                     ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
+                     slen =
+                       ikev2_generate_message (b0, sa0, ike0, 0, udp0, stats);
+                     if (~0 == slen)
+                       vlib_node_increment_counter (vm, node->node_index,
+                                                    IKEV2_ERROR_NO_BUFF_SPACE,
+                                                    1);
                    }
 
                  if (sa0->state == IKEV2_STATE_SA_INIT)
                    {
                      /* add SA to the pool */
-                     pool_get (km->per_thread_data[thread_index].sas, sa0);
+                     pool_get (ptd->sas, sa0);
                      clib_memcpy_fast (sa0, &sa, sizeof (*sa0));
-                     hash_set (km->per_thread_data[thread_index].sa_by_rspi,
-                               sa0->rspi,
-                               sa0 - km->per_thread_data[thread_index].sas);
+                     ikev2_init_sa (vm, sa0);
+                     hash_set (ptd->sa_by_rspi, sa0->rspi, sa0 - ptd->sas);
                    }
                  else
                    {
@@ -2713,286 +3049,435 @@ ikev2_node_fn (vlib_main_t * vm,
                    }
                }
            }
-         else if (ike0->exchange == IKEV2_EXCHANGE_IKE_AUTH)
+         else                  //received sa_init without initiator flag
            {
-             uword *p;
-             p = hash_get (km->per_thread_data[thread_index].sa_by_rspi,
-                           clib_net_to_host_u64 (ike0->rspi));
-             if (p)
-               {
-                 sa0 =
-                   pool_elt_at_index (km->per_thread_data[thread_index].sas,
-                                      p[0]);
+             if (is_ip4)
+               ikev2_set_ip_address (sa0, &ip40->dst_address,
+                                     &ip40->src_address, AF_IP4);
+             else
+               ikev2_set_ip_address (sa0, &ip60->dst_address,
+                                     &ip60->src_address, AF_IP6);
 
-                 r = ikev2_retransmit_resp (sa0, ike0);
-                 if (r == 1)
-                   {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
-                                                  IKEV2_ERROR_IKE_REQ_RETRANSMIT,
-                                                  1);
-                     len = clib_net_to_host_u32 (ike0->length);
-                     goto dispatch0;
-                   }
-                 else if (r == -1)
-                   {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
-                                                  IKEV2_ERROR_IKE_REQ_IGNORE,
-                                                  1);
-                     goto dispatch0;
-                   }
+             ikev2_process_sa_init_resp (vm, sa0, ike0, udp0, rlen);
 
-                 sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
-                 ikev2_process_auth_req (vm, sa0, ike0);
-                 ikev2_sa_auth (sa0);
-                 if (sa0->state == IKEV2_STATE_AUTHENTICATED)
+             if (sa0->state == IKEV2_STATE_SA_INIT)
+               {
+                 is_req = 1;
+                 ike0->exchange = IKEV2_EXCHANGE_IKE_AUTH;
+                 uword *p = hash_get (km->sa_by_ispi, sa0->ispi);
+                 if (p)
                    {
-                     ikev2_initial_contact_cleanup (sa0);
-                     ikev2_sa_match_ts (sa0);
-                     if (sa0->state != IKEV2_STATE_TS_UNACCEPTABLE)
-                       ikev2_create_tunnel_interface (vm, thread_index, sa0,
-                                                      &sa0->childs[0],
-                                                      p[0], 0, 0);
-                   }
+                     ikev2_sa_t *sai = pool_elt_at_index (km->sais, p[0]);
 
-                 if (sa0->is_initiator)
-                   {
-                     ikev2_del_sa_init (ike0->ispi);
-                   }
-                 else
-                   {
-                     len = ikev2_generate_message (sa0, ike0, 0, udp0);
+                     if (clib_atomic_bool_cmp_and_swap
+                         (&sai->init_response_received, 0, 1))
+                       {
+                         ikev2_complete_sa_data (sa0, sai);
+                         ikev2_calc_keys (sa0);
+                         ikev2_sa_auth_init (sa0);
+                         ike0->flags = IKEV2_HDR_FLAG_INITIATOR;
+                         ike0->msgid =
+                           clib_net_to_host_u32 (sai->last_init_msg_id);
+                         sa0->last_init_msg_id = sai->last_init_msg_id + 1;
+                         slen = ikev2_generate_message (b0, sa0, ike0, 0,
+                                                        udp0, stats);
+                         if (~0 == slen)
+                           vlib_node_increment_counter (vm,
+                                                        node->node_index,
+                                                        IKEV2_ERROR_NO_BUFF_SPACE,
+                                                        1);
+                       }
+                     else
+                       {
+                         /* we've already processed sa-init response */
+                         sa0->state = IKEV2_STATE_UNKNOWN;
+                       }
                    }
                }
+
+             if (sa0->state == IKEV2_STATE_SA_INIT)
+               {
+                 /* add SA to the pool */
+                 pool_get (ptd->sas, sa0);
+                 clib_memcpy_fast (sa0, &sa, sizeof (*sa0));
+                 hash_set (ptd->sa_by_rspi, sa0->rspi, sa0 - ptd->sas);
+               }
+             else
+               {
+                 ikev2_sa_free_all_vec (sa0);
+               }
            }
-         else if (ike0->exchange == IKEV2_EXCHANGE_INFORMATIONAL)
+       }
+      else if (ike0->exchange == IKEV2_EXCHANGE_IKE_AUTH)
+       {
+         uword *p;
+         p = hash_get (ptd->sa_by_rspi, clib_net_to_host_u64 (ike0->rspi));
+         if (p)
            {
-             uword *p;
-             p = hash_get (km->per_thread_data[thread_index].sa_by_rspi,
-                           clib_net_to_host_u64 (ike0->rspi));
-             if (p)
+             sa0 = pool_elt_at_index (ptd->sas, p[0]);
+             slen = ikev2_retransmit_resp (sa0, ike0);
+             if (slen)
                {
-                 sa0 =
-                   pool_elt_at_index (km->per_thread_data[thread_index].sas,
-                                      p[0]);
+                 vlib_node_increment_counter (vm, node->node_index,
+                                              ~0 ==
+                                              slen ?
+                                              IKEV2_ERROR_IKE_REQ_IGNORE
+                                              :
+                                              IKEV2_ERROR_IKE_REQ_RETRANSMIT,
+                                              1);
+                 goto dispatch0;
+               }
 
-                 r = ikev2_retransmit_resp (sa0, ike0);
-                 if (r == 1)
-                   {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
-                                                  IKEV2_ERROR_IKE_REQ_RETRANSMIT,
-                                                  1);
-                     len = clib_net_to_host_u32 (ike0->length);
-                     goto dispatch0;
-                   }
-                 else if (r == -1)
-                   {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
-                                                  IKEV2_ERROR_IKE_REQ_IGNORE,
-                                                  1);
-                     goto dispatch0;
-                   }
+             sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
+             res = ikev2_process_auth_req (vm, sa0, ike0, rlen);
+             if (res)
+               ikev2_sa_auth (sa0);
+             else
+               vlib_node_increment_counter (vm, node->node_index,
+                                            IKEV2_ERROR_MALFORMED_PACKET, 1);
+             if (sa0->state == IKEV2_STATE_AUTHENTICATED)
+               {
+                 ikev2_initial_contact_cleanup (ptd, sa0);
+                 ikev2_sa_match_ts (sa0);
+                 if (sa0->state != IKEV2_STATE_TS_UNACCEPTABLE)
+                   ikev2_create_tunnel_interface (vm, sa0,
+                                                  &sa0->childs[0],
+                                                  p[0], 0, 0);
+               }
+
+             if (sa0->is_initiator)
+               {
+                 sa0->last_msg_id = ~0;
+                 ikev2_del_sa_init (sa0->ispi);
+               }
+             else
+               {
+                 sa0->stats.n_sa_auth_req++;
+                 stats->n_sa_auth_req++;
+                 ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
+                 slen =
+                   ikev2_generate_message (b0, sa0, ike0, 0, udp0, stats);
+                 if (~0 == slen)
+                   vlib_node_increment_counter (vm, node->node_index,
+                                                IKEV2_ERROR_NO_BUFF_SPACE,
+                                                1);
+               }
+           }
+       }
+      else if (ike0->exchange == IKEV2_EXCHANGE_INFORMATIONAL)
+       {
+         uword *p;
+         p = hash_get (ptd->sa_by_rspi, clib_net_to_host_u64 (ike0->rspi));
+         if (p)
+           {
+             sa0 = pool_elt_at_index (ptd->sas, p[0]);
+             slen = ikev2_retransmit_resp (sa0, ike0);
+             if (slen)
+               {
+                 vlib_node_increment_counter (vm, node->node_index,
+                                              ~0 ==
+                                              slen ?
+                                              IKEV2_ERROR_IKE_REQ_IGNORE
+                                              :
+                                              IKEV2_ERROR_IKE_REQ_RETRANSMIT,
+                                              1);
+                 goto dispatch0;
+               }
+
+             res = ikev2_process_informational_req (vm, sa0, ike0, rlen);
+             if (!res)
+               {
+                 vlib_node_increment_counter (vm, node->node_index,
+                                              IKEV2_ERROR_MALFORMED_PACKET,
+                                              1);
+                 slen = ~0;
+                 goto dispatch0;
+               }
 
-                 ikev2_process_informational_req (vm, sa0, ike0);
-                 if (sa0->del)
+             if (sa0->del)
+               {
+                 if (sa0->del[0].protocol_id != IKEV2_PROTOCOL_IKE)
                    {
-                     if (sa0->del[0].protocol_id != IKEV2_PROTOCOL_IKE)
-                       {
-                         ikev2_delete_t *d, *tmp, *resp = 0;
-                         vec_foreach (d, sa0->del)
+                     ikev2_delete_t *d, *tmp, *resp = 0;
+                     vec_foreach (d, sa0->del)
+                     {
+                       ikev2_child_sa_t *ch_sa;
+                       ch_sa = ikev2_sa_get_child (sa0, d->spi,
+                                                   d->protocol_id,
+                                                   !sa0->is_initiator);
+                       if (ch_sa)
                          {
-                           ikev2_child_sa_t *ch_sa;
-                           ch_sa = ikev2_sa_get_child (sa0, d->spi,
-                                                       d->protocol_id,
-                                                       !sa0->is_initiator);
-                           if (ch_sa)
+                           ikev2_delete_tunnel_interface (km->vnet_main,
+                                                          sa0, ch_sa);
+                           if (!sa0->is_initiator)
                              {
-                               ikev2_delete_tunnel_interface (km->vnet_main,
-                                                              sa0, ch_sa);
-                               if (!sa0->is_initiator)
-                                 {
-                                   vec_add2 (resp, tmp, 1);
-                                   tmp->protocol_id = d->protocol_id;
-                                   tmp->spi = ch_sa->r_proposals[0].spi;
-                                 }
-                               ikev2_sa_del_child_sa (sa0, ch_sa);
+                               vec_add2 (resp, tmp, 1);
+                               tmp->protocol_id = d->protocol_id;
+                               tmp->spi = ch_sa->r_proposals[0].spi;
                              }
+                           ikev2_sa_del_child_sa (sa0, ch_sa);
                          }
-                         if (!sa0->is_initiator)
-                           {
-                             vec_free (sa0->del);
-                             sa0->del = resp;
-                           }
+                     }
+                     if (!sa0->is_initiator)
+                       {
+                         vec_free (sa0->del);
+                         sa0->del = resp;
                        }
                    }
-                 if (!(ike0->flags & IKEV2_HDR_FLAG_RESPONSE))
-                   {
-                     ike0->flags |= IKEV2_HDR_FLAG_RESPONSE;
-                     len = ikev2_generate_message (sa0, ike0, 0, udp0);
-                   }
+               }
+             if (ike_hdr_is_request (ike0))
+               {
+                 ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
+                 slen =
+                   ikev2_generate_message (b0, sa0, ike0, 0, udp0, stats);
+                 if (~0 == slen)
+                   vlib_node_increment_counter (vm, node->node_index,
+                                                IKEV2_ERROR_NO_BUFF_SPACE,
+                                                1);
                }
            }
-         else if (ike0->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
+       }
+      else if (ike0->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
+       {
+         uword *p;
+         p = hash_get (ptd->sa_by_rspi, clib_net_to_host_u64 (ike0->rspi));
+         if (p)
            {
-             uword *p;
-             p = hash_get (km->per_thread_data[thread_index].sa_by_rspi,
-                           clib_net_to_host_u64 (ike0->rspi));
-             if (p)
+             sa0 = pool_elt_at_index (ptd->sas, p[0]);
+             slen = ikev2_retransmit_resp (sa0, ike0);
+             if (slen)
                {
-                 sa0 =
-                   pool_elt_at_index (km->per_thread_data[thread_index].sas,
-                                      p[0]);
+                 vlib_node_increment_counter (vm, node->node_index,
+                                              ~0 ==
+                                              slen ?
+                                              IKEV2_ERROR_IKE_REQ_IGNORE
+                                              :
+                                              IKEV2_ERROR_IKE_REQ_RETRANSMIT,
+                                              1);
+                 goto dispatch0;
+               }
 
-                 r = ikev2_retransmit_resp (sa0, ike0);
-                 if (r == 1)
+             res = ikev2_process_create_child_sa_req (vm, sa0, ike0, rlen);
+             if (!res)
+               {
+                 vlib_node_increment_counter (vm, node->node_index,
+                                              IKEV2_ERROR_MALFORMED_PACKET,
+                                              1);
+                 slen = ~0;
+                 goto dispatch0;
+               }
+
+             if (sa0->rekey)
+               {
+                 if (sa0->rekey[0].protocol_id != IKEV2_PROTOCOL_IKE)
                    {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
-                                                  IKEV2_ERROR_IKE_REQ_RETRANSMIT,
-                                                  1);
-                     len = clib_net_to_host_u32 (ike0->length);
-                     goto dispatch0;
+                     if (sa0->childs)
+                       ikev2_sa_free_all_child_sa (&sa0->childs);
+                     ikev2_child_sa_t *child;
+                     vec_add2 (sa0->childs, child, 1);
+                     clib_memset (child, 0, sizeof (*child));
+                     child->r_proposals = sa0->rekey[0].r_proposal;
+                     child->i_proposals = sa0->rekey[0].i_proposal;
+                     child->tsi = sa0->rekey[0].tsi;
+                     child->tsr = sa0->rekey[0].tsr;
+                     ikev2_create_tunnel_interface (vm, sa0, child, p[0],
+                                                    child - sa0->childs, 1);
                    }
-                 else if (r == -1)
+                 if (ike_hdr_is_response (ike0))
                    {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
-                                                  IKEV2_ERROR_IKE_REQ_IGNORE,
-                                                  1);
-                     goto dispatch0;
+                     vec_free (sa0->rekey);
                    }
-
-                 ikev2_process_create_child_sa_req (vm, sa0, ike0);
-                 if (sa0->rekey)
+                 else
                    {
-                     if (sa0->rekey[0].protocol_id != IKEV2_PROTOCOL_IKE)
-                       {
-                         if (sa0->childs)
-                           ikev2_sa_free_all_child_sa (&sa0->childs);
-                         ikev2_child_sa_t *child;
-                         vec_add2 (sa0->childs, child, 1);
-                         clib_memset (child, 0, sizeof (*child));
-                         child->r_proposals = sa0->rekey[0].r_proposal;
-                         child->i_proposals = sa0->rekey[0].i_proposal;
-                         child->tsi = sa0->rekey[0].tsi;
-                         child->tsr = sa0->rekey[0].tsr;
-                         ikev2_create_tunnel_interface (vm, thread_index,
-                                                        sa0, child, p[0],
-                                                        child - sa0->childs,
-                                                        1);
-                       }
-                     if (sa0->is_initiator)
-                       {
-                         vec_free (sa0->rekey);
-                       }
-                     else
-                       {
-                         len = ikev2_generate_message (sa0, ike0, 0, udp0);
-                       }
+                     stats->n_rekey_req++;
+                     sa0->stats.n_rekey_req++;
+                     ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
+                     slen =
+                       ikev2_generate_message (b0, sa0, ike0, 0, udp0, stats);
+                     if (~0 == slen)
+                       vlib_node_increment_counter (vm, node->node_index,
+                                                    IKEV2_ERROR_NO_BUFF_SPACE,
+                                                    1);
+                   }
+               }
+             else if (sa0->new_child)
+               {
+                 ikev2_child_sa_t *c;
+                 vec_add2 (sa0->childs, c, 1);
+                 memset (c, 0, sizeof (*c));
+                 c->r_proposals = sa0->new_child[0].r_proposal;
+                 c->i_proposals = sa0->new_child[0].i_proposal;
+                 c->tsi = sa0->new_child[0].tsi;
+                 c->tsr = sa0->new_child[0].tsr;
+                 ikev2_create_tunnel_interface (vm, sa0, c, p[0],
+                                                c - sa0->childs, 0);
+                 if (ike_hdr_is_request (ike0))
+                   {
+                     ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
+                     slen =
+                       ikev2_generate_message (b0, sa0, ike0, 0, udp0, 0);
+                     if (~0 == slen)
+                       vlib_node_increment_counter (
+                         vm, node->node_index, IKEV2_ERROR_NO_BUFF_SPACE, 1);
                    }
                }
            }
+       }
+      else
+       {
+         ikev2_elog_uint_peers_addr (ike0->exchange, ip40, ip60, is_ip4);
+       }
+
+    dispatch0:
+      /* if we are sending packet back, rewrite headers */
+      if (slen && ~0 != slen)
+       {
+         if (is_ip4)
+           {
+             next[0] = IKEV2_NEXT_IP4_LOOKUP;
+             ikev2_rewrite_v4_addrs (sa0, ip40);
+           }
          else
            {
-             ikev2_elog_uint_peers (IKEV2_LOG_WARNING, "IKEv2 exchange %d "
-                                    "received from %d.%d.%d.%d to %d.%d.%d.%d",
-                                    ike0->exchange,
-                                    ip40->src_address.as_u32,
-                                    ip40->dst_address.as_u32);
+             next[0] = IKEV2_NEXT_IP6_LOOKUP;
+             ikev2_rewrite_v6_addrs (sa0, ip60);
            }
 
-       dispatch0:
-         /* if we are sending packet back, rewrite headers */
-         if (len)
+         if (is_req)
            {
-             next0 = IKEV2_NEXT_IP4_LOOKUP;
-             if (sa0->is_initiator)
-               {
-                 ip40->dst_address.as_u32 = sa0->raddr.as_u32;
-                 ip40->src_address.as_u32 = sa0->iaddr.as_u32;
-               }
-             else
-               {
-                 ip40->dst_address.as_u32 = sa0->iaddr.as_u32;
-                 ip40->src_address.as_u32 = sa0->raddr.as_u32;
-               }
+             udp0->dst_port = udp0->src_port =
+               clib_net_to_host_u16 (ikev2_get_port (sa0));
 
-             if (is_req)
+             if (udp0->dst_port == clib_net_to_host_u16 (IKEV2_PORT_NATT)
+                 && ikev2_natt_active (sa0))
                {
-                 udp0->dst_port = udp0->src_port =
-                   clib_net_to_host_u16 (ikev2_get_port (sa0));
-
-                 if (udp0->dst_port == clib_net_to_host_u16 (IKEV2_PORT_NATT)
-                     && sa0->natt)
-                   {
-                     if (!has_non_esp_marker)
-                       len = ikev2_insert_non_esp_marker (ike0, len);
-                   }
+                 if (!natt)
+                   slen = ikev2_insert_non_esp_marker (ike0, slen);
                }
-             else
-               {
-                 if (has_non_esp_marker)
-                   len += sizeof (ikev2_non_esp_marker);
+           }
+         else
+           {
+             if (natt)
+               slen += sizeof (ikev2_non_esp_marker);
 
-                 u16 tp = udp0->dst_port;
-                 udp0->dst_port = udp0->src_port;
-                 udp0->src_port = tp;
-               }
+             u16 tp = udp0->dst_port;
+             udp0->dst_port = udp0->src_port;
+             udp0->src_port = tp;
+           }
 
-             udp0->length =
-               clib_host_to_net_u16 (len + sizeof (udp_header_t));
-             udp0->checksum = 0;
-             b0->current_length =
-               len + sizeof (ip4_header_t) + sizeof (udp_header_t);
+         udp0->length = clib_host_to_net_u16 (slen + sizeof (udp_header_t));
+         udp0->checksum = 0;
+         b0->current_length = slen + ip_hdr_sz + sizeof (udp_header_t);
+         if (is_ip4)
+           {
              ip40->length = clib_host_to_net_u16 (b0->current_length);
              ip40->checksum = ip4_header_checksum (ip40);
            }
-         /* delete sa */
-         if (sa0 && (sa0->state == IKEV2_STATE_DELETED ||
-                     sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE))
+         else
            {
-             ikev2_child_sa_t *c;
-
-             vec_foreach (c, sa0->childs)
-               ikev2_delete_tunnel_interface (km->vnet_main, sa0, c);
-
-             ikev2_delete_sa (sa0);
+             ip60->payload_length =
+               clib_host_to_net_u16 (b0->current_length - sizeof (*ip60));
            }
-         sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+       }
+      /* delete sa */
+      if (sa0 && (sa0->state == IKEV2_STATE_DELETED ||
+                 sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE))
+       {
+         ikev2_child_sa_t *c;
 
-         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-           {
-             ikev2_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-             t->sw_if_index = sw_if_index0;
-             t->next_index = next0;
-           }
+         vec_foreach (c, sa0->childs)
+           ikev2_delete_tunnel_interface (km->vnet_main, sa0, c);
 
-         vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-                                          n_left_to_next, bi0, next0);
+         ikev2_delete_sa (ptd, sa0);
        }
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+                        && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+       {
 
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+         ikev2_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+         t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+         t->next_index = next[0];
+       }
+      n_left -= 1;
+      next += 1;
+      b += 1;
     }
 
-  vlib_node_increment_counter (vm, ikev2_node.index,
+  ikev2_update_stats (vm, node->node_index, stats);
+  vlib_node_increment_counter (vm, node->node_index,
                               IKEV2_ERROR_PROCESSED, frame->n_vectors);
+  vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
   return frame->n_vectors;
 }
 
+static uword
+ikev2_ip4 (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ikev2_node_internal (vm, node, frame, 1 /* is_ip4 */, 0);
+}
+
+static uword
+ikev2_ip4_natt (vlib_main_t *vm, vlib_node_runtime_t *node,
+               vlib_frame_t *frame)
+{
+  return ikev2_node_internal (vm, node, frame, 1 /* is_ip4 */, 1 /* natt */);
+}
+
+static uword
+ikev2_ip6 (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ikev2_node_internal (vm, node, frame, 0 /* is_ip4 */, 0);
+}
+
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ikev2_node,static) = {
-  .function = ikev2_node_fn,
-  .name = "ikev2",
+VLIB_REGISTER_NODE (ikev2_node_ip4,static) = {
+  .function = ikev2_ip4,
+  .name = "ikev2-ip4",
   .vector_size = sizeof (u32),
   .format_trace = format_ikev2_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
 
-  .n_errors = ARRAY_LEN(ikev2_error_strings),
-  .error_strings = ikev2_error_strings,
+  .n_errors = IKEV2_N_ERROR,
+  .error_counters = ikev2_error_counters,
 
-  .n_next_nodes = IKEV2_N_NEXT,
+  .n_next_nodes = IKEV2_IP4_N_NEXT,
+  .next_nodes = {
+    [IKEV2_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IKEV2_NEXT_IP4_ERROR_DROP] = "error-drop",
+  },
+};
+
+VLIB_REGISTER_NODE (ikev2_node_ip4_natt,static) = {
+  .function = ikev2_ip4_natt,
+  .name = "ikev2-ip4-natt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ikev2_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
 
+  .n_errors = IKEV2_N_ERROR,
+  .error_counters = ikev2_error_counters,
+
+  .n_next_nodes = IKEV2_IP4_N_NEXT,
   .next_nodes = {
     [IKEV2_NEXT_IP4_LOOKUP] = "ip4-lookup",
-        [IKEV2_NEXT_ERROR_DROP] = "error-drop",
+    [IKEV2_NEXT_IP4_ERROR_DROP] = "error-drop",
+  },
+};
+
+VLIB_REGISTER_NODE (ikev2_node_ip6,static) = {
+  .function = ikev2_ip6,
+  .name = "ikev2-ip6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ikev2_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = IKEV2_N_ERROR,
+  .error_counters = ikev2_error_counters,
+
+  .n_next_nodes = IKEV2_IP6_N_NEXT,
+  .next_nodes = {
+    [IKEV2_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IKEV2_NEXT_IP6_ERROR_DROP] = "error-drop",
   },
 };
 /* *INDENT-ON* */
@@ -3140,10 +3625,11 @@ ikev2_profile_index_by_name (u8 * name)
 
 
 static void
-ikev2_send_ike (vlib_main_t * vm, ip4_address_t * src, ip4_address_t * dst,
+ikev2_send_ike (vlib_main_t * vm, ip_address_t * src, ip_address_t * dst,
                u32 bi0, u32 len, u16 src_port, u16 dst_port, u32 sw_if_index)
 {
   ip4_header_t *ip40;
+  ip6_header_t *ip60;
   udp_header_t *udp0;
   vlib_buffer_t *b0;
   vlib_frame_t *f;
@@ -3152,49 +3638,72 @@ ikev2_send_ike (vlib_main_t * vm, ip4_address_t * src, ip4_address_t * dst,
   b0 = vlib_get_buffer (vm, bi0);
   vlib_buffer_advance (b0, -sizeof (udp_header_t));
   udp0 = vlib_buffer_get_current (b0);
-  vlib_buffer_advance (b0, -sizeof (ip4_header_t));
-  ip40 = vlib_buffer_get_current (b0);
-
-
-  ip40->ip_version_and_header_length = 0x45;
-  ip40->tos = 0;
-  ip40->fragment_id = 0;
-  ip40->flags_and_fragment_offset = 0;
-  ip40->ttl = 0xff;
-  ip40->protocol = IP_PROTOCOL_UDP;
-  ip40->dst_address.as_u32 = dst->as_u32;
-  ip40->src_address.as_u32 = src->as_u32;
   udp0->dst_port = clib_host_to_net_u16 (dst_port);
   udp0->src_port = clib_host_to_net_u16 (src_port);
   udp0->length = clib_host_to_net_u16 (len + sizeof (udp_header_t));
   udp0->checksum = 0;
-  b0->current_length = len + sizeof (ip4_header_t) + sizeof (udp_header_t);
-  ip40->length = clib_host_to_net_u16 (b0->current_length);
-  ip40->checksum = ip4_header_checksum (ip40);
 
+  if (ip_addr_version (dst) == AF_IP4)
+    {
+      vlib_buffer_advance (b0, -sizeof (ip4_header_t));
+      ip40 = vlib_buffer_get_current (b0);
+      ip40->ip_version_and_header_length = 0x45;
+      ip40->tos = 0;
+      ip40->fragment_id = 0;
+      ip40->flags_and_fragment_offset = 0;
+      ip40->ttl = 0xff;
+      ip40->protocol = IP_PROTOCOL_UDP;
+      ip40->dst_address.as_u32 = ip_addr_v4 (dst).as_u32;
+      ip40->src_address.as_u32 = ip_addr_v4 (src).as_u32;
+      b0->current_length =
+       len + sizeof (ip4_header_t) + sizeof (udp_header_t);
+      ip40->length = clib_host_to_net_u16 (b0->current_length);
+      ip40->checksum = ip4_header_checksum (ip40);
+    }
+  else
+    {
+      vlib_buffer_advance (b0, -sizeof (ip6_header_t));
+      ip60 = vlib_buffer_get_current (b0);
+
+      b0->current_length = len + sizeof (*ip60) + sizeof (udp_header_t);
+      ip60->ip_version_traffic_class_and_flow_label =
+       clib_host_to_net_u32 (0x6 << 28);
+      ip60->payload_length =
+       clib_host_to_net_u16 (b0->current_length - sizeof (*ip60));
+      ip60->protocol = IP_PROTOCOL_UDP;
+      ip60->hop_limit = 0xff;
+      clib_memcpy_fast (ip60->src_address.as_u8, ip_addr_v6 (src).as_u8,
+                       sizeof (ip60->src_address));
+      clib_memcpy_fast (ip60->dst_address.as_u8, ip_addr_v6 (dst).as_u8,
+                       sizeof (ip60->src_address));
+    }
+
+  b0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
   vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index;
   vnet_buffer (b0)->sw_if_index[VLIB_TX] = ~0;
 
+  u32 next_index = (ip_addr_version (dst) == AF_IP4) ?
+    ip4_lookup_node.index : ip6_lookup_node.index;
+
   /* send the request */
-  f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+  f = vlib_get_frame_to_node (vm, next_index);
   to_next = vlib_frame_vector_args (f);
   to_next[0] = bi0;
   f->n_vectors = 1;
-  vlib_put_frame_to_node (vm, ip4_lookup_node.index, f);
+  vlib_put_frame_to_node (vm, next_index, f);
 
 }
 
 static u32
-ikev2_get_new_ike_header_buff (vlib_main_t * vm, ike_header_t ** ike)
+ikev2_get_new_ike_header_buff (vlib_main_t * vm, vlib_buffer_t ** b)
 {
   u32 bi0;
   if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
     {
-      *ike = 0;
+      *b = 0;
       return 0;
     }
-  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
-  *ike = vlib_buffer_get_current (b0);
+  *b = vlib_get_buffer (vm, bi0);
   return bi0;
 }
 
@@ -3203,6 +3712,8 @@ ikev2_set_local_key (vlib_main_t * vm, u8 * file)
 {
   ikev2_main_t *km = &ikev2_main;
 
+  if (km->pkey)
+    EVP_PKEY_free (km->pkey);
   km->pkey = ikev2_load_key_file (file);
   if (km->pkey == NULL)
     return clib_error_return (0, "load key '%s' failed", file);
@@ -3213,27 +3724,7 @@ ikev2_set_local_key (vlib_main_t * vm, u8 * file)
 static_always_inline vnet_api_error_t
 ikev2_register_udp_port (ikev2_profile_t * p, u16 port)
 {
-  ikev2_main_t *km = &ikev2_main;
-  udp_dst_port_info_t *pi;
-
-  uword *v = hash_get (km->udp_ports, port);
-  pi = udp_get_dst_port_info (&udp_main, port, UDP_IP4);
-
-  if (v)
-    {
-      /* IKE already uses this port, only increment reference counter */
-      ASSERT (pi);
-      v[0]++;
-    }
-  else
-    {
-      if (pi)
-       return VNET_API_ERROR_UDP_PORT_TAKEN;
-
-      udp_register_dst_port (km->vlib_main, port,
-                            ipsec4_tun_input_node.index, 1);
-      hash_set (km->udp_ports, port, 1);
-    }
+  ipsec_register_udp_port (port);
   p->ipsec_over_udp_port = port;
   return 0;
 }
@@ -3241,73 +3732,72 @@ ikev2_register_udp_port (ikev2_profile_t * p, u16 port)
 static_always_inline void
 ikev2_unregister_udp_port (ikev2_profile_t * p)
 {
-  ikev2_main_t *km = &ikev2_main;
-  uword *v;
-
   if (p->ipsec_over_udp_port == IPSEC_UDP_PORT_NONE)
     return;
 
-  v = hash_get (km->udp_ports, p->ipsec_over_udp_port);
-  if (!v)
-    return;
-
-  v[0]--;
-
-  if (v[0] == 0)
-    {
-      udp_unregister_dst_port (km->vlib_main, p->ipsec_over_udp_port, 1);
-      hash_unset (km->udp_ports, p->ipsec_over_udp_port);
-    }
-
+  ipsec_unregister_udp_port (p->ipsec_over_udp_port);
   p->ipsec_over_udp_port = IPSEC_UDP_PORT_NONE;
 }
 
 static void
 ikev2_initiate_delete_ike_sa_internal (vlib_main_t * vm,
                                       ikev2_main_per_thread_data_t * tkm,
-                                      ikev2_sa_t * sa)
+                                      ikev2_sa_t * sa, u8 send_notification)
 {
   ikev2_main_t *km = &ikev2_main;
-  ip4_address_t *src, *dst;
-
-  /* Create the Initiator notification for IKE SA removal */
-  ike_header_t *ike0;
-  u32 bi0 = 0;
-  int len;
-
-  bi0 = ikev2_get_new_ike_header_buff (vm, &ike0);
-  if (!bi0)
-    {
-      ikev2_log_error ("buffer alloc failure");
-      return;
-    }
+  ip_address_t *src, *dst;
+  vlib_buffer_t *b0;
+  ikev2_child_sa_t *c;
+
+  /* Create the Initiator notification for IKE SA removal */
+  ike_header_t *ike0;
+  u32 bi0 = 0;
+  int len;
 
-  ike0->exchange = IKEV2_EXCHANGE_INFORMATIONAL;
-  ike0->ispi = clib_host_to_net_u64 (sa->ispi);
-  ike0->rspi = clib_host_to_net_u64 (sa->rspi);
   vec_resize (sa->del, 1);
   sa->del->protocol_id = IKEV2_PROTOCOL_IKE;
   sa->del->spi = sa->ispi;
-  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id + 1);
-  sa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
-  len = ikev2_generate_message (sa, ike0, 0, 0);
 
-  if (sa->is_initiator)
-    {
-      src = &sa->iaddr;
-      dst = &sa->raddr;
-    }
-  else
+  if (send_notification)
     {
-      dst = &sa->iaddr;
-      src = &sa->raddr;
-    }
+      bi0 = ikev2_get_new_ike_header_buff (vm, &b0);
+      if (!bi0)
+       {
+         ikev2_log_error ("buffer alloc failure");
+         goto delete_sa;
+       }
+
+      ike0 = vlib_buffer_get_current (b0);
+      ike0->exchange = IKEV2_EXCHANGE_INFORMATIONAL;
+      ike0->ispi = clib_host_to_net_u64 (sa->ispi);
+      ike0->rspi = clib_host_to_net_u64 (sa->rspi);
+      ike0->flags = 0;
+      ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id);
+      sa->last_init_msg_id += 1;
+      len = ikev2_generate_message (b0, sa, ike0, 0, 0, 0);
+      if (~0 == len)
+       return;
+
+      if (ikev2_natt_active (sa))
+       len = ikev2_insert_non_esp_marker (ike0, len);
+
+      if (sa->is_initiator)
+       {
+         src = &sa->iaddr;
+         dst = &sa->raddr;
+       }
+      else
+       {
+         dst = &sa->iaddr;
+         src = &sa->raddr;
+       }
 
-  ikev2_send_ike (vm, src, dst, bi0, len,
-                 ikev2_get_port (sa), sa->dst_port, 0);
+      ikev2_send_ike (vm, src, dst, bi0, len,
+                     ikev2_get_port (sa), sa->dst_port, 0);
+    }
 
+delete_sa:
   /* delete local SA */
-  ikev2_child_sa_t *c;
   vec_foreach (c, sa->childs)
     ikev2_delete_tunnel_interface (km->vnet_main, sa, c);
 
@@ -3330,19 +3820,35 @@ ikev2_cleanup_profile_sessions (ikev2_main_t * km, ikev2_profile_t * p)
   u32 *sai;
   u32 *del_sai = 0;
 
+  /* *INDENT-OFF* */
+  pool_foreach (sa, km->sais)  {
+    if (pi == sa->profile_index)
+      vec_add1 (del_sai, sa - km->sais);
+  }
+  /* *INDENT-ON* */
+
+  vec_foreach (sai, del_sai)
+  {
+    sa = pool_elt_at_index (km->sais, sai[0]);
+    ikev2_sa_free_all_vec (sa);
+    hash_unset (km->sa_by_ispi, sa->ispi);
+    pool_put (km->sais, sa);
+  }
+  vec_reset_length (del_sai);
+
   vec_foreach (tkm, km->per_thread_data)
   {
     /* *INDENT-OFF* */
-    pool_foreach (sa, tkm->sas, ({
+    pool_foreach (sa, tkm->sas)  {
       if (sa->profile_index != ~0 && pi == sa->profile_index)
         vec_add1 (del_sai, sa - tkm->sas);
-    }));
+    }
     /* *INDENT-ON* */
 
     vec_foreach (sai, del_sai)
     {
       sa = pool_elt_at_index (tkm->sas, sai[0]);
-      ikev2_initiate_delete_ike_sa_internal (km->vlib_main, tkm, sa);
+      ikev2_initiate_delete_ike_sa_internal (km->vlib_main, tkm, sa, 1);
     }
 
     vec_reset_length (del_sai);
@@ -3351,6 +3857,27 @@ ikev2_cleanup_profile_sessions (ikev2_main_t * km, ikev2_profile_t * p)
   vec_free (del_sai);
 }
 
+static void
+ikev2_profile_responder_free (ikev2_responder_t *r)
+{
+  vec_free (r->hostname);
+}
+
+static void
+ikev2_profile_free (ikev2_profile_t * p)
+{
+  vec_free (p->name);
+
+  vec_free (p->auth.data);
+  if (p->auth.key)
+    EVP_PKEY_free (p->auth.key);
+
+  ikev2_profile_responder_free (&p->responder);
+
+  vec_free (p->loc_id.data);
+  vec_free (p->rem_id.data);
+}
+
 clib_error_t *
 ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add)
 {
@@ -3380,7 +3907,7 @@ ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add)
       ikev2_unregister_udp_port (p);
       ikev2_cleanup_profile_sessions (km, p);
 
-      vec_free (p->name);
+      ikev2_profile_free (p);
       pool_put (km->profiles, p);
       mhash_unset (&km->profile_index_by_name, name, 0);
     }
@@ -3401,7 +3928,11 @@ ikev2_set_profile_auth (vlib_main_t * vm, u8 * name, u8 auth_method,
       r = clib_error_return (0, "unknown profile %v", name);
       return r;
     }
+
+  if (p->auth.key)
+    EVP_PKEY_free (p->auth.key);
   vec_free (p->auth.data);
+
   p->auth.method = auth_method;
   p->auth.data = vec_dup (auth_data);
   p->auth.hex = data_hex_format;
@@ -3409,8 +3940,6 @@ ikev2_set_profile_auth (vlib_main_t * vm, u8 * name, u8 auth_method,
   if (auth_method == IKEV2_AUTH_METHOD_RSA_SIG)
     {
       vec_add1 (p->auth.data, 0);
-      if (p->auth.key)
-       EVP_PKEY_free (p->auth.key);
       p->auth.key = ikev2_load_cert_file (p->auth.data);
       if (p->auth.key == NULL)
        return clib_error_return (0, "load cert '%s' failed", p->auth.data);
@@ -3419,6 +3948,15 @@ ikev2_set_profile_auth (vlib_main_t * vm, u8 * name, u8 auth_method,
   return 0;
 }
 
+static int
+ikev2_is_id_supported (u8 id_type)
+{
+  return (id_type == IKEV2_ID_TYPE_ID_IPV4_ADDR ||
+         id_type == IKEV2_ID_TYPE_ID_IPV6_ADDR ||
+         id_type == IKEV2_ID_TYPE_ID_RFC822_ADDR ||
+         id_type == IKEV2_ID_TYPE_ID_FQDN);
+}
+
 clib_error_t *
 ikev2_set_profile_id (vlib_main_t * vm, u8 * name, u8 id_type, u8 * data,
                      int is_local)
@@ -3426,8 +3964,7 @@ ikev2_set_profile_id (vlib_main_t * vm, u8 * name, u8 id_type, u8 * data,
   ikev2_profile_t *p;
   clib_error_t *r;
 
-  if (id_type > IKEV2_ID_TYPE_ID_RFC822_ADDR
-      && id_type < IKEV2_ID_TYPE_ID_KEY_ID)
+  if (!ikev2_is_id_supported (id_type))
     {
       r = clib_error_return (0, "unsupported identity type %U",
                             format_ikev2_id_type, id_type);
@@ -3458,10 +3995,27 @@ ikev2_set_profile_id (vlib_main_t * vm, u8 * name, u8 id_type, u8 * data,
   return 0;
 }
 
+static_always_inline void
+ikev2_set_ts_type (ikev2_ts_t * ts, const ip_address_t * addr)
+{
+  if (ip_addr_version (addr) == AF_IP4)
+    ts->ts_type = TS_IPV4_ADDR_RANGE;
+  else
+    ts->ts_type = TS_IPV6_ADDR_RANGE;
+}
+
+static_always_inline void
+ikev2_set_ts_addrs (ikev2_ts_t * ts, const ip_address_t * start,
+                   const ip_address_t * end)
+{
+  ip_address_copy (&ts->start_addr, start);
+  ip_address_copy (&ts->end_addr, end);
+}
+
 clib_error_t *
 ikev2_set_profile_ts (vlib_main_t * vm, u8 * name, u8 protocol_id,
-                     u16 start_port, u16 end_port, ip4_address_t start_addr,
-                     ip4_address_t end_addr, int is_local)
+                     u16 start_port, u16 end_port, ip_address_t start_addr,
+                     ip_address_t end_addr, int is_local)
 {
   ikev2_profile_t *p;
   clib_error_t *r;
@@ -3474,32 +4028,54 @@ ikev2_set_profile_ts (vlib_main_t * vm, u8 * name, u8 protocol_id,
       return r;
     }
 
+  if (ip_addr_version (&start_addr) != ip_addr_version (&end_addr))
+    return clib_error_return (0, "IP address version mismatch!");
+
   if (is_local)
     {
-      p->loc_ts.start_addr.as_u32 = start_addr.as_u32;
-      p->loc_ts.end_addr.as_u32 = end_addr.as_u32;
+      ikev2_set_ts_addrs (&p->loc_ts, &start_addr, &end_addr);
       p->loc_ts.start_port = start_port;
       p->loc_ts.end_port = end_port;
       p->loc_ts.protocol_id = protocol_id;
-      p->loc_ts.ts_type = 7;
+      ikev2_set_ts_type (&p->loc_ts, &start_addr);
     }
   else
     {
-      p->rem_ts.start_addr.as_u32 = start_addr.as_u32;
-      p->rem_ts.end_addr.as_u32 = end_addr.as_u32;
+      ikev2_set_ts_addrs (&p->rem_ts, &start_addr, &end_addr);
       p->rem_ts.start_port = start_port;
       p->rem_ts.end_port = end_port;
       p->rem_ts.protocol_id = protocol_id;
-      p->rem_ts.ts_type = 7;
+      ikev2_set_ts_type (&p->rem_ts, &start_addr);
     }
 
   return 0;
 }
 
+clib_error_t *
+ikev2_set_profile_responder_hostname (vlib_main_t *vm, u8 *name, u8 *hostname,
+                                     u32 sw_if_index)
+{
+  ikev2_profile_t *p;
+  clib_error_t *r;
+
+  p = ikev2_profile_index_by_name (name);
+
+  if (!p)
+    {
+      r = clib_error_return (0, "unknown profile %v", name);
+      return r;
+    }
+
+  p->responder.is_resolved = 0;
+  p->responder.sw_if_index = sw_if_index;
+  p->responder.hostname = vec_dup (hostname);
+
+  return 0;
+}
 
 clib_error_t *
 ikev2_set_profile_responder (vlib_main_t * vm, u8 * name,
-                            u32 sw_if_index, ip4_address_t ip4)
+                            u32 sw_if_index, ip_address_t addr)
 {
   ikev2_profile_t *p;
   clib_error_t *r;
@@ -3512,8 +4088,9 @@ ikev2_set_profile_responder (vlib_main_t * vm, u8 * name,
       return r;
     }
 
+  p->responder.is_resolved = 1;
   p->responder.sw_if_index = sw_if_index;
-  p->responder.ip4 = ip4;
+  ip_address_copy (&p->responder.addr, &addr);
 
   return 0;
 }
@@ -3547,7 +4124,6 @@ clib_error_t *
 ikev2_set_profile_esp_transforms (vlib_main_t * vm, u8 * name,
                                  ikev2_transform_encr_type_t crypto_alg,
                                  ikev2_transform_integ_type_t integ_alg,
-                                 ikev2_transform_dh_type_t dh_type,
                                  u32 crypto_key_size)
 {
   ikev2_profile_t *p;
@@ -3563,7 +4139,6 @@ ikev2_set_profile_esp_transforms (vlib_main_t * vm, u8 * name,
 
   p->esp_ts.crypto_alg = crypto_alg;
   p->esp_ts.integ_alg = integ_alg;
-  p->esp_ts.dh_type = dh_type;
   p->esp_ts.crypto_key_size = crypto_key_size;
   return 0;
 }
@@ -3593,9 +4168,7 @@ ikev2_set_profile_ipsec_udp_port (vlib_main_t * vm, u8 * name, u16 port,
                                  u8 is_set)
 {
   ikev2_profile_t *p = ikev2_profile_index_by_name (name);
-  ikev2_main_t *km = &ikev2_main;
   vnet_api_error_t rv = 0;
-  uword *v;
 
   if (!p)
     return VNET_API_ERROR_INVALID_VALUE;
@@ -3609,10 +4182,6 @@ ikev2_set_profile_ipsec_udp_port (vlib_main_t * vm, u8 * name, u16 port,
     }
   else
     {
-      v = hash_get (km->udp_ports, port);
-      if (!v)
-       return VNET_API_ERROR_IKE_NO_PORT;
-
       if (p->ipsec_over_udp_port == IPSEC_UDP_PORT_NONE)
        return VNET_API_ERROR_INVALID_VALUE;
 
@@ -3660,13 +4229,70 @@ ikev2_set_profile_sa_lifetime (vlib_main_t * vm, u8 * name,
   return 0;
 }
 
+static int
+ikev2_get_if_address (u32 sw_if_index, ip_address_family_t af,
+                     ip_address_t * out_addr)
+{
+  ip4_address_t *if_ip4;
+  ip6_address_t *if_ip6;
+
+  if (af == AF_IP4)
+    {
+      if_ip4 = ip4_interface_first_address (&ip4_main, sw_if_index, 0);
+      if (if_ip4)
+       {
+         ip_address_set (out_addr, if_ip4, AF_IP4);
+         return 1;
+       }
+    }
+  else
+    {
+      if_ip6 = ip6_interface_first_address (&ip6_main, sw_if_index);
+      if (if_ip6)
+       {
+         ip_address_set (out_addr, if_ip6, AF_IP6);
+         return 1;
+       }
+    }
+  return 0;
+}
+
+static clib_error_t *
+ikev2_resolve_responder_hostname (vlib_main_t *vm, ikev2_responder_t *r)
+{
+  ikev2_main_t *km = &ikev2_main;
+  dns_cache_entry_t *ep = 0;
+  dns_pending_request_t _t0, *t0 = &_t0;
+  dns_resolve_name_t _rn, *rn = &_rn;
+  int rv;
+
+  if (!km->dns_resolve_name)
+    return clib_error_return (0, "cannot load symbols from dns plugin");
+
+  t0->request_type = DNS_API_PENDING_NAME_TO_IP;
+  rv = km->dns_resolve_name (r->hostname, &ep, t0, rn);
+  if (rv < 0)
+    return clib_error_return (0, "dns lookup failure");
+
+  if (ep == 0)
+    return 0;
+
+  ip_address_copy (&r->addr, &rn->address);
+  r->is_resolved = 1;
+  return 0;
+}
+
 clib_error_t *
 ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
 {
   ikev2_profile_t *p;
   clib_error_t *r;
-  ip4_main_t *im = &ip4_main;
   ikev2_main_t *km = &ikev2_main;
+  vlib_buffer_t *b0;
+  ike_header_t *ike0;
+  u32 bi0 = 0;
+  int len = sizeof (ike_header_t), valid_ip = 0;
+  ip_address_t src_if_ip = ip_address_initializer;
 
   p = ikev2_profile_index_by_name (name);
 
@@ -3676,150 +4302,167 @@ ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
       return r;
     }
 
-  if (p->responder.sw_if_index == ~0 || p->responder.ip4.data_u32 == 0)
+  if (p->responder.sw_if_index == ~0 ||
+      (ip_address_is_zero (&p->responder.addr) &&
+       vec_len (p->responder.hostname) == 0))
     {
       r = clib_error_return (0, "responder not set for profile %v", name);
       return r;
     }
 
+  if (!p->responder.is_resolved)
+    {
+      /* try to resolve using dns plugin
+       * success does not mean we have resolved the name */
+      r = ikev2_resolve_responder_hostname (vm, &p->responder);
+      if (r)
+       return r;
+    }
 
-  /* Create the Initiator Request */
-  {
-    ike_header_t *ike0;
-    u32 bi0 = 0;
-    ip_lookup_main_t *lm = &im->lookup_main;
-    u32 if_add_index0;
-    int len = sizeof (ike_header_t);
-
-    /* Get own iface IP */
-    if_add_index0 =
-      lm->if_address_pool_index_by_sw_if_index[p->responder.sw_if_index];
-    ip_interface_address_t *if_add =
-      pool_elt_at_index (lm->if_address_pool, if_add_index0);
-    ip4_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
-
-    bi0 = ikev2_get_new_ike_header_buff (vm, &ike0);
-    if (!bi0)
-      {
-       char *errmsg = "buffer alloc failure";
-       ikev2_log_error (errmsg);
-       return clib_error_return (0, errmsg);
-      }
+  if (p->responder.is_resolved &&
+      ikev2_get_if_address (p->responder.sw_if_index,
+                           ip_addr_version (&p->responder.addr), &src_if_ip))
+    {
+      valid_ip = 1;
+    }
 
-    /* Prepare the SA and the IKE payload */
-    ikev2_sa_t sa;
-    clib_memset (&sa, 0, sizeof (ikev2_sa_t));
-    ikev2_payload_chain_t *chain = 0;
-    ikev2_payload_new_chain (chain);
-
-    /* Build the IKE proposal payload */
-    ikev2_sa_proposal_t *proposals = 0;
-    ikev2_set_initiator_proposals (vm, &sa, &p->ike_ts, &proposals, 1);
-    proposals[0].proposal_num = 1;
-    proposals[0].protocol_id = IKEV2_PROTOCOL_IKE;
-
-    /* Add and then cleanup proposal data */
-    ikev2_payload_add_sa (chain, proposals);
-    ikev2_sa_free_proposal_vector (&proposals);
-
-    sa.is_initiator = 1;
-    sa.profile_index = p - km->profiles;
-    sa.state = IKEV2_STATE_SA_INIT;
-    sa.tun_itf = p->tun_itf;
-    sa.udp_encap = p->udp_encap;
-    sa.ipsec_over_udp_port = p->ipsec_over_udp_port;
-    sa.is_tun_itf_set = 1;
-    sa.initial_contact = 1;
-    sa.dst_port = IKEV2_PORT;
-    ikev2_generate_sa_init_data (&sa);
-    ikev2_payload_add_ke (chain, sa.dh_group, sa.i_dh_data);
-    ikev2_payload_add_nonce (chain, sa.i_nonce);
-
-    /* Build the child SA proposal */
-    vec_resize (sa.childs, 1);
-    ikev2_set_initiator_proposals (vm, &sa, &p->esp_ts,
-                                  &sa.childs[0].i_proposals, 0);
-    sa.childs[0].i_proposals[0].proposal_num = 1;
-    sa.childs[0].i_proposals[0].protocol_id = IKEV2_PROTOCOL_ESP;
-    RAND_bytes ((u8 *) & sa.childs[0].i_proposals[0].spi,
-               sizeof (sa.childs[0].i_proposals[0].spi));
-
-    /* Add NAT detection notification messages (mandatory) */
-    u8 *nat_detection_sha1 =
-      ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa.ispi),
-                             clib_host_to_net_u64 (sa.rspi),
-                             clib_host_to_net_u32 (if_ip->as_u32),
-                             clib_host_to_net_u16 (IKEV2_PORT));
-
-    ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_NAT_DETECTION_SOURCE_IP,
-                             nat_detection_sha1);
-    vec_free (nat_detection_sha1);
-    nat_detection_sha1 =
-      ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa.ispi),
-                             clib_host_to_net_u64 (sa.rspi),
-                             clib_host_to_net_u32 (p->responder.ip4.as_u32),
-                             clib_host_to_net_u16 (sa.dst_port));
-    ikev2_payload_add_notify (chain,
-                             IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP,
-                             nat_detection_sha1);
-    vec_free (nat_detection_sha1);
-
-    u8 *sig_hash_algo = vec_new (u8, 8);
-    u64 tmpsig = clib_host_to_net_u64 (0x0001000200030004);
-    clib_memcpy_fast (sig_hash_algo, &tmpsig, sizeof (tmpsig));
-    ikev2_payload_add_notify (chain,
-                             IKEV2_NOTIFY_MSG_SIGNATURE_HASH_ALGORITHMS,
-                             sig_hash_algo);
-    vec_free (sig_hash_algo);
-
-
-    /* Buffer update and boilerplate */
-    len += vec_len (chain->data);
-    ike0->nextpayload = chain->first_payload_type;
-    ike0->length = clib_host_to_net_u32 (len);
-    clib_memcpy_fast (ike0->payload, chain->data, vec_len (chain->data));
-    ikev2_payload_destroy_chain (chain);
-
-    ike0->version = IKE_VERSION_2;
-    ike0->flags = IKEV2_HDR_FLAG_INITIATOR;
-    ike0->exchange = IKEV2_EXCHANGE_SA_INIT;
-    ike0->ispi = sa.ispi;
-    ike0->rspi = 0;
-    ike0->msgid = 0;
-
-    /* store whole IKE payload - needed for PSK auth */
-    vec_free (sa.last_sa_init_req_packet_data);
-    vec_add (sa.last_sa_init_req_packet_data, ike0, len);
-
-    /* add data to the SA then add it to the pool */
-    sa.iaddr.as_u32 = if_ip->as_u32;
-    sa.raddr.as_u32 = p->responder.ip4.as_u32;
-    sa.i_id.type = p->loc_id.type;
-    sa.i_id.data = vec_dup (p->loc_id.data);
-    sa.r_id.type = p->rem_id.type;
-    sa.r_id.data = vec_dup (p->rem_id.data);
-    sa.i_auth.method = p->auth.method;
-    sa.i_auth.hex = p->auth.hex;
-    sa.i_auth.data = vec_dup (p->auth.data);
-    sa.sw_if_index = p->responder.sw_if_index;
-    vec_add (sa.childs[0].tsi, &p->loc_ts, 1);
-    vec_add (sa.childs[0].tsr, &p->rem_ts, 1);
-
-    ikev2_initial_contact_cleanup (&sa);
-
-    /* add SA to the pool */
-    ikev2_sa_t *sa0 = 0;
-    pool_get (km->sais, sa0);
-    clib_memcpy_fast (sa0, &sa, sizeof (*sa0));
-    hash_set (km->sa_by_ispi, sa0->ispi, sa0 - km->sais);
-
-    ikev2_send_ike (vm, if_ip, &p->responder.ip4, bi0, len,
-                   IKEV2_PORT, sa.dst_port, sa.sw_if_index);
-
-    ikev2_elog_exchange ("ispi %lx rspi %lx IKEV2_EXCHANGE_SA_INIT sent to "
-                        "%d.%d.%d.%d", clib_host_to_net_u64 (sa0->ispi), 0,
-                        p->responder.ip4.as_u32);
-  }
+  /* Prepare the SA and the IKE payload */
+  ikev2_sa_t sa;
+  clib_memset (&sa, 0, sizeof (ikev2_sa_t));
+  ikev2_payload_chain_t *chain = 0;
+  ikev2_payload_new_chain (chain);
+
+  /* Build the IKE proposal payload */
+  ikev2_sa_proposal_t *proposals = 0;
+  ikev2_set_initiator_proposals (vm, &sa, &p->ike_ts, &proposals, 1);
+  proposals[0].proposal_num = 1;
+  proposals[0].protocol_id = IKEV2_PROTOCOL_IKE;
+
+  /* Add and then cleanup proposal data */
+  ikev2_payload_add_sa (chain, proposals);
+  ikev2_sa_free_proposal_vector (&proposals);
+
+  sa.is_initiator = 1;
+  sa.profile_index = p - km->profiles;
+  sa.state = IKEV2_STATE_SA_INIT;
+  sa.tun_itf = p->tun_itf;
+  sa.udp_encap = p->udp_encap;
+  if (p->natt_disabled)
+    sa.natt_state = IKEV2_NATT_DISABLED;
+  sa.ipsec_over_udp_port = p->ipsec_over_udp_port;
+  sa.is_tun_itf_set = 1;
+  sa.initial_contact = 1;
+  sa.dst_port = IKEV2_PORT;
+
+  ikev2_generate_sa_error_t rc = ikev2_generate_sa_init_data (&sa);
+  if (rc != IKEV2_GENERATE_SA_INIT_OK)
+    {
+      ikev2_sa_free_all_vec (&sa);
+      ikev2_payload_destroy_chain (chain);
+      return clib_error_return (0, "%U", format_ikev2_gen_sa_error, rc);
+    }
+
+  ikev2_payload_add_ke (chain, sa.dh_group, sa.i_dh_data);
+  ikev2_payload_add_nonce (chain, sa.i_nonce);
+
+  /* Build the child SA proposal */
+  vec_resize (sa.childs, 1);
+  ikev2_set_initiator_proposals (vm, &sa, &p->esp_ts,
+                                &sa.childs[0].i_proposals, 0);
+  sa.childs[0].i_proposals[0].proposal_num = 1;
+  sa.childs[0].i_proposals[0].protocol_id = IKEV2_PROTOCOL_ESP;
+  RAND_bytes ((u8 *) & sa.childs[0].i_proposals[0].spi,
+             sizeof (sa.childs[0].i_proposals[0].spi));
+
+  /* Add NAT detection notification messages (mandatory) */
+  u8 *nat_detection_sha1 = ikev2_compute_nat_sha1 (
+    clib_host_to_net_u64 (sa.ispi), clib_host_to_net_u64 (sa.rspi), &src_if_ip,
+    clib_host_to_net_u16 (IKEV2_PORT));
+
+  ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_NAT_DETECTION_SOURCE_IP,
+                           nat_detection_sha1);
+  vec_free (nat_detection_sha1);
+  nat_detection_sha1 =
+    ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa.ispi),
+                           clib_host_to_net_u64 (sa.rspi),
+                           &p->responder.addr,
+                           clib_host_to_net_u16 (sa.dst_port));
+  ikev2_payload_add_notify (chain,
+                           IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP,
+                           nat_detection_sha1);
+  vec_free (nat_detection_sha1);
+
+  u8 *sig_hash_algo = vec_new (u8, 8);
+  u64 tmpsig = clib_host_to_net_u64 (0x0001000200030004);
+  clib_memcpy_fast (sig_hash_algo, &tmpsig, sizeof (tmpsig));
+  ikev2_payload_add_notify (chain,
+                           IKEV2_NOTIFY_MSG_SIGNATURE_HASH_ALGORITHMS,
+                           sig_hash_algo);
+  vec_free (sig_hash_algo);
+
+  bi0 = ikev2_get_new_ike_header_buff (vm, &b0);
+  if (!bi0)
+    {
+      ikev2_sa_free_all_vec (&sa);
+      ikev2_payload_destroy_chain (chain);
+      char *errmsg = "buffer alloc failure";
+      ikev2_log_error (errmsg);
+      return clib_error_return (0, errmsg);
+    }
+  ike0 = vlib_buffer_get_current (b0);
+
+  /* Buffer update and boilerplate */
+  len += vec_len (chain->data);
+  ike0->nextpayload = chain->first_payload_type;
+  ike0->length = clib_host_to_net_u32 (len);
+  clib_memcpy_fast (ike0->payload, chain->data, vec_len (chain->data));
+  ikev2_payload_destroy_chain (chain);
+
+  ike0->version = IKE_VERSION_2;
+  ike0->flags = IKEV2_HDR_FLAG_INITIATOR;
+  ike0->exchange = IKEV2_EXCHANGE_SA_INIT;
+  ike0->ispi = clib_host_to_net_u64 (sa.ispi);
+  ike0->rspi = 0;
+  ike0->msgid = 0;
+  sa.last_init_msg_id += 1;
+
+  /* store whole IKE payload - needed for PSK auth */
+  vec_reset_length (sa.last_sa_init_req_packet_data);
+  vec_add (sa.last_sa_init_req_packet_data, ike0, len);
+
+  /* add data to the SA then add it to the pool */
+  ip_address_copy (&sa.iaddr, &src_if_ip);
+  ip_address_copy (&sa.raddr, &p->responder.addr);
+  sa.i_id.type = p->loc_id.type;
+  sa.i_id.data = vec_dup (p->loc_id.data);
+  sa.r_id.type = p->rem_id.type;
+  sa.r_id.data = vec_dup (p->rem_id.data);
+  sa.i_auth.method = p->auth.method;
+  sa.i_auth.hex = p->auth.hex;
+  sa.i_auth.data = vec_dup (p->auth.data);
+  sa.sw_if_index = p->responder.sw_if_index;
+  vec_add (sa.childs[0].tsi, &p->loc_ts, 1);
+  vec_add (sa.childs[0].tsr, &p->rem_ts, 1);
+
+  ikev2_initial_contact_cleanup (0, &sa);
+
+  /* add SA to the pool */
+  ikev2_sa_t *sa0 = 0;
+  pool_get (km->sais, sa0);
+  clib_memcpy_fast (sa0, &sa, sizeof (*sa0));
+  hash_set (km->sa_by_ispi, sa0->ispi, sa0 - km->sais);
+
+  if (valid_ip)
+    {
+      ikev2_send_ike (vm, &src_if_ip, &p->responder.addr, bi0, len, IKEV2_PORT,
+                     sa.dst_port, sa.sw_if_index);
+
+      ikev2_elog_exchange
+       ("ispi %lx rspi %lx IKEV2_EXCHANGE_SA_INIT sent to ",
+        clib_host_to_net_u64 (sa0->ispi), 0,
+        ip_addr_v4 (&p->responder.addr).as_u32,
+        ip_addr_version (&p->responder.addr) == AF_IP4);
+    }
 
   return 0;
 }
@@ -3832,25 +4475,31 @@ ikev2_delete_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   ikev2_main_t *km = &ikev2_main;
   ike_header_t *ike0;
   u32 bi0 = 0;
+  vlib_buffer_t *b0;
   int len;
 
-  bi0 = ikev2_get_new_ike_header_buff (vm, &ike0);
+  bi0 = ikev2_get_new_ike_header_buff (vm, &b0);
   if (!bi0)
     {
       ikev2_log_error ("buffer alloc failure");
       return;
     }
 
+  ike0 = vlib_buffer_get_current (b0);
   ike0->exchange = IKEV2_EXCHANGE_INFORMATIONAL;
   ike0->ispi = clib_host_to_net_u64 (sa->ispi);
   ike0->rspi = clib_host_to_net_u64 (sa->rspi);
+  ike0->flags = 0;
   vec_resize (sa->del, 1);
   sa->del->protocol_id = IKEV2_PROTOCOL_ESP;
   sa->del->spi = csa->i_proposals->spi;
-  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id + 1);
-  sa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
-  len = ikev2_generate_message (sa, ike0, 0, 0);
-  if (sa->natt)
+  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id);
+  sa->last_init_msg_id += 1;
+  len = ikev2_generate_message (b0, sa, ike0, 0, 0, 0);
+  if (~0 == len)
+    return;
+
+  if (ikev2_natt_active (sa))
     len = ikev2_insert_non_esp_marker (ike0, len);
   ikev2_send_ike (vm, &sa->iaddr, &sa->raddr, bi0, len,
                  ikev2_get_port (sa), sa->dst_port, sa->sw_if_index);
@@ -3876,14 +4525,14 @@ ikev2_initiate_delete_child_sa (vlib_main_t * vm, u32 ispi)
     if (fchild)
       break;
     /* *INDENT-OFF* */
-    pool_foreach (sa, tkm->sas, ({
+    pool_foreach (sa, tkm->sas)  {
       fchild = ikev2_sa_get_child(sa, ispi, IKEV2_PROTOCOL_ESP, 1);
       if (fchild)
         {
           fsa = sa;
           break;
         }
-    }));
+    }
     /* *INDENT-ON* */
   }
 
@@ -3916,14 +4565,14 @@ ikev2_initiate_delete_ike_sa (vlib_main_t * vm, u64 ispi)
     if (fsa)
       break;
     /* *INDENT-OFF* */
-    pool_foreach (sa, tkm->sas, ({
+    pool_foreach (sa, tkm->sas)  {
       if (sa->ispi == ispi)
         {
           fsa = sa;
           ftkm = tkm;
           break;
         }
-    }));
+    }
     /* *INDENT-ON* */
   }
 
@@ -3933,7 +4582,7 @@ ikev2_initiate_delete_ike_sa (vlib_main_t * vm, u64 ispi)
       return r;
     }
 
-  ikev2_initiate_delete_ike_sa_internal (vm, ftkm, fsa);
+  ikev2_initiate_delete_ike_sa_internal (vm, ftkm, fsa, 1);
   return 0;
 }
 
@@ -3943,25 +4592,28 @@ ikev2_rekey_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
 {
   /* Create the Initiator request for create child SA */
   ike_header_t *ike0;
+  vlib_buffer_t *b0;
   u32 bi0 = 0;
   int len;
 
-  bi0 = ikev2_get_new_ike_header_buff (vm, &ike0);
+  bi0 = ikev2_get_new_ike_header_buff (vm, &b0);
   if (!bi0)
     {
       ikev2_log_error ("buffer alloc failure");
       return;
     }
 
+  ike0 = vlib_buffer_get_current (b0);
   ike0->version = IKE_VERSION_2;
   ike0->flags = IKEV2_HDR_FLAG_INITIATOR;
   ike0->exchange = IKEV2_EXCHANGE_CREATE_CHILD_SA;
   ike0->ispi = clib_host_to_net_u64 (sa->ispi);
   ike0->rspi = clib_host_to_net_u64 (sa->rspi);
-  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id + 1);
-  sa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
+  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id);
+  sa->last_init_msg_id += 1;
 
   ikev2_rekey_t *rekey;
+  vec_reset_length (sa->rekey);
   vec_add2 (sa->rekey, rekey, 1);
   ikev2_sa_proposal_t *proposals = vec_dup (csa->i_proposals);
 
@@ -3969,8 +4621,11 @@ ikev2_rekey_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   RAND_bytes ((u8 *) & proposals[0].spi, sizeof (proposals[0].spi));
   rekey->spi = proposals[0].spi;
   rekey->ispi = csa->i_proposals->spi;
-  len = ikev2_generate_message (sa, ike0, proposals, 0);
-  if (sa->natt)
+  len = ikev2_generate_message (b0, sa, ike0, proposals, 0, 0);
+  if (~0 == len)
+    return;
+
+  if (ikev2_natt_active (sa))
     len = ikev2_insert_non_esp_marker (ike0, len);
   ikev2_send_ike (vm, &sa->iaddr, &sa->raddr, bi0, len,
                  ikev2_get_port (sa), ikev2_get_port (sa), sa->sw_if_index);
@@ -3993,14 +4648,14 @@ ikev2_initiate_rekey_child_sa (vlib_main_t * vm, u32 ispi)
     if (fchild)
       break;
     /* *INDENT-OFF* */
-    pool_foreach (sa, tkm->sas, ({
+    pool_foreach (sa, tkm->sas)  {
       fchild = ikev2_sa_get_child(sa, ispi, IKEV2_PROTOCOL_ESP, 1);
       if (fchild)
         {
           fsa = sa;
           break;
         }
-    }));
+    }
     /* *INDENT-ON* */
   }
 
@@ -4017,6 +4672,74 @@ ikev2_initiate_rekey_child_sa (vlib_main_t * vm, u32 ispi)
   return 0;
 }
 
+static int
+ikev2_sa_sw_if_match (ikev2_sa_t * sa, u32 sw_if_index)
+{
+  return (sa->sw_if_index == sw_if_index) && sa->is_initiator;
+}
+
+static void
+ikev2_sa_del (ikev2_profile_t * p, u32 sw_if_index)
+{
+  u64 *ispi, *ispi_vec = 0;
+  ikev2_sa_t *sa, **sap, **sa_vec = 0;
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_main_per_thread_data_t *tkm;
+  p->responder.sw_if_index = ~0;
+
+  vec_foreach (tkm, km->per_thread_data)
+  {
+    /* *INDENT-OFF* */
+    pool_foreach (sa, tkm->sas)  {
+      if (ikev2_sa_sw_if_match (sa, sw_if_index))
+        vec_add1 (sa_vec, sa);
+    }
+    /* *INDENT-ON* */
+
+    vec_foreach (sap, sa_vec)
+    {
+      ikev2_initiate_delete_ike_sa_internal (km->vlib_main, tkm, *sap, 0);
+    }
+    vec_reset_length (sa_vec);
+  }
+  vec_free (sa_vec);
+
+  /* *INDENT-OFF* */
+  pool_foreach (sa, km->sais)  {
+    if (ikev2_sa_sw_if_match (sa, sw_if_index))
+      vec_add1 (ispi_vec, sa->ispi);
+  }
+  /* *INDENT-ON* */
+
+  vec_foreach (ispi, ispi_vec)
+  {
+    ikev2_del_sa_init_from_main (ispi);
+  }
+
+  vec_free (ispi_vec);
+}
+
+static clib_error_t *
+ikev2_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *p;
+
+  if (is_add)
+    return 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (p, km->profiles)  {
+    if (p->responder.sw_if_index == sw_if_index)
+      ikev2_sa_del (p, sw_if_index);
+  }
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ikev2_sw_interface_add_del);
+
 clib_error_t *
 ikev2_init (vlib_main_t * vm)
 {
@@ -4056,25 +4779,30 @@ ikev2_init (vlib_main_t * vm)
 
   km->sa_by_ispi = hash_create (0, sizeof (uword));
   km->sw_if_indices = hash_create (0, 0);
-  km->udp_ports = hash_create (0, sizeof (uword));
 
-  udp_register_dst_port (vm, IKEV2_PORT, ikev2_node.index, 1);
-  udp_register_dst_port (vm, IKEV2_PORT_NATT, ikev2_node.index, 1);
+  udp_register_dst_port (vm, IKEV2_PORT, ikev2_node_ip4.index, 1);
+  udp_register_dst_port (vm, IKEV2_PORT, ikev2_node_ip6.index, 0);
+  udp_register_dst_port (vm, IKEV2_PORT_NATT, ikev2_node_ip4.index, 1);
+  udp_register_dst_port (vm, IKEV2_PORT_NATT, ikev2_node_ip6.index, 0);
 
-  vlib_punt_hdl_t punt_hdl = vlib_punt_client_register ("ikev2");
+  vlib_punt_hdl_t punt_hdl = vlib_punt_client_register ("ikev2-ip4-natt");
   vlib_punt_register (punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0],
-                     "ikev2");
+                     "ikev2-ip4-natt");
   ikev2_cli_reference ();
 
+  km->dns_resolve_name =
+    vlib_get_plugin_symbol ("dns_plugin.so", "dns_resolve_name");
+  if (!km->dns_resolve_name)
+    ikev2_log_error ("cannot load symbols from dns plugin");
+
   km->log_level = IKEV2_LOG_ERROR;
   km->log_class = vlib_log_register_class ("ikev2", 0);
   return 0;
 }
 
 /* *INDENT-OFF* */
-VLIB_INIT_FUNCTION (ikev2_init) =
-{
-  .runs_after = VLIB_INITS("ipsec_init", "ipsec_punt_init"),
+VLIB_INIT_FUNCTION (ikev2_init) = {
+  .runs_after = VLIB_INITS ("ipsec_init", "ipsec_punt_init", "dns_init"),
 };
 /* *INDENT-ON* */
 
@@ -4134,13 +4862,17 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa,
          ip46_address_t remote_ip;
          if (sa->is_initiator)
            {
-             ip46_address_set_ip4 (&local_ip, &sa->iaddr);
-             ip46_address_set_ip4 (&remote_ip, &sa->raddr);
+             local_ip = to_ip46 (ip_addr_version (&sa->iaddr),
+                                 ip_addr_bytes (&sa->iaddr));
+             remote_ip = to_ip46 (ip_addr_version (&sa->raddr),
+                                  ip_addr_bytes (&sa->raddr));
            }
          else
            {
-             ip46_address_set_ip4 (&local_ip, &sa->raddr);
-             ip46_address_set_ip4 (&remote_ip, &sa->iaddr);
+             local_ip = to_ip46 (ip_addr_version (&sa->raddr),
+                                 ip_addr_bytes (&sa->raddr));
+             remote_ip = to_ip46 (ip_addr_version (&sa->iaddr),
+                                  ip_addr_bytes (&sa->iaddr));
            }
 
        /* *INDENT-OFF* */
@@ -4163,7 +4895,10 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa,
       u32 *sas_in = NULL;
       vec_add1 (sas_in, csa->remote_sa_id);
       vlib_worker_thread_barrier_sync (vm);
-      ipsec_tun_protect_update (sw_if_index, NULL, csa->local_sa_id, sas_in);
+      int rv = ipsec_tun_protect_update (sw_if_index, NULL,
+                                        csa->local_sa_id, sas_in);
+      if (rv)
+       vec_free (sas_in);
       ipsec_sa_unlock_id (ikev2_flip_alternate_sa_bit (csa->remote_sa_id));
       vlib_worker_thread_barrier_release (vm);
     }
@@ -4199,6 +4934,17 @@ ikev2_set_liveness_params (u32 period, u32 max_retries)
   return 0;
 }
 
+clib_error_t *
+ikev2_profile_natt_disable (u8 * name)
+{
+  ikev2_profile_t *p = ikev2_profile_index_by_name (name);
+  if (!p)
+    return clib_error_return (0, "unknown profile %v", name);
+
+  p->natt_disabled = 1;
+  return 0;
+}
+
 static void
 ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
 {
@@ -4218,14 +4964,14 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
     if (fchild)
       break;
     /* *INDENT-OFF* */
-    pool_foreach (sa, tkm->sas, ({
+    pool_foreach (sa, tkm->sas)  {
       fchild = ikev2_sa_get_child(sa, ipsec_sa->spi, IKEV2_PROTOCOL_ESP, 1);
       if (fchild)
         {
           fsa = sa;
           break;
         }
-    }));
+    }
     /* *INDENT-ON* */
   }
   vlib_get_combined_counter (&ipsec_sa_counters,
@@ -4244,7 +4990,81 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
 }
 
 static void
-ikev2_process_pending_sa_init (ikev2_main_t * km)
+ikev2_process_pending_sa_init_one (vlib_main_t *vm, ikev2_main_t *km,
+                                  ikev2_sa_t *sa)
+{
+  ikev2_profile_t *p;
+  u32 bi0;
+  u8 *nat_sha, *np;
+  p = pool_elt_at_index (km->profiles, sa->profile_index);
+
+  if (!p->responder.is_resolved)
+    {
+      clib_error_t *r = ikev2_resolve_responder_hostname (vm, &p->responder);
+      if (r)
+       {
+         clib_error_free (r);
+         return;
+       }
+
+      if (!p->responder.is_resolved)
+       return;
+
+      ip_address_copy (&sa->raddr, &p->responder.addr);
+
+      /* update nat detection destination hash */
+      np = ikev2_find_ike_notify_payload (
+       (ike_header_t *) sa->last_sa_init_req_packet_data,
+       IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP);
+      if (np)
+       {
+         nat_sha = ikev2_compute_nat_sha1 (
+           clib_host_to_net_u64 (sa->ispi), clib_host_to_net_u64 (sa->rspi),
+           &sa->raddr, clib_host_to_net_u16 (sa->dst_port));
+         clib_memcpy_fast (np, nat_sha, vec_len (nat_sha));
+         vec_free (nat_sha);
+       }
+    }
+
+  if (ip_address_is_zero (&sa->iaddr))
+    {
+      if (!ikev2_get_if_address (p->responder.sw_if_index,
+                                ip_addr_version (&p->responder.addr),
+                                &sa->iaddr))
+       return;
+
+      /* update NAT detection payload */
+      np =
+       ikev2_find_ike_notify_payload
+       ((ike_header_t *) sa->last_sa_init_req_packet_data,
+        IKEV2_NOTIFY_MSG_NAT_DETECTION_SOURCE_IP);
+      if (np)
+       {
+         nat_sha =
+           ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa->ispi),
+                                   clib_host_to_net_u64 (sa->rspi),
+                                   &sa->iaddr,
+                                   clib_host_to_net_u16 (IKEV2_PORT));
+         clib_memcpy_fast (np, nat_sha, vec_len (nat_sha));
+         vec_free (nat_sha);
+       }
+    }
+
+  if (vlib_buffer_alloc (km->vlib_main, &bi0, 1) != 1)
+    return;
+
+  vlib_buffer_t *b = vlib_get_buffer (km->vlib_main, bi0);
+  clib_memcpy_fast (vlib_buffer_get_current (b),
+                   sa->last_sa_init_req_packet_data,
+                   vec_len (sa->last_sa_init_req_packet_data));
+
+  ikev2_send_ike (km->vlib_main, &sa->iaddr, &sa->raddr, bi0,
+                 vec_len (sa->last_sa_init_req_packet_data),
+                 ikev2_get_port (sa), IKEV2_PORT, sa->sw_if_index);
+}
+
+static void
+ikev2_process_pending_sa_init (vlib_main_t *vm, ikev2_main_t *km)
 {
   u32 sai;
   u64 ispi;
@@ -4257,47 +5077,41 @@ ikev2_process_pending_sa_init (ikev2_main_t * km)
     if (sa->init_response_received)
       continue;
 
-    u32 bi0;
-    if (vlib_buffer_alloc (km->vlib_main, &bi0, 1) != 1)
-      return;
-
-    vlib_buffer_t * b = vlib_get_buffer (km->vlib_main, bi0);
-    clib_memcpy_fast (vlib_buffer_get_current (b),
-        sa->last_sa_init_req_packet_data,
-        vec_len (sa->last_sa_init_req_packet_data));
-    ikev2_send_ike (km->vlib_main, &sa->iaddr, &sa->raddr, bi0,
-        vec_len (sa->last_sa_init_req_packet_data),
-        ikev2_get_port (sa), IKEV2_PORT, sa->sw_if_index);
+    ikev2_process_pending_sa_init_one (vm, km, sa);
   }));
   /* *INDENT-ON* */
 }
 
-static vlib_node_registration_t ikev2_mngr_process_node;
-
 static void
 ikev2_send_informational_request (ikev2_sa_t * sa)
 {
   ikev2_main_t *km = &ikev2_main;
-  ip4_address_t *src, *dst;
+  ip_address_t *src, *dst;
   ike_header_t *ike0;
+  vlib_buffer_t *b0;
   u32 bi0 = 0;
   u16 dp;
   int len;
 
-  bi0 = ikev2_get_new_ike_header_buff (km->vlib_main, &ike0);
+  bi0 = ikev2_get_new_ike_header_buff (km->vlib_main, &b0);
   if (!bi0)
     {
       ikev2_log_error ("buffer alloc failure");
       return;
     }
 
+  ike0 = vlib_buffer_get_current (b0);
   ike0->exchange = IKEV2_EXCHANGE_INFORMATIONAL;
   ike0->ispi = clib_host_to_net_u64 (sa->ispi);
   ike0->rspi = clib_host_to_net_u64 (sa->rspi);
-  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id + 1);
-  sa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
-  len = ikev2_generate_message (sa, ike0, 0, 0);
-  if (sa->natt)
+  ike0->msgid = clib_host_to_net_u32 (sa->last_init_msg_id);
+  ike0->flags = 0;
+  sa->last_init_msg_id += 1;
+  len = ikev2_generate_message (b0, sa, ike0, 0, 0, 0);
+  if (~0 == len)
+    return;
+
+  if (ikev2_natt_active (sa))
     len = ikev2_insert_non_esp_marker (ike0, len);
 
   if (sa->is_initiator)
@@ -4316,13 +5130,20 @@ ikev2_send_informational_request (ikev2_sa_t * sa)
                  sa->sw_if_index);
 }
 
+void
+ikev2_disable_dpd (void)
+{
+  ikev2_main_t *km = &ikev2_main;
+  km->dpd_disabled = 1;
+}
+
 static_always_inline int
 ikev2_mngr_process_responder_sas (ikev2_sa_t * sa)
 {
   ikev2_main_t *km = &ikev2_main;
   vlib_main_t *vm = km->vlib_main;
 
-  if (!sa->sk_ai || !sa->sk_ar)
+  if (!sa->keys_generated)
     return 0;
 
   if (sa->liveness_retries >= km->liveness_max_retries)
@@ -4344,15 +5165,13 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
                       vlib_frame_t * f)
 {
   ikev2_main_t *km = &ikev2_main;
-  ipsec_main_t *im = &ipsec_main;
   ikev2_profile_t *p;
   ikev2_child_sa_t *c;
   u32 *sai;
 
   while (1)
     {
-      u8 req_sent = 0;
-      vlib_process_wait_for_event_or_clock (vm, 1);
+      vlib_process_wait_for_event_or_clock (vm, 2);
       vlib_process_get_events (vm, NULL);
 
       /* process ike child sas */
@@ -4363,9 +5182,13 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
        u32 *to_be_deleted = 0;
 
         /* *INDENT-OFF* */
-        pool_foreach (sa, tkm->sas, ({
+        pool_foreach (sa, tkm->sas)  {
           ikev2_child_sa_t *c;
           u8 del_old_ids = 0;
+
+          if (sa->state != IKEV2_STATE_AUTHENTICATED)
+            continue;
+
           if (sa->old_remote_id_present && 0 > sa->old_id_expiration)
             {
               sa->old_remote_id_present = 0;
@@ -4375,13 +5198,11 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
             sa->old_id_expiration -= 1;
 
           vec_foreach (c, sa->childs)
-            {
-            req_sent |= ikev2_mngr_process_child_sa(sa, c, del_old_ids);
-            }
+            ikev2_mngr_process_child_sa(sa, c, del_old_ids);
 
-          if (ikev2_mngr_process_responder_sas (sa))
+          if (!km->dpd_disabled && ikev2_mngr_process_responder_sas (sa))
             vec_add1 (to_be_deleted, sa - tkm->sas);
-        }));
+        }
         /* *INDENT-ON* */
 
        vec_foreach (sai, to_be_deleted)
@@ -4402,7 +5223,12 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
              p = pool_elt_at_index (km->profiles, sa->profile_index);
              if (p)
                {
-                 ikev2_initiate_sa_init (vm, p->name);
+                 clib_error_t *e = ikev2_initiate_sa_init (vm, p->name);
+                 if (e)
+                   {
+                     ikev2_log_error ("%U", format_clib_error, e);
+                     clib_error_free (e);
+                   }
                }
            }
        }
@@ -4412,20 +5238,13 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
       /* process ipsec sas */
       ipsec_sa_t *sa;
       /* *INDENT-OFF* */
-      pool_foreach (sa, im->sad, ({
-        ikev2_mngr_process_ipsec_sa(sa);
-      }));
-      /* *INDENT-ON* */
-
-      ikev2_process_pending_sa_init (km);
-
-      if (req_sent)
+      pool_foreach (sa, ipsec_sa_pool)
        {
-         vlib_process_wait_for_event_or_clock (vm, 5);
-         vlib_process_get_events (vm, NULL);
-         req_sent = 0;
+         ikev2_mngr_process_ipsec_sa (sa);
        }
+      /* *INDENT-ON* */
 
+      ikev2_process_pending_sa_init (vm, km);
     }
   return 0;
 }