*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006 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.)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, write to the Free Software Foundation.
*/
#include <errno.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <time.h>
#include "internal.h"
#include "tvarith.h"
void adns__tcp_tryconnect(adns_state ads, struct timeval now) {
int r, fd, tries;
- struct sockaddr_in addr;
+ adns_rr_addr *addr;
struct protoent *proto;
for (tries=0; tries<ads->nservers; tries++) {
adns__diag(ads,-1,0,"unable to find protocol no. for TCP !");
return;
}
- fd= socket(AF_INET,SOCK_STREAM,proto->p_proto);
+ addr = &ads->servers[ads->tcpserver];
+ fd= socket(addr->addr.sa.sa_family, SOCK_STREAM, proto->p_proto);
if (fd<0) {
adns__diag(ads,-1,0,"cannot create TCP socket: %s",strerror(errno));
return;
close(fd);
return;
}
- memset(&addr,0,sizeof(addr));
- addr.sin_family= AF_INET;
- addr.sin_port= htons(DNS_PORT);
- addr.sin_addr= ads->servers[ads->tcpserver].addr;
- r= connect(fd,(const struct sockaddr*)&addr,sizeof(addr));
+ r= connect(fd,&addr->addr.sa,addr->len);
ads->tcpsocket= fd;
ads->tcpstate= server_connecting;
if (r==0) { tcp_connected(ads,now); return; }
/* Timeout handling functions. */
+int adns__gettimeofday(adns_state ads, struct timeval *tv) {
+ if (!(ads->iflags & adns_if_monotonic))
+ return gettimeofday(tv,0);
+
+ struct timespec ts;
+ int r = clock_gettime(CLOCK_MONOTONIC,&ts);
+ if (r) return r;
+
+ tv->tv_sec = ts.tv_sec;
+ tv->tv_usec = ts.tv_nsec / 1000;
+ return 0;
+}
+
void adns__must_gettimeofday(adns_state ads, const struct timeval **now_io,
struct timeval *tv_buf) {
const struct timeval *now;
now= *now_io;
if (now) return;
- r= gettimeofday(tv_buf,0); if (!r) { *now_io= tv_buf; return; }
- adns__diag(ads,-1,0,"gettimeofday failed: %s",strerror(errno));
+ r= adns__gettimeofday(ads,tv_buf); if (!r) { *now_io= tv_buf; return; }
+ adns__diag(ads,-1,0,"gettimeofday/clock_gettime failed: %s",
+ strerror(errno));
adns_globalsystemfailure(ads);
return;
}
struct timeval **tv_io, struct timeval *tvbuf,
struct timeval now, struct query_queue *queue) {
adns_query qu, nqu;
+ struct timeval expires;
for (qu= queue->head; qu; qu= nqu) {
nqu= qu->next;
- if (!timercmp(&now,&qu->timeout,>)) {
- inter_maxtoabs(tv_io,tvbuf,now,qu->timeout);
+ if (timercmp(&now,&qu->timeout_started,<)) /* clock rewound */
+ qu->timeout_started= now;
+ expires= qu->timeout_started;
+ timevaladd(&expires, qu->timeout_ms);
+ if (!timercmp(&now,&expires,>)) {
+ inter_maxtoabs(tv_io,tvbuf,now,expires);
} else {
if (!act) { inter_immed(tv_io,tvbuf); return; }
LIST_UNLINK(*queue,qu);
void adns_firsttimeout(adns_state ads,
struct timeval **tv_io, struct timeval *tvbuf,
struct timeval now) {
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
adns__timeouts(ads, 0, tv_io,tvbuf, now);
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
}
void adns_processtimeouts(adns_state ads, const struct timeval *now) {
struct timeval tv_buf;
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
adns__must_gettimeofday(ads,&now,&tv_buf);
if (now) adns__timeouts(ads, 1, 0,0, *now);
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
}
/* fd handling functions. These are the top-level of the real work of
int adns__pollfds(adns_state ads, struct pollfd pollfds_buf[MAX_POLLFDS]) {
/* Returns the number of entries filled in. Always zeroes revents. */
+ int nwanted=0;
+#define ADD_POLLFD(wantfd, wantevents) do{ \
+ pollfds_buf[nwanted].fd= (wantfd); \
+ pollfds_buf[nwanted].events= (wantevents); \
+ pollfds_buf[nwanted].revents= 0; \
+ nwanted++; \
+ }while(0)
+
+ int i;
- assert(MAX_POLLFDS==2);
+ assert(MAX_POLLFDS == MAXUDP + 1);
- pollfds_buf[0].fd= ads->udpsocket;
- pollfds_buf[0].events= POLLIN;
- pollfds_buf[0].revents= 0;
+ for (i=0; i<ads->nudpsockets; i++)
+ ADD_POLLFD(ads->udpsockets[i].fd, POLLIN);
switch (ads->tcpstate) {
case server_disconnected:
case server_broken:
- return 1;
+ break;
case server_connecting:
- pollfds_buf[1].events= POLLOUT;
+ ADD_POLLFD(ads->tcpsocket, POLLOUT);
break;
case server_ok:
- pollfds_buf[1].events=
- ads->tcpsend.used ? POLLIN|POLLOUT|POLLPRI : POLLIN|POLLPRI;
+ ADD_POLLFD(ads->tcpsocket,
+ ads->tcpsend.used ? POLLIN|POLLOUT|POLLPRI : POLLIN|POLLPRI);
break;
default:
abort();
}
- pollfds_buf[1].fd= ads->tcpsocket;
- return 2;
+ assert(nwanted<=MAX_POLLFDS);
+#undef ADD_POLLFD
+ return nwanted;
}
int adns_processreadable(adns_state ads, int fd, const struct timeval *now) {
- int want, dgramlen, r, udpaddrlen, serv, old_skip;
+ int want, dgramlen, r, i, serv, old_skip;
+ socklen_t udpaddrlen;
byte udpbuf[DNS_MAXUDP];
- struct sockaddr_in udpaddr;
+ char addrbuf[ADNS_ADDR2TEXT_BUFLEN];
+ struct udpsocket *udp;
+ adns_sockaddr udpaddr;
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
switch (ads->tcpstate) {
case server_disconnected:
default:
abort();
}
- if (fd == ads->udpsocket) {
+ for (i=0; i<ads->nudpsockets; i++) {
+ udp= &ads->udpsockets[i];
+ if (fd != udp->fd) continue;
for (;;) {
udpaddrlen= sizeof(udpaddr);
- r= recvfrom(ads->udpsocket,udpbuf,sizeof(udpbuf),0,
- (struct sockaddr*)&udpaddr,&udpaddrlen);
+ r= recvfrom(fd,udpbuf,sizeof(udpbuf),0, &udpaddr.sa,&udpaddrlen);
if (r<0) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { r= 0; goto xit; }
if (errno == EINTR) continue;
adns__warn(ads,-1,0,"datagram receive error: %s",strerror(errno));
r= 0; goto xit;
}
- if (udpaddrlen != sizeof(udpaddr)) {
- adns__diag(ads,-1,0,"datagram received with wrong address length %d"
- " (expected %lu)", udpaddrlen,
- (unsigned long)sizeof(udpaddr));
- continue;
- }
- if (udpaddr.sin_family != AF_INET) {
- adns__diag(ads,-1,0,"datagram received with wrong protocol family"
- " %u (expected %u)",udpaddr.sin_family,AF_INET);
- continue;
- }
- if (ntohs(udpaddr.sin_port) != DNS_PORT) {
- adns__diag(ads,-1,0,"datagram received from wrong port"
- " %u (expected %u)", ntohs(udpaddr.sin_port),DNS_PORT);
- continue;
- }
for (serv= 0;
serv < ads->nservers &&
- ads->servers[serv].addr.s_addr != udpaddr.sin_addr.s_addr;
+ !adns__sockaddrs_equal(&udpaddr.sa,
+ &ads->servers[serv].addr.sa);
serv++);
if (serv >= ads->nservers) {
adns__warn(ads,-1,0,"datagram received from unknown nameserver %s",
- inet_ntoa(udpaddr.sin_addr));
+ adns__sockaddr_ntoa(&udpaddr.sa, addrbuf));
continue;
}
adns__procdgram(ads,udpbuf,r,serv,0,*now);
}
+ break;
}
r= 0;
xit:
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
return r;
}
int adns_processwriteable(adns_state ads, int fd, const struct timeval *now) {
int r;
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
switch (ads->tcpstate) {
case server_disconnected:
assert(ads->tcprecv.used==0);
assert(ads->tcprecv_skip==0);
for (;;) {
+ /* This function can be called even if the fd wasn't actually
+ * flagged as writeable. For asynch tcp connect we have to
+ * actually use the writeability to tell us the connect has
+ * completed (or failed), so we need to double check. */
+ fd_set writeable;
+ struct timeval timeout = { 0,0 };
+ FD_ZERO(&writeable);
+ FD_SET(ads->tcpsocket,&writeable);
+ r= select(ads->tcpsocket+1,0,&writeable,0,&timeout);
+ if (r==0) break;
+ if (r<0) {
+ if (errno==EINTR) continue;
+ adns__tcp_broken(ads,"select","failed connecting writeability check");
+ r= 0; goto xit;
+ }
+ assert(FD_ISSET(ads->tcpsocket,&writeable));
if (!adns__vbuf_ensure(&ads->tcprecv,1)) { r= ENOMEM; goto xit; }
- r= read(ads->tcpsocket,&ads->tcprecv.buf,1);
+ r= read(ads->tcpsocket,ads->tcprecv.buf,1);
if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) {
tcp_connected(ads,*now);
r= 0; goto xit;
adns__tcp_broken(ads,"write",strerror(errno));
r= 0; goto xit;
} else if (r>0) {
+ assert(r <= ads->tcpsend.used);
ads->tcpsend.used -= r;
memmove(ads->tcpsend.buf,ads->tcpsend.buf+r,ads->tcpsend.used);
}
}
r= 0;
xit:
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
return r;
}
int adns_processexceptional(adns_state ads, int fd,
const struct timeval *now) {
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
switch (ads->tcpstate) {
case server_disconnected:
case server_broken:
default:
abort();
}
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
return 0;
}
struct pollfd pollfds[MAX_POLLFDS];
int i, fd, maxfd, npollfds;
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
if (tv_mod && (!*tv_mod || (*tv_mod)->tv_sec || (*tv_mod)->tv_usec)) {
/* The caller is planning to sleep. */
*maxfd_io= maxfd;
xit:
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
}
void adns_afterselect(adns_state ads, int maxfd, const fd_set *readfds,
struct pollfd pollfds[MAX_POLLFDS];
int npollfds, i;
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
adns__must_gettimeofday(ads,&now,&tv_buf);
if (!now) goto xit;
adns_processtimeouts(ads,now);
maxfd,readfds,writefds,exceptfds,
*now, 0);
xit:
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
}
/* General helpful functions. */
void adns_globalsystemfailure(adns_state ads) {
- adns__consistency(ads,0,cc_entex);
+ /* Must not be called by adns during actual processing of a
+ * particular query, since it reenters adns. Only safe to call in
+ * situations where it would be safe to call adns_returning. */
+ adns__consistency(ads,0,cc_enter);
- while (ads->udpw.head) adns__query_fail(ads->udpw.head, adns_s_systemfail);
- while (ads->tcpw.head) adns__query_fail(ads->tcpw.head, adns_s_systemfail);
+ for (;;) {
+ adns_query qu;
+#define GSF_QQ(QQ) \
+ if ((qu= ads->QQ.head)) { \
+ LIST_UNLINK(ads->QQ,qu); \
+ adns__query_fail(qu, adns_s_systemfail); \
+ continue; \
+ }
+ GSF_QQ(udpw);
+ GSF_QQ(tcpw);
+#undef GSF_QQ
+ break;
+ }
switch (ads->tcpstate) {
case server_connecting:
default:
abort();
}
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
}
int adns_processany(adns_state ads) {
struct pollfd pollfds[MAX_POLLFDS];
int npollfds;
- adns__consistency(ads,0,cc_entex);
+ adns__consistency(ads,0,cc_enter);
- r= gettimeofday(&now,0);
+ r= adns__gettimeofday(ads,&now);
if (!r) adns_processtimeouts(ads,&now);
/* We just use adns__fdevents to loop over the fd's trying them.
0,0,0,0,
now,&r);
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
return 0;
}
fd_set readfds, writefds, exceptfds;
struct timeval tvbuf, *tvp;
- adns__consistency(ads,*query_io,cc_entex);
+ adns__consistency(ads,*query_io,cc_enter);
for (;;) {
r= adns__internal_check(ads,query_io,answer_r,context_r);
if (r != EAGAIN) break;
adns_afterselect(ads,maxfd,&readfds,&writefds,&exceptfds,0);
}
}
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
return r;
}
struct timeval now;
int r;
- adns__consistency(ads,*query_io,cc_entex);
- r= gettimeofday(&now,0);
+ adns__consistency(ads,*query_io,cc_enter);
+ r= adns__gettimeofday(ads,&now);
if (!r) adns__autosys(ads,now);
r= adns__internal_check(ads,query_io,answer_r,context_r);
- adns__consistency(ads,0,cc_entex);
+ adns__returning(ads,0);
return r;
}
~ianmdlvl / adns.git / blobdiff