Skip to content

P
Postgres FD Implementation
Commit 76920de8 authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Rename parameter "hostname" to "virtual_host". Seemed very ambiguous...

parent 85b762b4
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 43 deletions
doc/src/sgml/runtime.sgml
View file @ 76920de8
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.36 2000/11/14 19:13:26 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.37 2000/11/15 18:36:03 petere Exp $
-->
<Chapter Id="runtime">
......@@ -932,33 +932,6 @@ env PGOPTIONS='-c geqo=off' psql
</listitem>
</varlistentry>
<varlistentry>
<term>HOSTNAME (<type>string</type>)</term>
<listitem>
<para>
Specifies the TCP/IP hostname or address on which the
<application>postmaster</application> is to listen for
connections from client applications. Defaults to the value
of the <envar>PGHOST</envar> environment variable, or if
<envar>PGHOST</envar> is not set, it defaults to listening on
all configured addresses (including localhost).
</para>
<para>
If you use a hostname do not try to run multiple instances of
<application>postmaster</application> on the same IP address
but different ports. Doing so will result in them attempting
(incorrectly) to use the same shared memory segments. Also,
if you use a hostname, all of the host's IP addresses on which
<application>postmaster</application> instances are listening
must be distinct in the two last octets.
</para>
<para>
If you do not use this option, then each instance must listen
on a different port.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>KRB_SERVER_KEYFILE (<type>string</type>)</term>
<listitem>
......@@ -1151,6 +1124,33 @@ env PGOPTIONS='-c geqo=off' psql
</listitem>
</varlistentry>
<varlistentry>
<term>VIRTUAL_HOST (<type>string</type>)</term>
<listitem>
<para>
Specifies the TCP/IP hostname or address on which the
<application>postmaster</application> is to listen for
connections from client applications. Defaults to the value
of the <envar>PGHOST</envar> environment variable, or if
<envar>PGHOST</envar> is not set, it defaults to listening on
all configured addresses (including localhost).
</para>
<para>
If you use a hostname do not try to run multiple instances of
<application>postmaster</application> on the same IP address
but different ports. Doing so will result in them attempting
(incorrectly) to use the same shared memory segments. Also,
if you use a hostname, all of the host's IP addresses on which
<application>postmaster</application> instances are listening
must be distinct in the two last octets.
</para>
<para>
If you do not use this option, then each instance must listen
on a different port.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</sect2>
......@@ -1189,6 +1189,11 @@ env PGOPTIONS='-c geqo=off' psql
<entry>fsync = off</entry>
<entry></entry>
</row>
<row>
<entry>-h <replaceable>x</replaceable></entry>
<entry>virtual_host = <replaceable>x</replaceable></entry>
<entry></entry>
</row>
<row>
<entry>-i</entry>
<entry>tcpip_socket = on</entry>
......
src/backend/postmaster/postmaster.c
View file @ 76920de8
......@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.187 2000/11/14 18:37:42 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.188 2000/11/15 18:36:04 petere Exp $
*
* NOTES
*
......@@ -115,7 +115,7 @@ static Dllist *PortList;
/* The socket number we are listening for connections on */
int PostPortNumber;
char * UnixSocketName;
char * HostName;
char * Virtual_host;
/*
* This is a sequence number that indicates how many times we've had to
......@@ -453,7 +453,7 @@ PostmasterMain(int argc, char *argv[])
enableFsync = false;
break;
case 'h':
HostName = optarg;
Virtual_host = optarg;
break;
case 'i':
NetServer = true;
......@@ -609,7 +609,7 @@ PostmasterMain(int argc, char *argv[])
if (NetServer)
{
status = StreamServerPort(AF_INET, HostName,
status = StreamServerPort(AF_INET, Virtual_host,
(unsigned short) PostPortNumber, UnixSocketName,
&ServerSock_INET);
if (status != STATUS_OK)
......@@ -621,7 +621,7 @@ PostmasterMain(int argc, char *argv[])
}
#ifdef HAVE_UNIX_SOCKETS
status = StreamServerPort(AF_UNIX, HostName,
status = StreamServerPort(AF_UNIX, Virtual_host,
(unsigned short) PostPortNumber, UnixSocketName,
&ServerSock_UNIX);
if (status != STATUS_OK)
......@@ -794,7 +794,7 @@ usage(const char *progname)
printf(" -d 1-5 debugging level\n");
printf(" -D DATADIR database directory\n");
printf(" -F turn fsync off\n");
printf(" -h HOSTNAME host name or IP address to listen to\n");
printf(" -h HOSTNAME host name or IP address to listen on\n");
printf(" -i enable TCP/IP connections\n");
printf(" -k FILENAME Unix domain socket location\n");
#ifdef USE_SSL
......@@ -1311,7 +1311,7 @@ ConnFree(Port *conn)
/*
* get_host_port -- return a pseudo port number (16 bits)
* derived from the primary IP address of HostName.
* derived from the primary IP address of Virtual_host.
*/
static unsigned short
get_host_port(void)
......@@ -1323,13 +1323,13 @@ get_host_port(void)
SockAddr saddr;
struct hostent *hp;
hp = gethostbyname(HostName);
hp = gethostbyname(Virtual_host);
if ((hp == NULL) || (hp->h_addrtype != AF_INET))
{
char msg[1024];
snprintf(msg, sizeof(msg),
"FATAL: get_host_port: gethostbyname(%s) failed\n",
HostName);
Virtual_host);
fputs(msg, stderr);
pqdebug("%s", msg);
exit(1);
......@@ -1362,7 +1362,7 @@ reset_shared(unsigned short port)
* the -h option, or set PGHOST, to a value other than the internal
* default.
*
* If HostName is set, then we generate the IPC keys using the
* If Virtual_host is set, then we generate the IPC keys using the
* last two octets of the IP address instead of the port number.
* This algorithm assumes that no one will run multiple PostgreSQL
* instances on one host using two IP addresses that have the same two
......@@ -1376,7 +1376,7 @@ reset_shared(unsigned short port)
* host.
*/
if (HostName[0] != '\0')
if (Virtual_host[0] != '\0')
port = get_host_port();
ipc_key = port * 1000 + shmem_seq * 100;
......
src/backend/utils/misc/guc.c
View file @ 76920de8
......@@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options.
*
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.20 2000/11/14 19:13:27 petere Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.21 2000/11/15 18:36:05 petere Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
......@@ -319,7 +319,7 @@ ConfigureNamesString[] =
{"unixsocket", PGC_POSTMASTER, &UnixSocketName,
"", NULL},
{"hostname", PGC_POSTMASTER, &HostName,
{"virtual_host", PGC_POSTMASTER, &Virtual_host,
"", NULL},
{NULL, 0, NULL, NULL, NULL}
......
src/include/libpq/pqcomm.h
View file @ 76920de8
......@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: pqcomm.h,v 1.44 2000/11/13 15:18:14 momjian Exp $
* $Id: pqcomm.h,v 1.45 2000/11/15 18:36:06 petere Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -180,6 +180,6 @@ extern int Unix_socket_permissions;
extern char * Unix_socket_group;
extern char * UnixSocketName;
extern char * HostName;
extern char * Virtual_host;
#endif /* PQCOMM_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment