const struct sockaddr *sockaddr_addr(const SockAddr_Value*);
void sockaddr_free(const SockAddr_Value*);
+/* from scriptinv.c */
+
+typedef struct { /* semi-opaque - read only, and then only where commented */
+ Tcl_Interp *ip; /* valid, non-0 and useable if set */
+ Tcl_Obj *obj; /* non-0 iff set (but only test for 0/non-0) */
+ int llength;
+} ScriptToInvoke;
+
+void scriptinv_init(ScriptToInvoke *si);
+int scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip, Tcl_Obj *newscript);
+void scriptinv_cancel(ScriptToInvoke *si); /* then don't invoke */
+ /* no separate free function - just cancel */
+
+void scriptinv_invoke(ScriptToInvoke *si, int argc, Tcl_Obj **argv);
+
/* from idtable.c */
typedef struct {
--- /dev/null
+/*
+ */
+
+#include "hbytes.h"
+
+void scriptinv_init(ScriptToInvoke *si) {
+ si->obj= 0;
+}
+
+void scriptinv_cancel(ScriptToInvoke *si) {
+ if (si->obj) {
+ Tcl_DecrRefCount(si->obj);
+ si->obj= 0;
+ }
+}
+
+int scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip, Tcl_Obj *newscript) {
+ int rc;
+
+ scriptinv_cancel(si);
+
+ rc= Tcl_ListObjLength(ip, newscript, &si->llength);
+ if (rc) return rc;
+
+ Tcl_IncrRefCount(newscript);
+ si->obj= newscript;
+ si->ip= ip;
+ return 0;
+}
+
+void scriptinv_invoke(ScriptToInvoke *si, int argc, Tcl_Obj **argv) {
+ Tcl_Obj *invoke=0;
+ int i, rc;
+
+ assert(si->obj);
+
+ for (i=0; i<argc; i++) Tcl_IncrRefCount(argv[i]);
+ invoke= Tcl_DuplicateObj(si->obj);
+ Tcl_IncrRefCount(invoke);
+
+ rc= Tcl_ListObjReplace(si->ip,invoke,si->llength,0,argc,argv);
+ for (i=0; i<argc; i++) { Tcl_DecrRefCount(argv[i]); argv[i]= 0; }
+ if (rc) goto x_rc;
+
+ rc= Tcl_EvalObjEx(si->ip,invoke,TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
+ if (rc) goto x_rc;
+
+ rc= 0;
+
+x_rc:
+ if (invoke) Tcl_DecrRefCount(invoke);
+ if (rc) Tcl_BackgroundError(si->ip);
+}
... obj
tuntap-socket
subcmd enum(TunSocket_SubCommand,"tuntap-socket subcommand")
- ... obj
+ ... obj
ulong
subcmd enum(ULong_SubCommand,"ulong subcommand")
... obj
?script obj
Table tuntap_socket TunSocket_SubCommand
- create-ptp
- local sockaddr
- peer sockaddr
- mtu long
+ create
?ifname string
=> iddata(&tuntap_socks)
close
=> string
receive
sock iddata(&tuntap_socks)
+ mtu long
data hb
on-transmit
sock iddata(&tuntap_socks)
hbytes.o \
enum.o \
idtable.o \
+ scriptinv.o \
ulongs.o \
sockaddr.o \
dgram.o \
typedef struct DgramSocket {
int ix; /* first ! */
- int fd, script_llength;
+ int fd;
Tcl_Interp *ip;
- Tcl_Obj *script;
+ ScriptToInvoke script;
void *addr_buf, *msg_buf;
int addr_buflen, msg_buflen;
} DgramSocket;
sock= TALLOC(sizeof(DgramSocket));
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->msg_buf= 0;
+ scriptinv_init(&sock->script);
*sock_r= sock;
return TCL_OK;
}
static void cancel(DgramSocket *sock) {
- if (sock->script) {
+ if (sock->script.obj) {
+ scriptinv_cancel(&sock->script);
Tcl_DeleteFileHandler(sock->fd);
- Tcl_DecrRefCount(sock->script);
- sock->script= 0;
}
}
static void recv_call(ClientData sock_cd, int mask) {
DgramSocket *sock= (void*)sock_cd;
- Tcl_Interp *ip= sock->ip;
- int sz, rc, i, peek;
+ Tcl_Interp *ip= sock->script.ip;
+ int sz, rc, peek;
HBytes_Value message_val;
SockAddr_Value peer_val;
- Tcl_Obj *args[3], *invoke;
+ Tcl_Obj *args[3];
struct msghdr mh;
struct iovec iov;
hbytes_empty(&message_val);
sockaddr_clear(&peer_val);
- invoke=0; for (i=0; i<3; i++) args[i]=0;
mh.msg_iov= &iov;
mh.msg_iovlen= 1;
iov.iov_len= sock->msg_buflen;
sz= recvmsg(sock->fd, &mh, peek);
- if (sz==-1) { rc=0; goto x_rc; }
+ if (sz==-1) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) rc=0;
+ else rc= posixerr(ip,errno,"recvmsg");
+ goto x_rc;
+ }
assert(mh.msg_namelen < sock->addr_buflen);
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_iddata(ip, sock, &dgram_socks);
- 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);
+ scriptinv_invoke(&sock->script,3,args);
+ rc= 0;
+
x_rc:
- if (invoke) Tcl_DecrRefCount(invoke);
-
if (rc)
Tcl_BackgroundError(ip);
}
int do_dgram_socket_on_receive(ClientData cd, Tcl_Interp *ip,
- void *sock_v, Tcl_Obj *script) {
+ void *sock_v, Tcl_Obj *newscript) {
DgramSocket *sock= sock_v;
int rc;
- if (script) {
- rc= Tcl_ListObjLength(ip, script, &sock->script_llength);
+ cancel(sock);
+
+ if (newscript) {
+ rc= scriptinv_set(&sock->script, ip, newscript);
if (rc) return rc;
}
- 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;
}
const struct sockaddr *sockaddr_addr(const SockAddr_Value*);
void sockaddr_free(const SockAddr_Value*);
+/* from scriptinv.c */
+
+typedef struct { /* semi-opaque - read only, and then only where commented */
+ Tcl_Interp *ip; /* valid, non-0 and useable if set */
+ Tcl_Obj *obj; /* non-0 iff set (but only test for 0/non-0) */
+ int llength;
+} ScriptToInvoke;
+
+void scriptinv_init(ScriptToInvoke *si);
+int scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip, Tcl_Obj *newscript);
+void scriptinv_cancel(ScriptToInvoke *si); /* then don't invoke */
+ /* no separate free function - just cancel */
+
+void scriptinv_invoke(ScriptToInvoke *si, int argc, Tcl_Obj **argv);
+
/* from idtable.c */
typedef struct {
/*
*/
/*
- * 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
*/
int ix, fd, script_llength;
Tcl_Interp *ip;
Tcl_Obj *script;
- void msg_buf;
int mtu;
+ unsigned char *msg_buf;
char *ifname;
} TuntapSocket;
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;
}
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;
mh.msg_controllen= 0;
mh.msg_flags= 0;
- peek= MSG_PEEK;
-
- for (;;) {
mh.msg_name= sock->addr_buf;
mh.msg_namelen= sock->addr_buflen;
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);
~ian / chiark-tcl.git / commitdiff