X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=adns%2Fadns.c;h=201212c44b36106950f9a1a17ce4a054a1355fa2;hp=e768cd6bf283853c9d74d29fe446410a105d6ca6;hb=ca8b96bf81245f21fe3906c71dc2994bfc5e516f;hpb=b92528a0a95714d8b738e619de5a1d80f2fbd413

diff --git a/adns/adns.c b/adns/adns.c
index e768cd6..201212c 100644
--- a/adns/adns.c
+++ b/adns/adns.c
@@ -1,5 +1,3 @@
-/*
- */
 /*
  * adns lookup TYPE DOMAIN [QUERY-OPTIONS]                    => [list RDATA]
  *    if no or dontknow, throws an exception, with errorCode one of
@@ -22,7 +20,7 @@
  *
  * adns asynch ON-YES ON-NO ON-DONTKNOW XARGS \
  *             TYPE DOMAIN \
- *             [QUERY-OPTIONS]                               => QUERY-ID
+ *             [QUERY-OPTIONS...]                            => QUERY-ID
  *        calls, later,
  *           [concat ON-YES|ON-NO|ON-DONTKNOW XARGS RESULTS]
  * adns asynch-cancel QUERY-ID
@@ -37,6 +35,8 @@
  *         -quotefail-cname
  *         -cname-loose
  *         -cname-forbid
+ *         -reverse
+ *         -reverse-any ZONE-A-LIKE
  *
  * adns new-resolver [RES-OPTIONS...]                         => RESOLVER
  *        options:
@@ -46,8 +46,6 @@
  *         -noenv|-debug|-logpid
  *         -checkc-entex
  *         -checkc-freq
- *         -reverse
- *         -reverse-any ZONE-A-LIKE
  *         -config CONFIG-STRING
  *
  * adns set-default-resolver RESOLVER
@@ -56,10 +54,37 @@
  *
  * adns destroy-resolver RESOLVER
  *        cancels outstanding queries
+ *
  */
+/* ---8<--- end of documentation comment --8<-- */
+
+/*
+ * adns.c - adns binding for Tcl
+ * Copyright 2006-2012 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 the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
 
-#include "tables.h"
-#include "hbytes.h"
+#include <adns.h>
+
+#include "chiark_tcl_adns.h"
 
 /*---------- important types and forward declarations ----------*/
 
