@@ -6,14 +6,15 @@

 # --------

 #              created by andrei

 #  2003-02-24  added LOCALBASE, fixed doc-dir for freebsd - patch provided

-#              by Maxim Sobolev <sobomax@FreeBSD.org>

+#               by Maxim Sobolev <sobomax@FreeBSD.org>

+#  2003-02-25  added -DDISABLE_NAGLE

 #version number

 VERSION = 0

 PATCHLEVEL = 8

 SUBLEVEL =   11

-EXTRAVERSION = pre6-tcp8-tm

+EXTRAVERSION = pre6-tcp9-tm

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

@@ -152,6 +153,8 @@ YACC := $(shell echo "$${YACC}")

 # -DUSE_TCP

 #		compiles in tcp support (highly experimental for now, it will probably

 #		not work, use it only if you really now what you are doing)

+# -DDISABLE_NAGLE

+#		disable the tcp Nagle algorithm (lower delay)

 # -DVOICE_MAIL

 #               enables voicemail support in ser core and in tm module

 #               voicemail needs also -D_TOTAG

@@ -167,6 +170,8 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

 	 -DVOICE_MAIL \

 	 -D_TOTAG \

 	 -DUSE_TCP \

+	 -DDISABLE_NAGLE \

+	 -DDBG_QM_MALLOC \

 	 #-DF_MALLOC \

 	 #-DNO_DEBUG \

 	 #-DNO_LOG

@@ -106,6 +106,9 @@ static char flags[]=

 #ifdef USE_TCP

 ", USE_TCP"

 #endif

+#ifdef DISABLE_NAGLE

+", DISABLE_NAGLE"

+#endif

 #ifdef NO_DEBUG

 ", NO_DEBUG"

 #endif

@@ -24,6 +24,15 @@

  * along with this program; if not, write to the Free Software

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

+/*

+ * History:

+ * --------

+ *  2002-11-29  created by andrei

+ *  2002-12-11  added tcp_send (andrei)

+ *  2003-01-20  locking fixes, hashtables (andrei)

+ *  2003-02-20  s/lock_t/gen_lock_t/ to avoid a conflict on solaris (andrei)

+ *  2003-02-25  Nagle is disabled if -DDISABLE_NAGLE (andrei)

+ */

 #ifdef USE_TCP

@@ -38,7 +47,9 @@

 #include <sys/types.h>

 #include <sys/select.h>

 #include <sys/socket.h>

+#include <netinet/tcp.h>

 #include <sys/uio.h>  /* writev*/

+#include <netdb.h>

 #include <unistd.h>

@@ -88,6 +99,7 @@ static int connection_id=1; /*  unique for each connection, used for

 								for a reply */

 int unix_tcp_sock;

+int tcp_proto_no=-1; /* tcp protocol number as returned by getprotobyname */

 struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su,

@@ -136,6 +148,9 @@ error:

 struct tcp_connection* tcpconn_connect(union sockaddr_union* server)

 {

 	int s;

+#ifdef DISABLE_NAGLE

+	int flag;

+#endif

 	s=socket(AF2PF(server->s.sa_family), SOCK_STREAM, 0);

 	if (s<0){

@@ -143,6 +158,15 @@ struct tcp_connection* tcpconn_connect(union sockaddr_union* server)

 				errno, strerror(errno));

 		goto error;

 	}

+#ifdef DISABLE_NAGLE

+	flag=1;

+	if ( (tcp_proto_no!=-1) && 

+		  (setsockopt(sock_info->socket, tcp_proto_no , TCP_NODELAY,

+					&flag, sizeof(flag))<0) ){

+		LOG(L_ERR, "ERROR: tcp_connect: could not disable Nagle: %s\n",

+				strerror(errno));

+	}

+#endif

 	if (connect(s, &server->s, sockaddru_len(*server))<0){

 		LOG(L_ERR, "ERROR: tcpconn_connect: connect: (%d) %s\n",

 				errno, strerror(errno));

@@ -417,6 +441,18 @@ void tcpconn_timeout(fd_set* set)

 int tcp_init(struct socket_info* sock_info)

 {

 	union sockaddr_union* addr;

+#ifdef DISABLE_NAGLE

+	int flag;

+	struct protoent* pe;

+	

+	pe=getprotobyname("tcp");

+	if (pe==0){

+		LOG(L_ERR, "ERROR: tcp_init: could not get TCP protocol number\n");

+		tcp_proto_no=-1;

+	}else{

+		tcp_proto_no=pe->p_proto;

+	}

+#endif

 	addr=&sock_info->su;

 	sock_info->proto=PROTO_TCP;

@@ -429,6 +465,15 @@ int tcp_init(struct socket_info* sock_info)

 		LOG(L_ERR, "ERROR: tcp_init: socket: %s\n", strerror(errno));

 		goto error;

 	}

+#ifdef DISABLE_NAGLE

+	flag=1;

+	if ( (tcp_proto_no!=-1) &&

+		 (setsockopt(sock_info->socket, tcp_proto_no , TCP_NODELAY,

+					 &flag, sizeof(flag))<0) ){

+		LOG(L_ERR, "ERROR: tcp_init: could not disable Nagle: %s\n",

+				strerror(errno));

+	}

+#endif

 	if (bind(sock_info->socket, &addr->s, sockaddru_len(*addr))==-1){

 		LOG(L_ERR, "ERROR: tcp_init: bind(%x, %p, %d) on %s: %s\n",

 				sock_info->socket, &addr->s,