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=8a28c4fe1d13cd11b8c471237bff84dc5cc9bdde;hp=9a19c5a7676467fb401baebdc431c1b4f79e3fc9;hb=b92528a0a95714d8b738e619de5a1d80f2fbd413;hpb=5d466de467f28ae6f7125bef086d141a7734a4ce;ds=sidebyside

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 9a19c5a..8a28c4f 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -2,14 +2,28 @@ Type hb:			HBytes_Value @
 Init hb				hbytes_sentinel(&@);
 
 Type hbv:			HBytes_Var @
-Init hbv			@.hb=0; @.obj=0; @.var=0; @.copied=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(const IdDataSpec *idds):	void *@
+Type ulong:			uint32_t @
+Type long:			long @
+Type string:			const char *@
+
+Type adnsresults:		adns_answer *@
+Init adnsresults		@=0;
+Fini adnsresults		free(@);
+
+Type charfrom(const char *opts, const char *what):	int
 
 H-Include	"hbytes.h"
 
@@ -20,29 +34,89 @@ 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
+	adns
+		subcmd	enum(Adns_SubCommand,"adns subcommand")
+		...	obj
+
+Table adns Adns_SubCommand
+	lookup
+		rrtype	enum(AdnsTclRRTypeInfo, "rrtype")
+		domain	string
+		...	obj
+		=>	obj
+	synch
+		rrtype	enum(AdnsTclRRTypeInfo, "rrtype")
+		domain	string
+		...	obj
+		=>	obj
+	asynch
+		on_yes	obj
+		on_no	obj
+		on_fail	obj
+		xargs	obj
+		rrtype	enum(AdnsTclRRTypeInfo, "rrtype")
+		domain	string
+		...	obj
+		=>	iddata(&adnstcl_queries)
+	asynch-cancel
+		query	iddata(&adnstcl_queries)
+	new-resolver
+		...	obj
+		=>	iddata(&adnstcl_resolvers)
+	set-default-resolver
+		res	iddata(&adnstcl_resolvers)
+	destroy-resolver
+		res	iddata(&adnstcl_resolvers)
+
+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 +134,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
@@ -121,18 +189,18 @@ Table hbytes HBytes_SubCommand
 		v	hb
 		count	int
 		=>	hb
-	clockincrement
-		value	hbv
-		change	int
-		=>	int
+	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
  		op	enum(BlockCipherOp, "op")
 		...	obj
@@ -146,19 +214,50 @@ 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
@@ -183,6 +282,10 @@ Table blockcipherop BlockCipherOp
  		mode	enum(BlockCipherModeInfo, "mode")
 		iv	hb
 		=>	hb
+	prop	-1
+		prop	enum(BlockCipherPropInfo, "prop")
+		alg	enum(BlockCipherAlgInfo, "alg")
+		=>	int
 
 EntryExtra BlockCipherOp
 	int encrypt;