|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.4 2003/04/02 00:49:28 tgl Exp $ |
| 11 | + * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.5 2003/04/0220:00:21 tgl Exp $ |
12 | 12 | * |
13 | 13 | * This file and the IPV6 implementation were initially provided by |
14 | 14 | * Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design |
@@ -328,18 +328,13 @@ rangeSockAddrAF_INET6(const SockAddr *addr, const SockAddr *netaddr, |
328 | 328 | staticvoid |
329 | 329 | convSockAddr6to4(constSockAddr*src,SockAddr*dst) |
330 | 330 | { |
331 | | -charaddr_str[INET6_ADDRSTRLEN]; |
332 | | - |
| 331 | +MemSet(dst,0,sizeof(*dst)); |
333 | 332 | dst->in.sin_family=AF_INET; |
| 333 | +/* both src and dst are assumed to be in network byte order */ |
334 | 334 | dst->in.sin_port=src->in6.sin6_port; |
335 | | - |
336 | | -dst->in.sin_addr.s_addr= |
337 | | -(src->in6.sin6_addr.s6_addr[15]) |
338 | | -+ (src->in6.sin6_addr.s6_addr[14] <<8) |
339 | | -+ (src->in6.sin6_addr.s6_addr[13] <<16) |
340 | | -+ (src->in6.sin6_addr.s6_addr[12] <<24); |
341 | | - |
342 | | -SockAddr_ntop(src,addr_str,INET6_ADDRSTRLEN,0); |
| 335 | +memcpy(&dst->in.sin_addr.s_addr, |
| 336 | + ((char*) (&src->in6.sin6_addr.s6_addr))+12, |
| 337 | +sizeof(structin_addr)); |
343 | 338 | } |
344 | 339 |
|
345 | 340 | #endif/* HAVE_IPV6 */ |