*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006 Ian Jackson
+ * Copyright (C) 1997-2000,2003,2006,2014-2016 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 "internal.h"
adns__consistency(ads,0,cc_entex);
+ if (flags & ~(adns_queryflags)0x4009ffff)
+ /* 0x40080000 are reserved for `harmless' future expansion
+ * 0x00000020 used to be adns_qf_quoteok_cname, now the default;
+ * see also addrfam.c:textaddr_check_qf */
+ return ENOSYS;
+
typei= adns__findtype(type);
if (!typei) return ENOSYS;
return rv;
}
-static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r) {
+static allocnode *alloc__info(adns_query qu, void *p, size_t *sz_r) {
allocnode *an;
if (!p || p == qu) { *sz_r= 0; return 0; }
void adns__free_interim(adns_query qu, void *p) {
size_t sz;
- allocnode *an= alloc_info(qu, p, &sz);
+ allocnode *an= alloc__info(qu, p, &sz);
if (!an) return;
assert(!qu->final_allocspace);
+ qu->interim_allocd -= sz;
+ assert(qu->interim_allocd >= 0);
LIST_UNLINK(qu->allocations, an);
free(an);
- qu->interim_allocd -= sz;
}
void *adns__alloc_mine(adns_query qu, size_t sz) {
void adns__transfer_interim(adns_query from, adns_query to, void *block) {
size_t sz;
- allocnode *an= alloc_info(from, block, &sz);
+ allocnode *an= alloc__info(from, block, &sz);
if (!an) return;
qu->query_dgram= 0;
}
-void adns__returning(adns_state ads, adns_query qu_for_caller) {
+void adns__intdone_process(adns_state ads) {
while (ads->intdone.head) {
adns_query iq= ads->intdone.head;
adns_query parent= iq->parent;
free(iq->answer);
free(iq);
}
+}
+
+void adns__returning(adns_state ads, adns_query qu_for_caller) {
+ adns__intdone_process(ads);
adns__consistency(ads,qu_for_caller,cc_entex);
}