mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

more portable method to generate v6 from v4 sockaddrs

Browse Source
This commit is contained in:
Michael Graff
1999-08-28 05:33:29 +00:00
parent c9b758b7c3
commit 2dcb05b6a8
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/isc/sockaddr.c
View File

@@ -111,11 +111,6 @@ isc_sockaddr_hash(isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
return (h); return (h);
} }
/*
* v6v4addr is used when creating IPv4-mapped IPv6 addresses.
*/
static struct in6_addr v6v4addr = {{{ 0,0,0,0,0,0,0,0,0,0,255,255,0,0,0,0 }}};
void void
isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, struct in_addr *ina, isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, struct in_addr *ina,
unsigned int port) unsigned int port)
@@ -155,7 +150,8 @@ isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, struct in_addr *ina,
#ifdef ISC_NET_HAVESALEN #ifdef ISC_NET_HAVESALEN
sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6; sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
#endif #endif
sockaddr->type.sin6.sin6_addr = v6v4addr; sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;
sockaddr->type.sin6.sin6_addr.s6_addr[11] = 0xff;
memcpy(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4); memcpy(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4);
sockaddr->type.sin6.sin6_port = htons(port); sockaddr->type.sin6.sin6_port = htons(port);
sockaddr->length = sizeof sockaddr->type.sin6; sockaddr->length = sizeof sockaddr->type.sin6;