#include <adns.h>
-#include "adnstcl.h"
+#include "chiark_tcl_adns.h"
/*---------- important types and forward declarations ----------*/
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;
}
-static 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;
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:;
}
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);
}
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,
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);
}
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,
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,&query->res);
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);
/*---------- main hooks for tcl ----------*/
-int do_toplevel_adns(ClientData cd, Tcl_Interp *ip,
+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 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);
+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