upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-28 17:46:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

4466. [bug] Interface scanning didn't work on a Windows system

Browse source 
without a non local IPv6 addresses. [RT #43130]

(cherry picked from commit 61ca100b80)
This commit is contained in:
Mark Andrews 2016-09-08 14:25:20 +10:00
parent 24695806b8
commit 120de36b05
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4466. [bug] Interface scanning didn't work on a Windows system
without a non local IPv6 addresses. [RT #43130]
4464. [bug] Fix windows python support. [RT #43173]
4461. [bug] win32: not all external data was properly marked

8
lib/isc/win32/interfaceiter.c
View file

@ -384,7 +384,7 @@ internal_current6(isc_interfaceiter_t *iter) {
memset(&iter->current, 0, sizeof(iter->current));
iter->current.af = AF_INET6;
if (iter->pos6 != 0U || !iter->pos6zero) {
if (!iter->pos6zero) {
if (iter->pos6 == 0U)
iter->pos6zero = ISC_TRUE;
get_addr(AF_INET6, &iter->current.address,
@ -475,9 +475,9 @@ internal_next(isc_interfaceiter_t *iter) {
static isc_result_t
internal_next6(isc_interfaceiter_t *iter) {
if (iter->pos6 == 0 && iter->v6loop)
if (iter->pos6 == 0U && iter->v6loop)
return (ISC_R_NOMORE);
if (iter->pos6 != 0)
if (iter->pos6 != 0U)
iter->pos6--;
return (ISC_R_SUCCESS);
}
@ -498,7 +498,7 @@ isc_interfaceiter_first(isc_interfaceiter_t *iter) {
if (iter->buf6 != NULL) {
iter->pos6 = iter->buf6->iAddressCount;
iter->v6loop = ISC_FALSE;
iter->pos6zero = ISC_FALSE;
iter->pos6zero = ISC_TF(iter->pos6 == 0U);
}
iter->result = ISC_R_SUCCESS;
return (isc_interfaceiter_next(iter));