mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-02 07:35:26 +00:00
don't reset added when retrying sources, and add another printf
This commit is contained in:
@@ -374,14 +374,18 @@ fillpool(isc_entropy_t *ent, unsigned int needed, isc_boolean_t blocking) {
|
|||||||
* others are always drained.
|
* others are always drained.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
printf("Waiting for %u bytes...\n", needed);
|
if (blocking)
|
||||||
|
printf("Waiting for %u bytes...\n", needed);
|
||||||
|
|
||||||
|
added = 0;
|
||||||
again:
|
again:
|
||||||
source = ISC_LIST_HEAD(ent->sources);
|
source = ISC_LIST_HEAD(ent->sources);
|
||||||
added = 0;
|
|
||||||
while (source != NULL && needed > 0) {
|
while (source != NULL && needed > 0) {
|
||||||
if (source->type == ENTROPY_SOURCETYPE_FILE)
|
if (source->type == ENTROPY_SOURCETYPE_FILE) {
|
||||||
added += get_from_filesource(source, needed);
|
isc_uint32_t got;
|
||||||
|
got = get_from_filesource(source, needed);
|
||||||
|
added += got;
|
||||||
|
}
|
||||||
|
|
||||||
if (added >= needed)
|
if (added >= needed)
|
||||||
break;
|
break;
|
||||||
@@ -395,11 +399,15 @@ fillpool(isc_entropy_t *ent, unsigned int needed, isc_boolean_t blocking) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (blocking && added < needed) {
|
if (blocking && added < needed) {
|
||||||
if (wait_for_sources(ent) > 0)
|
int fds;
|
||||||
|
fds = wait_for_sources(ent);
|
||||||
|
printf("wait_for_sources() returned %d\n", fds);
|
||||||
|
if (fds > 0)
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Got %u bytes...\n", added);
|
if (blocking)
|
||||||
|
printf("Got %u bytes...\n", added);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Adjust counts.
|
* Adjust counts.
|
||||||
|
Reference in New Issue
Block a user