Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1944cdc

Browse files
committed
libpq: PQhost to return active connected host or hostaddr
Previously, PQhost didn't return the connected host details when theconnection type was CHT_HOST_ADDRESS (i.e., via hostaddr). Instead, itreturned the complete host connection parameter (which could containmultiple hosts) or the default host details, which was confusing andarguably incorrect.Change this to return the actually connected host or hostaddrirrespective of the connection type. When hostaddr but no host wasspecified, hostaddr is now returned. Never return the original hostconnection parameter, and document that PQhost cannot be relied onbefore the connection is established.PQport is similarly changed to always return the active connection portand never the original connection parameter.Author: Hari Babu <kommi.haribabu@gmail.com>Reviewed-by: Michael Paquier <michael@paquier.xyz>Reviewed-by: Kyotaro HORIGUCHI <horiguchi.kyotaro@lab.ntt.co.jp>Reviewed-by: David G. Johnston <david.g.johnston@gmail.com>
1 parent44bd958 commit1944cdc

File tree

2 files changed

+59
-14
lines changed

2 files changed

+59
-14
lines changed

‎doc/src/sgml/libpq.sgml

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ char *PQpass(const PGconn *conn);
16921692

16931693
<listitem>
16941694
<para>
1695-
Returns the server host name of the connection.
1695+
Returns the server host name of theactiveconnection.
16961696
This can be a host name, an IP address, or a directory path if the
16971697
connection is via Unix socket. (The path case can be distinguished
16981698
because it will always be an absolute path, beginning
@@ -1701,6 +1701,30 @@ char *PQpass(const PGconn *conn);
17011701
char *PQhost(const PGconn *conn);
17021702
</synopsis>
17031703
</para>
1704+
1705+
<para>
1706+
If the connection parameters specified both <literal>host</literal> and
1707+
<literal>hostaddr</literal>, then <function>PQhost</function> will
1708+
return the <literal>host</literal> information. If only
1709+
<literal>hostaddr</literal> was specified, then that is returned.
1710+
If multiple hosts were specified in the connection parameters,
1711+
<function>PQhost</function> returns the host actually connected to.
1712+
</para>
1713+
1714+
<para>
1715+
<function>PQhost</function> returns <symbol>NULL</symbol> if the
1716+
<parameter>conn</parameter> argument is <symbol>NULL</symbol>.
1717+
Otherwise, if there is an error producing the host information (perhaps
1718+
if the connection has not been fully established or there was an
1719+
error), it returns an empty string.
1720+
</para>
1721+
1722+
<para>
1723+
If multiple hosts were specified in the connection parameters, it is
1724+
not possible to rely on the result of <function>PQhost</function> until
1725+
the connection is established. The status of the connection can be
1726+
checked using the function <function>PQstatus</function>.
1727+
</para>
17041728
</listitem>
17051729
</varlistentry>
17061730

@@ -1714,12 +1738,32 @@ char *PQhost(const PGconn *conn);
17141738

17151739
<listitem>
17161740
<para>
1717-
Returns the port of the connection.
1741+
Returns the port of theactiveconnection.
17181742

17191743
<synopsis>
17201744
char *PQport(const PGconn *conn);
17211745
</synopsis>
17221746
</para>
1747+
1748+
<para>
1749+
If multiple ports were specified in the connection parameters,
1750+
<function>PQport</function> returns the port actually connected to.
1751+
</para>
1752+
1753+
<para>
1754+
<function>PQport</function> returns <symbol>NULL</symbol> if the
1755+
<parameter>conn</parameter> argument is <symbol>NULL</symbol>.
1756+
Otherwise, if there is an error producing the port information (perhaps
1757+
if the connection has not been fully established or there was an
1758+
error), it returns an empty string.
1759+
</para>
1760+
1761+
<para>
1762+
If multiple ports were specified in the connection parameters, it is
1763+
not possible to rely on the result of <function>PQport</function> until
1764+
the connection is established. The status of the connection can be
1765+
checked using the function <function>PQstatus</function>.
1766+
</para>
17231767
</listitem>
17241768
</varlistentry>
17251769

‎src/interfaces/libpq/fe-connect.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6017,29 +6017,30 @@ PQhost(const PGconn *conn)
60176017
{
60186018
if (!conn)
60196019
returnNULL;
6020-
if (conn->connhost!=NULL&&
6021-
conn->connhost[conn->whichhost].type!=CHT_HOST_ADDRESS)
6022-
returnconn->connhost[conn->whichhost].host;
6023-
elseif (conn->pghost!=NULL&&conn->pghost[0]!='\0')
6024-
returnconn->pghost;
6025-
else
6020+
6021+
if (conn->connhost!=NULL)
60266022
{
6027-
#ifdefHAVE_UNIX_SOCKETS
6028-
returnDEFAULT_PGSOCKET_DIR;
6029-
#else
6030-
returnDefaultHost;
6031-
#endif
6023+
if (conn->connhost[conn->whichhost].host!=NULL&&
6024+
conn->connhost[conn->whichhost].host[0]!='\0')
6025+
returnconn->connhost[conn->whichhost].host;
6026+
elseif (conn->connhost[conn->whichhost].hostaddr!=NULL&&
6027+
conn->connhost[conn->whichhost].hostaddr[0]!='\0')
6028+
returnconn->connhost[conn->whichhost].hostaddr;
60326029
}
6030+
6031+
return"";
60336032
}
60346033

60356034
char*
60366035
PQport(constPGconn*conn)
60376036
{
60386037
if (!conn)
60396038
returnNULL;
6039+
60406040
if (conn->connhost!=NULL)
60416041
returnconn->connhost[conn->whichhost].port;
6042-
returnconn->pgport;
6042+
6043+
return"";
60436044
}
60446045

60456046
char*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp