ikev2: add option to disable NAT traversal
[vpp.git] / src / plugins / ikev2 / ikev2.c
index 63e89b5..ad727a9 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>
@@ -62,8 +61,6 @@ 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 ") \
@@ -92,16 +89,23 @@ static char *ikev2_error_strings[] = {
 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
@@ -263,7 +267,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)
@@ -339,19 +343,17 @@ ikev2_sa_free_all_vec (ikev2_sa_t * sa)
 }
 
 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);
     }
 }
 
@@ -417,14 +419,15 @@ 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;
+  sa->natt_state = sai->natt_state;
   sa->i_id.data = _(sai->i_id.data);
   sa->r_id.data = _(sai->r_id.data);
   sa->i_auth.method = sai->i_auth.method;
@@ -627,17 +630,18 @@ 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;
 }
 
@@ -691,9 +695,10 @@ ikev2_process_sa_init_req (vlib_main_t * vm,
   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);
 
@@ -735,12 +740,12 @@ ikev2_process_sa_init_req (vlib_main_t * vm,
            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, 0,
-                                                   sa->iaddr.as_u32,
+             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);
                }
@@ -749,12 +754,12 @@ ikev2_process_sa_init_req (vlib_main_t * vm,
          else if (n->msg_type ==
                   IKEV2_NOTIFY_MSG_NAT_DETECTION_DESTINATION_IP)
            {
-             u8 *dst_sha = ikev2_compute_nat_sha1 (ike->ispi, 0,
-                                                   sa->raddr.as_u32,
+             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);
                }
@@ -801,8 +806,9 @@ ikev2_process_sa_init_resp (vlib_main_t * vm,
   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_reset_length (sa->last_sa_init_res_packet_data);
@@ -848,9 +854,8 @@ ikev2_process_sa_init_resp (vlib_main_t * vm,
            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,
-                                                   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)))
                {
@@ -862,13 +867,13 @@ ikev2_process_sa_init_resp (vlib_main_t * vm,
          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);
                }
@@ -1023,43 +1028,61 @@ ikev2_is_id_equal (ikev2_id_t * i1, ikev2_id_t * i2)
 }
 
 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);
   sa->initial_contact = 0;
 }
 
+static void
+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)
 {
@@ -1100,10 +1123,12 @@ ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa,
   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);
 
@@ -1240,8 +1265,10 @@ ikev2_process_informational_req (vlib_main_t * vm,
 
   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, len, &dlen);
 
@@ -1316,8 +1343,10 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm,
   u16 plen;
 
   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);
+                      "from ", clib_host_to_net_u64 (ike->ispi),
+                      clib_host_to_net_u64 (ike->rspi),
+                      ip_addr_v4 (&sa->raddr).as_u32,
+                      ip_addr_version (&sa->raddr) == AF_IP4);
 
   plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len, &dlen);
 
@@ -1417,17 +1446,22 @@ ikev2_process_create_child_sa_req (vlib_main_t * vm,
       rekey->tsi = tsi;
       rekey->tsr = tsr;
       /* update Ni */
-      vec_free (sa->i_nonce);
+      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_free (n);
     }
+  else
+    goto cleanup_and_exit;
+  vec_free (n);
   return 1;
 
 cleanup_and_exit:
   vec_free (n);
+  vec_free (proposal);
+  vec_free (tsr);
+  vec_free (tsi);
   return 0;
 }
 
@@ -1479,8 +1513,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;
@@ -1662,11 +1696,13 @@ 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);
              sa->r_auth.data = ikev2_calc_prf (tr_prf, psk, authmsg);
              sa->r_auth.method = IKEV2_AUTH_METHOD_SHARED_KEY_MIC;
            }
          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;
            }
@@ -1723,11 +1759,13 @@ ikev2_sa_auth_init (ikev2_sa_t * sa)
 
   if (sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
     {
+      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;
     }
   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;
     }
@@ -1777,6 +1815,7 @@ 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;
+  ip46_address_t zero_addr = ip46_address_initializer;
 
   if (~0 == a->sw_if_index)
     {
@@ -1802,9 +1841,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;
     }
 
