SCTP: shutdown phase
[vpp.git] / src / vnet / sctp / sctp_output.c
index 841444e..276d7e7 100644 (file)
@@ -15,6 +15,7 @@
 #include <vnet/sctp/sctp.h>
 #include <vnet/sctp/sctp_debug.h>
 #include <vppinfra/random.h>
+#include <openssl/hmac.h>
 
 vlib_node_registration_t sctp4_output_node;
 vlib_node_registration_t sctp6_output_node;
@@ -224,16 +225,17 @@ ip6_sctp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
 }
 
 void
-sctp_push_ip_hdr (sctp_main_t * tm, sctp_sub_connection_t * tc,
+sctp_push_ip_hdr (sctp_main_t * tm, sctp_sub_connection_t * sctp_sub_conn,
                  vlib_buffer_t * b)
 {
   sctp_header_t *th = vlib_buffer_get_current (b);
   vlib_main_t *vm = vlib_get_main ();
-  if (tc->c_is_ip4)
+  if (sctp_sub_conn->c_is_ip4)
     {
       ip4_header_t *ih;
-      ih = vlib_buffer_push_ip4 (vm, b, &tc->c_lcl_ip4,
-                                &tc->c_rmt_ip4, IP_PROTOCOL_SCTP, 1);
+      ih = vlib_buffer_push_ip4 (vm, b, &sctp_sub_conn->c_lcl_ip4,
+                                &sctp_sub_conn->c_rmt_ip4, IP_PROTOCOL_SCTP,
+                                1);
       th->checksum = ip4_sctp_compute_checksum (vm, b, ih);
     }
   else
@@ -241,8 +243,8 @@ sctp_push_ip_hdr (sctp_main_t * tm, sctp_sub_connection_t * tc,
       ip6_header_t *ih;
       int bogus = ~0;
 
-      ih = vlib_buffer_push_ip6 (vm, b, &tc->c_lcl_ip6,
-                                &tc->c_rmt_ip6, IP_PROTOCOL_SCTP);
+      ih = vlib_buffer_push_ip6 (vm, b, &sctp_sub_conn->c_lcl_ip6,
+                                &sctp_sub_conn->c_rmt_ip6, IP_PROTOCOL_SCTP);
       th->checksum = ip6_sctp_compute_checksum (vm, b, ih, &bogus);
       ASSERT (!bogus);
     }
@@ -268,7 +270,7 @@ always_inline void *
 sctp_init_buffer (vlib_main_t * vm, vlib_buffer_t * b)
 {
   ASSERT ((b->flags & VLIB_BUFFER_NEXT_PRESENT) == 0);
-  b->flags &= VLIB_BUFFER_FREE_LIST_INDEX_MASK;
+  b->flags &= VLIB_BUFFER_NON_DEFAULT_FREELIST;
   b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
   b->total_length_not_including_first_buffer = 0;
   vnet_buffer (b)->sctp.flags = 0;
@@ -349,6 +351,13 @@ sctp_enqueue_to_output_i (vlib_main_t * vm, vlib_buffer_t * b, u32 bi,
     }
 }
 
+always_inline void
+sctp_enqueue_to_output (vlib_main_t * vm, vlib_buffer_t * b, u32 bi,
+                       u8 is_ip4)
+{
+  sctp_enqueue_to_output_i (vm, b, bi, is_ip4, 0);
+}
+
 always_inline void
 sctp_enqueue_to_output_now (vlib_main_t * vm, vlib_buffer_t * b, u32 bi,
                            u8 is_ip4)
@@ -404,13 +413,6 @@ sctp_enqueue_to_ip_lookup (vlib_main_t * vm, vlib_buffer_t * b, u32 bi,
   sctp_enqueue_to_ip_lookup_i (vm, b, bi, is_ip4, 0);
 }
 
-always_inline void
-sctp_enqueue_to_ip_lookup_now (vlib_main_t * vm, vlib_buffer_t * b, u32 bi,
-                              u8 is_ip4)
-{
-  sctp_enqueue_to_ip_lookup_i (vm, b, bi, is_ip4, 1);
-}
-
 /**
  * Convert buffer to INIT
  */
@@ -473,6 +475,11 @@ sctp_prepare_init_chunk (sctp_connection_t * sctp_conn, vlib_buffer_t * b)
   init_chunk->outbound_streams_count =
     clib_host_to_net_u16 (OUTBOUND_STREAMS_COUNT);
 
+  init_chunk->initial_tsn =
+    clib_host_to_net_u32 (sctp_conn->local_initial_tsn);
+  SCTP_CONN_TRACKING_DBG ("sctp_conn->local_initial_tsn = %u",
+                         sctp_conn->local_initial_tsn);
+
   sctp_conn->local_tag = init_chunk->initiate_tag;
 
   vnet_buffer (b)->sctp.connection_index = sub_conn->c_c_index;
@@ -488,14 +495,40 @@ sctp_prepare_init_chunk (sctp_connection_t * sctp_conn, vlib_buffer_t * b)
                          init_chunk->sctp_hdr.dst_port);
 }
 
-u64
-sctp_compute_mac ()
+void
+sctp_compute_mac (sctp_connection_t * sctp_conn,
+                 sctp_state_cookie_param_t * state_cookie)
 {
-  return 0x0;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+  HMAC_CTX *ctx;
+#else
+  HMAC_CTX ctx;
+  const EVP_MD *md = EVP_sha1 ();
+#endif
+  unsigned int len = 0;
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+  ctx = HMAC_CTX_new ();
+  HMAC_Init_ex (&ctx, &state_cookie->creation_time,
+               sizeof (state_cookie->creation_time), md, NULL);
+  HMAC_Update (ctx, (const unsigned char *) &sctp_conn, sizeof (sctp_conn));
+  HMAC_Final (ctx, state_cookie->mac, &len);
+#else
+  HMAC_CTX_init (&ctx);
+  HMAC_Init_ex (&ctx, &state_cookie->creation_time,
+               sizeof (state_cookie->creation_time), md, NULL);
+
+  HMAC_Update (&ctx, (const unsigned char *) &sctp_conn, sizeof (sctp_conn));
+  HMAC_Final (&ctx, state_cookie->mac, &len);
+  HMAC_CTX_cleanup (&ctx);
+#endif
+
+  ENDIANESS_SWAP (state_cookie->mac);
 }
 
 void
