X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fevent.c;h=582e95c54f893bcde8e1d843f6889b6d1e6e304c;hb=eec1d9c837c2b0f0c64d74a3dbf25732c7c475f2;hp=8329ff4c88bc4ed08043399581425d043d2866be;hpb=3955725ceceb330041f8e7a27e6629a2e8a9b5ba;p=adns.git diff --git a/src/event.c b/src/event.c index 8329ff4..582e95c 100644 --- a/src/event.c +++ b/src/event.c @@ -5,7 +5,7 @@ * - user-visible check/wait and event-loop-related functions */ /* - * This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson + * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson * * 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 @@ -27,6 +27,8 @@ #include #include +#include +#include #include #include "internal.h" @@ -76,7 +78,6 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) { int r, fd, tries; struct sockaddr_in addr; struct protoent *proto; - /* fixme: single TCP timeout, not once per server */ for (tries=0; triesnservers; tries++) { if (ads->tcpstate == server_connecting || ads->tcpstate == server_ok) return; @@ -101,7 +102,7 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) { addr.sin_family= AF_INET; addr.sin_port= htons(DNS_PORT); addr.sin_addr= ads->servers[ads->tcpserver].addr; - r= connect(fd,&addr,sizeof(addr)); + r= connect(fd,(const struct sockaddr*)&addr,sizeof(addr)); ads->tcpsocket= fd; ads->tcpstate= server_connecting; if (r==0) { tcp_connected(ads,now); continue; } @@ -125,16 +126,16 @@ static void inter_maxto(struct timeval **tv_io, struct timeval *tvbuf, } else { if (timercmp(rbuf,&maxto,>)) *rbuf= maxto; } -fprintf(stderr,"inter_maxto maxto=%ld.%06ld result=%ld.%06ld\n", - maxto.tv_sec,maxto.tv_usec,(**tv_io).tv_sec,(**tv_io).tv_usec); +/*fprintf(stderr,"inter_maxto maxto=%ld.%06ld result=%ld.%06ld\n", + maxto.tv_sec,maxto.tv_usec,(**tv_io).tv_sec,(**tv_io).tv_usec);*/ } static void inter_maxtoabs(struct timeval **tv_io, struct timeval *tvbuf, struct timeval now, struct timeval maxtime) { ldiv_t dr; -fprintf(stderr,"inter_maxtoabs now=%ld.%06ld maxtime=%ld.%06ld\n", - now.tv_sec,now.tv_usec,maxtime.tv_sec,maxtime.tv_usec); +/*fprintf(stderr,"inter_maxtoabs now=%ld.%06ld maxtime=%ld.%06ld\n", + now.tv_sec,now.tv_usec,maxtime.tv_sec,maxtime.tv_usec);*/ if (!tv_io) return; maxtime.tv_sec -= (now.tv_sec+2); maxtime.tv_usec -= (now.tv_usec-2000000); @@ -177,9 +178,9 @@ void adns_interest(adns_state ads, int *maxfd, struct timeval tvto_lr; int r; -fprintf(stderr,"adns_interest\n"); +/*fprintf(stderr,"adns_interest\n");*/ -r= gettimeofday(&now,0); + r= gettimeofday(&now,0); if (r) { adns__warn(ads,-1,0,"gettimeofday failed - will sleep for a bit: %s", strerror(errno)); @@ -201,6 +202,7 @@ r= gettimeofday(&now,0); inter_addfd(maxfd,readfds,ads->tcpsocket); inter_addfd(maxfd,exceptfds,ads->tcpsocket); if (ads->tcpsend.used) inter_addfd(maxfd,writefds,ads->tcpsocket); + break; default: abort(); } @@ -230,7 +232,7 @@ static int internal_callback(adns_state ads, int maxfd, if (callb_checkfd(maxfd,writefds,ads->tcpsocket)) { count++; assert(ads->tcprecv.used==0); - adns__vbuf_ensure(&ads->tcprecv,1); + if (!adns__vbuf_ensure(&ads->tcprecv,1)) return -1; if (ads->tcprecv.buf) { r= read(ads->tcpsocket,&ads->tcprecv.buf,1); if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) { @@ -263,8 +265,10 @@ static int internal_callback(adns_state ads, int maxfd, } ads->tcprecv.used -= skip; memmove(ads->tcprecv.buf,ads->tcprecv.buf+skip,ads->tcprecv.used); - adns__vbuf_ensure(&ads->tcprecv,want); - if (ads->tcprecv.used >= ads->tcprecv.avail) break; + skip= 0; + if (!adns__vbuf_ensure(&ads->tcprecv,want)) return -1; + assert(ads->tcprecv.used <= ads->tcprecv.avail); + if (ads->tcprecv.used == ads->tcprecv.avail) continue; r= read(ads->tcpsocket, ads->tcprecv.buf+ads->tcprecv.used, ads->tcprecv.avail-ads->tcprecv.used); @@ -282,7 +286,9 @@ static int internal_callback(adns_state ads, int maxfd, } else if (callb_checkfd(maxfd,exceptfds,ads->tcpsocket)) { adns__tcp_broken(ads,"select","exceptional condition detected"); } else if (ads->tcpsend.used && callb_checkfd(maxfd,writefds,ads->tcpsocket)) { + adns__sigpipe_protect(ads); r= write(ads->tcpsocket,ads->tcpsend.buf,ads->tcpsend.used); + adns__sigpipe_unprotect(ads); if (r<0) { if (errno!=EAGAIN && errno!=EWOULDBLOCK && errno!=ENOMEM && errno!=EINTR) { adns__tcp_broken(ads,"write",strerror(errno)); @@ -292,6 +298,7 @@ static int internal_callback(adns_state ads, int maxfd, memmove(ads->tcpsend.buf,ads->tcpsend.buf+r,ads->tcpsend.used); } } + break; default: abort(); } @@ -300,7 +307,8 @@ static int internal_callback(adns_state ads, int maxfd, count++; for (;;) { udpaddrlen= sizeof(udpaddr); - r= recvfrom(ads->udpsocket,udpbuf,sizeof(udpbuf),0,&udpaddr,&udpaddrlen); + r= recvfrom(ads->udpsocket,udpbuf,sizeof(udpbuf),0, + (struct sockaddr*)&udpaddr,&udpaddrlen); if (r<0) { if (!(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR || errno == ENOMEM || errno == ENOBUFS)) @@ -370,7 +378,7 @@ static int internal_check(adns_state ads, } LIST_UNLINK(ads->output,qu); *answer= qu->answer; - if (context_r) *context_r= qu->context.ext; + if (context_r) *context_r= qu->ctx.ext; free(qu); return 0; } @@ -390,7 +398,10 @@ int adns_wait(adns_state ads, FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); adns_interest(ads,&maxfd,&readfds,&writefds,&exceptfds,&tvp,&tvbuf); rsel= select(maxfd,&readfds,&writefds,&exceptfds,tvp); - if (rsel==-1) return r; + if (rsel==-1) { + if (errno == EINTR && !(ads->iflags & adns_if_eintr)) continue; + return errno; + } rcb= adns_callback(ads,maxfd,&readfds,&writefds,&exceptfds); assert(rcb==rsel); }