ikev2: refactor and test profile dump API
[vpp.git] / src / plugins / ikev2 / ikev2.c
index b6202ae..0842125 100644 (file)
 #include <plugins/ikev2/ikev2.h>
 #include <plugins/ikev2/ikev2_priv.h>
 #include <openssl/sha.h>
+#include <vnet/ipsec/ipsec_punt.h>
+
+#define IKEV2_LIVENESS_RETRIES 3
+#define IKEV2_LIVENESS_PERIOD_CHECK 30
 
 ikev2_main_t ikev2_main;
 
@@ -37,7 +41,7 @@ static int ikev2_delete_tunnel_interface (vnet_main_t * vnm,
 
 #define ikev2_set_state(sa, v) do { \
     (sa)->state = v; \
-    clib_warning("sa state changed to " #v); \
+    ikev2_elog_sa_state("ispi %lx SA state changed to " #v, sa->ispi); \
   } while(0);
 
 typedef struct
@@ -89,6 +93,22 @@ typedef enum
   IKEV2_N_NEXT,
 } ikev2_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;
+}
+
+static_always_inline int
+ikev2_insert_non_esp_marker (ike_header_t * ike, int len)
+{
+  memmove ((u8 *) ike + sizeof (ikev2_non_esp_marker), ike, len);
+  clib_memset (ike, 0, sizeof (ikev2_non_esp_marker));
+  return len + sizeof (ikev2_non_esp_marker);
+}
+
 static ikev2_sa_transform_t *
 ikev2_find_transform_data (ikev2_sa_transform_t * t)
 {
@@ -129,9 +149,8 @@ ikev2_select_proposal (ikev2_sa_proposal_t * proposals,
   if (prot_id == IKEV2_PROTOCOL_IKE)
     {
       mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_ENCR) |
-       (1 << IKEV2_TRANSFORM_TYPE_PRF) |
-       (1 << IKEV2_TRANSFORM_TYPE_INTEG) | (1 << IKEV2_TRANSFORM_TYPE_DH);
-      optional_bitmap = mandatory_bitmap;
+       (1 << IKEV2_TRANSFORM_TYPE_PRF) | (1 << IKEV2_TRANSFORM_TYPE_DH);
+      optional_bitmap = mandatory_bitmap | (1 << IKEV2_TRANSFORM_TYPE_INTEG);
     }
   else if (prot_id == IKEV2_PROTOCOL_ESP)
     {
@@ -171,9 +190,6 @@ ikev2_select_proposal (ikev2_sa_proposal_t * proposals,
        }
     }
 
-    clib_warning ("bitmap is %x mandatory is %x optional is %x",
-                 bitmap, mandatory_bitmap, optional_bitmap);
-
     if ((bitmap & mandatory_bitmap) == mandatory_bitmap &&
        (bitmap & ~optional_bitmap) == 0)
       {
@@ -346,8 +362,6 @@ ikev2_generate_sa_init_data (ikev2_sa_t * sa)
 
   if (!t)
     {
-      clib_warning ("unknown dh data group %u (data len %u)", sa->dh_group,
-                   vec_len (sa->i_dh_data));
       sa->dh_group = IKEV2_TRANSFORM_DH_TYPE_NONE;
       return;
     }
@@ -382,7 +396,6 @@ ikev2_complete_sa_data (ikev2_sa_t * sa, ikev2_sa_t * sai)
   ikev2_sa_transform_t *t = 0, *t2;
   ikev2_main_t *km = &ikev2_main;
 
-
   /*move some data to the new SA */
 #define _(A) ({void* __tmp__ = (A); (A) = 0; __tmp__;})
   sa->i_nonce = _(sai->i_nonce);
@@ -392,15 +405,22 @@ ikev2_complete_sa_data (ikev2_sa_t * sa, ikev2_sa_t * sai)
   sa->raddr.as_u32 = sai->raddr.as_u32;
   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->is_profile_index_set = sai->is_profile_index_set;
+  sa->tun_itf = sai->tun_itf;
+  sa->is_tun_itf_set = sai->is_tun_itf_set;
   sa->i_id.data = _(sai->i_id.data);
+  sa->r_id.data = _(sai->r_id.data);
   sa->i_auth.method = sai->i_auth.method;
   sa->i_auth.hex = sai->i_auth.hex;
   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->childs = _(sai->childs);
+  sa->udp_encap = sai->udp_encap;
+  sa->ipsec_over_udp_port = sai->ipsec_over_udp_port;
+  sa->dst_port = sai->dst_port;
+  sa->sw_if_index = sai->sw_if_index;
 #undef _
 
 
@@ -421,8 +441,6 @@ ikev2_complete_sa_data (ikev2_sa_t * sa, ikev2_sa_t * sai)
 
   if (!t)
     {
-      clib_warning ("unknown dh data group %u (data len %u)", sa->dh_group,
-                   vec_len (sa->i_dh_data));
       sa->dh_group = IKEV2_TRANSFORM_DH_TYPE_NONE;
       return;
     }
@@ -440,7 +458,7 @@ ikev2_calc_keys (ikev2_sa_t * sa)
   /* calculate SKEYSEED = prf(Ni | Nr, g^ir) */
   u8 *skeyseed = 0;
   u8 *s = 0;
-  u16 integ_key_len = 0;
+  u16 integ_key_len = 0, salt_len = 0;
   ikev2_sa_transform_t *tr_encr, *tr_prf, *tr_integ;
   tr_encr =
     ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
@@ -451,6 +469,8 @@ ikev2_calc_keys (ikev2_sa_t * sa)
 
   if (tr_integ)
     integ_key_len = tr_integ->key_len;
+  else
+    salt_len = sizeof (u32);
 
   vec_append (s, sa->i_nonce);
   vec_append (s, sa->r_nonce);
@@ -468,7 +488,8 @@ ikev2_calc_keys (ikev2_sa_t * sa)
   int len = tr_prf->key_trunc +        /* SK_d */
     integ_key_len * 2 +                /* SK_ai, SK_ar */
     tr_encr->key_len * 2 +     /* SK_ei, SK_er */
-    tr_prf->key_len * 2;       /* SK_pi, SK_pr */
+    tr_prf->key_len * 2 +      /* SK_pi, SK_pr */
+    salt_len * 2;
 
   keymat = ikev2_calc_prfplus (tr_prf, skeyseed, s, len);
   vec_free (skeyseed);
@@ -495,14 +516,14 @@ ikev2_calc_keys (ikev2_sa_t * sa)
     }
 
   /* SK_ei */
-  sa->sk_ei = vec_new (u8, tr_encr->key_len);
-  clib_memcpy_fast (sa->sk_ei, keymat + pos, tr_encr->key_len);
-  pos += tr_encr->key_len;
+  sa->sk_ei = vec_new (u8, tr_encr->key_len + salt_len);
+  clib_memcpy_fast (sa->sk_ei, keymat + pos, tr_encr->key_len + salt_len);
+  pos += tr_encr->key_len + salt_len;
 
   /* SK_er */
-  sa->sk_er = vec_new (u8, tr_encr->key_len);
-  clib_memcpy_fast (sa->sk_er, keymat + pos, tr_encr->key_len);
-  pos += tr_encr->key_len;
+  sa->sk_er = vec_new (u8, tr_encr->key_len + salt_len);
+  clib_memcpy_fast (sa->sk_er, keymat + pos, tr_encr->key_len + salt_len);
+  pos += tr_encr->key_len + salt_len;
 
   /* SK_pi */
   sa->sk_pi = vec_new (u8, tr_prf->key_len);
@@ -588,21 +609,33 @@ ikev2_calc_child_keys (ikev2_sa_t * sa, ikev2_child_sa_t * child)
   vec_free (keymat);
 }
 
+static_always_inline u8 *
+ikev2_compute_nat_sha1 (u64 ispi, u64 rspi, u32 ip, u16 port)
+{
+  /* ispi, rspi, ip, port */
+  u8 buf[8 + 8 + 4 + 2];
+  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);
+  return res;
+}
+
 static void
 ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
-                          ike_header_t * ike)
+                          ike_header_t * ike, udp_header_t * udp)
 {
   int p = 0;
   u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
 
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-               "exchange %x flags %x msgid %x length %u",
-               clib_net_to_host_u64 (ike->ispi),
-               clib_net_to_host_u64 (ike->rspi),
-               payload, ike->version,
-               ike->exchange, ike->flags,
-               clib_net_to_host_u32 (ike->msgid), len);
+  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);
 
   sa->ispi = clib_net_to_host_u64 (ike->ispi);
 
@@ -638,6 +671,37 @@ ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
       else if (payload == IKEV2_PAYLOAD_NOTIFY)
        {
          ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+         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);
+             if (clib_memcmp (src_sha, n->data, vec_len (src_sha)))
+               {
+                 sa->natt = 1;
+                 ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx initiator"
+                                  " behind NAT", sa->ispi);
+               }
+             vec_free (src_sha);
+           }
+         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);
+             if (clib_memcmp (dst_sha, n->data, vec_len (dst_sha)))
+               {
+                 sa->natt = 1;
+                 ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx responder"
+                                  " (self) behind NAT", sa->ispi);
+               }
+             vec_free (dst_sha);
+           }
          vec_free (n);
        }
       else if (payload == IKEV2_PAYLOAD_VENDOR)
