X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=dgram%2Fdgram.c;h=ff16917fb352c3843f2ea911ba79185223c8fcd7;hb=b1aa186fec2f36c274e71886e858408b1aa93e6d;hp=e6df127ab79bae33afa345d9268193f17f70c7eb;hpb=ec732779f1e6caddd2dcc3bf6bf084ad2202bfd1;p=chiark-tcl.git

diff --git a/dgram/dgram.c b/dgram/dgram.c
index e6df127..ff16917 100644
--- a/dgram/dgram.c
+++ b/dgram/dgram.c
@@ -4,116 +4,170 @@
  * dgram-socket create <local>                        => <sockid>
  * dgram-socket close <sockid>
  * dgram-socket transmit <sockid> <data> <remote>
- * dgram-socket on-receive <sockid> <script>
+ * dgram-socket on-receive <sockid> [<script>]
  *    calls, effectively,  eval <script> [list <data> <remote-addr> <socket>]
+ *    if script not supplied, cancel
  */
 
 #include "tables.h"
 #include "hbytes.h"
 
 typedef struct DgramSocket {
+  int ix; /* first ! */
   int fd;
+  Tcl_Interp *ip;
+  ScriptToInvoke script;
+  void *addr_buf, *msg_buf;
+  int addr_buflen, msg_buflen;
 } DgramSocket;
 
-static int n_socks;
-static DgramSocket *socks;
-
-static int sockfail(Tcl_Interp *ip, int fd, const char *m) {
-  int e;
-  e= errno;
-  close(fd);
-  return posixerr(ip,e,m);
-}
-
 int do_dgram_socket_create(ClientData cd, Tcl_Interp *ip,
-			  SockAddr_Value local, int *sock_r) {
-  int fd, al, r, sock;
+			   SockAddr_Value local, void **sock_r) {
+  int fd, al, r;
+  DgramSocket *sock;
   const struct sockaddr *sa;
 
-  for (sock=0; sock<n_socks && socks[sock].fd>=0; sock++);
-  if (sock>=n_socks) {
-    n_socks += 2;
-    n_socks *= 2;
-    socks= (void*)Tcl_Realloc((void*)socks, n_socks*sizeof(*socks));
-    while (sock<n_socks) socks[sock++].fd=-1;
-    sock--;
-  }
-
   sa= sockaddr_addr(&local);
   al= sockaddr_len(&local);
 
   fd= socket(sa->sa_family, SOCK_DGRAM, 0);
   if (fd<0) return posixerr(ip,errno,"socket");
-  r= bind(fd, sa, al);  if (r) return sockfail(ip,fd,"bind");
-  r= setnonblock(fd, 1);  if (r) return sockfail(ip,fd,"setnonblock");
+  r= bind(fd, sa, al);  if (r) return newfdposixerr(ip,fd,"bind");
+  r= setnonblock(fd, 1);  if (r) return newfdposixerr(ip,fd,"setnonblock");
+
+  sock= TALLOC(sizeof(DgramSocket));
+  sock->ix= -1;
+  sock->fd= fd;
+  sock->addr_buflen= al+1;
+  sock->addr_buf= TALLOC(sock->addr_buflen);
+  sock->msg_buflen= 0;
+  sock->msg_buf= 0;
+  scriptinv_init(&sock->script);
 
-  socks[sock].fd= fd;
   *sock_r= sock;
   return TCL_OK;
 }
 
-int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, int sock) {
-  close(socks[sock].fd); /* nothing useful to be done with errors */
-  socks[sock].fd= -1;
+int do_dgram_socket_transmit(ClientData cd, Tcl_Interp *ip,
+			     void *sock_v, HBytes_Value data,
+			     SockAddr_Value remote) {
+  DgramSocket *sock= sock_v;
+  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);
   return TCL_OK;
 }
 
-/* Arg parsing */
+static void cancel(DgramSocket *sock) {
+  if (sock->script.obj) {
+    scriptinv_cancel(&sock->script);
+    Tcl_DeleteFileHandler(sock->fd);
+  }
+}
 
