many improvements: use Get/SetAssocData for idtables to avoid globals, and adns bindi...

[chiark-tcl.git] / hbytes / hbytes.h

diff --git a/hbytes/hbytes.h b/hbytes/hbytes.h
index 17a05942b84a6b69b887fc015309c55f944993cb..b49301f02a935950b0c9a17c725ce395dde0671e 100644 (file)
--- a/hbytes/hbytes.h
+++ b/hbytes/hbytes.h
@@ -66,7 +66,7 @@
  *               ulong VARNAME/VALUE         VALUE if bitfields2ul)
  *
  *  hbytes mask-map lookup MAP-VAR ADDRESS [DEFAULT]   => DATA
  *               ulong VARNAME/VALUE         VALUE if bitfields2ul)
  *
  *  hbytes mask-map lookup MAP-VAR ADDRESS [DEFAULT]   => DATA

- *     error on missing default or if address too short
+ *     error on missing default or if any prefix longer than address

  *  hbytes mask-map amend MAP-VAR PREFIX PREFIX-LENGTH DATA
  *     a maskmap MAP is [list [list PREFIX PREFIX-LENGTH DATA]] sorted
  *     first by descending PREFIX-LENGTH and then by ascending PREFIX
  *  hbytes mask-map amend MAP-VAR PREFIX PREFIX-LENGTH DATA
  *     a maskmap MAP is [list [list PREFIX PREFIX-LENGTH DATA]] sorted
  *     first by descending PREFIX-LENGTH and then by ascending PREFIX


@@ -86,6 +86,8 @@
  * HBYTES LENGTH MISMATCH              when blocks must be exactly same length
  * HBYTES SYNTAX                       supposed hex block had wrong syntax
  * HBYTES VALUE OVERFLOW               value to be conv'd to hex too big/long
  * HBYTES LENGTH MISMATCH              when blocks must be exactly same length
  * HBYTES SYNTAX                       supposed hex block had wrong syntax
  * HBYTES VALUE OVERFLOW               value to be conv'd to hex too big/long

+ * HBYTES MASKMAP NOMATCH              no addr/mask matches address for lookup
+ * HBYTES MASKMAP UNDERRUN             addr value for lookup is too short

  * HBYTES MASKMAP SYNTAX LLENGTH       value for mask-map entry not llength==3
  * HBYTES MASKMAP SYNTAX UNDERRUN      value for mask-map entry hex too short
  * HBYTES MASKMAP SYNTAX OVERRUN       actual mask-map entry hex too short
  * HBYTES MASKMAP SYNTAX LLENGTH       value for mask-map entry not llength==3
  * HBYTES MASKMAP SYNTAX UNDERRUN      value for mask-map entry hex too short
  * HBYTES MASKMAP SYNTAX OVERRUN       actual mask-map entry hex too short


@@ -120,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 */


@@ -211,22 +215,38 @@ void scriptinv_invoke(ScriptToInvoke *si, int argc, Tcl_Obj **argv);
 /* from idtable.c */
 
 typedef struct {
 /* from idtable.c */
 
 typedef struct {

-  const char *const prefix;
-  int n;
-  void **a;
-} IdDataTable;
+  const char *valprefix, *assockey;
+  void (*destroyitem)(Tcl_Interp *ip, void *val);
+} IdDataSpec;
+
+/* 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;
 
 extern Tcl_ObjType tabledataid_nearlytype;

-int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab);
+int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, const IdDataSpec *idds);
+void tabledataid_disposing(Tcl_Interp *ip, void *val, const IdDataSpec *idds);
+  /* 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 const IdDataSpec adnstcl_queries, adnstcl_resolvers;

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

-extern IdDataTable dgram_socks;
+extern const IdDataSpec dgram_socks;

 int newfdposixerr(Tcl_Interp *ip, int fd, const char *m);
 
 /* from tuntap.c */
 
 int newfdposixerr(Tcl_Interp *ip, int fd, const char *m);
 
 /* from tuntap.c */
 

-extern IdDataTable tuntap_socks;
+extern const IdDataSpec tuntap_socks;

 
 /* from hook.c */
 
 
 /* from hook.c */