idtable better documented and sorted

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index 4b4f4e8210ecacf106d8a8671f5dc5a9ada13380..2b032877587cebcf815a987fd8883edcc2da9293 100644 (file)
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -122,6 +122,8 @@
 
 #include <tcl8.3/tcl.h>
 
 
 #include <tcl8.3/tcl.h>
 

+#include <adns.h>
+

 typedef unsigned char Byte;
 
 /* from hbytes.c */
 typedef unsigned char Byte;
 
 /* from hbytes.c */


@@ -218,8 +220,25 @@ typedef struct {
   void **a;
 } IdDataTable;
 
   void **a;
 } IdDataTable;
 

+/* The stored struct must start with a single int, conventionally
+ * named `ix'.  When the struct is returned for the first time ix must
+ * be -1; on subsequent occasions it must be >=0.  ix will be -1 iff
+ * the struct is registered by the iddatatable machinery. */
+

 extern Tcl_ObjType tabledataid_nearlytype;
 int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab);
 extern Tcl_ObjType tabledataid_nearlytype;
 int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab);

+void tabledataid_disposing(void *val, IdDataTable *tab);
+  /* call this when you destroy the struct, to remove its name;
+   * _disposing is idempotent*/
+
+/* from adns.c */
+
+typedef struct {
+  const char *name;
+  adns_rrtype number;
+} AdnsTclRRTypeInfo;
+
+extern IdDataTable adnstcl_queries, adnstcl_resolvers;

 
 /* from dgram.c */
 
 
 /* from dgram.c */
 

diff --git a/base/idtable.c b/base/idtable.c
index ed5e5e61287144ecfcce1e0b2c587abd4f731af6..f64a1013bc6a15581e4853a0e35ecc0a0d6a47c2 100644 (file)
--- a/base/idtable.c
+++ b/base/idtable.c
@@ -1,13 +1,5 @@
 /*
  */
 /*
  */

-/*
- * dgram-socket create <local>                        => <sockid>
- * dgram-socket close <sockid>
- * dgram-socket transmit <sockid> <data> <remote>
- * dgram-socket on-receive <sockid> [<script>]
- *    calls, effectively,  eval <script> [list <data> <remote-addr> <socket>]
- *    if script not supplied, cancel
- */

 
 #include "tables.h"
 #include "hbytes.h"
 
 #include "tables.h"
 #include "hbytes.h"


@@ -45,6 +37,16 @@ int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab) {
   return TCL_OK;
 }
 
   return TCL_OK;
 }
 

+void tabledataid_disposing(void *val, IdDataTable *tab) {
+  int ix;
+
+  ix= *(int*)val;
+  if (ix==-1) return;
+  assert(tab->a[ix] == val);
+  tab->a[ix]= 0;
+  *(int*)val= -1;
+}
+

 int pat_iddata(Tcl_Interp *ip, Tcl_Obj *o, void **rv, IdDataTable *tab) {
   int rc, ix;
   void *r;
 int pat_iddata(Tcl_Interp *ip, Tcl_Obj *o, void **rv, IdDataTable *tab) {
   int rc, ix;
   void *r;

diff --git a/dgram/dgram.c b/dgram/dgram.c
index b2661a4fe82611792a359e02fb25a12ee3c713ff..08f5f45ace92aea45c11cca8ec7c9204c0a6cf7e 100644 (file)
--- a/dgram/dgram.c
+++ b/dgram/dgram.c
@@ -154,13 +154,12 @@ int do_dgram_socket_on_receive(ClientData cd, Tcl_Interp *ip,
 
 int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, void *sock_v) {
   DgramSocket *sock= sock_v;
 
 int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, void *sock_v) {
   DgramSocket *sock= sock_v;

-  int sockix;
+

   cancel(sock);
   close(sock->fd); /* nothing useful to be done with errors */
   cancel(sock);
   close(sock->fd); /* nothing useful to be done with errors */

-  sockix= sock->ix;
+  tabledataid_disposing(sock,&dgram_socks);

   TFREE(sock->addr_buf);
   TFREE(sock->msg_buf);
   TFREE(sock);
   TFREE(sock->addr_buf);
   TFREE(sock->msg_buf);
   TFREE(sock);

-  dgram_socks.a[sockix]= 0;

   return TCL_OK;
 }
   return TCL_OK;
 }

diff --git a/hbytes/hbytes.h b/hbytes/hbytes.h
index 4b4f4e8210ecacf106d8a8671f5dc5a9ada13380..2b032877587cebcf815a987fd8883edcc2da9293 100644 (file)
--- a/hbytes/hbytes.h
+++ b/hbytes/hbytes.h
@@ -122,6 +122,8 @@
 
 #include <tcl8.3/tcl.h>
 
 
 #include <tcl8.3/tcl.h>
 

+#include <adns.h>
+

 typedef unsigned char Byte;
 
 /* from hbytes.c */
 typedef unsigned char Byte;
 
 /* from hbytes.c */


@@ -218,8 +220,25 @@ typedef struct {
   void **a;
 } IdDataTable;
 
   void **a;
 } IdDataTable;
 

+/* The stored struct must start with a single int, conventionally
+ * named `ix'.  When the struct is returned for the first time ix must
+ * be -1; on subsequent occasions it must be >=0.  ix will be -1 iff
+ * the struct is registered by the iddatatable machinery. */
+

 extern Tcl_ObjType tabledataid_nearlytype;
 int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab);
 extern Tcl_ObjType tabledataid_nearlytype;
 int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab);

+void tabledataid_disposing(void *val, IdDataTable *tab);
+  /* call this when you destroy the struct, to remove its name;
+   * _disposing is idempotent*/
+
+/* from adns.c */
+
+typedef struct {
+  const char *name;
+  adns_rrtype number;
+} AdnsTclRRTypeInfo;
+
+extern IdDataTable adnstcl_queries, adnstcl_resolvers;

 
 /* from dgram.c */
 
 
 /* from dgram.c */