API: Reject unknown flags

[adns] / src / event.c

diff --git a/src/event.c b/src/event.c
index 52a2efcb13084a8ab2b6e0cd6e1b9447093c4bf2..3dd927b6974fb675536676eff51a17a8162a319a 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -6,14 +6,15 @@
  */
 /*
  *  This file is part of adns, which is
  */
 /*
  *  This file is part of adns, which is

- *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014  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
  *    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,
  *  any later version.
  *  
  *  This program is distributed in the hope that it will be useful,


@@ -22,8 +23,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
  *  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 <errno.h>


@@ -286,7 +286,7 @@ void adns_firsttimeout(adns_state ads,
                       struct timeval now) {
   adns__consistency(ads,0,cc_entex);
   adns__timeouts(ads, 0, tv_io,tvbuf, now);
                       struct timeval now) {
   adns__consistency(ads,0,cc_entex);
   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) {
 }
 
 void adns_processtimeouts(adns_state ads, const struct timeval *now) {


@@ -295,7 +295,7 @@ void adns_processtimeouts(adns_state ads, const struct timeval *now) {
   adns__consistency(ads,0,cc_entex);
   adns__must_gettimeofday(ads,&now,&tv_buf);
   if (now) adns__timeouts(ads, 1, 0,0, *now);
   adns__consistency(ads,0,cc_entex);
   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
 }
 
 /* fd handling functions.  These are the top-level of the real work of


@@ -316,8 +316,8 @@ int adns__pollfds(adns_state ads, struct pollfd pollfds_buf[MAX_POLLFDS]) {
 
   assert(MAX_POLLFDS == MAXUDP + 1);
 
 
   assert(MAX_POLLFDS == MAXUDP + 1);
 

-  for (i=0; i<ads->nudp; i++)
-    ADD_POLLFD(ads->udpsocket[i].fd, POLLIN);
+  for (i=0; i<ads->nudpsockets; i++)
+    ADD_POLLFD(ads->udpsockets[i].fd, POLLIN);

 
   switch (ads->tcpstate) {
   case server_disconnected:
 
   switch (ads->tcpstate) {
   case server_disconnected:


@@ -396,37 +396,36 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) {
   default:
     abort();
   }
   default:
     abort();
   }

-  for (i=0; i<ads->nudp; 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);
+  for (i=0; i<ads->nudpsockets; i++) {
+    udp= &ads->udpsockets[i];
+    if (fd != udp->fd) continue;
+    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;

       }
       }

-      break;
+      for (serv= 0;
+          serv < ads->nservers &&
+            !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",
+                  adns__sockaddr_ntoa(&udpaddr.sa, addrbuf));
+       continue;
+      }
+      adns__procdgram(ads,udpbuf,r,serv,0,*now);

     }
     }

+    break;

   }
   r= 0;
 xit:
   }
   r= 0;
 xit:

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

   return r;
 }
 
   return r;
 }
 


@@ -483,7 +482,7 @@ int adns_processwriteable(adns_state ads, int fd, const struct timeval *now) {
   }
   r= 0;
 xit:
   }
   r= 0;
 xit:

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

   return r;
 }
   
   return r;
 }
   


@@ -502,7 +501,7 @@ int adns_processexceptional(adns_state ads, int fd,
   default:
     abort();
   }
   default:
     abort();
   }

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

   return 0;
 }
 
   return 0;
 }
 


@@ -579,7 +578,7 @@ void adns_beforeselect(adns_state ads, int *maxfd_io, fd_set *readfds_io,
   *maxfd_io= maxfd;
 
 xit:
   *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,
 }
 
 void adns_afterselect(adns_state ads, int maxfd, const fd_set *readfds,


@@ -601,7 +600,7 @@ void adns_afterselect(adns_state ads, int maxfd, const fd_set *readfds,
                 maxfd,readfds,writefds,exceptfds,
                 *now, 0);
 xit:
                 maxfd,readfds,writefds,exceptfds,
                 *now, 0);
 xit:

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

 }
 
 /* General helpful functions. */
 }
 
 /* General helpful functions. */


@@ -623,7 +622,7 @@ void adns_globalsystemfailure(adns_state ads) {
   default:
     abort();
   }
   default:
     abort();
   }

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

 }
 
 int adns_processany(adns_state ads) {
 }
 
 int adns_processany(adns_state ads) {


@@ -648,7 +647,7 @@ int adns_processany(adns_state ads) {
                 0,0,0,0,
                 now,&r);
 
                 0,0,0,0,
                 now,&r);
 

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

   return 0;
 }
 
   return 0;
 }
 


@@ -712,7 +711,7 @@ int adns_wait(adns_state ads,
       adns_afterselect(ads,maxfd,&readfds,&writefds,&exceptfds,0);
     }
   }
       adns_afterselect(ads,maxfd,&readfds,&writefds,&exceptfds,0);
     }
   }

-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);

   return r;
 }
 
   return r;
 }
 


@@ -728,6 +727,6 @@ int adns_check(adns_state ads,
   if (!r) adns__autosys(ads,now);
 
   r= adns__internal_check(ads,query_io,answer_r,context_r);
   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;
 }
   return r;
 }