Remove calls to getprotobyname(), which we now know leaks memory on

tglsfdc · tglsfdc · commit 1f0aff03c025 · 2000-05-21T21:19:53.000Z
some platforms --- and I also see that it is documented as not thread-
safe on HPUX and possibly other platforms.  No good reason not to just
use IPPROTO_TCP constant from &lt;netinet/in.h&gt; instead.
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.90 2000/05/20 13:10:54 ishii Exp $
+ *	$Id: pqcomm.c,v 1.91 2000/05/21 21:19:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -360,19 +360,12 @@ StreamConnection(int server_fd, Port *port)
 		return STATUS_ERROR;
 	}
 
-	/* select TCP_NODELAY option if it's a TCP connection */
+	/* select NODELAY and KEEPALIVE options if it's a TCP connection */
 	if (port->laddr.sa.sa_family == AF_INET)
 	{
-		struct protoent *pe;
 		int			on = 1;
 
-		pe = getprotobyname("TCP");
-		if (pe == NULL)
-		{
-			perror("postmaster: StreamConnection: getprotobyname");
-			return STATUS_ERROR;
-		}
-		if (setsockopt(port->sock, pe->p_proto, TCP_NODELAY,
+		if (setsockopt(port->sock, IPPROTO_TCP, TCP_NODELAY,
 					   &on, sizeof(on)) < 0)
 		{
 			perror("postmaster: StreamConnection: setsockopt(TCP_NODELAY)");
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.126 2000/04/12 17:17:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.127 2000/05/21 21:19:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #endif
@@ -625,19 +626,9 @@ connectMakeNonblocking(PGconn *conn)
 static int
 connectNoDelay(PGconn *conn)
 {
-	struct protoent *pe;
 	int			on = 1;
 
-	pe = getprotobyname("TCP");
-	if (pe == NULL)
-	{
-		printfPQExpBuffer(&conn->errorMessage,
-						  "connectNoDelay() -- "
-						  "getprotobyname failed: errno=%d\n%s\n",
-						  errno, strerror(errno));
-		return 0;
-	}
-	if (setsockopt(conn->sock, pe->p_proto, TCP_NODELAY,
+	if (setsockopt(conn->sock, IPPROTO_TCP, TCP_NODELAY,
 #ifdef WIN32
 				   (char *)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`30`	`30`	`* Portions Copyright (c) 1994, Regents of the University of California`
`31`	`31`	`*`
`32`		`- * $Id: pqcomm.c,v 1.90 2000/05/20 13:10:54 ishii Exp $`
	`32`	`+ * $Id: pqcomm.c,v 1.91 2000/05/21 21:19:53 tgl Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -360,19 +360,12 @@ StreamConnection(int server_fd, Port *port)`
`360`	`360`	`return STATUS_ERROR;`
`361`	`361`	`}`
`362`	`362`
`363`		`- /* select TCP_NODELAY option if it's a TCP connection */`
	`363`	`+ /* select NODELAY and KEEPALIVE options if it's a TCP connection */`
`364`	`364`	`if (port->laddr.sa.sa_family == AF_INET)`
`365`	`365`	`{`
`366`		`- struct protoent *pe;`
`367`	`366`	`int on = 1;`
`368`	`367`
`369`		`- pe = getprotobyname("TCP");`
`370`		`- if (pe == NULL)`
`371`		`- {`
`372`		`- perror("postmaster: StreamConnection: getprotobyname");`
`373`		`- return STATUS_ERROR;`
`374`		`- }`
`375`		`- if (setsockopt(port->sock, pe->p_proto, TCP_NODELAY,`
	`368`	`+ if (setsockopt(port->sock, IPPROTO_TCP, TCP_NODELAY,`
`376`	`369`	`&on, sizeof(on)) < 0)`
`377`	`370`	`{`
`378`	`371`	`perror("postmaster: StreamConnection: setsockopt(TCP_NODELAY)");`