#include <stdio.h>
-#include "tables.h"
-#include "hbytes.h"
+#include <adns.h>
+
+#include "chiark_tcl_adns.h"
/*---------- important types and forward declarations ----------*/
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 }
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++;
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;
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[]= {
};
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);
}
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);
}
asynch_query_dispose(ip, query_v);
}
adns_finish(res->ads);
+ res->ads= 0;
}
asynch_cancelhandlers(res);
- scriptinv_cancel(&res->errcallback);
- TFREE(res);
+ cht_scriptinv_cancel(&res->errcallback);
+ Tcl_EventuallyFree(res, Tcl_Free);
}
static void destroy_resolver_idtabcb(Tcl_Interp *ip, void *resolver_v) {
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;
}
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,
op->config_string,
op->errcallback ? adnslogfn_callback : 0,
op->errcallback ? (void*)res : (void*)op->errfile);
- if (ec) { rc= posixerr(ip,ec,"create adns resolver"); goto x_rc; }
+ if (ec) { rc= cht_posixerr(ip,ec,"create adns resolver"); goto x_rc; }
*res_r= res;
return TCL_OK;
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;
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
};
#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),
void *val_v;
int rc;
- rc= pat_iddata(ip,arg,&val_v,&adnstcl_resolvers);
+ rc= cht_pat_iddata(ip,arg,&val_v,&adnstcl_resolvers);
if (rc) return rc;
op->resolver= val_v;
return TCL_OK;
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));
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","");
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;
}
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));
}
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);
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);
}
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);
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,
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,
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;
query= query_v;
query->aqu= 0;
- tabledataid_disposing(interp, query, &adnstcl_queries);
+ cht_tabledataid_disposing(interp, query, &adnstcl_queries);
si= (!answer->status ? &query->on_yes
: answer->status > adns_s_max_tempfail ? &query->on_no
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;
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);
}
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, &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);
const IdDataSpec adnstcl_queries= {
"adns", "adns-query-table", destroy_query_idtabcb
};
+
+/*---------- main hooks for tcl ----------*/
+
+int cht_do_adnstoplevel_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 Chiark_tcl_adns_Init(Tcl_Interp *ip); /* called by Tcl's "load" */
+int Chiark_tcl_adns_Init(Tcl_Interp *ip) {
+ return cht_initextension(ip, cht_adnstoplevel_entries, 0);
+}
~ian / chiark-tcl.git / blobdiff