@@ -646,8 +710,8 @@ ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else
        {
-         clib_warning ("unknown payload %u flags %x length %u", payload,
-                       ikep->flags, plen);
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "Unknown payload! type=%d",
+                          payload);
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
              ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
@@ -665,23 +729,19 @@ ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
 
 static void
 ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
-                           ike_header_t * ike)
+                           ike_header_t * ike, udp_header_t * udp)
 {
   int p = 0;
   u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
 
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-               "exchange %x flags %x msgid %x length %u",
-               clib_net_to_host_u64 (ike->ispi),
-               clib_net_to_host_u64 (ike->rspi),
-               payload, ike->version,
-               ike->exchange, ike->flags,
-               clib_net_to_host_u32 (ike->msgid), len);
-
   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);
+
   /* store whole IKE payload - needed for PSK auth */
   vec_free (sa->last_sa_init_res_packet_data);
   vec_add (sa->last_sa_init_res_packet_data, ike, len);
@@ -720,6 +780,35 @@ ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
       else if (payload == IKEV2_PAYLOAD_NOTIFY)
        {
          ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+         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),
+                                                   udp->src_port);
+             if (clib_memcmp (src_sha, n->data, vec_len (src_sha)))
+               {
+                 ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx responder"
+                                  " behind NAT, unsupported", sa->ispi);
+               }
+             vec_free (src_sha);
+           }
+         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,
+                                                   udp->dst_port);
+             if (clib_memcmp (dst_sha, n->data, vec_len (dst_sha)))
+               {
+                 sa->natt = 1;
+                 ikev2_elog_uint (IKEV2_LOG_DEBUG, "ispi %lx initiator"
+                                  " (self) behind NAT", sa->ispi);
+               }
+             vec_free (dst_sha);
+           }
          vec_free (n);
        }
       else if (payload == IKEV2_PAYLOAD_VENDOR)
@@ -728,8 +817,8 @@ ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else
        {
-         clib_warning ("unknown payload %u flags %x length %u", payload,
-                       ikep->flags, plen);
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "Unknown payload! type=%d",
+                          payload);
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
              ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
@@ -746,15 +835,23 @@ 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_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
   int p = 0;
-  u8 last_payload = 0;
+  u8 last_payload = 0, *plaintext = 0;
   u8 *hmac = 0;
   u32 len = clib_net_to_host_u32 (ike->length);
   ike_payload_header_t *ikep = 0;
   u32 plen = 0;
   ikev2_sa_transform_t *tr_integ;
+  ikev2_sa_transform_t *tr_encr;
   tr_integ =
     ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+  tr_encr =
+    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)
+    return 0;
 
   while (p < len &&
         *payload != IKEV2_PAYLOAD_NONE && last_payload != IKEV2_PAYLOAD_SK)
@@ -767,13 +864,12 @@ ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
 
       if (*payload == IKEV2_PAYLOAD_SK)
        {
-         clib_warning ("received IKEv2 payload SK, len %u", plen - 4);
          last_payload = *payload;
        }
       else
        {
-         clib_warning ("unknown payload %u flags %x length %u", payload,
-                       ikep->flags, plen);
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "Unknown payload! type=%d",
+                          *payload);
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
              sa->unsupported_cp = *payload;
@@ -787,25 +883,64 @@ ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
 
   if (last_payload != IKEV2_PAYLOAD_SK)
     {
-      clib_warning ("Last payload must be SK");
+      ikev2_elog_error ("Last payload must be SK");
       return 0;
     }
 
-  hmac =
-    ikev2_calc_integr (tr_integ, sa->is_initiator ? sa->sk_ar : sa->sk_ai,
-                      (u8 *) ike, len - tr_integ->key_trunc);
+  if (is_aead)
+    {
+      if (plen < sizeof (*ikep) + IKEV2_GCM_ICV_SIZE)
+       return 0;
 
-  plen = plen - sizeof (*ikep) - tr_integ->key_trunc;
+      plen -= sizeof (*ikep) + IKEV2_GCM_ICV_SIZE;
+      u8 *aad = (u8 *) ike;
+      u32 aad_len = ikep->payload - aad;
+      u8 *tag = ikep->payload + plen;
 
-  if (memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
+      plaintext = ikev2_decrypt_aead_data (ptd, sa, tr_encr, ikep->payload,
+                                          plen, aad, aad_len, tag);
+    }
+  else
     {
-      clib_warning ("message integrity check failed");
+      if (len < 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);
+
+      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))
+       {
+         ikev2_elog_error ("message integrity check failed");
+         vec_free (hmac);
+         return 0;
+       }
       vec_free (hmac);
-      return 0;
+
+      plaintext = ikev2_decrypt_data (ptd, sa, tr_encr, ikep->payload, plen);
     }
-  vec_free (hmac);
 
-  return ikev2_decrypt_data (sa, ikep->payload, plen);
+  return plaintext;
+}
+
+static_always_inline int
+ikev2_is_id_equal (ikev2_id_t * i1, ikev2_id_t * i2)
+{
+  if (i1->type != i2->type)
+    return 0;
+
+  if (vec_len (i1->data) != vec_len (i2->data))
+    return 0;
+
+  if (memcmp (i1->data, i2->data, vec_len (i1->data)))
+    return 0;
+
+  return 1;
 }
 
 static void
@@ -823,9 +958,8 @@ ikev2_initial_contact_cleanup (ikev2_sa_t * sa)
   /* find old IKE SAs with the same authenticated identity */
   /* *INDENT-OFF* */
   pool_foreach (tmp, km->per_thread_data[thread_index].sas, ({
-        if (tmp->i_id.type != sa->i_id.type ||
-            vec_len(tmp->i_id.data) != vec_len(sa->i_id.data) ||
-            memcmp(sa->i_id.data, tmp->i_id.data, vec_len(sa->i_id.data)))
+        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)
@@ -852,20 +986,16 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
 {
   ikev2_child_sa_t *first_child_sa;
   int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
   u8 *plaintext = 0;
-
   ike_payload_header_t *ikep;
   u32 plen;
 
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-               "exchange %x flags %x msgid %x length %u",
-               clib_net_to_host_u64 (ike->ispi),
-               clib_net_to_host_u64 (ike->rspi),
-               payload, ike->version,
-               ike->exchange, ike->flags,
-               clib_net_to_host_u32 (ike->msgid), len);
+  ikev2_elog_exchange ("ispi %lx rspi %lx EXCHANGE_IKE_AUTH received "
+                      "from %d.%d.%d.%d", 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);
 
   ikev2_calc_keys (sa);
 
@@ -902,7 +1032,6 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
 
       if (payload == IKEV2_PAYLOAD_SA) /* 33 */
        {
-         clib_warning ("received payload SA, len %u", plen - sizeof (*ikep));
          if (sa->is_initiator)
            {
              ikev2_sa_free_proposal_vector (&first_child_sa->r_proposals);
@@ -921,9 +1050,6 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
          sa->i_id.type = id->id_type;
          vec_free (sa->i_id.data);
          vec_add (sa->i_id.data, id->payload, plen - sizeof (*id));
-
-         clib_warning ("received payload IDi, len %u id_type %u",
-                       plen - sizeof (*id), id->id_type);
        }
       else if (payload == IKEV2_PAYLOAD_IDR)   /* 36 */
        {
@@ -932,9 +1058,6 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
          sa->r_id.type = id->id_type;
          vec_free (sa->r_id.data);
          vec_add (sa->r_id.data, id->payload, plen - sizeof (*id));
-
-         clib_warning ("received payload IDr len %u id_type %u",
-                       plen - sizeof (*id), id->id_type);
        }
       else if (payload == IKEV2_PAYLOAD_AUTH)  /* 39 */
        {
@@ -952,9 +1075,6 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
              vec_free (sa->i_auth.data);
              vec_add (sa->i_auth.data, a->payload, plen - sizeof (*a));
            }
-
-         clib_warning ("received payload AUTH, len %u auth_type %u",
-                       plen - sizeof (*a), a->auth_method);
        }
       else if (payload == IKEV2_PAYLOAD_NOTIFY)        /* 41 */
        {
@@ -971,25 +1091,18 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
        }
       else if (payload == IKEV2_PAYLOAD_TSI)   /* 44 */
        {
-         clib_warning ("received payload TSi, len %u",
-                       plen - sizeof (*ikep));
-
          vec_free (first_child_sa->tsi);
          first_child_sa->tsi = ikev2_parse_ts_payload (ikep);
        }
       else if (payload == IKEV2_PAYLOAD_TSR)   /* 45 */
        {
-         clib_warning ("received payload TSr, len %u",
-                       plen - sizeof (*ikep));
-
          vec_free (first_child_sa->tsr);
          first_child_sa->tsr = ikev2_parse_ts_payload (ikep);
        }
       else
        {
-         clib_warning ("unknown payload %u flags %x length %u data %u",
-                       payload, ikep->flags, plen - 4,
-                       format_hex_bytes, ikep->payload, plen - 4);
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "Unknown payload! type=%d",
+                          payload);
 
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
@@ -1012,20 +1125,15 @@ ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
                                 ike_header_t * ike)
 {
   int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
   u8 *plaintext = 0;
-
   ike_payload_header_t *ikep;
   u32 plen;
 
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-               "exchange %x flags %x msgid %x length %u",
-               clib_net_to_host_u64 (ike->ispi),
-               clib_net_to_host_u64 (ike->rspi),
-               payload, ike->version,
-               ike->exchange, ike->flags,
-               clib_net_to_host_u32 (ike->msgid), len);
+  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);
 
   plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
 
@@ -1059,10 +1167,8 @@ ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else
        {
-         clib_warning ("unknown payload %u flags %x length %u data %u",
-                       payload, ikep->flags, plen - 4,
-                       format_hex_bytes, ikep->payload, plen - 4);
-
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "Unknown payload! type=%d",
+                          payload);
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
              sa->unsupported_cp = payload;
@@ -1083,7 +1189,6 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
                                   ike_header_t * ike)
 {
   int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
   u8 payload = ike->nextpayload;
   u8 *plaintext = 0;
   u8 rekeying = 0;
@@ -1097,13 +1202,9 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
   ikev2_sa_proposal_t *proposal = 0;
   ikev2_child_sa_t *child_sa;
 
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-               "exchange %x flags %x msgid %x length %u",
-               clib_net_to_host_u64 (ike->ispi),
-               clib_net_to_host_u64 (ike->rspi),
-               payload, ike->version,
-               ike->exchange, ike->flags,
-               clib_net_to_host_u32 (ike->msgid), len);
+  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);
 
   plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
 
@@ -1154,14 +1255,12 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
        }
       else
        {
-         clib_warning ("unknown payload %u flags %x length %u data %u",
-                       payload, ikep->flags, plen - 4,
-                       format_hex_bytes, ikep->payload, plen - 4);
-
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "Unknown payload! type=%d",
+                          payload);
          if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
            {
              sa->unsupported_cp = payload;
-             return;
+             goto cleanup_and_exit;
            }
        }
 
@@ -1194,7 +1293,8 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
       child_sa = ikev2_sa_get_child (sa, n->spi, n->protocol_id, 1);
       if (!child_sa)
        {
-         clib_warning ("child SA spi %lx not found", n->spi);
+         ikev2_elog_uint (IKEV2_LOG_ERROR, "child SA spi %lx not found",
+                          n->spi);
          goto cleanup_and_exit;
        }
       vec_add2 (sa->rekey, rekey, 1);
@@ -1280,7 +1380,7 @@ ikev2_sa_match_ts (ikev2_sa_t * sa)
   ikev2_main_t *km = &ikev2_main;
   ikev2_profile_t *p;
   ikev2_ts_t *ts, *p_tsi, *p_tsr, *tsi = 0, *tsr = 0;
-  ikev2_id_t *id;
+  ikev2_id_t *id_rem, *id_loc;
 
   /* *INDENT-OFF* */
   pool_foreach (p, km->profiles, ({
@@ -1289,21 +1389,24 @@ ikev2_sa_match_ts (ikev2_sa_t * sa)
       {
         p_tsi = &p->loc_ts;
         p_tsr = &p->rem_ts;
-        id = &sa->r_id;
+        id_rem = &sa->r_id;
+        id_loc = &sa->i_id;
       }
     else
       {
         p_tsi = &p->rem_ts;
         p_tsr = &p->loc_ts;
-        id = &sa->i_id;
+        id_rem = &sa->i_id;
+        id_loc = &sa->r_id;
       }
 
     /* check id */
-    if (p->rem_id.type != id->type ||
-        vec_len(p->rem_id.data) != vec_len(id->data) ||
-        memcmp(p->rem_id.data, id->data, vec_len(p->rem_id.data)))
+    if (!ikev2_is_id_equal (&p->rem_id, id_rem)
+          || !ikev2_is_id_equal (&p->loc_id, id_loc))
       continue;
 
+    sa->profile_index = p - km->profiles;
+
     vec_foreach(ts, sa->childs[0].tsi)
       {
         if (ikev2_ts_cmp(p_tsi, ts))
@@ -1356,8 +1459,9 @@ ikev2_sa_auth (ikev2_sa_t * sa)
   if (!(sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC ||
        sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG))
     {
-      clib_warning ("unsupported authentication method %u",
-                   sa->i_auth.method);
+      ikev2_elog_uint (IKEV2_LOG_ERROR,
+                      "unsupported authentication method %u",
+                      sa->i_auth.method);
       ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
       return;
     }
@@ -1365,17 +1469,19 @@ ikev2_sa_auth (ikev2_sa_t * sa)
   key_pad = format (0, "%s", IKEV2_KEY_PAD);
   authmsg = ikev2_sa_generate_authmsg (sa, sa->is_initiator);
 
-  ikev2_id_t *sa_id;
+  ikev2_id_t *id_rem, *id_loc;
   ikev2_auth_t *sa_auth;
 
   if (sa->is_initiator)
     {
-      sa_id = &sa->r_id;
+      id_rem = &sa->r_id;
+      id_loc = &sa->i_id;
       sa_auth = &sa->r_auth;
     }
   else
     {
-      sa_id = &sa->i_id;
+      id_rem = &sa->i_id;
+      id_loc = &sa->r_id;
       sa_auth = &sa->i_auth;
     }
 
@@ -1383,9 +1489,8 @@ ikev2_sa_auth (ikev2_sa_t * sa)
   pool_foreach (p, km->profiles, ({
 
     /* check id */
-    if (p->rem_id.type != sa_id->type ||
-        vec_len(p->rem_id.data) != vec_len(sa_id->data) ||
-        memcmp(p->rem_id.data, sa_id->data, vec_len(p->rem_id.data)))
+    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)
@@ -1424,6 +1529,11 @@ ikev2_sa_auth (ikev2_sa_t * sa)
   }));
   /* *INDENT-ON* */
 
+  if (sel_p)
+    {
+      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)
@@ -1433,6 +1543,8 @@ ikev2_sa_auth (ikev2_sa_t * sa)
          vec_free (sa->r_id.data);
          sa->r_id.data = vec_dup (sel_p->loc_id.data);
          sa->r_id.type = sel_p->loc_id.type;
+         sa->i_id.data = vec_dup (sel_p->rem_id.data);
+         sa->i_id.type = sel_p->rem_id.type;
 
          /* generate our auth data */
          authmsg = ikev2_sa_generate_authmsg (sa, 1);
@@ -1453,10 +1565,18 @@ ikev2_sa_auth (ikev2_sa_t * sa)
          sa->childs[0].r_proposals =
            ikev2_select_proposal (sa->childs[0].i_proposals,
                                   IKEV2_PROTOCOL_ESP);
+
+         if (~0 != sel_p->tun_itf)
+           {
+             sa->is_tun_itf_set = 1;
+             sa->tun_itf = sel_p->tun_itf;
+           }
        }
     }
   else
     {
+      ikev2_elog_uint (IKEV2_LOG_ERROR, "authentication failed, no matching "
+                      "profile found! ispi %lx", sa->ispi);
       ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
     }
   vec_free (psk);
@@ -1468,7 +1588,7 @@ static void
 ikev2_sa_auth_init (ikev2_sa_t * sa)
 {
   ikev2_main_t *km = &ikev2_main;
-  u8 *authmsg, *key_pad, *psk = 0, *auth = 0;
+  u8 *authmsg, *key_pad, *psk = 0;
   ikev2_sa_transform_t *tr_prf;
 
   tr_prf =
@@ -1478,8 +1598,9 @@ ikev2_sa_auth_init (ikev2_sa_t * sa)
   if (!(sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC ||
        sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG))
     {
-      clib_warning ("unsupported authentication method %u",
-                   sa->i_auth.method);
+      ikev2_elog_uint (IKEV2_LOG_ERROR,
+                      "unsupported authentication method %u",
+                      sa->i_auth.method);
       ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
       return;
     }
@@ -1487,8 +1608,6 @@ ikev2_sa_auth_init (ikev2_sa_t * sa)
   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);
-  auth = ikev2_calc_prf (tr_prf, psk, authmsg);
-
 
   if (sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
     {
@@ -1503,7 +1622,6 @@ ikev2_sa_auth_init (ikev2_sa_t * sa)
 
   vec_free (psk);
   vec_free (key_pad);
-  vec_free (auth);
   vec_free (authmsg);
 }
 
@@ -1521,6 +1639,7 @@ ikev2_mk_remote_sa_id (u32 sai, u32 ci, u32 ti)
 
 typedef struct
 {
+  u32 sw_if_index;
   u32 salt_local;
   u32 salt_remote;
   u32 local_sa_id;
@@ -1533,41 +1652,86 @@ typedef struct
   ip46_address_t local_ip;
   ip46_address_t remote_ip;
   ipsec_key_t loc_ckey, rem_ckey, loc_ikey, rem_ikey;
+  u8 is_rekey;
+  u32 old_remote_sa_id;
+  u16 ipsec_over_udp_port;
+  u16 src_port;
+  u16 dst_port;
 } ikev2_add_ipsec_tunnel_args_t;
 
 static void
 ikev2_add_tunnel_from_main (ikev2_add_ipsec_tunnel_args_t * a)
 {
+  ikev2_main_t *km = &ikev2_main;
   u32 sw_if_index;
-  int rv;
+  int rv = 0;
+
+  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,
+                           TUNNEL_ENCAP_DECAP_FLAG_NONE, IP_DSCP_CS0,
+                           TUNNEL_MODE_P2P, &sw_if_index);
+
+      if (rv == VNET_API_ERROR_IF_ALREADY_EXISTS)
+       {
+         if (hash_get (km->sw_if_indices, sw_if_index))
+           /* interface is managed by IKE; proceed with updating SAs */
+           rv = 0;
+       }
+      hash_set1 (km->sw_if_indices, sw_if_index);
+    }
+  else
+    {
+      sw_if_index = a->sw_if_index;
+      vnet_sw_interface_admin_up (vnet_get_main (), sw_if_index);
+    }
 
-  rv = ipip_add_tunnel (IPIP_TRANSPORT_IP4, ~0,
-                       &a->local_ip, &a->remote_ip, 0, 0, &sw_if_index);
+  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);
+      return;
+    }
+
+  u32 *sas_in = NULL;
+  vec_add1 (sas_in, a->remote_sa_id);
+  if (a->is_rekey)
+    {
+      ipsec_tun_protect_del (sw_if_index, NULL);
+
+      /* replace local SA immediately */
+      ipsec_sa_unlock_id (a->local_sa_id);
+
+      /* keep the old sa */
+      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->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->local_ip, NULL, a->ipsec_over_udp_port,
+                              a->ipsec_over_udp_port);
 
