scriptinv

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

diff --git a/tuntap/tuntap.c b/tuntap/tuntap.c
index a4d9f9a0117c2a943b7f6f0ebccb4e649b01ef98..554330255808dccd5cbba18611971d2b7df68684 100644 (file)
--- a/tuntap/tuntap.c
+++ b/tuntap/tuntap.c
@@ -1,12 +1,11 @@
 /*
  */
 /*
- * tuntap-socket create-ptp <local-addr> <peer-addr> <mtu> [<ifname>]
- *               => <sockid>
- * tuntap-socket close <sockid>
- * tuntap-socket ifname <sockid>
- * tuntap-socket receive <sockid> <data>
- * tuntap-socket on-transmit <sockid> [<script>]
+ * tuntap-socket-rawlinux create [<ifname>] => <sockid>
+ * tuntap-socket-rawlinux ifname <sockid> => <ifname>
+ * tuntap-socket-rawlinux close <sockid>
+ * tuntap-socket-rawlinux receive <sockid> <data>
+ * tuntap-socket-rawlinux on-transmit <sockid> [<script>]
  *    calls, effectively,  eval <script> [list <data> <socket>]
  *    if script not supplied, cancel
  */
@@ -18,8 +17,8 @@ typedef struct TunSocket {
   int ix, fd, script_llength;
   Tcl_Interp *ip;
   Tcl_Obj *script;
-  void msg_buf;
   int mtu;
+  unsigned char *msg_buf;
   char *ifname;
 } TuntapSocket;
 
@@ -64,38 +63,30 @@ int do_tuntap_socket_create_ptp(ClientData cd, Tcl_Interp *ip,
   if (fd<0) return posixerr(ip,errno,"open /dev/net/tun");
 
   r= ioctl(fd, TUNSETIFF, (void*)&ifr);
-  if (r) return posixerr(ip,errno,"ioctl TUNSETIFF");
+  if (r) return newfdposixerr(ip,fd,"ioctl TUNSETIFF");
 
-  
-
-  r= 
-  r= bind(fd, sa, al);  if (r) return sockfail(ip,fd,"bind");
-  r= setnonblock(fd, 1);  if (r) return sockfail(ip,fd,"setnonblock");
-
-  sock= TALLOC(sizeof(DgramSocket));
+  sock= TALLOC(sizeof(TuntapSocket));
   sock->ix= -1;
   sock->fd= fd;
   sock->script= 0;
-  sock->addr_buflen= al+1;
-  sock->addr_buf= TALLOC(sock->addr_buflen);
-  sock->msg_buflen= 0;
+  sock->mtu= 0;
   sock->msg_buf= 0;
+  sock->ifname= TALLOC(strlen(ifr.ifr_name)+1);
+  strcpy(sock->ifname, ifr.ifr_name);
 
   *sock_r= sock;
   return TCL_OK;
 }
 
-int do_tuntap_socket_transmit(ClientData cd, Tcl_Interp *ip,
+int do_tuntap_socket_receive(ClientData cd, Tcl_Interp *ip,
                             TuntapSocket *sock, HBytes_Value data,
                             SockAddr_Value remote) {
   int l, r;
 
-  r= sendto(sock->fd,
-           hbytes_data(&data), l=hbytes_len(&data),
-           0,
-           sockaddr_addr(&remote), sockaddr_len(&remote));
-  if (r==-1) return posixerr(ip,errno,"sendto");
-  else if (r!=l) return staticerr(ip,"sendto gave wrong answer",0);
+  r= write(sock->fd,
+          hbytes_data(&data), l=hbytes_len(&data));
+  if (r==-1) return posixerr(ip,errno,"write tuntap");
+  else if (r!=l) return staticerr(ip,"write tuntap gave wrong answer",0);
   return TCL_OK;
 }
 
@@ -117,7 +108,26 @@ static void recv_call(ClientData sock_cd, int mask) {
   struct msghdr mh;
   struct iovec iov;
 
-  hbytes_empty(&message_val);
+  for (;;) {
+    sz= read(sock->fd, sock->msg_buf, sock->mtu);
+    if (sz == -1) {
+      if (errno == EAGAIN || errno == EWOULDBLOCK) rc=0;
+      else rc= posixerr(ip,errno,"read tuntap");
+      goto x_rc;
+    }
+
+    assert(sz <= sock->mtu);
+
+    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;
 
@@ -127,9 +137,6 @@ static void recv_call(ClientData sock_cd, int mask) {
   mh.msg_controllen= 0;
   mh.msg_flags= 0;
 
-  peek= MSG_PEEK;
-  
-  for (;;) {
     mh.msg_name= sock->addr_buf;
     mh.msg_namelen= sock->addr_buflen;
 
@@ -180,6 +187,9 @@ x_rc:
 int do_tuntap_socket_on_receive(ClientData cd, Tcl_Interp *ip,
                               TuntapSocket *sock, Tcl_Obj *script) {
   int rc;
+
+  if (mtu > 65536)
+    return staticerr(ip,"tuntap mtu >2^16");
   
   if (script) {
     rc= Tcl_ListObjLength(ip, script, &sock->script_llength);