Commitf2eba41

committed

Use conn->raddr consistently for non-connect libpq error reporting.

1 parentbad8277 commitf2eba41Copy full SHA for f2eba41

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -989,16 +989,18 @@ connectFailureMessage(PGconn *conn, int errorno)`
`989`	`989`	`{`
`990`	`990`	`charhost_addr[NI_MAXHOST];`
`991`	`991`	`booldisplay_host_addr;`
	`992`	`+structsockaddr_inhost_addr_struct= (structsockaddr_in)`
	`993`	`+&conn->raddr.addr;`
`992`	`994`
`993`	`995`	`/*`
`994`	`996`	`*Optionally display the network address with the hostname.`
`995`	`997`	`*This is useful to distinguish between IPv4 and IPv6 connections.`
`996`	`998`	`*/`
`997`	`999`	`if (conn->pghostaddr!=NULL)`
`998`	`1000`	`strlcpy(host_addr,conn->pghostaddr,NI_MAXHOST);`
`999`		`-elseif (inet_net_ntop(conn->addr_cur->ai_family,`
`1000`		`-&conn->addr_cur->ai_addr,`
`1001`		`-conn->addr_cur->ai_family==AF_INET ?32 :128,`
	`1001`	`+elseif (inet_net_ntop(host_addr_struct->sin_family,`
	`1002`	`+&host_addr_struct->sin_addr.s_addr,`
	`1003`	`+host_addr_struct->sin_family==AF_INET ?32 :128,`
`1002`	`1004`	`host_addr,sizeof(host_addr))==NULL)`
`1003`	`1005`	`strcpy(host_addr,"???");`
`1004`	`1006`

Comments

(0)