-  u32 *sas_in = NULL;
-  vec_add1 (sas_in, a->remote_sa_id);
-  rv |= ipsec_tun_protect_update (sw_if_index, a->local_sa_id, sas_in);
+  rv |= ipsec_tun_protect_update (sw_if_index, NULL, a->local_sa_id, sas_in);
 }
 
 static int
-ikev2_create_tunnel_interface (vnet_main_t * vnm,
+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)
+                              u32 child_index, u8 is_rekey)
 {
   ikev2_main_t *km = &ikev2_main;
   ipsec_crypto_alg_t encr_type;
@@ -1590,7 +1754,7 @@ ikev2_create_tunnel_interface (vnet_main_t * vnm,
     {
       ip46_address_set_ip4 (&a.local_ip, &sa->iaddr);
       ip46_address_set_ip4 (&a.remote_ip, &sa->raddr);
-      proposals = child->i_proposals;
+      proposals = child->r_proposals;
       a.local_spi = child->r_proposals[0].spi;
       a.remote_spi = child->i_proposals[0].spi;
     }
@@ -1598,12 +1762,20 @@ ikev2_create_tunnel_interface (vnet_main_t * vnm,
     {
       ip46_address_set_ip4 (&a.local_ip, &sa->raddr);
       ip46_address_set_ip4 (&a.remote_ip, &sa->iaddr);
-      proposals = child->r_proposals;
+      proposals = child->i_proposals;
       a.local_spi = child->i_proposals[0].spi;
       a.remote_spi = child->r_proposals[0].spi;
     }
 
   a.flags = IPSEC_SA_FLAG_USE_ANTI_REPLAY;
+  if (sa->udp_encap)
+    {
+      a.flags |= IPSEC_SA_FLAG_IS_TUNNEL;
+      a.flags |= IPSEC_SA_FLAG_UDP_ENCAP;
+    }
+  if (sa->natt)
+    a.flags |= IPSEC_SA_FLAG_UDP_ENCAP;
+  a.is_rekey = is_rekey;
 
   tr = ikev2_sa_get_td_for_type (proposals, IKEV2_TRANSFORM_TYPE_ESN);
   if (tr && tr->esn_type)
@@ -1714,6 +1886,7 @@ ikev2_create_tunnel_interface (vnet_main_t * vnm,
          a.salt_remote = child->salt_er;
          a.salt_local = child->salt_ei;
        }
+      a.dst_port = a.src_port = sa->ipsec_over_udp_port;
     }
   else
     {
@@ -1726,15 +1899,16 @@ ikev2_create_tunnel_interface (vnet_main_t * vnm,
          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.src_port = sa->ipsec_over_udp_port;
     }
 
-  if (sa->is_profile_index_set)
+  if (sa->is_initiator && sa->profile_index != ~0)
     p = pool_elt_at_index (km->profiles, sa->profile_index);
 
   if (p && p->lifetime)
     {
-      child->time_to_expiration =
-       vlib_time_now (vnm->vlib_main) + p->lifetime;
+      child->time_to_expiration = vlib_time_now (vm) + p->lifetime;
       if (p->lifetime_jitter)
        {
          // This is not much better than rand(3), which Coverity warns
@@ -1742,7 +1916,7 @@ ikev2_create_tunnel_interface (vnet_main_t * vnm,
          // however fast. If this perturbance to the expiration time
          // needs to use a better RNG then we may need to use something
          // like /dev/urandom which has significant overhead.
-         u32 rnd = (u32) (vlib_time_now (vnm->vlib_main) * 1e6);
+         u32 rnd = (u32) (vlib_time_now (vm) * 1e6);
          rnd = random_u32 (&rnd);
 
          child->time_to_expiration += 1 + (rnd % p->lifetime_jitter);
@@ -1750,17 +1924,44 @@ ikev2_create_tunnel_interface (vnet_main_t * vnm,
     }
 
   if (thread_index & 0xffffffc0)
-    clib_warning ("error: thread index exceeds max range 0x3f!");
+    ikev2_elog_error ("error: thread index exceeds max range 0x3f!");
 
   if (child_index & 0xfffff000 || sa_index & 0xfffff000)
-    clib_warning ("error: sa/child index exceeds max range 0xfff!");
+    ikev2_elog_error ("error: sa/child index exceeds max range 0xfff!");
 
   child->local_sa_id =
     a.local_sa_id =
     ikev2_mk_local_sa_id (sa_index, child_index, thread_index);
-  child->remote_sa_id =
-    a.remote_sa_id =
-    ikev2_mk_remote_sa_id (sa_index, child_index, thread_index);
+
+  u32 remote_sa_id = ikev2_mk_remote_sa_id (sa_index, child_index,
+                                           thread_index);
+
+  if (is_rekey)
+    {
+      /* create a new remote SA ID to keep the old SA for a bit longer
+       * so the peer has some time to swap their SAs */
+
+      /* use most significat bit of child index part in id */
+      u32 mask = 0x800;
+      if (sa->current_remote_id_mask)
+       {
+         sa->old_remote_id = a.old_remote_sa_id = remote_sa_id | mask;
+         sa->current_remote_id_mask = 0;
+       }
+      else
+       {
+         sa->old_remote_id = a.old_remote_sa_id = remote_sa_id;
+         sa->current_remote_id_mask = mask;
+         remote_sa_id |= mask;
+       }
+      sa->old_id_expiration = 3.0;
+      sa->old_remote_id_present = 1;
+    }
+
+  child->remote_sa_id = a.remote_sa_id = remote_sa_id;
+
+  a.sw_if_index = (sa->is_tun_itf_set ? sa->tun_itf : ~0);
+  a.ipsec_over_udp_port = sa->ipsec_over_udp_port;
 
   vl_api_rpc_call_main_thread (ikev2_add_tunnel_from_main,
                               (u8 *) & a, sizeof (a));
@@ -1773,30 +1974,61 @@ typedef struct
   ip46_address_t remote_ip;
   u32 remote_sa_id;
   u32 local_sa_id;
+  u32 sw_if_index;
 } ikev2_del_ipsec_tunnel_args_t;
 
+static_always_inline u32
+ikev2_flip_alternate_sa_bit (u32 id)
+{
+  u32 mask = 0x800;
+  if (mask & id)
+    return id & ~mask;
+  return id | mask;
+}
+
 static void
 ikev2_del_tunnel_from_main (ikev2_del_ipsec_tunnel_args_t * a)
 {
-  /* *INDENT-OFF* */
-  ipip_tunnel_key_t key = {
-    .src = a->local_ip,
-    .dst = a->remote_ip,
-    .transport = IPIP_TRANSPORT_IP4,
-    .fib_index = 0,
-  };
-  ipip_tunnel_t *ipip;
-  /* *INDENT-ON* */
+  ikev2_main_t *km = &ikev2_main;
+  ipip_tunnel_t *ipip = NULL;
+  u32 sw_if_index;
+
+  if (~0 == a->sw_if_index)
+    {
+    /* *INDENT-OFF* */
+    ipip_tunnel_key_t key = {
+      .src = a->local_ip,
+      .dst = a->remote_ip,
+      .transport = IPIP_TRANSPORT_IP4,
+      .fib_index = 0,
+    };
+    /* *INDENT-ON* */
 
-  ipip = ipip_tunnel_db_find (&key);
+      ipip = ipip_tunnel_db_find (&key);
 
-  if (ipip)
+      if (ipip)
+       {
+         sw_if_index = ipip->sw_if_index;
+         hash_unset (km->sw_if_indices, ipip->sw_if_index);
+       }
+      else
+       sw_if_index = ~0;
+    }
+  else
     {
-      ipsec_tun_protect_del (ipip->sw_if_index);
-      ipsec_sa_unlock_id (a->remote_sa_id);
-      ipsec_sa_unlock_id (a->local_sa_id);
-      ipip_del_tunnel (ipip->sw_if_index);
+      sw_if_index = a->sw_if_index;
+      vnet_sw_interface_admin_down (vnet_get_main (), sw_if_index);
     }
+
+  if (~0 != sw_if_index)
+    ipsec_tun_protect_del (sw_if_index, NULL);
+
+  ipsec_sa_unlock_id (a->remote_sa_id);
+  ipsec_sa_unlock_id (a->local_sa_id);
+  ipsec_sa_unlock_id (ikev2_flip_alternate_sa_bit (a->remote_sa_id));
+
+  if (ipip)
+    ipip_del_tunnel (ipip->sw_if_index);
 }
 
 static int
@@ -1820,6 +2052,7 @@ ikev2_delete_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
 
   a.remote_sa_id = child->remote_sa_id;
   a.local_sa_id = child->local_sa_id;
+  a.sw_if_index = (sa->is_tun_itf_set ? sa->tun_itf : ~0);
 
   vl_api_rpc_call_main_thread (ikev2_del_tunnel_from_main, (u8 *) & a,
                               sizeof (a));
@@ -1827,7 +2060,8 @@ 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)
+ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user,
+                       udp_header_t * udp)
 {
   v8 *integ = 0;
   ike_payload_header_t *ph;
@@ -1881,10 +2115,30 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user)
        }
       else
        {
+         ASSERT (udp);
+
          ike->rspi = clib_host_to_net_u64 (sa->rspi);
          ikev2_payload_add_sa (chain, sa->r_proposals);
          ikev2_payload_add_ke (chain, sa->dh_group, sa->r_dh_data);
          ikev2_payload_add_nonce (chain, sa->r_nonce);
+
+         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);
+         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),
+                                   sa->iaddr.as_u32, udp->src_port);
+         ikev2_payload_add_notify (chain,
+                                   IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP,
+                                   nat_detection_sha1);
+         vec_free (nat_detection_sha1);
        }
     }
   else if (ike->exchange == IKEV2_EXCHANGE_IKE_AUTH)
@@ -1892,6 +2146,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user)
       if (sa->state == IKEV2_STATE_AUTHENTICATED)
        {
          ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
+         ikev2_payload_add_id (chain, &sa->i_id, IKEV2_PAYLOAD_IDI);
          ikev2_payload_add_auth (chain, &sa->r_auth);
          ikev2_payload_add_sa (chain, sa->childs[0].r_proposals);
          ikev2_payload_add_ts (chain, sa->childs[0].tsi, IKEV2_PAYLOAD_TSI);
@@ -1933,10 +2188,13 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user)
       else if (sa->state == IKEV2_STATE_SA_INIT)
        {
          ikev2_payload_add_id (chain, &sa->i_id, IKEV2_PAYLOAD_IDI);
+         ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
          ikev2_payload_add_auth (chain, &sa->i_auth);
          ikev2_payload_add_sa (chain, sa->childs[0].i_proposals);
          ikev2_payload_add_ts (chain, sa->childs[0].tsi, IKEV2_PAYLOAD_TSI);
          ikev2_payload_add_ts (chain, sa->childs[0].tsr, IKEV2_PAYLOAD_TSR);
+         ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_INITIAL_CONTACT,
+                                   0);
        }
       else
        {
@@ -2011,7 +2269,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user)
        }
       else
        {
-         if (sa->rekey)
+         if (vec_len (sa->rekey) > 0)
            {
              ikev2_payload_add_sa (chain, sa->rekey[0].r_proposal);
              ikev2_payload_add_nonce (chain, sa->r_nonce);
@@ -2069,7 +2327,7 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user)
     }
   else
     {
-
+      ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
       ikev2_payload_chain_add_padding (chain, tr_encr->block_size);
 
       /* SK payload */
@@ -2077,24 +2335,40 @@ ikev2_generate_message (ikev2_sa_t * sa, ike_header_t * ike, void *user)
       ph = (ike_payload_header_t *) & ike->payload[0];
       ph->nextpayload = chain->first_payload_type;
       ph->flags = 0;
-      int enc_len = ikev2_encrypt_data (sa, chain->data, ph->payload);
-      plen += enc_len;
-
-      /* add space for hmac */
-      plen += tr_integ->key_trunc;
+      int is_aead =
+       tr_encr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_GCM_16;
+      int iv_len = is_aead ? IKEV2_GCM_IV_SIZE : tr_encr->block_size;
+      plen += vec_len (chain->data) + iv_len;
+
+      /* add space for hmac/tag */
+      if (tr_integ)
+       plen += tr_integ->key_trunc;
+      else
+       plen += IKEV2_GCM_ICV_SIZE;
       tlen += plen;
 
       /* payload and total length */
       ph->length = clib_host_to_net_u16 (plen);
       ike->length = clib_host_to_net_u32 (tlen);
 
-      /* calc integrity data for whole packet except hash itself */
-      integ =
-       ikev2_calc_integr (tr_integ, sa->is_initiator ? sa->sk_ai : sa->sk_ar,
-                          (u8 *) ike, tlen - tr_integ->key_trunc);
-
-      clib_memcpy_fast (ike->payload + tlen - tr_integ->key_trunc -
-                       sizeof (*ike), integ, tr_integ->key_trunc);
+      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);
+       }
+      else
+       {
+         ikev2_encrypt_data (ptd, sa, tr_encr, chain->data, ph->payload);
+         integ =
+           ikev2_calc_integr (tr_integ,
+                              sa->is_initiator ? sa->sk_ai : sa->sk_ar,
+                              (u8 *) ike, tlen - tr_integ->key_trunc);
+         clib_memcpy_fast (ike->payload + tlen - tr_integ->key_trunc -
+                           sizeof (*ike), integ, tr_integ->key_trunc);
+       }
 
       /* store whole IKE payload - needed for retransmit */
       vec_free (sa->last_res_packet_data);
@@ -2151,17 +2425,21 @@ ikev2_retransmit_sa_init (ike_header_t * ike,
                       ike->length = tmp->length;
                       clib_memcpy_fast(ike->payload, tmp->payload,
                              clib_net_to_host_u32(tmp->length) - sizeof(*ike));
-                      clib_warning("IKE_SA_INIT retransmit from %U to %U",
-                                   format_ip4_address, &raddr,
-                                   format_ip4_address, &iaddr);
+                      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
                     {
-                      clib_warning("IKE_SA_INIT ignore from %U to %U",
-                                   format_ip4_address, &raddr,
-                                   format_ip4_address, &iaddr);
+                      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;
                     }
                 }
@@ -2203,23 +2481,47 @@ ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
       ike->length = tmp->length;
       clib_memcpy_fast (ike->payload, tmp->payload,
                        clib_net_to_host_u32 (tmp->length) - sizeof (*ike));
-      clib_warning ("IKE msgid %u retransmit from %U to %U",
-                   msg_id,
-                   format_ip4_address, &sa->raddr,
-                   format_ip4_address, &sa->iaddr);
+      ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE retransmit msgid %d",
+                            msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
       return 1;
     }
   /* old req ignore */
   else
     {
-      clib_warning ("IKE msgid %u req ignore from %U to %U",
-                   msg_id,
-                   format_ip4_address, &sa->raddr,
-                   format_ip4_address, &sa->iaddr);
-      return -1;
+      ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE req ignore msgid %d",
+                            msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
+    }
+  return -1;
+}
+
+static void
+ikev2_init_sa (vlib_main_t * vm, ikev2_sa_t * sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+  sa->liveness_period_check = vlib_time_now (vm) + km->liveness_period;
+  sa->profile_index = ~0;
+}
+
+static void
+ikev2_del_sa_init_from_main (u64 * ispi)
+{
+  ikev2_main_t *km = &ikev2_main;
+  uword *p = hash_get (km->sa_by_ispi, *ispi);
+  if (p)
+    {
+      ikev2_sa_t *sai = pool_elt_at_index (km->sais, p[0]);
+      hash_unset (km->sa_by_ispi, sai->ispi);
+      ikev2_sa_free_all_vec (sai);
+      pool_put (km->sais, sai);
     }
 }
 
+static void
+ikev2_del_sa_init (u64 ispi)
+{
+  vl_api_rpc_call_main_thread (ikev2_del_sa_init_from_main, (u8 *) & ispi,
+                              sizeof (ispi));
+}
 
 static uword
 ikev2_node_fn (vlib_main_t * vm,
@@ -2252,7 +2554,7 @@ ikev2_node_fn (vlib_main_t * vm,
          ikev2_sa_t *sa0 = 0;
          ikev2_sa_t sa;        /* temporary store for SA */
          int len = 0;
-         int r;
+         int r, is_req = 0, has_non_esp_marker = 0;
 
          /* speculatively enqueue b0 to the current next frame */
          bi0 = from[0];
@@ -2263,11 +2565,31 @@ ikev2_node_fn (vlib_main_t * vm,
          n_left_to_next -= 1;
 
          b0 = vlib_get_buffer (vm, bi0);
-         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);
+
+         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;
+           }
+         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;
+           }
 
          if (ike0->version != IKE_VERSION_2)
            {
@@ -2287,6 +2609,7 @@ ikev2_node_fn (vlib_main_t * vm,
                    {
                      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);
 
                      r = ikev2_retransmit_sa_init (ike0, sa0->iaddr,
                                                    sa0->raddr);
@@ -2306,7 +2629,7 @@ ikev2_node_fn (vlib_main_t * vm,
                          goto dispatch0;
                        }
 
-                     ikev2_process_sa_init_req (vm, sa0, ike0);
+                     ikev2_process_sa_init_req (vm, sa0, ike0, udp0);
 
                      if (sa0->state == IKEV2_STATE_SA_INIT)
                        {
@@ -2320,7 +2643,7 @@ ikev2_node_fn (vlib_main_t * vm,
                      if (sa0->state == IKEV2_STATE_SA_INIT
                          || sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE)
                        {
-                         len = ikev2_generate_message (sa0, ike0, 0);
+                         len = ikev2_generate_message (sa0, ike0, 0, udp0);
                        }
 
                      if (sa0->state == IKEV2_STATE_SA_INIT)
@@ -2329,6 +2652,7 @@ ikev2_node_fn (vlib_main_t * vm,
                          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,
@@ -2343,10 +2667,13 @@ ikev2_node_fn (vlib_main_t * vm,
                }
              else              //received sa_init without initiator flag
                {
-                 ikev2_process_sa_init_resp (vm, sa0, ike0);
+                 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);
 
                  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)
@@ -2354,10 +2681,20 @@ ikev2_node_fn (vlib_main_t * vm,
                          ikev2_sa_t *sai =
                            pool_elt_at_index (km->sais, p[0]);
 
-                         ikev2_complete_sa_data (sa0, sai);
-                         ikev2_calc_keys (sa0);
-                         ikev2_sa_auth_init (sa0);
-                         len = ikev2_generate_message (sa0, ike0, 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;
+                           }
                        }
                    }
 
@@ -2404,6 +2741,7 @@ ikev2_node_fn (vlib_main_t * vm,
                      goto dispatch0;
                    }
 
+                 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)
@@ -2411,27 +2749,18 @@ ikev2_node_fn (vlib_main_t * vm,
                      ikev2_initial_contact_cleanup (sa0);
                      ikev2_sa_match_ts (sa0);
                      if (sa0->state != IKEV2_STATE_TS_UNACCEPTABLE)
-                       ikev2_create_tunnel_interface (km->vnet_main,
-                                                      thread_index, sa0,
+                       ikev2_create_tunnel_interface (vm, thread_index, sa0,
                                                       &sa0->childs[0],
-                                                      p[0], 0);
+                                                      p[0], 0, 0);
                    }
 
                  if (sa0->is_initiator)
                    {
-                     uword *p = hash_get (km->sa_by_ispi, ike0->ispi);
-                     if (p)
-                       {
-                         ikev2_sa_t *sai =
-                           pool_elt_at_index (km->sais, p[0]);
-                         hash_unset (km->sa_by_ispi, sai->ispi);
-                         ikev2_sa_free_all_vec (sai);
-                         pool_put (km->sais, sai);
-                       }
+                     ikev2_del_sa_init (ike0->ispi);
                    }
                  else
                    {
-                     len = ikev2_generate_message (sa0, ike0, 0);
+                     len = ikev2_generate_message (sa0, ike0, 0, udp0);
                    }
                }
            }
@@ -2495,9 +2824,10 @@ ikev2_node_fn (vlib_main_t * vm,
                            }
                        }
                    }
-                 if (!sa0->is_initiator)
+                 if (!(ike0->flags & IKEV2_HDR_FLAG_RESPONSE))
                    {
-                     len = ikev2_generate_message (sa0, ike0, 0);
+                     ike0->flags |= IKEV2_HDR_FLAG_RESPONSE;
+                     len = ikev2_generate_message (sa0, ike0, 0, udp0);
                    }
                }
            }
@@ -2534,34 +2864,38 @@ ikev2_node_fn (vlib_main_t * vm,
                    {
                      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 (km->vnet_main,
-                                                        thread_index, sa0,
-                                                        child, p[0],
-                                                        child - sa0->childs);
+                         ikev2_create_tunnel_interface (vm, thread_index,
+                                                        sa0, child, p[0],
+                                                        child - sa0->childs,
+                                                        1);
                        }
                      if (sa0->is_initiator)
                        {
-                         vec_del1 (sa0->rekey, 0);
+                         vec_free (sa0->rekey);
                        }
                      else
                        {
-                         len = ikev2_generate_message (sa0, ike0, 0);
+                         len = ikev2_generate_message (sa0, ike0, 0, udp0);
                        }
                    }
                }
            }
          else
            {
-             clib_warning ("IKEv2 exchange %u packet received from %U to %U",
-                           ike0->exchange,
-                           format_ip4_address, ip40->src_address.as_u8,
-                           format_ip4_address, ip40->dst_address.as_u8);
+             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);
            }
 
        dispatch0:
@@ -2579,6 +2913,29 @@ ikev2_node_fn (vlib_main_t * vm,
                  ip40->dst_address.as_u32 = sa0->iaddr.as_u32;
                  ip40->src_address.as_u32 = sa0->raddr.as_u32;
                }
+
+             if (is_req)
+               {
+                 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);
+                   }
+               }
+             else
+               {
+                 if (has_non_esp_marker)
+                   len += sizeof (ikev2_non_esp_marker);
+
+                 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;
@@ -2678,24 +3035,27 @@ ikev2_set_initiator_proposals (vlib_main_t * vm, ikev2_sa_t * sa,
       return r;
     }
 
-  /* Integrity */
-  error = 1;
-  vec_foreach (td, km->supported_transforms)
-  {
-    if (td->type == IKEV2_TRANSFORM_TYPE_INTEG
-       && td->integ_type == ts->integ_alg)
+  if (IKEV2_TRANSFORM_INTEG_TYPE_NONE != ts->integ_alg)
+    {
+      /* Integrity */
+      error = 1;
+      vec_foreach (td, km->supported_transforms)
       {
-       vec_add1 (proposal->transforms, *td);
-       error = 0;
-       break;
+       if (td->type == IKEV2_TRANSFORM_TYPE_INTEG
+           && td->integ_type == ts->integ_alg)
+         {
+           vec_add1 (proposal->transforms, *td);
+           error = 0;
+           break;
+         }
       }
-  }
-  if (error)
-    {
-      clib_warning
-       ("Didn't find any supported algorithm for IKEV2_TRANSFORM_TYPE_INTEG");
-      r = clib_error_return (0, "Unsupported algorithm");
-      return r;
+      if (error)
+       {
+         ikev2_elog_error
+           ("Didn't find any supported algorithm for IKEV2_TRANSFORM_TYPE_INTEG");
+         r = clib_error_return (0, "Unsupported algorithm");
+         return r;
+       }
     }
 
   /* PRF */
@@ -2720,7 +3080,7 @@ ikev2_set_initiator_proposals (vlib_main_t * vm, ikev2_sa_t * sa,
     }
 
   /* DH */
-  if (is_ike || ts->dh_type != IKEV2_TRANSFORM_DH_TYPE_NONE)
+  if (is_ike)
     {
       error = 1;
       vec_foreach (td, km->supported_transforms)
@@ -2752,7 +3112,6 @@ ikev2_set_initiator_proposals (vlib_main_t * vm, ikev2_sa_t * sa,
          {
            vec_add1 (proposal->transforms, *td);
            error = 0;
-           break;
          }
       }
       if (error)
@@ -2782,7 +3141,7 @@ ikev2_profile_index_by_name (u8 * name)
 
 static void
 ikev2_send_ike (vlib_main_t * vm, ip4_address_t * src, ip4_address_t * dst,
-               u32 bi0, u32 len)
+               u32 bi0, u32 len, u16 src_port, u16 dst_port, u32 sw_if_index)
 {
   ip4_header_t *ip40;
   udp_header_t *udp0;
@@ -2805,14 +3164,16 @@ ikev2_send_ike (vlib_main_t * vm, ip4_address_t * src, ip4_address_t * dst,
   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 (500);
-  udp0->src_port = clib_host_to_net_u16 (500);
+  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);
 
+  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index;
+  vnet_buffer (b0)->sw_if_index[VLIB_TX] = ~0;
 
   /* send the request */
   f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
@@ -2849,30 +3210,176 @@ ikev2_set_local_key (vlib_main_t * vm, u8 * file)
   return 0;
 }
 
-clib_error_t *
-ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add)
+static_always_inline vnet_api_error_t
+ikev2_register_udp_port (ikev2_profile_t * p, u16 port)
 {
   ikev2_main_t *km = &ikev2_main;
-  ikev2_profile_t *p;
+  udp_dst_port_info_t *pi;
 
-  if (is_add)
-    {
-      if (ikev2_profile_index_by_name (name))
-       return clib_error_return (0, "policy %v already exists", name);
+  uword *v = hash_get (km->udp_ports, port);
+  pi = udp_get_dst_port_info (&udp_main, port, UDP_IP4);
 
-      pool_get (km->profiles, p);
-      clib_memset (p, 0, sizeof (*p));
-      p->name = vec_dup (name);
-      p->responder.sw_if_index = ~0;
-      uword index = p - km->profiles;
-      mhash_set_mem (&km->profile_index_by_name, name, &index, 0);
+  if (v)
+    {
+      /* IKE already uses this port, only increment reference counter */
+      ASSERT (pi);
+      v[0]++;
     }
   else
     {
-      p = ikev2_profile_index_by_name (name);
-      if (!p)
+      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);
+    }
+  p->ipsec_over_udp_port = port;
+  return 0;
+}
+
+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);
+    }
+
+  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_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;
+    }
+
+  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
+    {
+      dst = &sa->iaddr;
+      src = &sa->raddr;
+    }
+
+  ikev2_send_ike (vm, src, dst, bi0, len,
+                 ikev2_get_port (sa), sa->dst_port, 0);
+
+  /* delete local SA */
+  ikev2_child_sa_t *c;
+  vec_foreach (c, sa->childs)
+    ikev2_delete_tunnel_interface (km->vnet_main, sa, c);
+
+  u64 rspi = sa->rspi;
+  ikev2_sa_free_all_vec (sa);
+  uword *p = hash_get (tkm->sa_by_rspi, rspi);
+  if (p)
+    {
+      hash_unset (tkm->sa_by_rspi, rspi);
+      pool_put (tkm->sas, sa);
+    }
+}
+
+static void
+ikev2_cleanup_profile_sessions (ikev2_main_t * km, ikev2_profile_t * p)
+{
+  ikev2_main_per_thread_data_t *tkm;
+  ikev2_sa_t *sa;
+  u32 pi = p - km->profiles;
+  u32 *sai;
+  u32 *del_sai = 0;
+
+  vec_foreach (tkm, km->per_thread_data)
+  {
+    /* *INDENT-OFF* */
+    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);
+    }
+
+    vec_reset_length (del_sai);
+  }
+
+  vec_free (del_sai);
+}
+
+clib_error_t *
+ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *p;
+
+  if (is_add)
+    {
+      if (ikev2_profile_index_by_name (name))
+       return clib_error_return (0, "policy %v already exists", name);
+
+      pool_get (km->profiles, p);
+      clib_memset (p, 0, sizeof (*p));
+      p->name = vec_dup (name);
+      p->ipsec_over_udp_port = IPSEC_UDP_PORT_NONE;
+      p->responder.sw_if_index = ~0;
+      p->tun_itf = ~0;
+      uword index = p - km->profiles;
+      mhash_set_mem (&km->profile_index_by_name, name, &index, 0);
+    }
+  else
+    {
+      p = ikev2_profile_index_by_name (name);
+      if (!p)
        return clib_error_return (0, "policy %v does not exists", name);
 
+      ikev2_unregister_udp_port (p);
+      ikev2_cleanup_profile_sessions (km, p);
+
       vec_free (p->name);
       pool_put (km->profiles, p);
       mhash_unset (&km->profile_index_by_name, name, 0);
@@ -2904,9 +3411,9 @@ ikev2_set_profile_auth (vlib_main_t * vm, u8 * name, u8 auth_method,
       vec_add1 (p->auth.data, 0);
       if (p->auth.key)
        EVP_PKEY_free (p->auth.key);
-      p->auth.key = ikev2_load_cert_file (auth_data);
+      p->auth.key = ikev2_load_cert_file (p->auth.data);
       if (p->auth.key == NULL)
-       return clib_error_return (0, "load cert '%s' failed", auth_data);
+       return clib_error_return (0, "load cert '%s' failed", p->auth.data);
     }
 
   return 0;
@@ -3040,7 +3547,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;
@@ -3056,11 +3562,79 @@ 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;
 }
 
