Compiling with DISABLE_NAGLE does not propogate tcp_proto_no and never sets TCP_NODELAY (#3859)

(cherry picked from commit 1c90d5d)

Author: davidtrihy-genesys

net/net_tcp.c

@@ -112,8 +112,8 @@ static int *tcp_main_proc_no = 0;
 /* array of TCP partitions */
 static struct tcp_partition tcp_parts[TCP_PARTITION_SIZE];
 
-/*!< tcp protocol number as returned by getprotobyname */
-static int tcp_proto_no=-1;
+/* communication socket from generic proc to TCP main */
+int unix_tcp_sock = -1;
 
 /*!< current number of open connections */
 static unsigned int *tcp_connections_no = 0;
@@ -246,8 +246,7 @@ int tcp_init_sock_opt(int s, const struct tcp_conn_profile *prof, enum si_flags
 
 #ifdef DISABLE_NAGLE
 	flags=1;
-	if ( (tcp_proto_no!=-1) && (setsockopt(s, tcp_proto_no , TCP_NODELAY,
-					&flags, sizeof(flags))<0) ){
+	if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags)) < 0){
 		LM_WARN("could not disable Nagle: %s\n", strerror(errno));
 	}
 #endif
@@ -418,10 +417,12 @@ int tcp_write_in_main(void)
 int tcp_init_listener(struct socket_info *si)
 {
 	union sockaddr_union* addr = &si->su;
+
 	if (init_su(addr, &si->address, si->port_no)<0){
 		LM_ERR("could no init sockaddr_union\n");
 		return -1;
 	}
+
 	return 0;
 }
 
@@ -432,17 +433,6 @@ int tcp_bind_listener(struct socket_info *si)
 	int optval;
 #ifdef DISABLE_NAGLE
 	int flag;
-	struct protoent* pe;
-
-	if (tcp_proto_no==-1){ /* if not already set */
-		pe=getprotobyname("tcp");
-		if (pe==0){
-			LM_ERR("could not get TCP protocol number\n");
-			tcp_proto_no=-1;
-		}else{
-			tcp_proto_no=pe->p_proto;
-		}
-	}
 #endif
 
 	addr = &si->su;
@@ -453,9 +443,7 @@ int tcp_bind_listener(struct socket_info *si)
 	}
 #ifdef DISABLE_NAGLE
 	flag=1;
-	if ( (tcp_proto_no!=-1) &&
-		 (setsockopt(si->socket, tcp_proto_no , TCP_NODELAY,
-					 &flag, sizeof(flag))<0) ){
+	if (setsockopt(si->socket, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag)) < 0){
 		LM_ERR("could not disable Nagle: %s\n",strerror(errno));
 	}
 #endif