mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

ISC_NET_HAVESALEN -> ISC_PLATFORM_HAVESALEN

Browse Source
This commit is contained in:
Andreas Gustafsson
1999-10-28 01:36:36 +00:00
parent 5b62e9688e
commit 0e42fb6588
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/dispatch_tcp_test.c
View File

@@ -168,7 +168,7 @@ start_response(void)
memset(&from, 0, sizeof(from)); memset(&from, 0, sizeof(from));
from.length = sizeof(struct sockaddr_in); from.length = sizeof(struct sockaddr_in);
#ifdef ISC_NET_HAVESALEN #ifdef ISC_PLATFORM_HAVESALEN
from.type.sa.sa_len = sizeof(struct sockaddr_in); from.type.sa.sa_len = sizeof(struct sockaddr_in);
#endif #endif
from.type.sin.sin_port = htons(53); from.type.sin.sin_port = htons(53);

2
bin/tests/dispatch_test.c
View File

@@ -144,7 +144,7 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
memset(&from, 0, sizeof(from)); memset(&from, 0, sizeof(from));
from.length = sizeof(struct sockaddr_in); from.length = sizeof(struct sockaddr_in);
#ifdef ISC_NET_HAVESALEN #ifdef ISC_PLATFORM_HAVESALEN
from.type.sa.sa_len = sizeof(struct sockaddr_in); from.type.sa.sa_len = sizeof(struct sockaddr_in);
#endif #endif
from.type.sin.sin_port = htons(53); from.type.sin.sin_port = htons(53);

6
lib/isc/sockaddr.c
View File

@@ -188,7 +188,7 @@ isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
{ {
memset(sockaddr, 0, sizeof *sockaddr); memset(sockaddr, 0, sizeof *sockaddr);
sockaddr->type.sin.sin_family = AF_INET; sockaddr->type.sin.sin_family = AF_INET;
#ifdef ISC_NET_HAVESALEN #ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin.sin_len = sizeof sockaddr->type.sin; sockaddr->type.sin.sin_len = sizeof sockaddr->type.sin;
#endif #endif
sockaddr->type.sin.sin_addr = *ina; sockaddr->type.sin.sin_addr = *ina;
@@ -203,7 +203,7 @@ isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
{ {
memset(sockaddr, 0, sizeof *sockaddr); memset(sockaddr, 0, sizeof *sockaddr);
sockaddr->type.sin6.sin6_family = AF_INET6; sockaddr->type.sin6.sin6_family = AF_INET6;
#ifdef ISC_NET_HAVESALEN #ifdef ISC_PLATFORM_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 = *ina6; sockaddr->type.sin6.sin6_addr = *ina6;
@@ -218,7 +218,7 @@ isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
{ {
memset(sockaddr, 0, sizeof *sockaddr); memset(sockaddr, 0, sizeof *sockaddr);
sockaddr->type.sin6.sin6_family = AF_INET6; sockaddr->type.sin6.sin6_family = AF_INET6;
#ifdef ISC_NET_HAVESALEN #ifdef ISC_PLATFORM_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.s6_addr[10] = 0xff; sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;