X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fevent.c;h=4aee6c4c9ae9040785353445372afdcbc74b6642;hb=f7e35411ca63bd2ed9596959e8258bd2caa1deb6;hp=684759a727f2cfa5c2e390978950ec49f6b7ac21;hpb=5a0be2445e09e1d0fc6ae995b6c0296bc28e657d;p=adns.git diff --git a/src/event.c b/src/event.c index 684759a..4aee6c4 100644 --- a/src/event.c +++ b/src/event.c @@ -5,12 +5,11 @@ * - user-visible check/wait and event-loop-related functions */ /* - * This file is - * Copyright (C) 1997-2000 Ian Jackson - * - * It is part of adns, which is - * Copyright (C) 1997-2000 Ian Jackson - * Copyright (C) 1999 Tony Finch + * This file is part of adns, which is + * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * 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 @@ -44,9 +43,6 @@ /* TCP connection management. */ static void tcp_close(adns_state ads) { - int serv; - - serv= ads->tcpserver; close(ads->tcpsocket); ads->tcpsocket= -1; ads->tcprecv.used= ads->tcprecv_skip= ads->tcpsend.used= 0; @@ -83,9 +79,24 @@ static void tcp_connected(adns_state ads, struct timeval now) { } } +static void tcp_broken_events(adns_state ads) { + adns_query qu, nqu; + + assert(ads->tcpstate == server_broken); + for (qu= ads->tcpw.head; qu; qu= nqu) { + nqu= qu->next; + assert(qu->state == query_tcpw); + if (qu->retries > ads->nservers) { + LIST_UNLINK(ads->tcpw,qu); + adns__query_fail(qu,adns_s_allservfail); + } + } + ads->tcpstate= server_disconnected; +} + 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; triesnservers; tries++) { @@ -105,23 +116,24 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) { assert(!ads->tcprecv_skip); proto= getprotobyname("tcp"); - if (!proto) { adns__diag(ads,-1,0,"unable to find protocol no. for TCP !"); return; } - fd= socket(AF_INET,SOCK_STREAM,proto->p_proto); + if (!proto) { + adns__diag(ads,-1,0,"unable to find protocol no. for TCP !"); + return; + } + 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; } r= adns__setnonblock(ads,fd); if (r) { - adns__diag(ads,-1,0,"cannot make TCP socket nonblocking: %s",strerror(r)); + adns__diag(ads,-1,0,"cannot make TCP socket nonblocking:" + " %s",strerror(r)); 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; } @@ -131,7 +143,7 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) { return; } adns__tcp_broken(ads,"connect",strerror(errno)); - ads->tcpstate= server_disconnected; + tcp_broken_events(ads); } } @@ -218,21 +230,11 @@ static void timeouts_queue(adns_state ads, int act, static void tcp_events(adns_state ads, int act, struct timeval **tv_io, struct timeval *tvbuf, struct timeval now) { - adns_query qu, nqu; - for (;;) { switch (ads->tcpstate) { case server_broken: if (!act) { inter_immed(tv_io,tvbuf); return; } - for (qu= ads->tcpw.head; qu; qu= nqu) { - nqu= qu->next; - assert(qu->state == query_tcpw); - if (qu->retries > ads->nservers) { - LIST_UNLINK(ads->tcpw,qu); - adns__query_fail(qu,adns_s_allservfail); - } - } - ads->tcpstate= server_disconnected; + tcp_broken_events(ads); case server_disconnected: /* fall through */ if (!ads->tcpw.head) return; if (!act) { inter_immed(tv_io,tvbuf); return; } @@ -303,33 +305,40 @@ void adns_processtimeouts(adns_state ads, const struct timeval *now) { int adns__pollfds(adns_state ads, struct pollfd pollfds_buf[MAX_POLLFDS]) { /* Returns the number of entries filled in. Always zeroes revents. */ - assert(MAX_POLLFDS==2); + int i; + + assert(MAX_POLLFDS == MAXUDP + 1); - pollfds_buf[0].fd= ads->udpsocket; - pollfds_buf[0].events= POLLIN; - pollfds_buf[0].revents= 0; + for (i=0; inudp; i++) { + pollfds_buf[i].fd= ads->udpsocket[i].fd; + pollfds_buf[i].events= POLLIN; + pollfds_buf[i].revents= 0; + } switch (ads->tcpstate) { case server_disconnected: case server_broken: return 1; case server_connecting: - pollfds_buf[1].events= POLLOUT; + pollfds_buf[i].events= POLLOUT; break; case server_ok: - pollfds_buf[1].events= ads->tcpsend.used ? POLLIN|POLLOUT|POLLPRI : POLLIN|POLLPRI; + pollfds_buf[i].events= + ads->tcpsend.used ? POLLIN|POLLOUT|POLLPRI : POLLIN|POLLPRI; break; default: abort(); } - pollfds_buf[1].fd= ads->tcpsocket; - return 2; + pollfds_buf[i++].fd= ads->tcpsocket; + return i; } 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, udpaddrlen, serv, old_skip; 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); @@ -358,7 +367,8 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) { want= 2; } ads->tcprecv.used -= ads->tcprecv_skip; - memmove(ads->tcprecv.buf,ads->tcprecv.buf+ads->tcprecv_skip,ads->tcprecv.used); + memmove(ads->tcprecv.buf, ads->tcprecv.buf+ads->tcprecv_skip, + ads->tcprecv.used); ads->tcprecv_skip= 0; if (!adns__vbuf_ensure(&ads->tcprecv,want)) { r= ENOMEM; goto xit; } assert(ads->tcprecv.used <= ads->tcprecv.avail); @@ -381,44 +391,32 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) { default: abort(); } - if (fd == ads->udpsocket) { - for (;;) { - udpaddrlen= sizeof(udpaddr); - r= recvfrom(ads->udpsocket,udpbuf,sizeof(udpbuf),0, - (struct sockaddr*)&udpaddr,&udpaddrlen); - if (r<0) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { r= 0; goto xit; } - if (errno == EINTR) continue; - if (errno_resources(errno)) { r= errno; goto xit; } - 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; - serv++); - if (serv >= ads->nservers) { - adns__warn(ads,-1,0,"datagram received from unknown nameserver %s", - inet_ntoa(udpaddr.sin_addr)); - continue; + for (i=0; inudp; i++) { + udp= &ads->udpsocket[i]; + if (fd == udp->fd) { + for (;;) { + udpaddrlen= sizeof(udpaddr); + 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; + if (errno_resources(errno)) { r= errno; goto xit; } + adns__warn(ads,-1,0,"datagram receive error: %s",strerror(errno)); + r= 0; goto xit; + } + for (serv= 0; + serv < ads->nservers && + !adns__sockaddr_equal_p(&udpaddr.sa, + &ads->servers[serv].addr.sa); + serv++); + if (serv >= ads->nservers) { + adns__warn(ads,-1,0,"datagram received from unknown nameserver %s", + adns__sockaddr_ntoa(&udpaddr.sa, addrbuf)); + continue; + } + adns__procdgram(ads,udpbuf,r,serv,0,*now); } - adns__procdgram(ads,udpbuf,r,serv,0,*now); + break; } } r= 0; @@ -484,7 +482,8 @@ xit: return r; } -int adns_processexceptional(adns_state ads, int fd, const struct timeval *now) { +int adns_processexceptional(adns_state ads, int fd, + const struct timeval *now) { adns__consistency(ads,0,cc_entex); switch (ads->tcpstate) { case server_disconnected: @@ -505,7 +504,8 @@ int adns_processexceptional(adns_state ads, int fd, const struct timeval *now) { static void fd_event(adns_state ads, int fd, int revent, int pollflag, int maxfd, const fd_set *fds, - int (*func)(adns_state, int fd, const struct timeval *now), + int (*func)(adns_state, int fd, + const struct timeval *now), struct timeval now, int *r_r) { int r; @@ -516,7 +516,8 @@ static void fd_event(adns_state ads, int fd, if (r_r) { *r_r= r; } else { - adns__diag(ads,-1,0,"process fd failed after select: %s",strerror(errno)); + adns__diag(ads,-1,0,"process fd failed after select:" + " %s",strerror(errno)); adns_globalsystemfailure(ads); } } @@ -533,9 +534,12 @@ void adns__fdevents(adns_state ads, fd= pollfds[i].fd; if (fd >= maxfd) maxfd= fd+1; revents= pollfds[i].revents; - fd_event(ads,fd, revents,POLLIN, maxfd,readfds, adns_processreadable,now,r_r); - fd_event(ads,fd, revents,POLLOUT, maxfd,writefds, adns_processwriteable,now,r_r); - fd_event(ads,fd, revents,POLLPRI, maxfd,exceptfds, adns_processexceptional,now,r_r); +#define EV(pollfl,fds,how) \ + fd_event(ads,fd, revents,pollfl, maxfd,fds, adns_process##how,now,r_r) + EV( POLLIN, readfds, readable ); + EV( POLLOUT, writefds, writeable ); + EV( POLLPRI, exceptfds, exceptional ); +#undef EV } }