@@ -115,7 +140,7 @@ static int oifn_fs(Tcl_Interp *ip, const OptionInfo *oi, Tcl_Obj *arg,
 
 static int oifn_reverse_any(Tcl_Interp *ip, const OptionInfo *oi,
 			    Tcl_Obj *arg, OptionParse *op) {
-  return pat_string(ip,arg,&op->reverseany);
+  return cht_pat_string(ip,arg,&op->reverseany);
 }
 
 #define OIFA1(t,f,r) { "-" #f, oifn_fa, 0, adns_##t##_##f, r }
@@ -125,7 +150,7 @@ static int oifn_reverse_any(Tcl_Interp *ip, const OptionInfo *oi,
 
 static void optparse_blank(OptionParse *op) {
   memset(op,0,sizeof(*op));
-  op->errfile= 0;
+  op->errfile= stderr;
   op->errcallback= 0;
   op->config_string= 0;
 }
@@ -140,14 +165,14 @@ static int parse_options(Tcl_Interp *ip, int objc, Tcl_Obj *const *objv,
   objc--; objv++;
   for (;;) {
     if (!objc--) break;
-    rc= pat_enum(ip, *objv++, &oi_v, opttable, sizeof(OptionInfo),
+    rc= cht_pat_enum(ip, *objv++, &oi_v, opttable, sizeof(OptionInfo),
 		 "query or resolver option");
     if (rc) return rc;
     oi= oi_v;
 
     if (oi->takesarg) {
       if (!objc--) {
-	setstringresult(ip,"missing value for option");
+	cht_setstringresult(ip,"missing value for option");
 	return TCL_ERROR;
       }
       arg= *objv++;
@@ -170,6 +195,15 @@ struct Resolver {
   int maxfd;
   fd_set handling[3];
   ScriptToInvoke errcallback;
+  Tcl_Obj *errstring_accum;
+};
+
+struct Query {
+  int ix; /* first! */
+  Resolver *res;
+  adns_query aqu;
+  ScriptToInvoke on_yes, on_no, on_fail;
+  Tcl_Obj *xargs;
 };
 
 /* The default resolver is recorded using Tcl_SetAssocData with key
@@ -184,10 +218,10 @@ static int oifn_errfile(Tcl_Interp *ip, const OptionInfo *oi,
   int rc;
   const char *str;
   
-  rc= pat_string(ip,arg,&str);  if (rc) return rc;
+  rc= cht_pat_string(ip,arg,&str);  if (rc) return rc;
   if (!strcmp(str,"stderr")) op->errfile= stderr;
   else if (!strcmp(str,"stdout")) op->errfile= stdout;
-  else return staticerr(ip,"-errfile argument must be stderr or stdout",0);
+  else return cht_staticerr(ip,"-errfile argument must be stderr or stdout",0);
 
   op->aflags &= ~adns_if_noerrprint;
   op->errcallback= 0;
@@ -204,7 +238,7 @@ static int oifn_errcallback(Tcl_Interp *ip, const OptionInfo *oi,
 
 static int oifn_config(Tcl_Interp *ip, const OptionInfo *oi,
 		       Tcl_Obj *arg, OptionParse *op) {
-  return pat_string(ip,arg,&op->config_string);
+  return cht_pat_string(ip,arg,&op->config_string);
 }
 
 static const OptionInfo resolver_optioninfos[]= {
@@ -220,9 +254,36 @@ static const OptionInfo resolver_optioninfos[]= {
   { 0 }
 };
 
+static void adnslogfn_flushmessage(Resolver *res) {
+  cht_scriptinv_invoke(&res->errcallback, 1, &res->errstring_accum);
+  Tcl_SetObjLength(res->errstring_accum, 0);
+}
+
 static void adnslogfn_callback(adns_state ads, void *logfndata,
 			       const char *fmt, va_list al) {
-  abort(); /* fixme implement adns_logcallbackfn */
+  Resolver *res= logfndata;
+  int l, newline;
+  char *str;
+
+  l= vasprintf(&str,fmt,al);
+  if (l<0) {
+    cht_posixerr(res->interp,errno,"construct adns log callback string");
+    Tcl_BackgroundError(res->interp);
+  }
+
+  if (l==0) { free(str); return; }
+  if ((newline= l>0 && str[l-1]=='\n')) l--;
+
+  if (!res->errstring_accum) {
+    res->errstring_accum= Tcl_NewStringObj(str,l);
+    Tcl_IncrRefCount(res->errstring_accum);
+  } else {
+    Tcl_AppendToObj(res->errstring_accum,str,l);
+  }
+  free(str);
+
+  if (newline)
+    adnslogfn_flushmessage(res);
 }
 
 static Resolver *default_resolver(Tcl_Interp *ip) {
@@ -231,11 +292,21 @@ static Resolver *default_resolver(Tcl_Interp *ip) {
 
 static void destroy_resolver(Tcl_Interp *ip, Resolver *res) {
   void *query_v;
+  Query *query;
+  int logstring_len;
+  char *rstr;
   adns_query aqu;
  
   if (res == default_resolver(ip))
     Tcl_DeleteAssocData(ip,ASSOC_DEFAULTRES);
  
+  if (res->errstring_accum) {
+    rstr= Tcl_GetStringFromObj(res->errstring_accum, &logstring_len);
+    assert(rstr);
+    if (logstring_len)
+      adnslogfn_flushmessage(res);
+  }
+
   if (res->ads) {
     /* although adns would throw these away for us, we need to
      * destroy our own data too and only adns has a list of them */
@@ -243,12 +314,17 @@ static void destroy_resolver(Tcl_Interp *ip, Resolver *res) {
       adns_forallqueries_begin(res->ads);
       aqu= adns_forallqueries_next(res->ads, &query_v);
       if (!aqu) break;
+      query= query_v;
+      assert(query->aqu == aqu);
+      query->aqu= 0; /* avoid disrupting the adns query list */
       asynch_query_dispose(ip, query_v);
     }
     adns_finish(res->ads);
+    res->ads= 0;
   }
   asynch_cancelhandlers(res);
-  TFREE(res);
+  cht_scriptinv_cancel(&res->errcallback);
+  Tcl_EventuallyFree(res, Tcl_Free);
 }
 
 static void destroy_resolver_idtabcb(Tcl_Interp *ip, void *resolver_v) {
@@ -258,9 +334,9 @@ static void destroy_resolver_defcb(ClientData resolver_v, Tcl_Interp *ip) {
   destroy_resolver(ip,resolver_v);
 }
 
-int do_adns_destroy_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
+int cht_do_adns_destroy_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
+  cht_tabledataid_disposing(ip,res_v,&cht_adnstcl_resolvers);
   destroy_resolver(ip,res_v);
-  tabledataid_disposing(ip,res_v,&adnstcl_resolvers);
   return TCL_OK;
 }
 
@@ -275,19 +351,19 @@ static int create_resolver(Tcl_Interp *ip, const OptionParse *op,
   res->ads= 0;
   res->timertoken= 0;
   res->maxfd= 0;
-  scriptinv_init(&res->errcallback);
   for (i=0; i<3; i++) FD_ZERO(&res->handling[i]);
+  cht_scriptinv_init(&res->errcallback);
+  res->errstring_accum= 0;
+
+  if (op->errcallback)
+    cht_scriptinv_set(&res->errcallback, ip, op->errcallback, 0);
 
   ec= adns_init_logfn(&res->ads,
 		      op->aflags | adns_if_noautosys,
 		      op->config_string,
 		      op->errcallback ? adnslogfn_callback : 0,
-		      op->errcallback ? (void*)op->errcallback
-		      : (void*)op->errfile);
-  if (ec) { rc= posixerr(ip,ec,"create adns resolver"); goto x_rc; }
-
-  if (op->errcallback)
-    scriptinv_set(&res->errcallback, ip, op->errcallback, 0);
+		      op->errcallback ? (void*)res : (void*)op->errfile);
+  if (ec) { rc= cht_posixerr(ip,ec,"create adns resolver"); goto x_rc; }
 
   *res_r= res;
   return TCL_OK;
@@ -300,7 +376,7 @@ static int create_resolver(Tcl_Interp *ip, const OptionParse *op,
   return rc;
 }  
 
-int do_adns_new_resolver(ClientData cd, Tcl_Interp *ip,
+int cht_do_adns_new_resolver(ClientData cd, Tcl_Interp *ip,
 			 int objc, Tcl_Obj *const *objv,
 			 void **result) {
   OptionParse op;
@@ -323,14 +399,14 @@ int do_adns_new_resolver(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
-int do_adns_set_default_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
+int cht_do_adns_set_default_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
   Resolver *res= res_v;
   Tcl_DeleteAssocData(ip,ASSOC_DEFAULTRES);
   Tcl_SetAssocData(ip, ASSOC_DEFAULTRES, 0, res);
   return TCL_OK;
 }
 
-const IdDataSpec adnstcl_resolvers= {
+const IdDataSpec cht_adnstcl_resolvers= {
   "adns-res", "adns-resolvers-table", destroy_resolver_idtabcb
 };
 
@@ -341,7 +417,7 @@ const IdDataSpec adnstcl_resolvers= {
 #define RRTYPE_PLUS(t) { #t "+", adns_r_##t }
 #define RRTYPE_MINUS(t) { #t "-", adns_r_##t##_raw }
 
-const AdnsTclRRTypeInfo adnstclrrtypeinfos[]= {
+const AdnsTclRRTypeInfo cht_adnstclrrtypeinfo_entries[]= {
   RRTYPE_EXACTLY(a),
   RRTYPE_EXACTLY(cname),
   RRTYPE_EXACTLY(hinfo),
@@ -349,6 +425,7 @@ const AdnsTclRRTypeInfo adnstclrrtypeinfos[]= {
 
   RRTYPE_RAW(ns),
   RRTYPE_RAW(mx),
+  RRTYPE_EXACTLY(txt),
 
   RRTYPE_EXACTLY(soa),
   RRTYPE_EXACTLY(ptr),
@@ -365,7 +442,7 @@ static int oifn_resolver(Tcl_Interp *ip, const OptionInfo *oi,
   void *val_v;
   int rc;
   
-  rc= pat_iddata(ip,arg,&val_v,&adnstcl_resolvers);
+  rc= cht_pat_iddata(ip,arg,&val_v,&cht_adnstcl_resolvers);
   if (rc) return rc;
   op->resolver= val_v;
   return TCL_OK;
@@ -388,33 +465,36 @@ static const OptionInfo query_optioninfos[]= {
 static int query_submit(Tcl_Interp *ip,
 			const AdnsTclRRTypeInfo *type, const char *domain,
 			int queryopts_objc, Tcl_Obj *const *queryopts_objv,
-			adns_query *aqu_r, void *context, OptionParse *op) {
+			adns_query *aqu_r, void *context, Resolver **res_r) {
   struct sockaddr sa;
   static const int aftry[]= { AF_INET, AF_INET6 };
+  OptionParse op;
   OptionParse res_op;
   int rc, r, ec;
   adns_state ads;
   
-  op->aflags= adns_qf_owner;
-  op->sflags= 0;
-  op->resolver= 0;
-  op->reverseany= 0;
-  rc= parse_options(ip, queryopts_objc,queryopts_objv, query_optioninfos,op);
+  op.aflags= adns_qf_owner;
+  op.sflags= 0;
+  op.resolver= 0;
+  op.reverseany= 0;
+  rc= parse_options(ip, queryopts_objc,queryopts_objv, query_optioninfos,&op);
   if (rc) return rc;
 
-  if (!op->resolver) {
-    op->resolver= default_resolver(ip);
-    if (!op->resolver) {
+  if (!op.resolver) {
+    op.resolver= default_resolver(ip);
+    if (!op.resolver) {
       optparse_blank(&res_op);
-      rc= create_resolver(ip, &res_op, &op->resolver);
+      rc= create_resolver(ip, &res_op, &op.resolver);
       if (rc) return rc;
 
       Tcl_SetAssocData(ip, ASSOC_DEFAULTRES,
-		       destroy_resolver_defcb, op->resolver);
+		       destroy_resolver_defcb, op.resolver);
     }
   }
+
+  *res_r= op.resolver;
   
-  if (op->reverseany || (op->sflags & oisf_reverse)) {
+  if (op.reverseany || (op.sflags & oisf_reverse)) {
     const int *af;
     for (af=aftry; af < af + sizeof(af)/sizeof(*af); af++) {
       memset(&sa,0,sizeof(sa));
@@ -422,24 +502,25 @@ static int query_submit(Tcl_Interp *ip,
       r= inet_pton(*af,domain,&sa);
       if (!r) goto af_found;
     }
-    return staticerr(ip,"invalid address for adns reverse submit","");
+    return cht_staticerr(ip,"invalid address for adns reverse submit",
+			 "ADNS REVERSE INVALID");
   af_found:;
   }
 
-  ads= op->resolver->ads;
+  ads= op.resolver->ads;
 
-  if (op->reverseany) {
-    ec= adns_submit_reverse_any(ads, &sa, op->reverseany,
-				type->number, op->aflags, context, aqu_r);
-  } else if (op->sflags & oisf_reverse) {
+  if (op.reverseany) {
+    ec= adns_submit_reverse_any(ads, &sa, op.reverseany,
+				type->number, op.aflags, context, aqu_r);
+  } else if (op.sflags & oisf_reverse) {
     ec= adns_submit_reverse(ads, &sa,
-			    type->number, op->aflags, context, aqu_r);
+			    type->number, op.aflags, context, aqu_r);
   } else {
     ec= adns_submit(ads, domain,
-		    type->number, op->aflags, context, aqu_r);
+		    type->number, op.aflags, context, aqu_r);
   }
   if (ec)
-    return posixerr(ip,ec,"submit adns query");
+    return cht_posixerr(ip,ec,"submit adns query");
 
   return TCL_OK;
 }
@@ -449,10 +530,11 @@ static int query_submit(Tcl_Interp *ip,
 
 static void make_resultstatus(Tcl_Interp *ip, adns_status status,
 			      Tcl_Obj *results[RESULTSTATUS_LLEN]) {
-  results[0]= ret_string(ip, adns_errtypeabbrev(status));
-  results[1]= ret_int(ip, status);
-  results[2]= ret_string(ip, adns_errabbrev(status));
-  results[3]= ret_string(ip, adns_strerror(status));
+  results[0]= cht_ret_string(ip, adns_errtypeabbrev(status));
+  results[1]= cht_ret_int(ip, status);
+  results[2]= cht_ret_string(ip, adns_errabbrev(status));
+  results[3]= cht_ret_string(ip, adns_strerror(status));
+  assert(RESULTSTATUS_LLEN==4);
 }
 
 static Tcl_Obj *make_resultrdata(Tcl_Interp *ip, adns_answer *answer) {
@@ -467,7 +549,7 @@ static Tcl_Obj *make_resultrdata(Tcl_Interp *ip, adns_answer *answer) {
        i++, datap += rrsz) {
     st= adns_rr_info(answer->type, 0,0, &rrsz, datap, &rdatastring);
     assert(!st);
-    rdata[i]= ret_string(ip, rdatastring);
+    rdata[i]= cht_ret_string(ip, rdatastring);
     free(rdatastring);
   }
   rl= Tcl_NewListObj(answer->nrrs, rdata);
@@ -480,9 +562,10 @@ static void make_resultlist(Tcl_Interp *ip, adns_answer *answer,
 
   make_resultstatus(ip, answer->status, results);
   assert(RESULTSTATUS_LLEN==4);
-  results[4]= ret_string(ip, answer->owner);
-  results[5]= ret_string(ip, answer->cname ? answer->cname : "");
+  results[4]= cht_ret_string(ip, answer->owner);
+  results[5]= cht_ret_string(ip, answer->cname ? answer->cname : "");
   results[6]= make_resultrdata(ip, answer);
+  assert(RESULTLIST_LLEN==7);
 }
 
 /*---------- synchronous query handling ----------*/
@@ -491,14 +574,12 @@ static int synch(Tcl_Interp *ip, const AdnsTclRRTypeInfo *rrtype,
 		 const char *domain,
 		 int objc, Tcl_Obj *const *objv, adns_answer **answer_r) {
   adns_query aqu;
-  OptionParse op;
   Resolver *res;
   int rc, ec;
   
-  rc= query_submit(ip,rrtype,domain,objc,objv,&aqu,0,&op);
+  rc= query_submit(ip,rrtype,domain,objc,objv,&aqu,0,&res);
   if (rc) return rc;
 
-  res= op.resolver;
   ec= adns_wait(res->ads,&aqu,answer_r,0);
   assert(!ec);
 
@@ -506,7 +587,7 @@ static int synch(Tcl_Interp *ip, const AdnsTclRRTypeInfo *rrtype,
   return TCL_OK;
 }
 
-int do_adns_lookup(ClientData cd, Tcl_Interp *ip,
+int cht_do_adns_lookup(ClientData cd, Tcl_Interp *ip,
 		   const AdnsTclRRTypeInfo *rrtype,
 		   const char *domain,
 		   int objc, Tcl_Obj *const *objv,
@@ -527,7 +608,7 @@ int do_adns_lookup(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
-int do_adns_synch(ClientData cd, Tcl_Interp *ip,
+int cht_do_adns_synch(ClientData cd, Tcl_Interp *ip,
 		  const AdnsTclRRTypeInfo *rrtype,
 		  const char *domain,
 		  int objc, Tcl_Obj *const *objv,
@@ -545,14 +626,6 @@ int do_adns_synch(ClientData cd, Tcl_Interp *ip,
 
 /*---------- asynchronous query handling ----------*/
 
-struct Query {
-  int ix; /* first! */
-  Resolver *res;
-  adns_query aqu;
-  ScriptToInvoke on_yes, on_no, on_fail;
-  Tcl_Obj *xargs;
-};
-
 static void asynch_check_now(Resolver *res);
 
 static void asynch_timerhandler(void *res_v) {
@@ -595,9 +668,15 @@ static void asynch_sethandlers_generic(Resolver *res,
 	if (FD_ISSET(fd, &want[0])) mask |= TCL_READABLE;
 	if (FD_ISSET(fd, &want[1])) mask |= TCL_WRITABLE;
 	if (FD_ISSET(fd, &want[2])) mask |= TCL_EXCEPTION;
-	if (mask) Tcl_CreateFileHandler(fd,mask,asynch_filehandler,res);
-	else Tcl_DeleteFileHandler(fd);
+	if (mask) {
+	  Tcl_CreateFileHandler(fd,mask,asynch_filehandler,res);
+	  FD_SET(fd, &res->handling[i]);
+	} else {
+	  Tcl_DeleteFileHandler(fd);
+	  FD_CLR(fd, &res->handling[i]);
+	}
       }
+  res->maxfd= maxfd;
 
   Tcl_DeleteTimerHandler(res->timertoken);
 
@@ -637,7 +716,14 @@ static void asynch_check_now(Resolver *res) {
   int ec;
   Tcl_Obj *results[RESULTLIST_LLEN];
 
+  Tcl_Preserve(res);
+  
   for (;;) {
+    if (!res->ads) { /* oh, it has been destroyed! */
+      Tcl_Release(res);
+      return;
+    }
+
     aqu= 0;
     ec= adns_check(res->ads, &aqu, &answer, &query_v);
     if (ec==ESRCH || ec==EAGAIN) break;
@@ -645,7 +731,7 @@ static void asynch_check_now(Resolver *res) {
     query= query_v;
 
     query->aqu= 0;
-    tabledataid_disposing(interp, query, &adnstcl_queries);
+    cht_tabledataid_disposing(interp, query, &cht_adnstcl_queries);
 
     si= (!answer->status ? &query->on_yes
 	 : answer->status > adns_s_max_tempfail ? &query->on_no
@@ -653,39 +739,40 @@ static void asynch_check_now(Resolver *res) {
 
     make_resultlist(interp, answer, results);
     free(answer);
-    scriptinv_invoke(si, RESULTLIST_LLEN, results);
+    cht_scriptinv_invoke(si, RESULTLIST_LLEN, results);
     asynch_query_dispose(interp, query);
   }
 
   asynch_sethandlers(res);
+
+  Tcl_Release(res);
 }
     
-int do_adns_asynch(ClientData cd, Tcl_Interp *ip,
+int cht_do_adns_asynch(ClientData cd, Tcl_Interp *ip,
 		   Tcl_Obj *on_yes, Tcl_Obj *on_no,
 		   Tcl_Obj *on_fail, Tcl_Obj *xargs,
 		   const AdnsTclRRTypeInfo *rrtype, const char *domain,
 		   int objc, Tcl_Obj *const *objv, void **result) {
   Query *query;
   int rc;
-  Resolver *res=0;
-  OptionParse op;
+  Resolver *res= 0;
   
   query= TALLOC(sizeof(*query));
   query->ix= -1;
   query->aqu= 0;
-  scriptinv_init(&query->on_yes);
-  scriptinv_init(&query->on_no);
-  scriptinv_init(&query->on_fail);
+  cht_scriptinv_init(&query->on_yes);
+  cht_scriptinv_init(&query->on_no);
+  cht_scriptinv_init(&query->on_fail);
   query->xargs= 0;
 
-  rc= query_submit(ip,rrtype,domain,objc,objv,&query->aqu,query,&op);
+  rc= query_submit(ip,rrtype,domain,objc,objv,&query->aqu,query,&query->res);
   if (rc) goto x_rc;
 
-  res= op.resolver;
+  res= query->res;
 
-  rc= scriptinv_set(&query->on_yes, ip,on_yes, xargs);  if (rc) goto x_rc;
-  rc= scriptinv_set(&query->on_no,  ip,on_no,  xargs);  if (rc) goto x_rc;
-  rc= scriptinv_set(&query->on_fail,ip,on_fail,xargs);  if (rc) goto x_rc;
+  rc= cht_scriptinv_set(&query->on_yes, ip,on_yes, xargs);  if (rc) goto x_rc;
+  rc= cht_scriptinv_set(&query->on_no,  ip,on_no,  xargs);  if (rc) goto x_rc;
+  rc= cht_scriptinv_set(&query->on_fail,ip,on_fail,xargs);  if (rc) goto x_rc;
   query->xargs= xargs;
   Tcl_IncrRefCount(xargs);
   *result= query;
@@ -698,7 +785,7 @@ int do_adns_asynch(ClientData cd, Tcl_Interp *ip,
   return rc;
 }
 
-int do_adns_asynch_cancel(ClientData cd, Tcl_Interp *ip, void *query_v) {
+int cht_do_adns_asynch_cancel(ClientData cd, Tcl_Interp *ip, void *query_v) {
   Query *query= query_v;
   Resolver *res= query->res;
   asynch_query_dispose(ip, query);
@@ -707,10 +794,10 @@ int do_adns_asynch_cancel(ClientData cd, Tcl_Interp *ip, void *query_v) {
 }
 
 static void asynch_query_dispose(Tcl_Interp *interp, Query *query) {
-  tabledataid_disposing(interp, query, &adnstcl_queries);
-  scriptinv_cancel(&query->on_yes);
-  scriptinv_cancel(&query->on_no);
-  scriptinv_cancel(&query->on_fail);
+  cht_tabledataid_disposing(interp, query, &cht_adnstcl_queries);
+  cht_scriptinv_cancel(&query->on_yes);
+  cht_scriptinv_cancel(&query->on_no);
+  cht_scriptinv_cancel(&query->on_fail);
   if (query->xargs) Tcl_DecrRefCount(query->xargs);
   if (query->aqu) adns_cancel(query->aqu);
   TFREE(query);
@@ -720,6 +807,10 @@ static void destroy_query_idtabcb(Tcl_Interp *interp, void *query_v) {
   asynch_query_dispose(interp, query_v);
 }
 
-const IdDataSpec adnstcl_queries= {
+const IdDataSpec cht_adnstcl_queries= {
   "adns", "adns-query-table", destroy_query_idtabcb
 };
+
+/*---------- main hooks for tcl ----------*/
+
+CHT_INIT(adns, {}, CHTI_COMMANDS(cht_adnstoplevel_entries))