From 2958c8ec73dcb35eba6d5888fb515745b316a1cc Mon Sep 17 00:00:00 2001
From: mom040267 <mom040267@users.noreply.github.com>
Date: Mon, 16 Mar 2015 07:10:07 +0000
Subject: [PATCH] working on sctp

---
 src/apps/relay/ns_ioalib_engine_impl.c | 13 +++++++++++
 src/apps/relay/tls_listener.c          | 30 --------------------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/apps/relay/ns_ioalib_engine_impl.c b/src/apps/relay/ns_ioalib_engine_impl.c
index 4e3f73f5..44361c0c 100644
--- a/src/apps/relay/ns_ioalib_engine_impl.c
+++ b/src/apps/relay/ns_ioalib_engine_impl.c
@@ -50,6 +50,13 @@
 #include "hiredis_libevent2.h"
 #endif
 
+#if defined(__linux__) || defined(__LINUX__) || defined(__linux) || defined(linux__) || defined(LINUX) || defined(__LINUX) || defined(LINUX__)
+#include <linux/sctp.h>
+#else
+#include <netinet/sctp.h>
+#endif
+
+
 /* Compilation test:
 #if defined(IP_RECVTTL)
 #undef IP_RECVTTL
@@ -870,6 +877,12 @@ int set_socket_options_fd(evutil_socket_t fd, int tcp, int family)
 				(char*)&flag, /* value */
 				sizeof(int)); /* length of option value */
 
+		setsockopt(fd, /* socket affected */
+				IPPROTO_SCTP, /* set option at TCP level */
+				SCTP_NODELAY, /* name of option */
+				(char*)&flag, /* value */
+				sizeof(int)); /* length of option value */
+
 		socket_tcp_set_keepalive(fd);
 	}
 
diff --git a/src/apps/relay/tls_listener.c b/src/apps/relay/tls_listener.c
index 85fa0c6c..accdfa26 100644
--- a/src/apps/relay/tls_listener.c
+++ b/src/apps/relay/tls_listener.c
@@ -38,12 +38,6 @@
 
 #include <event2/listener.h>
 
-#if defined(__linux__) || defined(__LINUX__) || defined(__linux) || defined(linux__) || defined(LINUX) || defined(__LINUX) || defined(LINUX__)
-#include <linux/sctp.h>
-#else
-#include <netinet/sctp.h>
-#endif
-
 ///////////////////////////////////////////////////
 
 #define FUNCSTART if(server && eve(server->verbose)) TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,"%s:%d:start\n",__FUNCTION__,__LINE__)
@@ -284,30 +278,6 @@ static int sctp_create_server_listener(tls_listener_relay_server_type* server) {
 
   socket_set_nonblocking(tls_listen_fd);
 
-  {
-	  struct sctp_paddrparams heartbeat;
-	  ns_bzero(&heartbeat, sizeof(struct sctp_paddrparams));
-
-	  heartbeat.spp_flags = SPP_HB_ENABLE;
-	  heartbeat.spp_hbinterval = 5000;
-	  heartbeat.spp_pathmaxrxt = 5;
-
-	  /*Set Heartbeats*/
-	  if(setsockopt(tls_listen_fd, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS , &heartbeat, sizeof(heartbeat)) != 0)
-		  perror("setsockopt");
-  }
-
-  {
-	  struct sctp_rtoinfo rtoinfo;
-	  ns_bzero(&rtoinfo, sizeof(struct sctp_rtoinfo));
-
-	  rtoinfo.srto_max = 5000;
-
-	  /*Set rto_max*/
-	  if(setsockopt(tls_listen_fd, IPPROTO_SCTP, SCTP_RTOINFO , &rtoinfo, sizeof(rtoinfo)) != 0)
-		  perror("setsockopt");
-  }
-
   server->sctp_l = evconnlistener_new(server->e->event_base,
 		  sctp_server_input_handler, server,
 		  LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,