*/
/*
* 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
- * 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 <stdlib.h>
static void ccf_options(adns_state ads, const char *fn,
int lno, const char *buf) {
- const char *word;
+ const char *word, *rhs;
char *ep;
unsigned long v;
int i,l;
if (!buf) return;
+#define OPTION__IS(s,op) (l op (sizeof(s)-1) && !memcmp(word,s,(sizeof(s)-1)))
+#define OPTION_IS(s) (OPTION__IS(s,==))
+#define OPTION_STARTS(s) (OPTION__IS(s,>=) ? ((rhs=word+sizeof(s)-1)) : 0)
+
while (nextword(&buf,&word,&l)) {
- if (l==5 && !memcmp(word,"debug",5)) {
+ if (OPTION_IS("debug")) {
ads->iflags |= adns_if_debug;
continue;
}
- if (l>=6 && !memcmp(word,"ndots:",6)) {
- v= strtoul(word+6,&ep,10);
- if (l==6 || ep != word+l || v > INT_MAX) {
+ if (OPTION_STARTS("ndots:")) {
+ v= strtoul(rhs,&ep,10);
+ if (ep==rhs || ep != word+l || v > INT_MAX) {
configparseerr(ads,fn,lno,"option `%.*s' malformed"
" or has bad value",l,word);
continue;
ads->searchndots= v;
continue;
}
- if (l>=12 && !memcmp(word,"adns_checkc:",12)) {
- if (!strcmp(word+12,"none")) {
+ if (OPTION_STARTS("adns_checkc:")) {
+ if (!strcmp(rhs,"none")) {
ads->iflags &= ~adns_if_checkc_freq;
ads->iflags |= adns_if_checkc_entex;
- } else if (!strcmp(word+12,"entex")) {
+ } else if (!strcmp(rhs,"entex")) {
ads->iflags &= ~adns_if_checkc_freq;
ads->iflags |= adns_if_checkc_entex;
- } else if (!strcmp(word+12,"freq")) {
+ } else if (!strcmp(rhs,"freq")) {
ads->iflags |= adns_if_checkc_freq;
} else {
configparseerr(ads,fn,lno, "option adns_checkc has bad value `%s' "
- "(must be none, entex or freq", word+12);
+ "(must be none, entex or freq", rhs);
}
continue;
}
- if (l>=8 && !memcmp(word,"adns_af:",8)) {
- word += 8;
+ if (OPTION_STARTS("adns_af:")) {
+ word= rhs;
ads->iflags &= ~adns_if_afmask;
if (strcmp(word,"any")) for (;;) {
i= strcspn(word,",");
}
adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word);
}
+
+#undef OPTION__IS
+#undef OPTION_IS
+#undef OPTION_STARTS
}
static void ccf_clearnss(adns_state ads, const char *fn,
adns_state ads;
pid_t pid;
+ if (flags & ~(adns_initflags)(0x4fff))
+ /* 0x4000 is reserved for `harmless' future expansion */
+ return ENOSYS;
+
ads= malloc(sizeof(*ads)); if (!ads) return errno;
ads->iflags= flags;
struct sockaddr_in sin;
struct protoent *proto;
struct udpsocket *udp;
- int i, j;
+ int i;
int r;
if (!ads->nservers) {
return 0;
x_closeudp:
- for (j=0; j<ads->nudpsockets; j++) close(ads->udpsockets[j].fd);
+ for (i=0; i<ads->nudpsockets; i++) close(ads->udpsockets[i].fd);
x_free:
free(ads);
return r;