X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/0c4b77992e89ec742c9a938395ddaf979b2747e0..a6253970d63f1b9f3c9d31a9bc8cfab3cdd3be3f:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 35f30843..45248185 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -187,10 +187,13 @@ 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);
@@ -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;
@@ -548,6 +573,14 @@ static int mactcp_write_oob(Socket sock, char *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 +591,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:
+	;
     }
 }