From: ian <ian>
Date: Thu, 26 Dec 2002 15:54:07 +0000 (+0000)
Subject: tuntap compiles
X-Git-Tag: debian/1.1.1~136
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=a41625aefb08ed5bf5f07951841bdfe30c4a72c7

tuntap compiles
---

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index 484f10d..afdae9a 100644
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -83,6 +83,8 @@
  * ULONG BITCOUNT UNDERRUN             bitfields add up to less than 32
  * ULONG VALUE NEGATIVE                attempt convert -ve integers to ulong
  * ULONG VALUE OVERFLOW                converted value does not fit in result
+ * TUNTAP IFNAME LENGTH                tun/tap interface name too long
+ * TUNTAP MTU OVERRUN                  tun/tap mtu limited to 2^16 bytes
  *
  * Refs: HMAC: RFC2104
  */
diff --git a/base/idtable.c b/base/idtable.c
index c2f3aaa..d2f3e04 100644
--- a/base/idtable.c
+++ b/base/idtable.c
@@ -119,7 +119,7 @@ static void tabledataid_nt_ustr(Tcl_Obj *o) {
 			  (char*)0);
 }
 
-Tcl_ObjType tabledataid_ntype = {
+Tcl_ObjType tabledataid_nearlytype = {
   "tabledataid",
   tabledataid_nt_free, tabledataid_nt_dup,
   tabledataid_nt_ustr, tabledataid_nt_sfa
diff --git a/base/parse.c b/base/parse.c
index 44f00e2..539f074 100644
--- a/base/parse.c
+++ b/base/parse.c
@@ -30,6 +30,11 @@ int pat_long(Tcl_Interp *ip, Tcl_Obj *obj, long *val) {
   return Tcl_GetLongFromObj(ip, obj, val);
 }
   
+int pat_string(Tcl_Interp *ip, Tcl_Obj *obj, const char **val) {
+  *val= Tcl_GetString(obj);
+  return TCL_OK;
+}
+  
 int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
   int rc;
   Tcl_Obj *val;
@@ -89,6 +94,10 @@ Tcl_Obj *ret_long(Tcl_Interp *ip, long val) {
   return Tcl_NewLongObj(val);
 }
 
+Tcl_Obj *ret_string(Tcl_Interp *ip, const char *val) {
+  return Tcl_NewStringObj(val,-1);
+}
+
 Tcl_Obj *ret_obj(Tcl_Interp *ip, Tcl_Obj *val) {
   return val;
 }
diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index b98ba5f..1a02eb6 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -194,10 +194,10 @@ Table tuntap_socket TunSocket_SubCommand
 		=>	string
 	receive
 		sock	iddata(&tuntap_socks)
-		mtu	long
 		data	hb
 	on-transmit
 		sock	iddata(&tuntap_socks)
+		mtu	long
 		?script	obj
 
 Table blockcipherop BlockCipherOp
diff --git a/base/troglodyte-Makefile b/base/troglodyte-Makefile
index 24f1e13..9e5618a 100644
--- a/base/troglodyte-Makefile
+++ b/base/troglodyte-Makefile
@@ -6,6 +6,7 @@ OBJS=		tables.o \
 		ulongs.o \
 		sockaddr.o \
 		dgram.o \
+		tuntap.o \
 		chop.o \
 		hook.o \
 		bcmode.o \
diff --git a/hbytes/hbytes.h b/hbytes/hbytes.h
index 484f10d..afdae9a 100644
--- a/hbytes/hbytes.h
+++ b/hbytes/hbytes.h
@@ -83,6 +83,8 @@
  * ULONG BITCOUNT UNDERRUN             bitfields add up to less than 32
  * ULONG VALUE NEGATIVE                attempt convert -ve integers to ulong
  * ULONG VALUE OVERFLOW                converted value does not fit in result
+ * TUNTAP IFNAME LENGTH                tun/tap interface name too long
+ * TUNTAP MTU OVERRUN                  tun/tap mtu limited to 2^16 bytes
  *
  * Refs: HMAC: RFC2104
  */
diff --git a/hbytes/parse.c b/hbytes/parse.c
index 44f00e2..539f074 100644
--- a/hbytes/parse.c
+++ b/hbytes/parse.c
@@ -30,6 +30,11 @@ int pat_long(Tcl_Interp *ip, Tcl_Obj *obj, long *val) {
   return Tcl_GetLongFromObj(ip, obj, val);
 }
   
+int pat_string(Tcl_Interp *ip, Tcl_Obj *obj, const char **val) {
+  *val= Tcl_GetString(obj);
+  return TCL_OK;
+}
+  
 int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
   int rc;
   Tcl_Obj *val;
@@ -89,6 +94,10 @@ Tcl_Obj *ret_long(Tcl_Interp *ip, long val) {
   return Tcl_NewLongObj(val);
 }
 
+Tcl_Obj *ret_string(Tcl_Interp *ip, const char *val) {
+  return Tcl_NewStringObj(val,-1);
+}
+
 Tcl_Obj *ret_obj(Tcl_Interp *ip, Tcl_Obj *val) {
   return val;
 }
diff --git a/tuntap/tuntap.c b/tuntap/tuntap.c
index 5543302..ee8e99e 100644
--- a/tuntap/tuntap.c
+++ b/tuntap/tuntap.c
@@ -5,18 +5,23 @@
  * tuntap-socket-rawlinux ifname <sockid> => <ifname>
  * tuntap-socket-rawlinux close <sockid>
  * tuntap-socket-rawlinux receive <sockid> <data>
- * tuntap-socket-rawlinux on-transmit <sockid> [<script>]
+ * tuntap-socket-rawlinux on-transmit <sockid> <mtu> [<script>]
  *    calls, effectively,  eval <script> [list <data> <socket>]
  *    if script not supplied, cancel
  */
 
 #include "tables.h"
 #include "hbytes.h"
+#include "hbytes.h"
+
+#include <sys/ioctl.h>
+#include <linux/if.h>
+#include <linux/if_tun.h>
 
 typedef struct TunSocket {
   int ix, fd, script_llength;
   Tcl_Interp *ip;
-  Tcl_Obj *script;
+  ScriptToInvoke script;
   int mtu;
   unsigned char *msg_buf;
   char *ifname;
@@ -24,63 +29,46 @@ typedef struct TunSocket {
 
 IdDataTable tuntap_socks= { "tuntap" };
 
-static int sockfail(Tcl_Interp *ip, int fd, const char *m) {
-  int e;
-  e= errno;
-  close(fd);
-  return posixerr(ip,e,m);
-}
-
-int do_tuntap_socket_create_ptp(ClientData cd, Tcl_Interp *ip,
-				SockAddr_Value local, SockAddr_Value peer,
-				long mtu, const char *ifname,
-				void **sock_r) {
-  int fd, local_al, peer_al, r;
+int do_tuntap_socket_create(ClientData cd, Tcl_Interp *ip,
+			    const char *ifname, void **sock_r) {
+  int fd, r;
   struct ifreq ifr;
-  DgramSocket *sock;
-  const struct sockaddr *local_sa, *peer_sa;
-
-  local_sa= sockaddr_addr(&local);
-  local_al= sockaddr_len(&local);
-
-  peer_sa= sockaddr_addr(&peer);
-  peer_al= sockaddr_len(&peer);
-
-  if (local_sa != AF_INET || local_al != sizeof(struct in_addr) ||
-      peer_sa != AF_INET || peer_al != sizeof(struct in_addr))
-    return staticerr(ip,"tuntap not IPv4");
+  TuntapSocket *sock;
 
   memset(&ifr,0,sizeof(ifr));
   ifr.ifr_flags= IFF_TUN | IFF_NO_PI;
   
   if (ifname) {
-    if (strlen(ifname) > IFNAMSIZ-1)
-      return staticerr(ip,"tun interface name too long");
+    if (strlen(ifname) > IFNAMSIZ-1) return
+      staticerr(ip,"tun interface name too long","TUNTAP IFNAME LENGTH");
     strcpy(ifr.ifr_name, ifname);
   }
 
   fd= open("/dev/net/tun", O_RDWR);
   if (fd<0) return posixerr(ip,errno,"open /dev/net/tun");
 
+  r= setnonblock(fd,1);
+  if (r) return posixerr(ip,errno,"setnonblock tun");
+  
   r= ioctl(fd, TUNSETIFF, (void*)&ifr);
   if (r) return newfdposixerr(ip,fd,"ioctl TUNSETIFF");
 
   sock= TALLOC(sizeof(TuntapSocket));
   sock->ix= -1;
   sock->fd= fd;
-  sock->script= 0;
   sock->mtu= 0;
   sock->msg_buf= 0;
   sock->ifname= TALLOC(strlen(ifr.ifr_name)+1);
   strcpy(sock->ifname, ifr.ifr_name);
+  scriptinv_init(&sock->script);
 
   *sock_r= sock;
   return TCL_OK;
 }
 
 int do_tuntap_socket_receive(ClientData cd, Tcl_Interp *ip,
-			     TuntapSocket *sock, HBytes_Value data,
-			     SockAddr_Value remote) {
+			     void *sock_v, HBytes_Value data) {
+  TuntapSocket *sock= sock_v;
   int l, r;
 
   r= write(sock->fd,
@@ -90,23 +78,28 @@ int do_tuntap_socket_receive(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
+int do_tuntap_socket_ifname(ClientData cd, Tcl_Interp *ip,
+			    void *sock_v, const char **result) {
+  TuntapSocket *sock= sock_v;
+  *result= sock->ifname;
+  return TCL_OK;
+}
+
 static void cancel(TuntapSocket *sock) {
-  if (sock->script) {
+  if (sock->script.obj) {
+    scriptinv_cancel(&sock->script);
     Tcl_DeleteFileHandler(sock->fd);
-    Tcl_DecrRefCount(sock->script);
-    sock->script= 0;
+    TFREE(sock->msg_buf);
+    sock->msg_buf= 0;
   }
 }
 
-static void recv_call(ClientData sock_cd, int mask) {
+static void read_call(ClientData sock_cd, int mask) {
   TuntapSocket *sock= (void*)sock_cd;
   Tcl_Interp *ip= sock->ip;
-  int sz, rc, i, peek;
+  int sz, rc;
   HBytes_Value message_val;
-  SockAddr_Value peer_val;
-  Tcl_Obj *args[3], *invoke;
-  struct msghdr mh;
-  struct iovec iov;
+  Tcl_Obj *args[2];
 
   for (;;) {
     sz= read(sock->fd, sock->msg_buf, sock->mtu);
@@ -121,166 +114,43 @@ static void recv_call(ClientData sock_cd, int mask) {
     hbytes_array(&message_val, sock->msg_buf, sz);
     args[0]= ret_hb(ip, message_val);  hbytes_empty(&message_val);
     args[1]= ret_iddata(ip, sock, &tuntap_socks);
-    script_invoke(sock->script, args, 0);
-    
-
-    for (i=0; i<2; i++) Tcl_IncrRefCount(args[i]);
-
-  
-
-  sockaddr_clear(&peer_val);
-  invoke=0; for (i=0; i<3; i++) args[i]=0;
-
-  mh.msg_iov= &iov;
-  mh.msg_iovlen= 1;
-  mh.msg_control= 0;
-  mh.msg_controllen= 0;
-  mh.msg_flags= 0;
-
-    mh.msg_name= sock->addr_buf;
-    mh.msg_namelen= sock->addr_buflen;
-
-    iov.iov_base= sock->msg_buf;
-    iov.iov_len= sock->msg_buflen;
-
-    sz= recvmsg(sock->fd, &mh, peek);
-    if (sz==-1) { rc=0; goto x_rc; }
-
-    assert(mh.msg_namelen < sock->addr_buflen);
-
-    if (!(mh.msg_flags & MSG_TRUNC)) {
-      if (!peek) break;
-      peek= 0;
-      continue;
-    }
-
-    TFREE(sock->msg_buf);
-    sock->msg_buflen *= 2;
-    sock->msg_buflen += 100;
-    sock->msg_buf= TALLOC(sock->msg_buflen);
+    scriptinv_invoke(&sock->script, 2, args);
   }
 
-  hbytes_array(&message_val, iov.iov_base, sz);
-  sockaddr_create(&peer_val, mh.msg_name, mh.msg_namelen);
-
-  args[0]= ret_hb(ip, message_val);  hbytes_empty(&message_val);
-  args[1]= ret_sockaddr(ip, peer_val);  sockaddr_clear(&peer_val);
-  args[2]= ret_sockid(ip, sock);
-  for (i=0; i<3; i++) Tcl_IncrRefCount(args[i]);
-
-  invoke= Tcl_DuplicateObj(sock->script);
-  Tcl_IncrRefCount(invoke);
-
-  rc= Tcl_ListObjReplace(ip,invoke,sock->script_llength,0,3,args);
-  for (i=0; i<3; i++) { Tcl_DecrRefCount(args[i]); args[i]= 0; }
-  if (rc) goto x_rc;
-
-  rc= Tcl_EvalObjEx(ip,invoke,TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
-
 x_rc:
-  if (invoke) Tcl_DecrRefCount(invoke);
-
-  if (rc)
-    Tcl_BackgroundError(ip);
+  if (rc) Tcl_BackgroundError(ip);
 }
 
-int do_tuntap_socket_on_receive(ClientData cd, Tcl_Interp *ip,
-			       TuntapSocket *sock, Tcl_Obj *script) {
+int do_tuntap_socket_on_transmit(ClientData cd, Tcl_Interp *ip, void *sock_v,
+				 long mtu, Tcl_Obj *newscript) {
+  TuntapSocket *sock= sock_v;
   int rc;
 
   if (mtu > 65536)
-    return staticerr(ip,"tuntap mtu >2^16");
+    return staticerr(ip,"tuntap mtu >2^16","TUNTAP MTU OVERRUN");
+
+  cancel(sock);
   
-  if (script) {
-    rc= Tcl_ListObjLength(ip, script, &sock->script_llength);
+  if (newscript) {
+    rc= scriptinv_set(&sock->script,ip,newscript);
     if (rc) return rc;
+    
+    sock->mtu= mtu;
+    sock->msg_buf= TALLOC(mtu);
+    Tcl_CreateFileHandler(sock->fd, TCL_READABLE, read_call, sock);
   }
-  
-  cancel(sock);
-  if (script) {
-    Tcl_IncrRefCount(script);
-    sock->script= script;
-    sock->ip= ip;
-  }
-  Tcl_CreateFileHandler(sock->fd, TCL_READABLE, recv_call, sock);
   return TCL_OK;
 }
 
-int do_tuntap_socket_close(ClientData cd, Tcl_Interp *ip, TuntapSocket *sock) {
+int do_tuntap_socket_close(ClientData cd, Tcl_Interp *ip, 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->addr_buf);
   TFREE(sock->msg_buf);
   TFREE(sock);
-  socks[sockix]= 0;
-  return TCL_OK;
-}
-
-/* Arg parsing */
-
-int pat_sockid(Tcl_Interp *ip, Tcl_Obj *o, TuntapSocket **val) {
-  int rc, sockix;
-  TuntapSocket *sock;
-  
-  rc= Tcl_ConvertToType(ip,o,&tuntapsockid_type);
-  if (rc) return rc;
-
-  sockix= o->internalRep.longValue;
-  if (sockix >= n_socks || !(sock= socks[sockix]))
-    return staticerr(ip,"tuntap socket not open",0);
-
-  assert(socks[sockix]->ix == sockix);
-
-  *val= sock;
-  return TCL_OK;
-}
-
-Tcl_Obj *ret_sockid(Tcl_Interp *ip, TuntapSocket *val) {
-  Tcl_Obj *o;
-
-  o= Tcl_NewObj();
-  Tcl_InvalidateStringRep(o);
-  o->internalRep.longValue= val->ix;
-  o->typePtr= &tuntapsockid_type;
-  return o;
-}
-
-static void sockid_t_free(Tcl_Obj *o) { }
-
-static void sockid_t_dup(Tcl_Obj *src, Tcl_Obj *dup) {
-  dup->internalRep= src->internalRep;
-  dup->typePtr= &tuntapsockid_type;
-}
-
-static void sockid_t_ustr(Tcl_Obj *o) {
-  char buf[75];
-
-  snprintf(buf,sizeof(buf), "%d", (int)o->internalRep.longValue);
-  obj_updatestr_vstringls(o,
-			  "tuntapsock",9,
-			  buf, strlen(buf),
-			  (char*)0);
-}
-
-static int sockid_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
-  unsigned long ul;
-  char *ep, *str;
-  
-  str= Tcl_GetStringFromObj(o,0);
-  if (memcmp(str,"tuntapsock",9)) return staticerr(ip,"bad tuntap socket id",0);
-  errno=0; ul=strtoul(str+9,&ep,10);
-  if (errno || *ep) return staticerr(ip,"bad tuntap socket id number",0);
-  if (ul > INT_MAX) return staticerr(ip,"out of range tuntap socket id",0);
-
-  objfreeir(o);
-  o->internalRep.longValue= ul;
-  o->typePtr= &tuntapsockid_type;
+  tuntap_socks.a[sockix]= 0;
   return TCL_OK;
 }
-
-Tcl_ObjType tuntapsockid_type = {
-  "tuntapsockid",
-  sockid_t_free, sockid_t_dup, sockid_t_ustr, sockid_t_sfa
-};