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

[chiark-tcl.git] / tuntap / tuntap.c

diff --git a/tuntap/tuntap.c b/tuntap/tuntap.c
index 7a1d2682e79ccfbba9a507c327809429b80e1830..f45b3c9b1419a116192684faee3064498035ebbc 100644 (file)
--- a/tuntap/tuntap.c
+++ b/tuntap/tuntap.c
@@ -26,8 +26,6 @@ typedef struct TunSocket {
   char *ifname;
 } TuntapSocket;
 
-IdDataTable tuntap_socks= { "tuntap" };
-
 int do_tuntap_socket_raw_create(ClientData cd, Tcl_Interp *ip,
                                const char *ifname, void **sock_r) {
   int fd, r;
@@ -142,15 +140,24 @@ int do_tuntap_socket_raw_on_transmit(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
-int do_tuntap_socket_raw_close(ClientData cd, Tcl_Interp *ip, void *sock_v) {
+static void destroy(void *sock_v) {
   TuntapSocket *sock= sock_v;
-  
-  int sockix;
   cancel(sock);
   close(sock->fd); /* nothing useful to be done with errors */
-  sockix= sock->ix;
   TFREE(sock->msg_buf);
   TFREE(sock);
-  tuntap_socks.a[sockix]= 0;
+}
+
+static void destroy_idtabcb(Tcl_Interp *ip, void *sock_v) {
+  destroy(sock_v);
+}
+
+int do_tuntap_socket_raw_close(ClientData cd, Tcl_Interp *ip, void *sock) {
+  destroy(sock);
+  tabledataid_disposing(ip,sock,&tuntap_socks);
   return TCL_OK;
 }
+
+const IdDataSpec tuntap_socks= {
+  "tuntap", "tuntap-table", destroy_idtabcb
+};