@@ -1825,14 +1864,18 @@ ikev2_add_tunnel_from_main (ikev2_add_ipsec_tunnel_args_t * a)
                               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);
+                              a->flags, 0, a->salt_local, &zero_addr,
+                              &zero_addr, TUNNEL_ENCAP_DECAP_FLAG_NONE,
+                              IP_DSCP_CS0, 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->salt_remote, &zero_addr,
+                              &zero_addr, TUNNEL_ENCAP_DECAP_FLAG_NONE,
+                              IP_DSCP_CS0, 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);
@@ -1864,16 +1907,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_to_46 (&sa->iaddr, &a.local_ip);
+      ip_address_to_46 (&sa->raddr, &a.remote_ip);
       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_to_46 (&sa->raddr, &a.local_ip);
+      ip_address_to_46 (&sa->iaddr, &a.remote_ip);
       proposals = child->i_proposals;
       a.local_spi = child->i_proposals[0].spi;
       a.remote_spi = child->r_proposals[0].spi;
@@ -1885,7 +1928,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;
 
@@ -2011,7 +2054,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;
     }
 
@@ -2153,13 +2197,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;
@@ -2239,8 +2283,7 @@ ikev2_generate_message (vlib_buffer_t * b, ikev2_sa_t * sa,
          u8 *nat_detection_sha1 =
            ikev2_compute_nat_sha1 (clib_host_to_net_u64 (sa->ispi),
                                    clib_host_to_net_u64 (sa->rspi),
-                                   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);
@@ -2248,7 +2291,7 @@ ikev2_generate_message (vlib_buffer_t * b, ikev2_sa_t * sa,
          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);
@@ -2323,7 +2366,7 @@ ikev2_generate_message (vlib_buffer_t * b, ikev2_sa_t * sa,
        {
          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
@@ -2417,16 +2460,14 @@ ikev2_generate_message (vlib_buffer_t * b, ikev2_sa_t * sa,
   ike->version = IKE_VERSION_2;
   ike->nextpayload = IKEV2_PAYLOAD_SK;
   tlen = sizeof (*ike);
+
   if (sa->is_initiator)
+    ike->flags |= IKEV2_HDR_FLAG_INITIATOR;
+
+  if (ike_hdr_is_request (ike))
     {
-      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 (ike->exchange == IKEV2_EXCHANGE_SA_INIT)
     {
@@ -2518,73 +2559,87 @@ done:
 }
 
 static u32
-ikev2_retransmit_sa_init (ike_header_t * ike, ip4_address_t iaddr,
-                         ip4_address_t raddr, u32 rlen)
+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;
-        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);
-          if (plen > p + sizeof (*ike))
-            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);
 
-          if (plen < sizeof(ike_payload_header_t))
-            return ~0;
+      if (plen < sizeof (ike_payload_header_t))
+       return ~0;
 
-          if (payload == IKEV2_PAYLOAD_NONCE)
-            {
-              if (!clib_memcmp(sa->i_nonce, ikep->payload,
-                    plen - sizeof(*ikep)))
-                {
-                  /* req is retransmit */
-                  if (sa->state == IKEV2_STATE_SA_INIT)
-                    {
-                      ike_header_t * 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,
-                                             raddr.as_u32, 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,
-                                             raddr.as_u32, iaddr.as_u32);
-                      return ~0;
-                    }
-                }
-            }
-          payload = ikep->nextpayload;
-          p+=plen;
-        }
-      }
+      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)
+           {
+             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;
+    }
+
+  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* */
 
@@ -2595,6 +2650,9 @@ ikev2_retransmit_sa_init (ike_header_t * ike, ip4_address_t iaddr,
 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 */
@@ -2619,13 +2677,15 @@ ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
       ike->length = tmp->length;
       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);
+                            msg_id, ip_addr_v4 (&sa->raddr).as_u32,
+                            ip_addr_v4 (&sa->iaddr).as_u32);
       return slen;
     }
 
   /* old req ignore */
   ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE req ignore msgid %d",
-                        msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
+                        msg_id, ip_addr_v4 (&sa->raddr).as_u32,
+                        ip_addr_v4 (&sa->iaddr).as_u32);
   return ~0;
 }
 
