X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=base%2Ftables-examples.tct;h=9165827456f282900c00e23fafc350860a70cfd6;hp=f2146a552c6dc23b1c3518ce7604a415c27ca09a;hb=4149293c485d766e446f1a841892420059755347;hpb=29d695bbfb0f42019af456fc8a7a3137e9745806

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index f2146a5..9165827 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -2,14 +2,24 @@ Type hb:			HBytes_Value @
 Init hb				hbytes_sentinel(&@);
 
 Type hbv:			HBytes_Var @
-Init hbv			@.hb=0; @.obj=0; @.var=0;
-Fini hbv			fini_hbv(ip, rc, &@);
+Init hbv			@.hb=0; init_somethingv(&@.sth);
+Fini hbv			fini_somethingv(ip, rc, &@.sth);
+
+Type constv(Tcl_ObjType*):	Tcl_Obj *@
+
+Type maskmapv:			MaskMap_Var @
+Init maskmapv			@.mm=0; init_somethingv(&@.sth);
+Fini maskmapv			fini_somethingv(ip, rc, &@.sth);
 
 Type sockaddr:			SockAddr_Value @
 Init sockaddr			sockaddr_clear(&@);
 
-Type sockid:			DgramSockID @
-Type ulong:			unsigned long @
+Type iddata(IdDataTable *tab):	void *@
+Type ulong:			uint32_t @
+Type long:			long @
+Type string:			const char *@
+
+Type charfrom(const char *opts, const char *what):	int
 
 H-Include	"hbytes.h"
 
@@ -20,29 +30,56 @@ Table toplevel TopLevel_Command
 	dgram-socket
 		subcmd	enum(DgramSocket_SubCommand,"dgram-socket subcommand")
 		...	obj
+	tuntap-socket-raw
+	    subcmd enum(TunSocket_SubCommand,"tuntap-socket-raw subcommand")
+	    ...	obj
 	ulong
 		subcmd	enum(ULong_SubCommand,"ulong subcommand")
 		...	obj
 
+Table maskmap MaskMap_SubCommand
+	lookup
+		map	constv(&maskmap_type)
+		addr	hb
+		?def	obj
+		=>	obj
+	amend
+		map	maskmapv
+		prefix	obj
+		preflen	obj
+		data	obj
+
 Table ulong ULong_SubCommand
-	shift
-		right	charfrom("lr", "shift direction")
+	ul2int
 		v	ulong
-		bits	int
+		=>	int
+	int2ul
+		v	int
 		=>	ulong
 	mask
 		a	ulong
 		b	ulong
 		=>	ulong
+	add
+		a	ulong
+		b	ulong
+		=>	ulong
+	multiply
+		a	ulong
+		b	ulong
+		=>	ulong
+	subtract
+		a	ulong
+		b	ulong
+		=>	ulong
 	compare
 		a	ulong
 		b	ulong
 		=>	int
-	ul2int
+	shift
+		right	charfrom("lr", "shift direction")
 		v	ulong
-		=>	int
-	int2ul
-		v	int
+		bits	int
 		=>	ulong
 	ul2bitfields
 		value	ulong
@@ -60,18 +97,12 @@ Table hbytes HBytes_SubCommand
 	h2raw
 		hex	hb
 		=>	obj
-	ulong2h
-		value	ulong
-		=>	hb
-	h2ulong
-		hex	hb
-		=>	ulong
 	ushort2h
-		value	ulong
+		value	long
 		=>	hb
 	h2ushort
 		hex	hb
-		=>	ulong
+		=>	long
 	length
 		v	hb
 		=>	int
@@ -112,6 +143,8 @@ Table hbytes HBytes_SubCommand
 		v	hbv
 		start	int
 		sub	hb
+	trimleft
+		v	hbv
 	zeroes
 		length	int
 		=>	hb
@@ -119,22 +152,21 @@ Table hbytes HBytes_SubCommand
 		v	hb
 		count	int
 		=>	hb
+	xor
+		v	hbv
+		d	hb
 	random
 		length	int
 		=>	hb
- 	pkcs5
- 		meth	enum(PadMethod, "hbytes pad subcommand")
+	pad
+ 		op	enum(PadOp, "hbytes pad subcommand")
 		v	hbv
-		block	obj
-		=>	int
+		blocksz	obj
+		meth	enum(PadMethodInfo, "pad method")
+		...	methargs
  	blockcipher
- 		encrypt	charfrom("de","encrypt/decrypt")
- 		v	hbv
- 		alg	enum(BlockCipherAlgInfo, "alg")
-		key	obj
- 		mode	enum(BlockCipherModeInfo, "mode")
- 		?iv	hb
- 		=>	hb
+ 		op	enum(BlockCipherOp, "op")
+		...	obj
  	hash
  		alg	enum(HashAlgInfo, "hash alg")
  		message	hb
@@ -145,17 +177,78 @@ Table hbytes HBytes_SubCommand
  		key	obj
  		?maclen	obj
  		=>	hb
+	hash-prop
+		prop	enum(HashAlgPropInfo, "prop")
+		alg	enum(HashAlgInfo, "alg")
+		=>	int
+	mask-map
+		subcmd	enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
+		...	obj
+
+Table padmethodinfo PadMethodInfo
+	pkcs5
+		=>	int
+	rfc2406
+		nxthdr	obj
+		=>	int
 
 Table dgram_socket DgramSocket_SubCommand
 	create
 		local	sockaddr
-		=>	sockid
+		=>	iddata(&dgram_socks)
 	close
-		sock	sockid
+		sock	iddata(&dgram_socks)
 	transmit
-		sock	sockid
+		sock	iddata(&dgram_socks)
 		data	hb
 		remote	sockaddr
 	on-receive
-		sock	sockid
+		sock	iddata(&dgram_socks)
+		?script	obj
+
+Table tuntap_socket_raw TunSocket_SubCommand
+	create
+		?ifname	string
+		=>	iddata(&tuntap_socks)
+	close
+		sock	iddata(&tuntap_socks)
+	ifname
+		sock	iddata(&tuntap_socks)
+		=>	string
+	receive
+		sock	iddata(&tuntap_socks)
+		data	hb
+	on-transmit
+		sock	iddata(&tuntap_socks)
+		mtu	long
 		?script	obj
+
+Table blockcipherop BlockCipherOp
+	e	1
+ 		v	hbv
+ 		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+ 		?iv	hb
+ 		=>	hb
+	d	0
+ 		v	hbv
+ 		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+ 		?iv	hb
+ 		=>	hb
+	mac	-1
+		msg	hb
+		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+		iv	hb
+		=>	hb
+	prop	-1
+		prop	enum(BlockCipherPropInfo, "prop")
+		alg	enum(BlockCipherAlgInfo, "alg")
+		=>	int
+
+EntryExtra BlockCipherOp
+	int encrypt;