diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-01-09 14:35:03 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-01-09 14:35:03 +0000 |
| commit | 9df2c440326cf5ebfe485af4e76938c12faa220d (patch) | |
| tree | e163735a8a89bf771d23440e2dae4fc1446c0960 /src | |
| parent | 2e98da52467de01bc5373926022ee26be77e63b3 (diff) | |
| download | postgresql-9df2c440326cf5ebfe485af4e76938c12faa220d.tar.gz postgresql-9df2c440326cf5ebfe485af4e76938c12faa220d.zip | |
Fix IPv6 detection and IPv6 to 4 conversion to use only standard
interfaces.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/ip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c index 21f5c2fe1d5..20f5df311a8 100644 --- a/src/backend/libpq/ip.c +++ b/src/backend/libpq/ip.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.1 2003/01/06 03:18:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.2 2003/01/09 14:35:03 petere Exp $ * * This file and the IPV6 implementation were initially provided by * Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design @@ -365,7 +365,11 @@ convSockAddr6to4(const SockAddr *src, SockAddr *dst) dst->in.sin_family = AF_INET; dst->in.sin_port = src->in6.sin6_port; - dst->in.sin_addr.s_addr = src->in6.sin6_addr.s6_addr32[3]; + dst->in.sin_addr.s_addr = + (src->in6.sin6_addr.s6_addr[15]) + + (src->in6.sin6_addr.s6_addr[14] << 8) + + (src->in6.sin6_addr.s6_addr[13] << 16) + + (src->in6.sin6_addr.s6_addr[12] << 24); SockAddr_ntop(src, addr_str, INET6_ADDRSTRLEN, 0); } #endif |