@@ -2658,9 +2718,68 @@ 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)
+{
+  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);
+    }
+}
+
+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);
+    }
+}
+
+static_always_inline void
+ikev2_set_ip_address (ikev2_sa_t * sa, const void *iaddr,
+                     const void *raddr, const int 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
+    {
+      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_always_inline uword
+ikev2_node_internal (vlib_main_t * vm,
+                    vlib_node_runtime_t * node, vlib_frame_t * frame,
+                    u8 is_ip4)
 {
   u32 n_left = frame->n_vectors, *from;
   ikev2_main_t *km = &ikev2_main;
@@ -2676,13 +2795,16 @@ ikev2_node_fn (vlib_main_t * vm,
   while (n_left > 0)
     {
       vlib_buffer_t *b0 = b[0];
-      next[0] = IKEV2_NEXT_ERROR_DROP;
-      ip4_header_t *ip40;
+      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, has_non_esp_marker = 0;
 
       if (b0->punt_reason == ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0])
@@ -2693,17 +2815,29 @@ ikev2_node_fn (vlib_main_t * vm,
          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);
-         vlib_buffer_advance (b0, -sizeof (*ip40));
-         ip40 = vlib_buffer_get_current (b0);
+
+         if (is_ip4)
+           {
+             ip40 = (ip4_header_t *) ipx_hdr;
+             ip_hdr_sz = sizeof (*ip40);
+           }
+         else
+           {
+             ip60 = (ip6_header_t *) ipx_hdr;
+             ip_hdr_sz = sizeof (*ip60);
+           }
+         vlib_buffer_advance (b0, -ip_hdr_sz);
        }
 
-      rlen = b0->current_length - sizeof (*ip40) - sizeof (*udp0);
+      rlen = b0->current_length - ip_hdr_sz - sizeof (*udp0);
 
       /* check for non-esp marker */
       if (*((u32 *) ike0) == 0)
@@ -2716,14 +2850,14 @@ ikev2_node_fn (vlib_main_t * vm,
 
       if (clib_net_to_host_u32 (ike0->length) != rlen)
        {
-         vlib_node_increment_counter (vm, ikev2_node.index,
+         vlib_node_increment_counter (vm, node->node_index,
                                       IKEV2_ERROR_BAD_LENGTH, 1);
          goto dispatch0;
        }
 
       if (ike0->version != IKE_VERSION_2)
        {
-         vlib_node_increment_counter (vm, ikev2_node.index,
+         vlib_node_increment_counter (vm, node->node_index,
                                       IKEV2_ERROR_NOT_IKEV2, 1);
          goto dispatch0;
        }
@@ -2733,12 +2867,17 @@ ikev2_node_fn (vlib_main_t * vm,
          sa0 = &sa;
          clib_memset (sa0, 0, sizeof (*sa0));
 
-         if (ike0->flags & IKEV2_HDR_FLAG_INITIATOR)
+         if (ike_hdr_is_initiator (ike0))
            {
              if (ike0->rspi == 0)
                {
-                 sa0->raddr.as_u32 = ip40->dst_address.as_u32;
-                 sa0->iaddr.as_u32 = ip40->src_address.as_u32;
+                 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);
+
                  sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
 
                  slen =
@@ -2746,7 +2885,7 @@ ikev2_node_fn (vlib_main_t * vm,
                                              sa0->raddr, rlen);
                  if (slen)
                    {
-                     vlib_node_increment_counter (vm, ikev2_node.index,
+                     vlib_node_increment_counter (vm, node->node_index,
                                                   ~0 ==
                                                   slen ?
                                                   IKEV2_ERROR_IKE_SA_INIT_IGNORE
@@ -2758,7 +2897,7 @@ ikev2_node_fn (vlib_main_t * vm,
 
                  res = ikev2_process_sa_init_req (vm, sa0, ike0, udp0, rlen);
                  if (!res)
-                   vlib_node_increment_counter (vm, ikev2_node.index,
+                   vlib_node_increment_counter (vm, node->node_index,
                                                 IKEV2_ERROR_MALFORMED_PACKET,
                                                 1);
 
@@ -2774,9 +2913,10 @@ ikev2_node_fn (vlib_main_t * vm,
                  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);
                      if (~0 == slen)
-                       vlib_node_increment_counter (vm, ikev2_node.index,
+                       vlib_node_increment_counter (vm, node->node_index,
                                                     IKEV2_ERROR_NO_BUFF_SPACE,
                                                     1);
                    }
@@ -2797,8 +2937,13 @@ ikev2_node_fn (vlib_main_t * vm,
            }
          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;
+             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);
+
              ikev2_process_sa_init_resp (vm, sa0, ike0, udp0, rlen);
 
              if (sa0->state == IKEV2_STATE_SA_INIT)
@@ -2816,11 +2961,12 @@ ikev2_node_fn (vlib_main_t * vm,
                          ikev2_complete_sa_data (sa0, sai);
                          ikev2_calc_keys (sa0);
                          ikev2_sa_auth_init (sa0);
+                         ike0->flags = IKEV2_HDR_FLAG_INITIATOR;
                          slen =
                            ikev2_generate_message (b0, sa0, ike0, 0, udp0);
                          if (~0 == slen)
                            vlib_node_increment_counter (vm,
-                                                        ikev2_node.index,
+                                                        node->node_index,
                                                         IKEV2_ERROR_NO_BUFF_SPACE,
                                                         1);
                        }
@@ -2855,7 +3001,7 @@ ikev2_node_fn (vlib_main_t * vm,
              slen = ikev2_retransmit_resp (sa0, ike0);
              if (slen)
                {
-                 vlib_node_increment_counter (vm, ikev2_node.index,
+                 vlib_node_increment_counter (vm, node->node_index,
                                               ~0 ==
                                               slen ?
                                               IKEV2_ERROR_IKE_REQ_IGNORE
@@ -2870,11 +3016,11 @@ ikev2_node_fn (vlib_main_t * vm,
              if (res)
                ikev2_sa_auth (sa0);
              else
-               vlib_node_increment_counter (vm, ikev2_node.index,
+               vlib_node_increment_counter (vm, node->node_index,
                                             IKEV2_ERROR_MALFORMED_PACKET, 1);
              if (sa0->state == IKEV2_STATE_AUTHENTICATED)
                {
-                 ikev2_initial_contact_cleanup (sa0);
+                 ikev2_initial_contact_cleanup (ptd, sa0);
                  ikev2_sa_match_ts (sa0);
                  if (sa0->state != IKEV2_STATE_TS_UNACCEPTABLE)
                    ikev2_create_tunnel_interface (vm, sa0,
@@ -2890,7 +3036,7 @@ ikev2_node_fn (vlib_main_t * vm,
                {
                  slen = ikev2_generate_message (b0, sa0, ike0, 0, udp0);
                  if (~0 == slen)
-                   vlib_node_increment_counter (vm, ikev2_node.index,
+                   vlib_node_increment_counter (vm, node->node_index,
                                                 IKEV2_ERROR_NO_BUFF_SPACE,
                                                 1);
                }
@@ -2906,7 +3052,7 @@ ikev2_node_fn (vlib_main_t * vm,
              slen = ikev2_retransmit_resp (sa0, ike0);
              if (slen)
                {
-                 vlib_node_increment_counter (vm, ikev2_node.index,
+                 vlib_node_increment_counter (vm, node->node_index,
                                               ~0 ==
                                               slen ?
                                               IKEV2_ERROR_IKE_REQ_IGNORE
@@ -2919,7 +3065,7 @@ ikev2_node_fn (vlib_main_t * vm,
              res = ikev2_process_informational_req (vm, sa0, ike0, rlen);
              if (!res)
                {
-                 vlib_node_increment_counter (vm, ikev2_node.index,
+                 vlib_node_increment_counter (vm, node->node_index,
                                               IKEV2_ERROR_MALFORMED_PACKET,
                                               1);
                  slen = ~0;
@@ -2957,12 +3103,12 @@ ikev2_node_fn (vlib_main_t * vm,
                        }
                    }
                }
-             if (!(ike0->flags & IKEV2_HDR_FLAG_RESPONSE))
+             if (ike_hdr_is_request (ike0))
                {
-                 ike0->flags |= IKEV2_HDR_FLAG_RESPONSE;
+                 ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
                  slen = ikev2_generate_message (b0, sa0, ike0, 0, udp0);
                  if (~0 == slen)
-                   vlib_node_increment_counter (vm, ikev2_node.index,
+                   vlib_node_increment_counter (vm, node->node_index,
                                                 IKEV2_ERROR_NO_BUFF_SPACE,
                                                 1);
                }
@@ -2978,7 +3124,7 @@ ikev2_node_fn (vlib_main_t * vm,
              slen = ikev2_retransmit_resp (sa0, ike0);
              if (slen)
                {
-                 vlib_node_increment_counter (vm, ikev2_node.index,
+                 vlib_node_increment_counter (vm, node->node_index,
                                               ~0 ==
                                               slen ?
                                               IKEV2_ERROR_IKE_REQ_IGNORE
@@ -2991,7 +3137,7 @@ ikev2_node_fn (vlib_main_t * vm,
              res = ikev2_process_create_child_sa_req (vm, sa0, ike0, rlen);
              if (!res)
                {
-                 vlib_node_increment_counter (vm, ikev2_node.index,
+                 vlib_node_increment_counter (vm, node->node_index,
                                               IKEV2_ERROR_MALFORMED_PACKET,
                                               1);
                  slen = ~0;
@@ -3014,15 +3160,16 @@ ikev2_node_fn (vlib_main_t * vm,
                      ikev2_create_tunnel_interface (vm, sa0, child, p[0],
                                                     child - sa0->childs, 1);
                    }
-                 if (sa0->is_initiator)
+                 if (ike_hdr_is_response (ike0))
                    {
                      vec_free (sa0->rekey);
                    }
                  else
                    {
+                     ike0->flags = IKEV2_HDR_FLAG_RESPONSE;
                      slen = ikev2_generate_message (b0, sa0, ike0, 0, udp0);
                      if (~0 == slen)
-                       vlib_node_increment_counter (vm, ikev2_node.index,
+                       vlib_node_increment_counter (vm, node->node_index,
                                                     IKEV2_ERROR_NO_BUFF_SPACE,
                                                     1);
                    }
@@ -3031,27 +3178,22 @@ ikev2_node_fn (vlib_main_t * vm,
        }
       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);
+         ikev2_elog_uint_peers_addr (ike0->exchange, ip40, ip60, is_ip4);
        }
 
     dispatch0:
       /* if we are sending packet back, rewrite headers */
       if (slen && ~0 != slen)
        {
-         next[0] = IKEV2_NEXT_IP4_LOOKUP;
-         if (sa0->is_initiator)
+         if (is_ip4)
            {
-             ip40->dst_address.as_u32 = sa0->raddr.as_u32;
-             ip40->src_address.as_u32 = sa0->iaddr.as_u32;
+             next[0] = IKEV2_NEXT_IP4_LOOKUP;
+             ikev2_rewrite_v4_addrs (sa0, ip40);
            }
          else
            {
-             ip40->dst_address.as_u32 = sa0->iaddr.as_u32;
-             ip40->src_address.as_u32 = sa0->raddr.as_u32;
+             next[0] = IKEV2_NEXT_IP6_LOOKUP;
+             ikev2_rewrite_v6_addrs (sa0, ip60);
            }
 
          if (is_req)
@@ -3060,7 +3202,7 @@ ikev2_node_fn (vlib_main_t * vm,
                clib_net_to_host_u16 (ikev2_get_port (sa0));
 
              if (udp0->dst_port == clib_net_to_host_u16 (IKEV2_PORT_NATT)
-                 && sa0->natt)
+                 && ikev2_natt_active (sa0))
                {
                  if (!has_non_esp_marker)
                    slen = ikev2_insert_non_esp_marker (ike0, slen);
@@ -3078,10 +3220,17 @@ ikev2_node_fn (vlib_main_t * vm,
 
          udp0->length = clib_host_to_net_u16 (slen + sizeof (udp_header_t));
          udp0->checksum = 0;
-         b0->current_length =
-           slen + sizeof (ip4_header_t) + sizeof (udp_header_t);
-         ip40->length = clib_host_to_net_u16 (b0->current_length);
-         ip40->checksum = ip4_header_checksum (ip40);
+         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);
+           }
+         else
+           {
+             ip60->payload_length =
+               clib_host_to_net_u16 (b0->current_length - sizeof (*ip60));
+           }
        }
       /* delete sa */
       if (sa0 && (sa0->state == IKEV2_STATE_DELETED ||
@@ -3092,7 +3241,7 @@ ikev2_node_fn (vlib_main_t * vm,
          vec_foreach (c, sa0->childs)
            ikev2_delete_tunnel_interface (km->vnet_main, sa0, c);
 
-         ikev2_delete_sa (sa0);
+         ikev2_delete_sa (ptd, sa0);
        }
       if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
                         && (b0->flags & VLIB_BUFFER_IS_TRACED)))
@@ -3107,16 +3256,28 @@ ikev2_node_fn (vlib_main_t * vm,
       b += 1;
     }
 
-  vlib_node_increment_counter (vm, ikev2_node.index,
+  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 */ );
+}
+
+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 */ );
+}
+
 /* *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,
@@ -3124,11 +3285,27 @@ VLIB_REGISTER_NODE (ikev2_node,static) = {
   .n_errors = ARRAY_LEN(ikev2_error_strings),
   .error_strings = ikev2_error_strings,
 
-  .n_next_nodes = IKEV2_N_NEXT,
-
+  .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 = ARRAY_LEN(ikev2_error_strings),
+  .error_strings = ikev2_error_strings,
+
+  .n_next_nodes = IKEV2_IP6_N_NEXT,
+  .next_nodes = {
+    [IKEV2_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IKEV2_NEXT_IP6_ERROR_DROP] = "error-drop",
   },
 };
 /* *INDENT-ON* */
@@ -3276,10 +3453,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;
@@ -3288,35 +3466,59 @@ 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);
 
 }
 
@@ -3402,53 +3604,62 @@ ikev2_unregister_udp_port (ikev2_profile_t * p)
 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;
+  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;
 
-  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);
   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 (b0, sa, ike0, 0, 0);
-  if (~0 == len)
-    return;
 
-  if (sa->is_initiator)
+  if (send_notification)
     {
-      src = &sa->iaddr;
-      dst = &sa->raddr;
-    }
-  else
-    {
-      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 + 1);
+      sa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
+      len = ikev2_generate_message (b0, sa, ike0, 0, 0);
+      if (~0 == len)
+       return;
+
+      if (ikev2_natt_active (sa))
+       len = ikev2_insert_non_esp_marker (ike0, len);
 
-  ikev2_send_ike (vm, src, dst, bi0, len,
-                 ikev2_get_port (sa), sa->dst_port, 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_sa:
   /* delete local SA */
-  ikev2_child_sa_t *c;
   vec_foreach (c, sa->childs)
     ikev2_delete_tunnel_interface (km->vnet_main, sa, c);
 
@@ -3471,6 +3682,22 @@ 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* */
@@ -3483,7 +3710,7 @@ ikev2_cleanup_profile_sessions (ikev2_main_t * km, ikev2_profile_t * p)
     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);
@@ -3575,6 +3802,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)
@@ -3582,8 +3818,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);
@@ -3614,10 +3849,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;
@@ -3630,23 +3882,24 @@ 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;
@@ -3655,7 +3908,7 @@ ikev2_set_profile_ts (vlib_main_t * vm, u8 * name, u8 protocol_id,
 
 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;
@@ -3669,7 +3922,7 @@ ikev2_set_profile_responder (vlib_main_t * vm, u8 * name,
     }
 
   p->responder.sw_if_index = sw_if_index;
-  p->responder.ip4 = ip4;
+  ip_address_copy (&p->responder.addr, &addr);
 
   return 0;
 }
@@ -3814,13 +4067,45 @@ 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;
+}
+
 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 if_ip = ip_address_initializer;
 
   p = ikev2_profile_index_by_name (name);
 
@@ -3830,152 +4115,154 @@ 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))
     {
       r = clib_error_return (0, "responder not set for profile %v", name);
       return r;
     }
 
+  if (ikev2_get_if_address (p->responder.sw_if_index,
+                           ip_addr_version (&p->responder.addr), &if_ip))
+    {
+      valid_ip = 1;
+    }
 
-  /* Create the Initiator Request */
-  {
-    vlib_buffer_t *b0;
-    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, &b0);
-    if (!bi0)
-      {
-       char *errmsg = "buffer alloc failure";
-       ikev2_log_error (errmsg);
-       return clib_error_return (0, errmsg);
-      }
-    ike0 = vlib_buffer_get_current (b0);
-
-    /* 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),
-                             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),
-                             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 = clib_host_to_net_u64 (sa.ispi);
-    ike0->rspi = 0;
-    ike0->msgid = 0;
-
-    /* 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 */
-    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);
-  }
+  bi0 = ikev2_get_new_ike_header_buff (vm, &b0);
+  if (!bi0)
+    {
+      char *errmsg = "buffer alloc failure";
+      ikev2_log_error (errmsg);
+      return clib_error_return (0, errmsg);
+    }
+  ike0 = vlib_buffer_get_current (b0);
+
+  /* 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_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),
+                           &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);
+
+  /* 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;
+
+  /* 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, &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, &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);
+    }
+  else
+    {
+      r =
+       clib_error_return (0, "interface  %U does not have any IP address!",
+                          format_vnet_sw_if_index_name, vnet_get_main (),
+                          p->responder.sw_if_index);
+      return r;
+    }
 
   return 0;
 }
@@ -4002,6 +4289,7 @@ ikev2_delete_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   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;
@@ -4011,7 +4299,7 @@ ikev2_delete_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   if (~0 == len)
     return;
 
-  if (sa->natt)
+  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);
@@ -4094,7 +4382,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;
 }
 
@@ -4136,7 +4424,7 @@ ikev2_rekey_child_sa_internal (vlib_main_t * vm, ikev2_sa_t * sa,
   if (~0 == len)
     return;
 
-  if (sa->natt)
+  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);
@@ -4183,6 +4471,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)
 {
@@ -4224,12 +4580,14 @@ ikev2_init (vlib_main_t * vm)
   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");
   vlib_punt_register (punt_hdl, ipsec_punt_reason[IPSEC_PUNT_IP4_SPI_UDP_0],
-                     "ikev2");
+                     "ikev2-ip4");
   ikev2_cli_reference ();
 
   km->log_level = IKEV2_LOG_ERROR;
@@ -4300,13 +4658,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* */
@@ -4365,6 +4727,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)
 {
@@ -4409,6 +4782,51 @@ ikev2_mngr_process_ipsec_sa (ipsec_sa_t * ipsec_sa)
     }
 }
 
+static void
+ikev2_process_pending_sa_init_one (ikev2_main_t * km, ikev2_sa_t * sa)
+{
+  ikev2_profile_t *p;
+  u32 bi0;
+  u8 *nat_sha, *np;
+
+  if (ip_address_is_zero (&sa->iaddr))
+    {
+      p = pool_elt_at_index (km->profiles, sa->profile_index);
+      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 (ikev2_main_t * km)
 {
@@ -4423,28 +4841,16 @@ 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 (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;
@@ -4463,12 +4869,13 @@ ikev2_send_informational_request (ikev2_sa_t * 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);
+  ike0->flags = 0;
   sa->last_init_msg_id = clib_net_to_host_u32 (ike0->msgid);
   len = ikev2_generate_message (b0, sa, ike0, 0, 0);
   if (~0 == len)
     return;
 
-  if (sa->natt)
+  if (ikev2_natt_active (sa))
     len = ikev2_insert_non_esp_marker (ike0, len);
 
   if (sa->is_initiator)
@@ -4487,6 +4894,13 @@ 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)
 {
@@ -4522,8 +4936,7 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
 
   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 */
@@ -4537,6 +4950,10 @@ ikev2_mngr_process_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
         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;
@@ -4546,11 +4963,9 @@ 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* */
@@ -4589,14 +5004,6 @@ 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);
-         vlib_process_get_events (vm, NULL);
-         req_sent = 0;
-       }
-
     }
   return 0;
 }