X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=hbytes%2Fhook.c;h=4c742f3dcd99de2a1140c17733edd95e473384c1;hp=32c604f9101a5603fad7cadede960a026e59f68c;hb=82f88c53ddb84e42c770c23feb9bb0ee18341188;hpb=a138b1187d28e61d1decd36142ce6eda505d583a diff --git a/hbytes/hook.c b/hbytes/hook.c index 32c604f..4c742f3 100644 --- a/hbytes/hook.c +++ b/hbytes/hook.c @@ -3,48 +3,18 @@ #include -#include "hbytes.h" -#include "tables.h" +#include "chiark_tcl_hbytes.h" -int staticerr(Tcl_Interp *ip, const char *m, const char *ec) { - Tcl_SetResult(ip, (char*)m, TCL_STATIC); - if (ec) Tcl_SetObjErrorCode(ip, Tcl_NewStringObj(ec,-1)); - return TCL_ERROR; -} - -int posixerr(Tcl_Interp *ip, int errnoval, const char *m) { - const char *em; - - Tcl_ResetResult(ip); - errno= errnoval; - em= Tcl_PosixError(ip); - Tcl_AppendResult(ip, m, ": ", em, (char*)0); - return TCL_ERROR; -} - -int newfdposixerr(Tcl_Interp *ip, int fd, const char *m) { - int e; - e= errno; - close(fd); - return posixerr(ip,e,m); -} - -void objfreeir(Tcl_Obj *o) { - if (o->typePtr && o->typePtr->freeIntRepProc) - o->typePtr->freeIntRepProc(o); - o->typePtr= 0; -} - -int do_hbytes_rep_info(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_rep_info(ClientData cd, Tcl_Interp *ip, Tcl_Obj *obj, Tcl_Obj **result) { const char *tn; int nums[3], i, lnl; Tcl_Obj *objl[4]; - if (obj->typePtr == &hbytes_type) { + if (obj->typePtr == &cht_hbytes_type) { HBytes_Value *v= OBJ_HBYTES(obj); memset(nums,0,sizeof(nums)); - nums[1]= hbytes_len(v); + nums[1]= cht_hb_len(v); if (HBYTES_ISEMPTY(v)) tn= "empty"; else if (HBYTES_ISSENTINEL(v)) tn= "sentinel!"; @@ -69,14 +39,14 @@ int do_hbytes_rep_info(ClientData cd, Tcl_Interp *ip, } static void hbytes_t_dup(Tcl_Obj *src, Tcl_Obj *dup) { - hbytes_array(OBJ_HBYTES(dup), - hbytes_data(OBJ_HBYTES(src)), - hbytes_len(OBJ_HBYTES(src))); - dup->typePtr= &hbytes_type; + cht_hb_array(OBJ_HBYTES(dup), + cht_hb_data(OBJ_HBYTES(src)), + cht_hb_len(OBJ_HBYTES(src))); + dup->typePtr= &cht_hbytes_type; } static void hbytes_t_free(Tcl_Obj *o) { - hbytes_free(OBJ_HBYTES(o)); + cht_hb_free(OBJ_HBYTES(o)); } void obj_updatestr_array_prefix(Tcl_Obj *o, const Byte *byte, @@ -102,38 +72,10 @@ void obj_updatestr_array(Tcl_Obj *o, const Byte *byte, int l) { obj_updatestr_array_prefix(o,byte,l,""); } -void obj_updatestr_vstringls(Tcl_Obj *o, ...) { - va_list al; - char *p; - const char *part; - int l, pl; - - va_start(al,o); - for (l=0; (part= va_arg(al, const char*)); ) - l+= va_arg(al, int); - va_end(al); - - o->length= l; - o->bytes= TALLOC(l+1); - - va_start(al,o); - for (p= o->bytes; (part= va_arg(al, const char*)); p += pl) { - pl= va_arg(al, int); - memcpy(p, part, pl); - } - va_end(al); - - *p= 0; -} - -void obj_updatestr_string(Tcl_Obj *o, const char *str) { - obj_updatestr_vstringls(o, str, strlen(str), (char*)0); -} - static void hbytes_t_ustr(Tcl_Obj *o) { obj_updatestr_array(o, - hbytes_data(OBJ_HBYTES(o)), - hbytes_len(OBJ_HBYTES(o))); + cht_hb_data(OBJ_HBYTES(o)), + cht_hb_len(OBJ_HBYTES(o))); } static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) { @@ -142,21 +84,21 @@ static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) { int l; char cbuf[3]; - if (o->typePtr == &ulong_type) { + if (o->typePtr == &cht_ulong_type) { uint32_t ul; ul= htonl(*(const uint32_t*)&o->internalRep.longValue); - hbytes_array(OBJ_HBYTES(o), (const Byte*)&ul, 4); + cht_hb_array(OBJ_HBYTES(o), (const Byte*)&ul, 4); } else { os= str= Tcl_GetStringFromObj(o,&l); assert(str); - objfreeir(o); + cht_objfreeir(o); - if (l & 1) return staticerr(ip, "hbytes: conversion from hex:" + if (l & 1) return cht_staticerr(ip, "hbytes: conversion from hex:" " odd length in hex", "HBYTES SYNTAX"); - startbytes= bytes= hbytes_arrayspace(OBJ_HBYTES(o), l/2); + startbytes= bytes= cht_hb_arrayspace(OBJ_HBYTES(o), l/2); cbuf[2]= 0; while (l>0) { @@ -164,8 +106,8 @@ static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) { cbuf[1]= *str++; *bytes++= strtoul(cbuf,&ep,16); if (ep != cbuf+2) { - hbytes_free(OBJ_HBYTES(o)); - return staticerr(ip, "hbytes: conversion from hex:" + cht_hb_free(OBJ_HBYTES(o)); + return cht_staticerr(ip, "hbytes: conversion from hex:" " bad hex digit", "HBYTES SYNTAX"); } l -= 2; @@ -173,88 +115,88 @@ static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) { } - o->typePtr = &hbytes_type; + o->typePtr = &cht_hbytes_type; return TCL_OK; } -Tcl_ObjType hbytes_type = { +Tcl_ObjType cht_hbytes_type = { "hbytes", hbytes_t_free, hbytes_t_dup, hbytes_t_ustr, hbytes_t_sfa }; -int do_hbytes_raw2h(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_raw2h(ClientData cd, Tcl_Interp *ip, Tcl_Obj *binary, HBytes_Value *result) { const unsigned char *str; int l; str= Tcl_GetByteArrayFromObj(binary,&l); - hbytes_array(result, str, l); + cht_hb_array(result, str, l); return TCL_OK; } -int do_hbytes_h2raw(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_h2raw(ClientData cd, Tcl_Interp *ip, HBytes_Value hex, Tcl_Obj **result) { - *result= Tcl_NewByteArrayObj(hbytes_data(&hex), hbytes_len(&hex)); + *result= Tcl_NewByteArrayObj(cht_hb_data(&hex), cht_hb_len(&hex)); return TCL_OK; } -int do_hbytes_length(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_length(ClientData cd, Tcl_Interp *ip, HBytes_Value v, int *result) { - *result= hbytes_len(&v); + *result= cht_hb_len(&v); return TCL_OK; } -int do_hbytes_random(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_random(ClientData cd, Tcl_Interp *ip, int length, HBytes_Value *result) { Byte *space; int rc; - space= hbytes_arrayspace(result, length); - rc= get_urandom(ip, space, length); - if (rc) { hbytes_free(result); return rc; } + space= cht_hb_arrayspace(result, length); + rc= cht_get_urandom(ip, space, length); + if (rc) { cht_hb_free(result); return rc; } return TCL_OK; } -int do_hbytes_overwrite(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_overwrite(ClientData cd, Tcl_Interp *ip, HBytes_Var v, int start, HBytes_Value sub) { int sub_l; - sub_l= hbytes_len(&sub); + sub_l= cht_hb_len(&sub); if (start < 0) - return staticerr(ip, "hbytes overwrite start -ve", + return cht_staticerr(ip, "hbytes overwrite start -ve", "HBYTES LENGTH RANGE"); - if (start + sub_l > hbytes_len(v.hb)) - return staticerr(ip, "hbytes overwrite out of range", + if (start + sub_l > cht_hb_len(v.hb)) + return cht_staticerr(ip, "hbytes overwrite out of range", "HBYTES LENGTH UNDERRUN"); - memcpy(hbytes_data(v.hb) + start, hbytes_data(&sub), sub_l); + memcpy(cht_hb_data(v.hb) + start, cht_hb_data(&sub), sub_l); return TCL_OK; } -int do_hbytes_trimleft(ClientData cd, Tcl_Interp *ip, HBytes_Var v) { +int cht_do_hbytes_trimleft(ClientData cd, Tcl_Interp *ip, HBytes_Var v) { const Byte *o, *p, *e; - o= p= hbytes_data(v.hb); - e= p + hbytes_len(v.hb); + o= p= cht_hb_data(v.hb); + e= p + cht_hb_len(v.hb); while (p INT_MAX/sub_l) return staticerr(ip, "hbytes repeat too long", 0); + if (count > INT_MAX/sub_l) return cht_staticerr(ip, "hbytes repeat too long", 0); - data= hbytes_arrayspace(result, sub_l*count); - sub_d= hbytes_data(&sub); + data= cht_hb_arrayspace(result, sub_l*count); + sub_d= cht_hb_data(&sub); while (count) { memcpy(data, sub_d, sub_l); count--; data += sub_l; @@ -262,39 +204,39 @@ int do_hbytes_repeat(ClientData cd, Tcl_Interp *ip, return TCL_OK; } -int do_hbytes_xor(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_xor(ClientData cd, Tcl_Interp *ip, HBytes_Var v, HBytes_Value d) { int l; Byte *dest; const Byte *source; - l= hbytes_len(v.hb); - if (hbytes_len(&d) != l) return - staticerr(ip, "hbytes xor lengths do not match", "HBYTES LENGTH MISMATCH"); + l= cht_hb_len(v.hb); + if (cht_hb_len(&d) != l) return + cht_staticerr(ip, "hbytes xor lengths do not match", "HBYTES LENGTH MISMATCH"); - dest= hbytes_data(v.hb); - source= hbytes_data(&d); + dest= cht_hb_data(v.hb); + source= cht_hb_data(&d); memxor(dest,source,l); return TCL_OK; } -int do_hbytes_zeroes(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_zeroes(ClientData cd, Tcl_Interp *ip, int length, HBytes_Value *result) { Byte *space; - space= hbytes_arrayspace(result, length); + space= cht_hb_arrayspace(result, length); memset(space,0,length); return TCL_OK; } -int do_hbytes_compare(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_compare(ClientData cd, Tcl_Interp *ip, HBytes_Value a, HBytes_Value b, int *result) { int al, bl, minl, r; - al= hbytes_len(&a); - bl= hbytes_len(&b); + al= cht_hb_len(&a); + bl= cht_hb_len(&b); minl= al0) *result= +2; @@ -306,120 +248,81 @@ int do_hbytes_compare(ClientData cd, Tcl_Interp *ip, return TCL_OK; } -int do_hbytes_range(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_range(ClientData cd, Tcl_Interp *ip, HBytes_Value v, int start, int size, HBytes_Value *result) { const Byte *data; int l; - l= hbytes_len(&v); + l= cht_hb_len(&v); if (start<0 || size<0) - return staticerr(ip,"hbytes range subscript(s) -ve","HBYTES LENGTH RANGE"); + return cht_staticerr(ip,"hbytes range subscript(s) -ve","HBYTES LENGTH RANGE"); if (lfunc(0,ip,objc,objv); +} + /* hbytes representing uint16_t's */ -int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip, HBytes_Value hex, long *result) { const Byte *data; int l; - l= hbytes_len(&hex); + l= cht_hb_len(&hex); if (l>2) - return staticerr(ip, "hbytes h2ushort input more than 4 hex digits", + return cht_staticerr(ip, "hbytes h2ushort input more than 4 hex digits", "HBYTES VALUE OVERFLOW"); - data= hbytes_data(&hex); + data= cht_hb_data(&hex); *result= data[l-1] | (l>1 ? data[0]<<8 : 0); return TCL_OK; } -int do_hbytes_ushort2h(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytes_ushort2h(ClientData cd, Tcl_Interp *ip, long input, HBytes_Value *result) { uint16_t us; if (input > 0x0ffff) - return staticerr(ip, "hbytes ushort2h input >2^16", + return cht_staticerr(ip, "hbytes ushort2h input >2^16", "HBYTES VALUE OVERFLOW"); us= htons(input); - hbytes_array(result,(const Byte*)&us,2); + cht_hb_array(result,(const Byte*)&us,2); return TCL_OK; } /* toplevel functions */ -int do_toplevel_hbytes(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytestoplevel_hbytes(ClientData cd, Tcl_Interp *ip, const HBytes_SubCommand *subcmd, int objc, Tcl_Obj *const *objv) { return subcmd->func(0,ip,objc,objv); } -int do_toplevel_dgram_socket(ClientData cd, Tcl_Interp *ip, - const DgramSocket_SubCommand *subcmd, - int objc, Tcl_Obj *const *objv) { - return subcmd->func(0,ip,objc,objv); -} - -int do_toplevel_tuntap_socket_raw(ClientData cd, Tcl_Interp *ip, - const TunSocket_SubCommand *subcmd, - int objc, Tcl_Obj *const *objv) { - return subcmd->func(0,ip,objc,objv); -} - -int do_toplevel_ulong(ClientData cd, Tcl_Interp *ip, +int cht_do_hbytestoplevel_ulong(ClientData cd, Tcl_Interp *ip, const ULong_SubCommand *subcmd, int objc, Tcl_Obj *const *objv) { return subcmd->func(0,ip,objc,objv); } -#define URANDOM "/dev/urandom" - -int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) { - static FILE *urandom; - - int r, esave; - - if (!urandom) { - urandom= fopen(URANDOM,"rb"); - if (!urandom) return posixerr(ip,errno,"open " URANDOM); - } - r= fread(buffer,1,l,urandom); - if (r==l) return 0; - - esave= errno; - fclose(urandom); urandom=0; - - if (ferror(urandom)) { - return posixerr(ip,errno,"read " URANDOM); - } else { - assert(feof(urandom)); - return staticerr(ip, URANDOM " gave eof!", 0); - } -} - -int Hbytes_Init(Tcl_Interp *ip) { - const TopLevel_Command *cmd; - - Tcl_RegisterObjType(&hbytes_type); - Tcl_RegisterObjType(&blockcipherkey_type); - Tcl_RegisterObjType(&enum_nearlytype); - Tcl_RegisterObjType(&enum1_nearlytype); - Tcl_RegisterObjType(&sockaddr_type); - Tcl_RegisterObjType(&tabledataid_nearlytype); - Tcl_RegisterObjType(&ulong_type); - - for (cmd=toplevel_commands; - cmd->name; - cmd++) - Tcl_CreateObjCommand(ip, (char*)cmd->name, cmd->func, 0,0); - - return TCL_OK; +extern int Chiark_tcl_hbytes_Init(Tcl_Interp *ip); /*called by load(3tcl)*/ +int Chiark_tcl_hbytes_Init(Tcl_Interp *ip) { + static int initd; + + return cht_initextension(ip, cht_hbytestoplevel_entries, &initd, + &cht_hbytes_type, + &cht_ulong_type, + &cht_addrmap_type, + (Tcl_ObjType*)0); }