-int pat_sockid(Tcl_Interp *ip, Tcl_Obj *o, int *val) {
-  int rc, sock;
+static void recv_call(ClientData sock_cd, int mask) {
+  DgramSocket *sock= (void*)sock_cd;
+  Tcl_Interp *ip= sock->script.ip;
+  int sz, rc, peek;
+  HBytes_Value message_val;
+  SockAddr_Value peer_val;
+  Tcl_Obj *args[3];
+  struct msghdr mh;
+  struct iovec iov;
+
+  hbytes_empty(&message_val);
+  sockaddr_clear(&peer_val);
+
+  mh.msg_iov= &iov;
+  mh.msg_iovlen= 1;
+  mh.msg_control= 0;
+  mh.msg_controllen= 0;
+  mh.msg_flags= 0;
+
+  peek= MSG_PEEK;
   
-  rc= Tcl_ConvertToType(ip,o,&sockid_type);
-  if (rc) return rc;
-
-  sock= o->internalRep.longValue;
-  if (sock >= n_socks || socks[sock].fd==-1)
-    return staticerr(ip,"dgram socket not open");
+  for (;;) {
+    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) {
+      if (errno == EAGAIN || errno == EWOULDBLOCK) rc=0;
+      else rc= posixerr(ip,errno,"recvmsg");
+      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);
+  }
 
-  *val= sock;
-  return TCL_OK;
-}
+  hbytes_array(&message_val, iov.iov_base, sz);
+  sockaddr_create(&peer_val, mh.msg_name, mh.msg_namelen);
 
-Tcl_Obj *ret_sockid(Tcl_Interp *ip, int val) {
-  Tcl_Obj *o;
+  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);
+  scriptinv_invoke(&sock->script,3,args);
 
-  o= Tcl_NewObj();
-  Tcl_InvalidateStringRep(o);
-  o->internalRep.longValue= val;
-  o->typePtr= &sockid_type;
-  return o;
+  rc= 0;
+  
+x_rc:
+  if (rc)
+    Tcl_BackgroundError(ip);
 }
 
-static void sockid_t_free(Tcl_Obj *o) { }
-
-static void sockid_t_dup(Tcl_Obj *src, Tcl_Obj *dup) {
-  dup->internalRep= src->internalRep;
+int do_dgram_socket_on_receive(ClientData cd, Tcl_Interp *ip,
+			       void *sock_v, Tcl_Obj *newscript) {
+  DgramSocket *sock= sock_v;
+  int rc;
+  
+  cancel(sock);
+  
+  if (newscript) {
+    rc= scriptinv_set(&sock->script, ip, newscript);
+    if (rc) return rc;
+  }
+  
+  Tcl_CreateFileHandler(sock->fd, TCL_READABLE, recv_call, sock);
+  return TCL_OK;
 }
 
-static void sockid_t_ustr(Tcl_Obj *o) {
-  char buf[100];
-  int l;
+static void destroy(DgramSocket *sock) {
+  cancel(sock);
+  close(sock->fd); /* nothing useful to be done with errors */
+  TFREE(sock->addr_buf);
+  TFREE(sock->msg_buf);
+  TFREE(sock);
+}
 
-  snprintf(buf,sizeof(buf),"dgramsock%d", (int)o->internalRep.longValue);
-  l= o->length= strlen(buf);
-  o->bytes= TALLOC(l+1);
-  strcpy(o->bytes, buf);
+static void destroy_idtabcb(Tcl_Interp *ip, void *sock_v) {
+  destroy(sock_v);
 }
 
-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,"dgramsock",9)) return staticerr(ip,"bad dgram socket id");
-  errno=0; ul=strtoul(str+9,&ep,10);
-  if (errno || *ep) return staticerr(ip,"bad dgram socket id number");
-  if (ul > INT_MAX) return staticerr(ip,"out of range dgram socket id");
-  o->internalRep.longValue= ul;
+int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, void *sock_v) {
+  destroy(sock_v);
+  tabledataid_disposing(ip,sock_v,&dgram_socks);
   return TCL_OK;
 }
 
-Tcl_ObjType sockid_type = {
-  "sockid-nearly",
-  sockid_t_free, sockid_t_dup, sockid_t_ustr, sockid_t_sfa
+const IdDataSpec dgram_socks= {
+  "dgramsock", "dgramsock-table", destroy_idtabcb
 };