chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regress: Move case-*.in opening to shlib playback_prepare
[adns.git]
/
src
/
poll.c
diff --git
a/src/poll.c
b/src/poll.c
index 0b47a8373c9a78a4732b401c40583471fc2f8573..6484b346dba5df13665734e5f0b5d959e8ca0d65 100644
(file)
--- a/
src/poll.c
+++ b/
src/poll.c
@@
-4,7
+4,8
@@
*/
/*
* This file is part of adns, which is
*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson
+ * Copyright (C) 1997-2000,2003,2006,2014-2016,2020 Ian Jackson
+ * Copyright (C) 2014 Mark Wooding
* Copyright (C) 1999-2000,2003,2006 Tony Finch
* Copyright (C) 1991 Massachusetts Institute of Technology
* (See the file INSTALL for full details.)
* Copyright (C) 1999-2000,2003,2006 Tony Finch
* Copyright (C) 1991 Massachusetts Institute of Technology
* (See the file INSTALL for full details.)
@@
-36,7
+37,7
@@
int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io,
int space, found, timeout_ms, r;
struct pollfd fds_tmp[MAX_POLLFDS];
int space, found, timeout_ms, r;
struct pollfd fds_tmp[MAX_POLLFDS];
- adns__consistency(ads,0,cc_ente
x
);
+ adns__consistency(ads,0,cc_ente
r
);
if (timeout_io) {
adns__must_gettimeofday(ads,&now,&tv_nowbuf);
if (timeout_io) {
adns__must_gettimeofday(ads,&now,&tv_nowbuf);
@@
-84,10
+85,11
@@
void adns_afterpoll(adns_state ads, const struct pollfd *fds, int nfds,
const struct timeval *now) {
struct timeval tv_buf;
const struct timeval *now) {
struct timeval tv_buf;
- adns__consistency(ads,0,cc_ente
x
);
+ adns__consistency(ads,0,cc_ente
r
);
adns__must_gettimeofday(ads,&now,&tv_buf);
if (now) {
adns__timeouts(ads, 1, 0,0, *now);
adns__must_gettimeofday(ads,&now,&tv_buf);
if (now) {
adns__timeouts(ads, 1, 0,0, *now);
+ adns__intdone_process(ads); /* fdevents calls adns_processwriteable */
adns__fdevents(ads, fds,nfds, 0,0,0,0, *now,0);
}
adns__returning(ads,0);
adns__fdevents(ads, fds,nfds, 0,0,0,0, *now,0);
}
adns__returning(ads,0);
@@
-100,7
+102,7
@@
int adns_wait_poll(adns_state ads,
int r, nfds, to;
struct pollfd fds[MAX_POLLFDS];
int r, nfds, to;
struct pollfd fds[MAX_POLLFDS];
- adns__consistency(ads,0,cc_ente
x
);
+ adns__consistency(ads,0,cc_ente
r
);
for (;;) {
r= adns__internal_check(ads,query_io,answer_r,context_r);
for (;;) {
r= adns__internal_check(ads,query_io,answer_r,context_r);