+clib_error_t *
+ikev2_set_profile_tunnel_interface (vlib_main_t * vm,
+                                   u8 * name, 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->tun_itf = sw_if_index;
+
+  return 0;
+}
+
+vnet_api_error_t
+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;
+
+  if (is_set)
+    {
+      if (p->ipsec_over_udp_port != IPSEC_UDP_PORT_NONE)
+       return VNET_API_ERROR_VALUE_EXIST;
+
+      rv = ikev2_register_udp_port (p, 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;
+
+      ikev2_unregister_udp_port (p);
+    }
+  return rv;
+}
+
+clib_error_t *
+ikev2_set_profile_udp_encap (vlib_main_t * vm, u8 * name)
+{
+  ikev2_profile_t *p = ikev2_profile_index_by_name (name);
+  clib_error_t *r;
+
+  if (!p)
+    {
+      r = clib_error_return (0, "unknown profile %v", name);
+      return r;
+    }
+
+  p->udp_encap = 1;
+  return 0;
+}
+
 clib_error_t *
 ikev2_set_profile_sa_lifetime (vlib_main_t * vm, u8 * name,
                               u64 lifetime, u32 jitter, u32 handover,
@@ -3123,6 +3697,12 @@ ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
     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);
+      }
 
     /* Prepare the SA and the IKE payload */
     ikev2_sa_t sa;
@@ -3141,9 +3721,14 @@ ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
     ikev2_sa_free_proposal_vector (&proposals);
 
     sa.is_initiator = 1;
-    sa.profile_index = km->profiles - p;
-    sa.is_profile_index_set = 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);
@@ -3157,29 +3742,21 @@ ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
     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_source[8 + 8 + 4 + 2];
-    u8 *nat_detection_sha1 = vec_new (u8, 20);
-
-    u64 tmpspi = clib_host_to_net_u64 (sa.ispi);
-    clib_memcpy_fast (&nat_detection_source[0], &tmpspi, sizeof (tmpspi));
-    tmpspi = clib_host_to_net_u64 (sa.rspi);
-    clib_memcpy_fast (&nat_detection_source[8], &tmpspi, sizeof (tmpspi));
-    u16 tmpport = clib_host_to_net_u16 (500);
-    clib_memcpy_fast (&nat_detection_source[8 + 8 + 4], &tmpport,
-                     sizeof (tmpport));
-    u32 tmpip = clib_host_to_net_u32 (if_ip->as_u32);
-    clib_memcpy_fast (&nat_detection_source[8 + 8], &tmpip, sizeof (tmpip));
-    SHA1 (nat_detection_source, sizeof (nat_detection_source),
-         nat_detection_sha1);
+    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);
-    tmpip = clib_host_to_net_u32 (p->responder.ip4.as_u32);
-    clib_memcpy_fast (&nat_detection_source[8 + 8], &tmpip, sizeof (tmpip));
-    SHA1 (nat_detection_source, sizeof (nat_detection_source),
-         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);
@@ -3217,20 +3794,29 @@ ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
     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_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);
   }
 
   return 0;
@@ -3247,7 +3833,11 @@ ikev2_delete_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   int len;
 
   bi0 = ikev2_get_new_ike_header_buff (vm, &ike0);
-
+  if (!bi0)
+    {
+      ikev2_log_error ("buffer alloc failure");
+      return;
+    }
 
   ike0->exchange = IKEV2_EXCHANGE_INFORMATIONAL;
   ike0->ispi = clib_host_to_net_u64 (sa->ispi);
@@ -3257,9 +3847,11 @@ ikev2_delete_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   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);
-
-  ikev2_send_ike (vm, &sa->iaddr, &sa->raddr, bi0, len);
+  len = ikev2_generate_message (sa, ike0, 0, 0);
+  if (sa->natt)
+    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);
 
   /* delete local child SA */
   ikev2_delete_tunnel_interface (km->vnet_main, sa, csa);
@@ -3339,46 +3931,7 @@ ikev2_initiate_delete_ike_sa (vlib_main_t * vm, u64 ispi)
       return r;
     }
 
-
-  /* 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);
-
-
-    ike0->exchange = IKEV2_EXCHANGE_INFORMATIONAL;
-    ike0->ispi = clib_host_to_net_u64 (fsa->ispi);
-    ike0->rspi = clib_host_to_net_u64 (fsa->rspi);
-    vec_resize (fsa->del, 1);
-    fsa->del->protocol_id = IKEV2_PROTOCOL_IKE;
-    fsa->del->spi = ispi;
-    ike0->msgid = clib_host_to_net_u32 (fsa->last_init_msg_id + 1);
-    fsa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
-    len = ikev2_generate_message (fsa, ike0, 0);
-
-    ikev2_send_ike (vm, &fsa->iaddr, &fsa->raddr, bi0, len);
-  }
-
-
-  /* delete local SA */
-  ikev2_child_sa_t *c;
-  vec_foreach (c, fsa->childs)
-  {
-    ikev2_delete_tunnel_interface (km->vnet_main, fsa, c);
-    ikev2_sa_del_child_sa (fsa, c);
-  }
-  ikev2_sa_free_all_vec (fsa);
-  uword *p = hash_get (ftkm->sa_by_rspi, fsa->rspi);
-  if (p)
-    {
-      hash_unset (ftkm->sa_by_rspi, fsa->rspi);
-      pool_put (ftkm->sas, fsa);
-    }
-
-
+  ikev2_initiate_delete_ike_sa_internal (vm, ftkm, fsa);
   return 0;
 }
 
@@ -3391,9 +3944,12 @@ ikev2_rekey_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   u32 bi0 = 0;
   int len;
 
-
   bi0 = ikev2_get_new_ike_header_buff (vm, &ike0);
-
+  if (!bi0)
+    {
+      ikev2_log_error ("buffer alloc failure");
+      return;
+    }
 
   ike0->version = IKE_VERSION_2;
   ike0->flags = IKEV2_HDR_FLAG_INITIATOR;
@@ -3411,8 +3967,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);
-  ikev2_send_ike (vm, &sa->iaddr, &sa->raddr, bi0, len);
+  len = ikev2_generate_message (sa, ike0, proposals, 0);
+  if (sa->natt)
+    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);
   vec_free (proposals);
 }
 
@@ -3467,36 +4026,59 @@ ikev2_init (vlib_main_t * vm)
   km->vnet_main = vnet_get_main ();
   km->vlib_main = vm;
 
