const fallout from Simon's X forwarding changes.

[sgt/putty] / mac / mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 35f3084..60dd84e 100644 (file)
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -187,15 +187,18 @@ static struct {
     Handle dnr_handle;
     int initialised;
     short refnum;
+    ProcessSerialNumber self;
     Actual_Socket socklist;
 } mactcp;
 
 static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie);
+static pascal void mactcp_asr(StreamPtr, unsigned short, Ptr, unsigned short,
+                             struct ICMPReport *);
 static Plug mactcp_plug(Socket, Plug);
 static void mactcp_flush(Socket);
 static void mactcp_close(Socket);
-static int mactcp_write(Socket, char *, int);
-static int mactcp_write_oob(Socket, char *, int);
+static int mactcp_write(Socket, char const *, int);
+static int mactcp_write_oob(Socket, char const*, int);
 static void mactcp_set_private_ptr(Socket, void *);
 static void *mactcp_get_private_ptr(Socket);
 static char *mactcp_socket_error(Socket);
@@ -230,7 +233,24 @@ OSErr mactcp_init(void)
 
 void mactcp_shutdown(void)
 {
+    Actual_Socket s, next;
 
+    /*
+     * Eventually, PuTTY should close down each session as it exits,
+     * so there should be no sockets left when we get here.  Still,
+     * better safe than sorry.
+     *
+     * XXX What about in-flight aync I/O (when we support that)?
+     */
+    for (s = mactcp.socklist; s != NULL; s = next) {
+       next = s->next; /* s is about to vanish */
+       mactcp_close(&s->fn);
+    }
+
+    /*
+     * When we get async DNS, we have to wait for any outstanding
+     * requests to complete here before exiting.
+     */
     CloseResolver();
     mactcp.initialised = FALSE;
 }
@@ -365,6 +385,8 @@ Socket sk_register(void *sock, Plug plug)
     fatalbox("sk_register");
 }
 
+static TCPNotifyUPP mactcp_asr_upp;
+
 Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
              int nodelay, Plug plug)
 {
@@ -424,11 +446,14 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
 
     buflen = upb.csParam.mtu.mtuSize * 4 + 1024;
     if (buflen < 4096) buflen = 4096;
+    if (mactcp_asr_upp == NULL)
+       mactcp_asr_upp = NewTCPNotifyUPP(&mactcp_asr);
+    GetCurrentProcess(&mactcp.self);
     pb.ioCRefNum = mactcp.refnum;
     pb.csCode = TCPCreate;
     pb.csParam.create.rcvBuff = smalloc(buflen);
     pb.csParam.create.rcvBuffLen = buflen;
-    pb.csParam.create.notifyProc = NULL;
+    pb.csParam.create.notifyProc = mactcp_asr_upp;
     pb.csParam.create.userDataPtr = (Ptr)ret;
     ret->err = PBControlSync((ParmBlkPtr)&pb);
     if (ret->err != noErr) return (Socket)ret;
@@ -520,14 +545,18 @@ static void mactcp_close(Socket sock)
     sfree(s);
 }
 
-static int mactcp_write(Socket sock, char *buf, int len)
+static int mactcp_write(Socket sock, char const *buf, int len)
 {
     Actual_Socket s = (Actual_Socket) sock;
     wdsEntry wds[2];
     TCPiopb pb;
 
+    /* 
+     * Casting away const from buf should be safe -- MacTCP won't
+     * write to it.
+     */
     wds[0].length = len;
-    wds[0].ptr = buf;
+    wds[0].ptr = (char *)buf;
     wds[1].length = 0;
 
     pb.ioCRefNum = mactcp.refnum;
@@ -542,12 +571,20 @@ static int mactcp_write(Socket sock, char *buf, int len)
     return 0;
 }
 
-static int mactcp_write_oob(Socket sock, char *buf, int len)
+static int mactcp_write_oob(Socket sock, char const *buf, int len)
 {
 
     fatalbox("mactcp_write_oob");
 }
 
+static pascal void mactcp_asr(StreamPtr str, unsigned short event, Ptr cookie, 
+                             unsigned short termin_reason,
+                             struct ICMPReport *icmp)
+{
+
+    WakeUpProcess(&mactcp.self);
+}
+                             
 /*
  * Called from our event loop if there's work to do.
  */
@@ -558,16 +595,21 @@ void mactcp_poll(void)
 
     for (s = mactcp.socklist; s != NULL; s = s->next) {
        /* XXX above can't handle sockets being deleted. */
-       pb.ioCRefNum = mactcp.refnum;
-       pb.csCode = TCPStatus;
-       pb.tcpStream = s->s;
-       pb.csParam.status.userDataPtr = (Ptr)s;
-       s->err = PBControlSync((ParmBlkPtr)&pb);
-       if (s->err != noErr)
-           continue;
-       if (pb.csParam.status.amtUnreadData > 0)
+       do {
+           pb.ioCRefNum = mactcp.refnum;
+           pb.csCode = TCPStatus;
+           pb.tcpStream = s->s;
+           pb.csParam.status.userDataPtr = (Ptr)s;
+           s->err = PBControlSync((ParmBlkPtr)&pb);
+           if (s->err != noErr)
+               goto next_socket;
+           if (pb.csParam.status.amtUnreadData == 0)
+               break;
            mactcp_recv(s, pb.csParam.status.amtUnreadData);
-       /* Should check connectionState in case remote has closed */
+           /* Should check connectionState in case remote has closed */
+       } while (TRUE);
+      next_socket:
+       ;
     }
 }