-sctp_prepare_cookie_ack_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
+sctp_prepare_cookie_ack_chunk (sctp_connection_t * sctp_conn,
+                              vlib_buffer_t * b)
 {
   vlib_main_t *vm = vlib_get_main ();
   u8 idx = sctp_pick_conn_idx_on_chunk (COOKIE_ACK);
@@ -515,18 +548,24 @@ sctp_prepare_cookie_ack_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
     vlib_buffer_push_uninit (b, alloc_bytes);
 
   cookie_ack_chunk->sctp_hdr.checksum = 0;
-  cookie_ack_chunk->sctp_hdr.src_port = tc->sub_conn[idx].connection.lcl_port;
-  cookie_ack_chunk->sctp_hdr.dst_port = tc->sub_conn[idx].connection.rmt_port;
-  cookie_ack_chunk->sctp_hdr.verification_tag = tc->remote_tag;
+  cookie_ack_chunk->sctp_hdr.src_port =
+    sctp_conn->sub_conn[idx].connection.lcl_port;
+  cookie_ack_chunk->sctp_hdr.dst_port =
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  cookie_ack_chunk->sctp_hdr.verification_tag = sctp_conn->remote_tag;
   vnet_sctp_set_chunk_type (&cookie_ack_chunk->chunk_hdr, COOKIE_ACK);
   vnet_sctp_set_chunk_length (&cookie_ack_chunk->chunk_hdr, chunk_len);
 
+  /* Measure RTT with this */
+  sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
+
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 void
-sctp_prepare_cookie_echo_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
+sctp_prepare_cookie_echo_chunk (sctp_connection_t * sctp_conn,
+                               vlib_buffer_t * b,
                                sctp_state_cookie_param_t * sc)
 {
   vlib_main_t *vm = vlib_get_main ();
@@ -545,23 +584,27 @@ sctp_prepare_cookie_echo_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
     vlib_buffer_push_uninit (b, alloc_bytes);
   cookie_echo_chunk->sctp_hdr.checksum = 0;
   cookie_echo_chunk->sctp_hdr.src_port =
-    tc->sub_conn[idx].connection.lcl_port;
+    sctp_conn->sub_conn[idx].connection.lcl_port;
   cookie_echo_chunk->sctp_hdr.dst_port =
-    tc->sub_conn[idx].connection.rmt_port;
-  cookie_echo_chunk->sctp_hdr.verification_tag = tc->remote_tag;
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  cookie_echo_chunk->sctp_hdr.verification_tag = sctp_conn->remote_tag;
   vnet_sctp_set_chunk_type (&cookie_echo_chunk->chunk_hdr, COOKIE_ECHO);
   vnet_sctp_set_chunk_length (&cookie_echo_chunk->chunk_hdr, chunk_len);
   clib_memcpy (&(cookie_echo_chunk->cookie), sc,
               sizeof (sctp_state_cookie_param_t));
+
+  /* Measure RTT with this */
+  sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
+
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 /**
  * Convert buffer to INIT-ACK
  */
 void
-sctp_prepare_initack_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
+sctp_prepare_initack_chunk (sctp_connection_t * sctp_conn, vlib_buffer_t * b,
                            ip4_address_t * ip4_addr,
                            ip6_address_t * ip6_addr)
 {
@@ -588,7 +631,7 @@ sctp_prepare_initack_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
       alloc_bytes += SCTP_IPV6_ADDRESS_TYPE_LENGTH;
     }
 
-  if (tc->sub_conn[idx].connection.is_ip4)
+  if (sctp_conn->sub_conn[idx].connection.is_ip4)
     alloc_bytes += sizeof (sctp_ipv4_addr_param_t);
   else
     alloc_bytes += sizeof (sctp_ipv6_addr_param_t);
@@ -616,7 +659,8 @@ sctp_prepare_initack_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
   state_cookie_param->creation_time = clib_host_to_net_u32 (sctp_time_now ());
   state_cookie_param->cookie_lifespan =
     clib_host_to_net_u32 (SCTP_VALID_COOKIE_LIFE);
-  state_cookie_param->mac = clib_host_to_net_u64 (sctp_compute_mac ());
+
+  sctp_compute_mac (sctp_conn, state_cookie_param);
 
   pointer_offset += sizeof (sctp_state_cookie_param_t);
 
@@ -636,8 +680,7 @@ sctp_prepare_initack_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
   if (PREDICT_TRUE (ip6_addr != NULL))
     {
       sctp_ipv6_addr_param_t *ipv6_addr =
-       (sctp_ipv6_addr_param_t *) init_ack_chunk +
-       sizeof (sctp_init_chunk_t) + pointer_offset;
+       (sctp_ipv6_addr_param_t *) init_ack_chunk + pointer_offset;
 
       ipv6_addr->param_hdr.type =
        clib_host_to_net_u16 (SCTP_IPV6_ADDRESS_TYPE);
@@ -649,11 +692,11 @@ sctp_prepare_initack_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
       pointer_offset += SCTP_IPV6_ADDRESS_TYPE_LENGTH;
     }
 
-  if (tc->sub_conn[idx].connection.is_ip4)
+  if (sctp_conn->sub_conn[idx].connection.is_ip4)
     {
       ip4_param = (sctp_ipv4_addr_param_t *) init_ack_chunk + pointer_offset;
       ip4_param->address.as_u32 =
-       tc->sub_conn[idx].connection.lcl_ip.ip4.as_u32;
+       sctp_conn->sub_conn[idx].connection.lcl_ip.ip4.as_u32;
 
       pointer_offset += sizeof (sctp_ipv4_addr_param_t);
     }
@@ -661,51 +704,56 @@ sctp_prepare_initack_chunk (sctp_connection_t * tc, vlib_buffer_t * b,
     {
       ip6_param = (sctp_ipv6_addr_param_t *) init_ack_chunk + pointer_offset;
       ip6_param->address.as_u64[0] =
-       tc->sub_conn[idx].connection.lcl_ip.ip6.as_u64[0];
+       sctp_conn->sub_conn[idx].connection.lcl_ip.ip6.as_u64[0];
       ip6_param->address.as_u64[1] =
-       tc->sub_conn[idx].connection.lcl_ip.ip6.as_u64[1];
+       sctp_conn->sub_conn[idx].connection.lcl_ip.ip6.as_u64[1];
 
       pointer_offset += sizeof (sctp_ipv6_addr_param_t);
     }
 
   /* src_port & dst_port are already in network byte-order */
   init_ack_chunk->sctp_hdr.checksum = 0;
-  init_ack_chunk->sctp_hdr.src_port = tc->sub_conn[idx].connection.lcl_port;
-  init_ack_chunk->sctp_hdr.dst_port = tc->sub_conn[idx].connection.rmt_port;
-  /* the tc->verification_tag is already in network byte-order (being a copy of the init_tag coming with the INIT chunk) */
-  init_ack_chunk->sctp_hdr.verification_tag = tc->remote_tag;
+  init_ack_chunk->sctp_hdr.src_port =
+    sctp_conn->sub_conn[idx].connection.lcl_port;
+  init_ack_chunk->sctp_hdr.dst_port =
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  /* the sctp_conn->verification_tag is already in network byte-order (being a copy of the init_tag coming with the INIT chunk) */
+  init_ack_chunk->sctp_hdr.verification_tag = sctp_conn->remote_tag;
+  init_ack_chunk->initial_tsn =
+    clib_host_to_net_u32 (sctp_conn->local_initial_tsn);
+  SCTP_CONN_TRACKING_DBG ("init_ack_chunk->initial_tsn = %u",
+                         init_ack_chunk->initial_tsn);
 
   vnet_sctp_set_chunk_type (&init_ack_chunk->chunk_hdr, INIT_ACK);
   vnet_sctp_set_chunk_length (&init_ack_chunk->chunk_hdr, chunk_len);
 
   init_ack_chunk->initiate_tag =
     clib_host_to_net_u32 (random_u32 (&random_seed));
-  /* As per RFC 4960, the initial_tsn may be the same value as the initiate_tag */
-  init_ack_chunk->initial_tsn = init_ack_chunk->initiate_tag;
+
   init_ack_chunk->a_rwnd = clib_host_to_net_u32 (DEFAULT_A_RWND);
   init_ack_chunk->inboud_streams_count =
     clib_host_to_net_u16 (INBOUND_STREAMS_COUNT);
   init_ack_chunk->outbound_streams_count =
     clib_host_to_net_u16 (OUTBOUND_STREAMS_COUNT);
 
-  tc->local_tag = init_ack_chunk->initiate_tag;
+  sctp_conn->local_tag = init_ack_chunk->initiate_tag;
+
+  /* Measure RTT with this */
+  sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
 
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 /**
  * Convert buffer to SHUTDOWN
  */
 void
-sctp_prepare_shutdown_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
+sctp_prepare_shutdown_chunk (sctp_connection_t * sctp_conn, vlib_buffer_t * b)
 {
-  vlib_main_t *vm = vlib_get_main ();
   u8 idx = sctp_pick_conn_idx_on_chunk (SHUTDOWN);
   u16 alloc_bytes = sizeof (sctp_shutdown_association_chunk_t);
 
-  b = sctp_reuse_buffer (vm, b);
-
   /* As per RFC 4960 the chunk_length value does NOT contemplate
    * the size of the first header (see sctp_header_t) and any padding
    */
@@ -718,30 +766,32 @@ sctp_prepare_shutdown_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
 
   shutdown_chunk->sctp_hdr.checksum = 0;
   /* No need of host_to_net conversion, already in net-byte order */
-  shutdown_chunk->sctp_hdr.src_port = tc->sub_conn[idx].connection.lcl_port;
-  shutdown_chunk->sctp_hdr.dst_port = tc->sub_conn[idx].connection.rmt_port;
-  shutdown_chunk->sctp_hdr.verification_tag = tc->remote_tag;
+  shutdown_chunk->sctp_hdr.src_port =
+    sctp_conn->sub_conn[idx].connection.lcl_port;
+  shutdown_chunk->sctp_hdr.dst_port =
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  shutdown_chunk->sctp_hdr.verification_tag = sctp_conn->remote_tag;
   vnet_sctp_set_chunk_type (&shutdown_chunk->chunk_hdr, SHUTDOWN);
   vnet_sctp_set_chunk_length (&shutdown_chunk->chunk_hdr, chunk_len);
 
-  shutdown_chunk->cumulative_tsn_ack = tc->rcv_las;
+  shutdown_chunk->cumulative_tsn_ack = sctp_conn->last_rcvd_tsn;
 
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 /*
  * Send SHUTDOWN
  */
 void
-sctp_send_shutdown (sctp_connection_t * tc)
+sctp_send_shutdown (sctp_connection_t * sctp_conn)
 {
   vlib_buffer_t *b;
   u32 bi;
   sctp_main_t *tm = vnet_get_sctp_main ();
   vlib_main_t *vm = vlib_get_main ();
 
-  if (sctp_check_outstanding_data_chunks (tc) > 0)
+  if (sctp_check_outstanding_data_chunks (sctp_conn) > 0)
     return;
 
   if (PREDICT_FALSE (sctp_get_free_buffer_index (tm, &bi)))
@@ -749,18 +799,22 @@ sctp_send_shutdown (sctp_connection_t * tc)
 
   b = vlib_get_buffer (vm, bi);
   sctp_init_buffer (vm, b);
-  sctp_prepare_shutdown_chunk (tc, b);
+  sctp_prepare_shutdown_chunk (sctp_conn, b);
 
   u8 idx = sctp_pick_conn_idx_on_chunk (SHUTDOWN);
-  sctp_push_ip_hdr (tm, &tc->sub_conn[idx], b);
-  sctp_enqueue_to_output_now (vm, b, bi, tc->sub_conn[idx].connection.is_ip4);
+  sctp_enqueue_to_output_now (vm, b, bi,
+                             sctp_conn->sub_conn[idx].connection.is_ip4);
+
+  /* Measure RTT with this */
+  sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
 }
 
 /**
  * Convert buffer to SHUTDOWN_ACK
  */
 void
-sctp_prepare_shutdown_ack_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
+sctp_prepare_shutdown_ack_chunk (sctp_connection_t * sctp_conn,
+                                vlib_buffer_t * b)
 {
   u8 idx = sctp_pick_conn_idx_on_chunk (SHUTDOWN_ACK);
   u16 alloc_bytes = sizeof (sctp_shutdown_association_chunk_t);
@@ -774,53 +828,44 @@ sctp_prepare_shutdown_ack_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
   shutdown_ack_chunk->sctp_hdr.checksum = 0;
   /* No need of host_to_net conversion, already in net-byte order */
   shutdown_ack_chunk->sctp_hdr.src_port =
-    tc->sub_conn[idx].connection.lcl_port;
+    sctp_conn->sub_conn[idx].connection.lcl_port;
   shutdown_ack_chunk->sctp_hdr.dst_port =
-    tc->sub_conn[idx].connection.rmt_port;
-  shutdown_ack_chunk->sctp_hdr.verification_tag = tc->remote_tag;
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  shutdown_ack_chunk->sctp_hdr.verification_tag = sctp_conn->remote_tag;
 
   vnet_sctp_set_chunk_type (&shutdown_ack_chunk->chunk_hdr, SHUTDOWN_ACK);
   vnet_sctp_set_chunk_length (&shutdown_ack_chunk->chunk_hdr, chunk_len);
 
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 /*
  * Send SHUTDOWN_ACK
  */
 void
-sctp_send_shutdown_ack (sctp_connection_t * tc)
+sctp_send_shutdown_ack (sctp_connection_t * sctp_conn, vlib_buffer_t * b)
 {
-  vlib_buffer_t *b;
-  u32 bi;
-  sctp_main_t *tm = vnet_get_sctp_main ();
   vlib_main_t *vm = vlib_get_main ();
 
-  if (sctp_check_outstanding_data_chunks (tc) > 0)
+  if (sctp_check_outstanding_data_chunks (sctp_conn) > 0)
     return;
 
-  if (PREDICT_FALSE (sctp_get_free_buffer_index (tm, &bi)))
-    return;
+  sctp_reuse_buffer (vm, b);
 
-  b = vlib_get_buffer (vm, bi);
-  sctp_init_buffer (vm, b);
-  sctp_prepare_shutdown_ack_chunk (tc, b);
+  sctp_prepare_shutdown_ack_chunk (sctp_conn, b);
 
   u8 idx = sctp_pick_conn_idx_on_chunk (SHUTDOWN_ACK);
-  sctp_push_ip_hdr (tm, &tc->sub_conn[idx], b);
-  sctp_enqueue_to_ip_lookup (vm, b, bi, tc->sub_conn[idx].connection.is_ip4);
 
-  /* Start the SCTP_TIMER_T2_SHUTDOWN timer */
-  sctp_timer_set (tc, idx, SCTP_TIMER_T2_SHUTDOWN, SCTP_RTO_INIT);
-  tc->state = SCTP_STATE_SHUTDOWN_ACK_SENT;
+  /* Measure RTT with this */
+  sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
 }
 
 /**
  * Convert buffer to SACK
  */
 void
-sctp_prepare_sack_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
+sctp_prepare_sack_chunk (sctp_connection_t * sctp_conn, vlib_buffer_t * b)
 {
   vlib_main_t *vm = vlib_get_main ();
   u8 idx = sctp_pick_conn_idx_on_chunk (SACK);
@@ -839,21 +884,121 @@ sctp_prepare_sack_chunk (sctp_connection_t * tc, vlib_buffer_t * b)
   sctp_selective_ack_chunk_t *sack = vlib_buffer_push_uninit (b, alloc_bytes);
 
   sack->sctp_hdr.checksum = 0;
-  sack->sctp_hdr.src_port = tc->sub_conn[idx].connection.lcl_port;
-  sack->sctp_hdr.dst_port = tc->sub_conn[idx].connection.rmt_port;
-  sack->sctp_hdr.verification_tag = tc->remote_tag;
+  sack->sctp_hdr.src_port = sctp_conn->sub_conn[idx].connection.lcl_port;
+  sack->sctp_hdr.dst_port = sctp_conn->sub_conn[idx].connection.rmt_port;
+  sack->sctp_hdr.verification_tag = sctp_conn->remote_tag;
   vnet_sctp_set_chunk_type (&sack->chunk_hdr, SACK);
   vnet_sctp_set_chunk_length (&sack->chunk_hdr, chunk_len);
 
+  sack->cumulative_tsn_ack = sctp_conn->next_tsn_expected;
+
+  sctp_conn->ack_state = 0;
+
+  vnet_buffer (b)->sctp.connection_index =
+    sctp_conn->sub_conn[idx].connection.c_index;
+}
+
+/**
+ * Convert buffer to HEARTBEAT_ACK
+ */
+void
+sctp_prepare_heartbeat_ack_chunk (sctp_connection_t * sctp_conn,
+                                 vlib_buffer_t * b)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  u8 idx = sctp_pick_conn_idx_on_chunk (HEARTBEAT_ACK);
+  u16 alloc_bytes = sizeof (sctp_hb_ack_chunk_t);
+
+  sctp_reuse_buffer (vm, b);
+
+  /* As per RFC 4960 the chunk_length value does NOT contemplate
+   * the size of the first header (see sctp_header_t) and any padding
+   */
+  u16 chunk_len = alloc_bytes - sizeof (sctp_header_t);
+
+  alloc_bytes += vnet_sctp_calculate_padding (alloc_bytes);
+
+  sctp_hb_ack_chunk_t *hb_ack = vlib_buffer_push_uninit (b, alloc_bytes);
+
+  hb_ack->sctp_hdr.checksum = 0;
+  /* No need of host_to_net conversion, already in net-byte order */
+  hb_ack->sctp_hdr.src_port = sctp_conn->sub_conn[idx].connection.lcl_port;
+  hb_ack->sctp_hdr.dst_port = sctp_conn->sub_conn[idx].connection.rmt_port;
+  hb_ack->sctp_hdr.verification_tag = sctp_conn->remote_tag;
+  hb_ack->hb_info.param_hdr.type = clib_host_to_net_u16 (1);
+  hb_ack->hb_info.param_hdr.length =
+    clib_host_to_net_u16 (sizeof (hb_ack->hb_info.hb_info));
+
+  vnet_sctp_set_chunk_type (&hb_ack->chunk_hdr, HEARTBEAT_ACK);
+  vnet_sctp_set_chunk_length (&hb_ack->chunk_hdr, chunk_len);
+
+  vnet_buffer (b)->sctp.connection_index =
+    sctp_conn->sub_conn[idx].connection.c_index;
+}
+
+/**
+ * Convert buffer to HEARTBEAT
+ */
+void
+sctp_prepare_heartbeat_chunk (sctp_connection_t * sctp_conn,
+                             vlib_buffer_t * b)
+{
+  u8 idx = sctp_pick_conn_idx_on_chunk (HEARTBEAT);
+  u16 alloc_bytes = sizeof (sctp_hb_req_chunk_t);
+
+  /* As per RFC 4960 the chunk_length value does NOT contemplate
+   * the size of the first header (see sctp_header_t) and any padding
+   */
+  u16 chunk_len = alloc_bytes - sizeof (sctp_header_t);
+
+  alloc_bytes += vnet_sctp_calculate_padding (alloc_bytes);
+
+  sctp_hb_req_chunk_t *hb_req = vlib_buffer_push_uninit (b, alloc_bytes);
+
+  hb_req->sctp_hdr.checksum = 0;
+  /* No need of host_to_net conversion, already in net-byte order */
+  hb_req->sctp_hdr.src_port = sctp_conn->sub_conn[idx].connection.lcl_port;
+  hb_req->sctp_hdr.dst_port = sctp_conn->sub_conn[idx].connection.rmt_port;
+  hb_req->sctp_hdr.verification_tag = sctp_conn->remote_tag;
+  hb_req->hb_info.param_hdr.type = clib_host_to_net_u16 (1);
+  hb_req->hb_info.param_hdr.length =
+    clib_host_to_net_u16 (sizeof (hb_req->hb_info.hb_info));
+
+  vnet_sctp_set_chunk_type (&hb_req->chunk_hdr, HEARTBEAT);
+  vnet_sctp_set_chunk_length (&hb_req->chunk_hdr, chunk_len);
+
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
+}
+
+void
+sctp_send_heartbeat (sctp_connection_t * sctp_conn)
+{
+  vlib_buffer_t *b;
+  u32 bi;
+  sctp_main_t *tm = vnet_get_sctp_main ();
+  vlib_main_t *vm = vlib_get_main ();
+
+  if (PREDICT_FALSE (sctp_get_free_buffer_index (tm, &bi)))
+    return;
+
+  b = vlib_get_buffer (vm, bi);
+  sctp_init_buffer (vm, b);
+  sctp_prepare_heartbeat_chunk (sctp_conn, b);
+
+  u8 idx = sctp_pick_conn_idx_on_state (SCTP_STATE_ESTABLISHED);
+  sctp_enqueue_to_output_now (vm, b, bi,
+                             sctp_conn->sub_conn[idx].connection.is_ip4);
+
+  sctp_conn->sub_conn[idx].unacknowledged_hb += 1;
 }
 
 /**
  * Convert buffer to SHUTDOWN_COMPLETE
  */
 void
-sctp_prepare_shutdown_complete_chunk (sctp_connection_t * tc,
+sctp_prepare_shutdown_complete_chunk (sctp_connection_t * sctp_conn,
                                      vlib_buffer_t * b)
 {
   u8 idx = sctp_pick_conn_idx_on_chunk (SHUTDOWN_COMPLETE);
@@ -868,20 +1013,20 @@ sctp_prepare_shutdown_complete_chunk (sctp_connection_t * tc,
   shutdown_complete->sctp_hdr.checksum = 0;
   /* No need of host_to_net conversion, already in net-byte order */
   shutdown_complete->sctp_hdr.src_port =
-    tc->sub_conn[idx].connection.lcl_port;
+    sctp_conn->sub_conn[idx].connection.lcl_port;
   shutdown_complete->sctp_hdr.dst_port =
-    tc->sub_conn[idx].connection.rmt_port;
-  shutdown_complete->sctp_hdr.verification_tag = tc->remote_tag;
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  shutdown_complete->sctp_hdr.verification_tag = sctp_conn->remote_tag;
 
   vnet_sctp_set_chunk_type (&shutdown_complete->chunk_hdr, SHUTDOWN_COMPLETE);
   vnet_sctp_set_chunk_length (&shutdown_complete->chunk_hdr, chunk_len);
 
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 void
-sctp_send_shutdown_complete (sctp_connection_t * tc)
+sctp_send_shutdown_complete (sctp_connection_t * sctp_conn)
 {
   vlib_buffer_t *b;
   u32 bi;
@@ -893,13 +1038,13 @@ sctp_send_shutdown_complete (sctp_connection_t * tc)
 
   b = vlib_get_buffer (vm, bi);
   sctp_init_buffer (vm, b);
-  sctp_prepare_shutdown_complete_chunk (tc, b);
+  sctp_prepare_shutdown_complete_chunk (sctp_conn, b);
 
   u8 idx = sctp_pick_conn_idx_on_chunk (SHUTDOWN_COMPLETE);
-  sctp_push_ip_hdr (tm, &tc->sub_conn[idx], b);
-  sctp_enqueue_to_ip_lookup (vm, b, bi, tc->sub_conn[idx].connection.is_ip4);
+  sctp_enqueue_to_output (vm, b, bi,
+                         sctp_conn->sub_conn[idx].connection.is_ip4);
 
-  tc->state = SCTP_STATE_CLOSED;
+  sctp_conn->state = SCTP_STATE_CLOSED;
 }
 
 
@@ -907,7 +1052,7 @@ sctp_send_shutdown_complete (sctp_connection_t * tc)
  *  Send INIT
  */
 void
-sctp_send_init (sctp_connection_t * tc)
+sctp_send_init (sctp_connection_t * sctp_conn)
 {
   vlib_buffer_t *b;
   u32 bi;
@@ -921,37 +1066,29 @@ sctp_send_init (sctp_connection_t * tc)
   u8 idx = sctp_pick_conn_idx_on_chunk (INIT);
 
   sctp_init_buffer (vm, b);
-  sctp_prepare_init_chunk (tc, b);
+  sctp_prepare_init_chunk (sctp_conn, b);
 
-  /* Measure RTT with this */
-  tc->rtt_ts = sctp_time_now ();
-  tc->rtt_seq = tc->snd_nxt;
-  tc->rto_boff = 0;
+  sctp_push_ip_hdr (tm, &sctp_conn->sub_conn[idx], b);
+  sctp_enqueue_to_ip_lookup (vm, b, bi, sctp_conn->sub_conn[idx].c_is_ip4);
 
-  sctp_push_ip_hdr (tm, &tc->sub_conn[idx], b);
-  sctp_enqueue_to_ip_lookup_now (vm, b, bi, tc->sub_conn[idx].c_is_ip4);
+  /* Measure RTT with this */
+  sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
 
   /* Start the T1_INIT timer */
-  sctp_timer_set (tc, idx, SCTP_TIMER_T1_INIT, SCTP_RTO_INIT);
-  /* Change state to COOKIE_WAIT */
-  tc->state = SCTP_STATE_COOKIE_WAIT;
-}
+  sctp_timer_set (sctp_conn, idx, SCTP_TIMER_T1_INIT,
+                 sctp_conn->sub_conn[idx].RTO);
 
-always_inline u8
-sctp_in_cong_recovery (sctp_connection_t * sctp_conn)
-{
-  return 0;
+  /* Change state to COOKIE_WAIT */
+  sctp_conn->state = SCTP_STATE_COOKIE_WAIT;
 }
 
 /**
  * Push SCTP header and update connection variables
  */
 static void
-sctp_push_hdr_i (sctp_connection_t * tc, vlib_buffer_t * b,
+sctp_push_hdr_i (sctp_connection_t * sctp_conn, u8 idx, vlib_buffer_t * b,
                 sctp_state_t next_state)
 {
-  u8 idx = sctp_pick_conn_idx_on_chunk (DATA);
-
   u16 data_len =
     b->current_length + b->total_length_not_including_first_buffer;
   ASSERT (!b->total_length_not_including_first_buffer
@@ -971,35 +1108,62 @@ sctp_push_hdr_i (sctp_connection_t * tc, vlib_buffer_t * b,
     vlib_buffer_push_uninit (b, bytes_to_add);
 
   data_chunk->sctp_hdr.checksum = 0;
-  data_chunk->sctp_hdr.src_port = tc->sub_conn[idx].connection.lcl_port;
-  data_chunk->sctp_hdr.dst_port = tc->sub_conn[idx].connection.rmt_port;
-  data_chunk->sctp_hdr.verification_tag = tc->remote_tag;
+  data_chunk->sctp_hdr.src_port =
+    sctp_conn->sub_conn[idx].connection.lcl_port;
+  data_chunk->sctp_hdr.dst_port =
+    sctp_conn->sub_conn[idx].connection.rmt_port;
+  data_chunk->sctp_hdr.verification_tag = sctp_conn->remote_tag;
 
-  data_chunk->tsn = clib_host_to_net_u32 (0);
+  data_chunk->tsn = clib_host_to_net_u32 (sctp_conn->next_tsn);
   data_chunk->stream_id = clib_host_to_net_u16 (0);
   data_chunk->stream_seq = clib_host_to_net_u16 (0);
 
   vnet_sctp_set_chunk_type (&data_chunk->chunk_hdr, DATA);
   vnet_sctp_set_chunk_length (&data_chunk->chunk_hdr, chunk_length);
 
+  vnet_sctp_set_bbit (&data_chunk->chunk_hdr);
+  vnet_sctp_set_ebit (&data_chunk->chunk_hdr);
+
   SCTP_ADV_DBG_OUTPUT ("POINTER_WITH_DATA = %p, DATA_OFFSET = %u",
                       b->data, b->current_data);
 
+  sctp_conn->next_tsn += data_len;
+
   vnet_buffer (b)->sctp.connection_index =
-    tc->sub_conn[idx].connection.c_index;
+    sctp_conn->sub_conn[idx].connection.c_index;
 }
 
 u32
-sctp_push_header (transport_connection_t * tconn, vlib_buffer_t * b)
+sctp_push_header (transport_connection_t * trans_conn, vlib_buffer_t * b)
 {
-  sctp_connection_t *tc = sctp_get_connection_from_transport (tconn);
-  sctp_push_hdr_i (tc, b, SCTP_STATE_ESTABLISHED);
+  sctp_connection_t *sctp_conn =
+    sctp_get_connection_from_transport (trans_conn);
+
+  u8 idx = sctp_pick_conn_idx_on_chunk (DATA);
 
-  if (tc->rtt_ts == 0 && !sctp_in_cong_recovery (tc))
+  if (sctp_conn->sub_conn[idx].unacknowledged_hb >
+      SCTP_ASSOCIATION_MAX_RETRANS)
     {
-      tc->rtt_ts = sctp_time_now ();
-      tc->rtt_seq = tc->snd_nxt;
+      // The remote-peer is considered to be unreachable hence shutting down
+
+      /* Start cleanup. App wasn't notified yet so use delete notify as
+       * opposed to delete to cleanup session layer state. */
+      stream_session_delete_notify (&sctp_conn->sub_conn
+                                   [MAIN_SCTP_SUB_CONN_IDX].connection);
+
+      sctp_connection_timers_reset (sctp_conn);
+
+      sctp_connection_cleanup (sctp_conn);
     }
+
+  sctp_push_hdr_i (sctp_conn, idx, b, SCTP_STATE_ESTABLISHED);
+
+  if (sctp_conn->sub_conn[idx].RTO_pending == 0)
+    {
+      sctp_conn->sub_conn[idx].RTO_pending = 1;
+      sctp_conn->sub_conn[idx].rtt_ts = sctp_time_now ();
+    }
+
   sctp_trajectory_add_start (b0, 3);
 
   return 0;
@@ -1030,7 +1194,7 @@ sctp46_output_inline (vlib_main_t * vm,
          u32 bi0;
          vlib_buffer_t *b0;
          sctp_header_t *sctp_hdr = 0;
-         sctp_connection_t *tc0;
+         sctp_connection_t *sctp_conn;
          sctp_tx_trace_t *t0;
          sctp_header_t *th0 = 0;
          u32 error0 = SCTP_ERROR_PKTS_SENT, next0 =
@@ -1048,80 +1212,83 @@ sctp46_output_inline (vlib_main_t * vm,
          n_left_to_next -= 1;
 
          b0 = vlib_get_buffer (vm, bi0);
-         tc0 = sctp_connection_get (vnet_buffer (b0)->sctp.connection_index,
-                                    my_thread_index);
 
-         if (PREDICT_FALSE (tc0 == 0))
+         sctp_conn =
+           sctp_connection_get (vnet_buffer (b0)->sctp.connection_index,
+                                my_thread_index);
+
+         if (PREDICT_FALSE (sctp_conn == 0))
            {
              error0 = SCTP_ERROR_INVALID_CONNECTION;
              next0 = SCTP_OUTPUT_NEXT_DROP;
              goto done;
            }
 
-         u8 idx = sctp_pick_conn_idx_on_state (tc0->state);
+         u8 idx = sctp_pick_conn_idx_on_state (sctp_conn->state);
 
          th0 = vlib_buffer_get_current (b0);
 
          if (is_ip4)
            {
-             ip4_header_t *th0 = vlib_buffer_push_ip4 (vm,
-                                                       b0,
-                                                       &tc0->sub_conn
-                                                       [idx].connection.
-                                                       lcl_ip.ip4,
-                                                       &tc0->
-                                                       sub_conn
-                                                       [idx].connection.
-                                                       rmt_ip.ip4,
-                                                       IP_PROTOCOL_SCTP, 1);
-
-             u32 checksum = ip4_sctp_compute_checksum (vm, b0, th0);
-
-             sctp_hdr = ip4_next_header (th0);
+             ip4_header_t *iph4 = vlib_buffer_push_ip4 (vm,
+                                                        b0,
+                                                        &sctp_conn->sub_conn
+                                                        [idx].connection.
+                                                        lcl_ip.ip4,
+                                                        &sctp_conn->
+                                                        sub_conn
+                                                        [idx].connection.
+                                                        rmt_ip.ip4,
+                                                        IP_PROTOCOL_SCTP, 1);
+
+             u32 checksum = ip4_sctp_compute_checksum (vm, b0, iph4);
+
+             sctp_hdr = ip4_next_header (iph4);
              sctp_hdr->checksum = checksum;
 
              vnet_buffer (b0)->l4_hdr_offset = (u8 *) th0 - b0->data;
-             th0->checksum = 0;
 
 #if SCTP_DEBUG_STATE_MACHINE
-             packet_length = clib_net_to_host_u16 (th0->length);
+             packet_length = clib_net_to_host_u16 (iph4->length);
 #endif
            }
          else
            {
-             ip6_header_t *ih0;
-             ih0 = vlib_buffer_push_ip6 (vm,
-                                         b0,
-                                         &tc0->sub_conn[idx].
-                                         connection.lcl_ip.ip6,
-                                         &tc0->sub_conn[idx].
-                                         connection.rmt_ip.ip6,
-                                         IP_PROTOCOL_SCTP);
+             ip6_header_t *iph6 = vlib_buffer_push_ip6 (vm,
+                                                        b0,
+                                                        &sctp_conn->sub_conn
+                                                        [idx].
+                                                        connection.lcl_ip.
+                                                        ip6,
+                                                        &sctp_conn->sub_conn
+                                                        [idx].
+                                                        connection.rmt_ip.
+                                                        ip6,
+                                                        IP_PROTOCOL_SCTP);
 
              int bogus = ~0;
-             u32 checksum = ip6_sctp_compute_checksum (vm, b0, ih0, &bogus);
+             u32 checksum = ip6_sctp_compute_checksum (vm, b0, iph6, &bogus);
              ASSERT (!bogus);
 
-             sctp_hdr = ip6_next_header (ih0);
+             sctp_hdr = ip6_next_header (iph6);
              sctp_hdr->checksum = checksum;
 
-             vnet_buffer (b0)->l3_hdr_offset = (u8 *) ih0 - b0->data;
+             vnet_buffer (b0)->l3_hdr_offset = (u8 *) iph6 - b0->data;
              vnet_buffer (b0)->l4_hdr_offset = (u8 *) th0 - b0->data;
-             th0->checksum = 0;
 
 #if SCTP_DEBUG_STATE_MACHINE
-             packet_length = clib_net_to_host_u16 (ih0->payload_length);
+             packet_length = clib_net_to_host_u16 (iph6->payload_length);
 #endif
            }
 
          u8 is_valid =
-           (tc0->sub_conn[idx].connection.lcl_port ==
+           (sctp_conn->sub_conn[idx].connection.lcl_port ==
             sctp_hdr->src_port
-            || tc0->sub_conn[idx].connection.lcl_port ==
+            || sctp_conn->sub_conn[idx].connection.lcl_port ==
             sctp_hdr->dst_port)
-           && (tc0->sub_conn[idx].connection.rmt_port ==
+           && (sctp_conn->sub_conn[idx].connection.rmt_port ==
                sctp_hdr->dst_port
-               || tc0->sub_conn[idx].connection.rmt_port ==
+               || sctp_conn->sub_conn[idx].connection.rmt_port ==
                sctp_hdr->src_port);
 
          sctp_full_hdr_t *full_hdr = (sctp_full_hdr_t *) sctp_hdr;
@@ -1134,13 +1301,14 @@ sctp46_output_inline (vlib_main_t * vm,
                                      "chunk_type = %u [%s], "
                                      "connection.lcl_port = %u, sctp_hdr->src_port = %u, "
                                      "connection.rmt_port = %u, sctp_hdr->dst_port = %u",
-                                     tc0->sub_conn
+                                     sctp_conn->sub_conn
                                      [idx].connection.c_index, packet_length,
                                      chunk_type,
                                      sctp_chunk_to_string (chunk_type),
-                                     tc0->sub_conn[idx].connection.lcl_port,
-                                     sctp_hdr->src_port,
-                                     tc0->sub_conn[idx].connection.rmt_port,
+                                     sctp_conn->sub_conn[idx].
+                                     connection.lcl_port, sctp_hdr->src_port,
+                                     sctp_conn->sub_conn[idx].
+                                     connection.rmt_port,
                                      sctp_hdr->dst_port);
 
              error0 = SCTP_ERROR_UNKOWN_CHUNK;
@@ -1151,8 +1319,8 @@ sctp46_output_inline (vlib_main_t * vm,
          SCTP_DBG_STATE_MACHINE
            ("CONN_INDEX = %u, CURR_CONN_STATE = %u (%s), "
             "CHUNK_TYPE = %s, " "SRC_PORT = %u, DST_PORT = %u",
-            tc0->sub_conn[idx].connection.c_index,
-            tc0->state, sctp_state_to_string (tc0->state),
+            sctp_conn->sub_conn[idx].connection.c_index,
+            sctp_conn->state, sctp_state_to_string (sctp_conn->state),
             sctp_chunk_to_string (chunk_type), full_hdr->hdr.src_port,
             full_hdr->hdr.dst_port);
 
@@ -1160,7 +1328,7 @@ sctp46_output_inline (vlib_main_t * vm,
            SCTP_ADV_DBG_OUTPUT ("PACKET_LENGTH = %u", packet_length);
 
          /* Let's make sure the state-machine does not send anything crazy */
-         switch (tc0->state)
+         switch (sctp_conn->state)
            {
            case SCTP_STATE_CLOSED:
              {
@@ -1169,7 +1337,7 @@ sctp46_output_inline (vlib_main_t * vm,
                    SCTP_DBG_STATE_MACHINE
                      ("Sending the wrong chunk (%s) based on state-machine status (%s)",
                       sctp_chunk_to_string (chunk_type),
-                      sctp_state_to_string (tc0->state));
+                      sctp_state_to_string (sctp_conn->state));
 
                    error0 = SCTP_ERROR_UNKOWN_CHUNK;
                    next0 = SCTP_OUTPUT_NEXT_DROP;
@@ -1185,7 +1353,7 @@ sctp46_output_inline (vlib_main_t * vm,
                  SCTP_DBG_STATE_MACHINE
                    ("Sending the wrong chunk (%s) based on state-machine status (%s)",
                     sctp_chunk_to_string (chunk_type),
-                    sctp_state_to_string (tc0->state));
+                    sctp_state_to_string (sctp_conn->state));
 
                  error0 = SCTP_ERROR_UNKOWN_CHUNK;
                  next0 = SCTP_OUTPUT_NEXT_DROP;
@@ -1198,29 +1366,71 @@ sctp46_output_inline (vlib_main_t * vm,
                  SCTP_DBG_STATE_MACHINE
                    ("Sending the wrong chunk (%s) based on state-machine status (%s)",
                     sctp_chunk_to_string (chunk_type),
-                    sctp_state_to_string (tc0->state));
+                    sctp_state_to_string (sctp_conn->state));
 
                  error0 = SCTP_ERROR_UNKOWN_CHUNK;
                  next0 = SCTP_OUTPUT_NEXT_DROP;
                  goto done;
                }
              /* Change state */
-             tc0->state = SCTP_STATE_COOKIE_ECHOED;
+             sctp_conn->state = SCTP_STATE_COOKIE_ECHOED;
              break;
+           case SCTP_STATE_SHUTDOWN_SENT:
+             if (chunk_type != SHUTDOWN_COMPLETE)
+               {
+                 SCTP_DBG_STATE_MACHINE
+                   ("Sending the wrong chunk (%s) based on state-machine status (%s)",
+                    sctp_chunk_to_string (chunk_type),
+                    sctp_state_to_string (sctp_conn->state));
+
+                 error0 = SCTP_ERROR_UNKOWN_CHUNK;
+                 next0 = SCTP_OUTPUT_NEXT_DROP;
+                 goto done;
+               }
+           case SCTP_STATE_SHUTDOWN_RECEIVED:
+             if (chunk_type != SHUTDOWN_ACK)
+               {
+                 SCTP_DBG_STATE_MACHINE
+                   ("Sending the wrong chunk (%s) based on state-machine status (%s)",
+                    sctp_chunk_to_string (chunk_type),
+                    sctp_state_to_string (sctp_conn->state));
+
+                 error0 = SCTP_ERROR_UNKOWN_CHUNK;
+                 next0 = SCTP_OUTPUT_NEXT_DROP;
+                 goto done;
+               }
            default:
              SCTP_DBG_STATE_MACHINE
                ("Sending chunk (%s) based on state-machine status (%s)",
                 sctp_chunk_to_string (chunk_type),
-                sctp_state_to_string (tc0->state));
+                sctp_state_to_string (sctp_conn->state));
              break;
            }
 
-         if (chunk_type == SHUTDOWN)
+         switch (chunk_type)
            {
-             /* Start the SCTP_TIMER_T2_SHUTDOWN timer */
-             sctp_timer_set (tc0, idx, SCTP_TIMER_T2_SHUTDOWN,
-                             SCTP_RTO_INIT);
-             tc0->state = SCTP_STATE_SHUTDOWN_SENT;
+           case DATA:
+             {
+               sctp_timer_update (sctp_conn, idx, SCTP_TIMER_T3_RXTX,
+                                  sctp_conn->sub_conn[idx].RTO);
+               break;
+             }
+           case SHUTDOWN:
+             {
+               /* Start the SCTP_TIMER_T2_SHUTDOWN timer */
+               sctp_timer_set (sctp_conn, idx, SCTP_TIMER_T2_SHUTDOWN,
+                               sctp_conn->sub_conn[idx].RTO);
+               sctp_conn->state = SCTP_STATE_SHUTDOWN_SENT;
+               break;
+             }
+           case SHUTDOWN_ACK:
+             {
+               /* Start the SCTP_TIMER_T2_SHUTDOWN timer */
+               sctp_timer_set (sctp_conn, idx, SCTP_TIMER_T2_SHUTDOWN,
+                               sctp_conn->sub_conn[idx].RTO);
+               sctp_conn->state = SCTP_STATE_SHUTDOWN_ACK_SENT;
+               break;
+             }
            }
 
          vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
@@ -1231,8 +1441,8 @@ sctp46_output_inline (vlib_main_t * vm,
          SCTP_DBG_STATE_MACHINE ("CONNECTION_INDEX = %u, "
                                  "NEW_STATE = %s, "
                                  "CHUNK_SENT = %s",
-                                 tc0->sub_conn[idx].connection.c_index,
-                                 sctp_state_to_string (tc0->state),
+                                 sctp_conn->sub_conn[idx].connection.c_index,
+                                 sctp_state_to_string (sctp_conn->state),
                                  sctp_chunk_to_string (chunk_type));
 
          vnet_sctp_common_hdr_params_host_to_net (&full_hdr->common_hdr);
@@ -1251,7 +1461,7 @@ sctp46_output_inline (vlib_main_t * vm,
                {
                  memset (&t0->sctp_header, 0, sizeof (t0->sctp_header));
                }
-             clib_memcpy (&t0->sctp_connection, tc0,
+             clib_memcpy (&t0->sctp_connection, sctp_conn,
                           sizeof (t0->sctp_connection));
            }