initial import and build-faff, wip

[chiark-tcl.git] / adns / adns.c

diff --git a/adns/adns.c b/adns/adns.c
index d57c49bf1ba3e2efee7f11add33135a8e450e671..5248c62efd37f830b1033c3b3470398d1c38c64f 100644 (file)
--- a/adns/adns.c
+++ b/adns/adns.c
@@ -62,8 +62,9 @@
 
 #include <stdio.h>
 
-#include "tables.h"
-#include "hbytes.h"
+#include <adns.h>
+
+#include "adnstcl.h"
 
 /*---------- important types and forward declarations ----------*/
 
@@ -119,7 +120,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 }
@@ -144,14 +145,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++;
@@ -189,10 +190,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;
@@ -209,7 +210,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[]= {
@@ -226,7 +227,7 @@ static const OptionInfo resolver_optioninfos[]= {
 };
 
 static void adnslogfn_flushmessage(Resolver *res) {
-  scriptinv_invoke(&res->errcallback, 1, &res->errstring_accum);
+  cht_scriptinv_invoke(&res->errcallback, 1, &res->errstring_accum);
   Tcl_SetObjLength(res->errstring_accum, 0);
 }
 
@@ -238,7 +239,7 @@ static void adnslogfn_callback(adns_state ads, void *logfndata,
 
   l= vasprintf(&str,fmt,al);
   if (l<0) {
-    posixerr(res->interp,errno,"construct adns log callback string");
+    cht_posixerr(res->interp,errno,"construct adns log callback string");
     Tcl_BackgroundError(res->interp);
   }
 
@@ -290,7 +291,7 @@ static void destroy_resolver(Tcl_Interp *ip, Resolver *res) {
     res->ads= 0;
   }
   asynch_cancelhandlers(res);
-  scriptinv_cancel(&res->errcallback);
+  cht_scriptinv_cancel(&res->errcallback);
   Tcl_EventuallyFree(res, Tcl_Free);
 }
 
@@ -301,8 +302,8 @@ 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) {
-  tabledataid_disposing(ip,res_v,&adnstcl_resolvers);
+int cht_do_adns_destroy_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
+  cht_tabledataid_disposing(ip,res_v,&adnstcl_resolvers);
   destroy_resolver(ip,res_v);
   return TCL_OK;
 }
@@ -319,11 +320,11 @@ static int create_resolver(Tcl_Interp *ip, const OptionParse *op,
   res->timertoken= 0;
   res->maxfd= 0;
   for (i=0; i<3; i++) FD_ZERO(&res->handling[i]);
-  scriptinv_init(&res->errcallback);
+  cht_scriptinv_init(&res->errcallback);
   res->errstring_accum= 0;
 
   if (op->errcallback)
-    scriptinv_set(&res->errcallback, ip, op->errcallback, 0);
+    cht_scriptinv_set(&res->errcallback, ip, op->errcallback, 0);
 
   ec= adns_init_logfn(&res->ads,
                      op->aflags | adns_if_noautosys,
@@ -373,7 +374,7 @@ int do_adns_set_default_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
   return TCL_OK;
 }
 
-const IdDataSpec adnstcl_resolvers= {
+static const IdDataSpec adnstcl_resolvers= {
   "adns-res", "adns-resolvers-table", destroy_resolver_idtabcb
 };
 
@@ -781,3 +782,19 @@ static void destroy_query_idtabcb(Tcl_Interp *interp, void *query_v) {
 const IdDataSpec adnstcl_queries= {
   "adns", "adns-query-table", destroy_query_idtabcb
 };
+
+/*---------- main hooks for tcl ----------*/
+
+int do_toplevel_adns(ClientData cd, Tcl_Interp *ip,
+                     const Adns_SubCommand *subcmd,
+                     int objc, Tcl_Obj *const *objv) {
+  return subcmd->func(0,ip,objc,objv);
+}
+
+extern int Adns_Init(Tcl_Interp *ip); /* called by Tcl's "load" */
+int Adns_Init(
+  Tcl_RegisterObjType(&blockcipherkey_type);
+  Tcl_RegisterObjType(&sockaddr_type);
+  Tcl_RegisterObjType(&tabledataid_nearlytype);
+  Tcl_RegisterObjType(&ulong_type);
+  Tcl_RegisterObjType(&addrmap_type);