+  km->liveness_period = IKEV2_LIVENESS_PERIOD_CHECK;
+  km->liveness_max_retries = IKEV2_LIVENESS_RETRIES;
   ikev2_crypto_init (km);
 
   mhash_init_vec_string (&km->profile_index_by_name, sizeof (uword));
 
-  vec_validate (km->per_thread_data, tm->n_vlib_mains - 1);
-  for (thread_id = 0; thread_id < tm->n_vlib_mains - 1; thread_id++)
+  vec_validate_aligned (km->per_thread_data, tm->n_vlib_mains - 1,
+                       CLIB_CACHE_LINE_BYTES);
+  for (thread_id = 0; thread_id < tm->n_vlib_mains; thread_id++)
     {
-      km->per_thread_data[thread_id].sa_by_rspi =
-       hash_create (0, sizeof (uword));
+      ikev2_main_per_thread_data_t *ptd =
+       vec_elt_at_index (km->per_thread_data, thread_id);
+
+      ptd->sa_by_rspi = hash_create (0, sizeof (uword));
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+      ptd->evp_ctx = EVP_CIPHER_CTX_new ();
+      ptd->hmac_ctx = HMAC_CTX_new ();
+#else
+      EVP_CIPHER_CTX_init (&ptd->_evp_ctx);
+      ptd->evp_ctx = &ptd->_evp_ctx;
+      HMAC_CTX_init (&(ptd->_hmac_ctx));
+      ptd->hmac_ctx = &ptd->_hmac_ctx;
+#endif
     }
 
   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, 500, ikev2_node.index, 1);
+  udp_register_dst_port (vm, IKEV2_PORT, ikev2_node.index, 1);
+  udp_register_dst_port (vm, IKEV2_PORT_NATT, ikev2_node.index, 1);
 
+  vlib_punt_hdl_t punt_hdl = vlib_punt_client_register ("ikev2");
+  vlib_punt_register (punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0],
+                     "ikev2");
   ikev2_cli_reference ();
 
+  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"),
+  .runs_after = VLIB_INITS("ipsec_init", "ipsec_punt_init"),
 };
 /* *INDENT-ON* */
 
-
 static u8
-ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa)
+ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa,
+                            u8 del_old_ids)
 {
   ikev2_main_t *km = &ikev2_main;
   ikev2_profile_t *p = 0;
@@ -3504,7 +4086,7 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa)
   f64 now = vlib_time_now (vm);
   u8 res = 0;
 
-  if (sa->is_profile_index_set)
+  if (sa->profile_index != ~0)
     p = pool_elt_at_index (km->profiles, sa->profile_index);
 
   if (sa->is_initiator && p && csa->time_to_expiration
@@ -3522,8 +4104,8 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa)
          else if (csa->rekey_retries > 0)
            {
              csa->rekey_retries--;
-             clib_warning ("Rekeying Child SA 0x%x, retries left %d",
-                           csa->i_proposals->spi, csa->rekey_retries);
+             ikev2_log_debug ("Rekeying Child SA 0x%x, retries left %d",
+                              csa->i_proposals->spi, csa->rekey_retries);
              if (csa->rekey_retries == 0)
                {
                  csa->rekey_retries = -1;
@@ -3536,12 +4118,85 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa)
          csa->time_to_expiration = 0;
          ikev2_delete_child_sa_internal (vm, sa, csa);
          res |= 1;
+         return res;
+       }
+    }
+
+  if (del_old_ids)
+    {
+      ipip_tunnel_t *ipip = NULL;
+      u32 sw_if_index = sa->is_tun_itf_set ? sa->tun_itf : ~0;
+      if (~0 == sw_if_index)
+       {
+         ip46_address_t local_ip;
+         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);
+           }
+         else
+           {
+             ip46_address_set_ip4 (&local_ip, &sa->raddr);
+             ip46_address_set_ip4 (&remote_ip, &sa->iaddr);
+           }
+
+       /* *INDENT-OFF* */
+       ipip_tunnel_key_t key = {
+         .src = local_ip,
+         .dst = remote_ip,
+         .transport = IPIP_TRANSPORT_IP4,
+         .fib_index = 0,
+       };
+       /* *INDENT-ON* */
+
+         ipip = ipip_tunnel_db_find (&key);
+
+         if (ipip)
+           sw_if_index = ipip->sw_if_index;
+         else
+           return res;
        }
+
+      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);
+      ipsec_sa_unlock_id (ikev2_flip_alternate_sa_bit (csa->remote_sa_id));
+      vlib_worker_thread_barrier_release (vm);
     }
 
   return res;
 }
 
+int
+ikev2_set_log_level (ikev2_log_level_t log_level)
+{
+  ikev2_main_t *km = &ikev2_main;
+
+  if (log_level >= IKEV2_LOG_MAX)
+    {
+      ikev2_log_error ("unknown logging level %d", log_level);
+      return -1;
+    }
+
+  km->log_level = log_level;
+  return 0;
+}
+
+clib_error_t *
+ikev2_set_liveness_params (u32 period, u32 max_retries)
+{
+  ikev2_main_t *km = &ikev2_main;
+
+  if (period == 0 || max_retries == 0)
+    return clib_error_return (0, "invalid args");
+
+  km->liveness_period = period;
+  km->liveness_max_retries = max_retries;
+  return 0;
+}
+
 static void
 ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
 {
@@ -3574,7 +4229,7 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
   vlib_get_combined_counter (&ipsec_sa_counters,
                             ipsec_sa->stat_index, &counts);
 
-  if (fsa && fsa->is_profile_index_set)
+  if (fsa && fsa->profile_index != ~0 && fsa->is_initiator)
     p = pool_elt_at_index (km->profiles, fsa->profile_index);
 
   if (fchild && p && p->lifetime_maxdata)
@@ -3586,14 +4241,111 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
     }
 }
 
+static void
+ikev2_process_pending_sa_init (ikev2_main_t * km)
+{
+  u32 sai;
+  u64 ispi;
+  ikev2_sa_t *sa;
+
+  /* *INDENT-OFF* */
+  hash_foreach (ispi, sai, km->sa_by_ispi,
+  ({
+    sa = pool_elt_at_index (km->sais, sai);
+    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);
+  }));
+  /* *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;
+  ike_header_t *ike0;
+  u32 bi0 = 0;
+  u16 dp;
+  int len;
+
+  bi0 = ikev2_get_new_ike_header_buff (km->vlib_main, &ike0);
+  if (!bi0)
+    {
+      ikev2_log_error ("buffer alloc failure");
+      return;
+    }
+
+  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)
+    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;
+    }
+
+  dp = sa->dst_port ? sa->dst_port : ikev2_get_port (sa);
+  ikev2_send_ike (km->vlib_main, src, dst, bi0, len, ikev2_get_port (sa), dp,
+                 sa->sw_if_index);
+}
+
+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)
+    return 0;
+
+  if (sa->liveness_retries >= km->liveness_max_retries)
+    return 1;
+
+  f64 now = vlib_time_now (vm);
+
+  if (sa->liveness_period_check < now)
+    {
+      sa->liveness_retries++;
+      sa->liveness_period_check = now + km->liveness_period;
+      ikev2_send_informational_request (sa);
+    }
+  return 0;
+}
+
 static uword
 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)
     {
@@ -3606,15 +4358,53 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
       vec_foreach (tkm, km->per_thread_data)
       {
        ikev2_sa_t *sa;
+       u32 *to_be_deleted = 0;
+
         /* *INDENT-OFF* */
         pool_foreach (sa, tkm->sas, ({
           ikev2_child_sa_t *c;
+          u8 del_old_ids = 0;
+          if (sa->old_remote_id_present && 0 > sa->old_id_expiration)
+            {
+              sa->old_remote_id_present = 0;
+              del_old_ids = 1;
+            }
+          else
+            sa->old_id_expiration -= 1;
+
           vec_foreach (c, sa->childs)
             {
-            req_sent |= ikev2_mngr_process_child_sa(sa, c);
+            req_sent |= ikev2_mngr_process_child_sa(sa, c, del_old_ids);
             }
+
+          if (ikev2_mngr_process_responder_sas (sa))
+            vec_add1 (to_be_deleted, sa - tkm->sas);
         }));
         /* *INDENT-ON* */
+
+       vec_foreach (sai, to_be_deleted)
+       {
+         sa = pool_elt_at_index (tkm->sas, sai[0]);
+         u8 reinitiate = (sa->is_initiator && sa->profile_index != ~0);
+         vec_foreach (c, sa->childs)
+         {
+           ikev2_delete_tunnel_interface (km->vnet_main, sa, c);
+           ikev2_sa_del_child_sa (sa, c);
+         }
+         ikev2_sa_free_all_vec (sa);
+         hash_unset (tkm->sa_by_rspi, sa->rspi);
+         pool_put (tkm->sas, sa);
+
+         if (reinitiate)
+           {
+             p = pool_elt_at_index (km->profiles, sa->profile_index);
+             if (p)
+               {
+                 ikev2_initiate_sa_init (vm, p->name);
+               }
+           }
+       }
+       vec_free (to_be_deleted);
       }
 
       /* process ipsec sas */
@@ -3625,6 +4415,8 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
       }));
       /* *INDENT-ON* */
 
+      ikev2_process_pending_sa_init (km);
+
       if (req_sent)
        {
          vlib_process_wait_for_event_or_clock (vm, 5);