X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/d25f9823be478b4b8eab34f016f85122525b2bed..2f92b7170f74a58d1e33d7913e154f9f47852683:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index d057dc4f..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;
 }
@@ -244,7 +264,6 @@ SockAddr sk_namelookup(char *host, char **canonicalname)
     volatile int done = FALSE;
     char *realhost;
 
-    fprintf(stderr, "Resolving %s...\n", host);
     /* Clear the structure. */
     memset(ret, 0, sizeof(struct SockAddr_tag));
     if (mactcp_lookupdone_upp == NULL)
@@ -266,7 +285,6 @@ SockAddr sk_namelookup(char *host, char **canonicalname)
 	realhost = "";
     *canonicalname = smalloc(1+strlen(realhost));
     strcpy(*canonicalname, realhost);
-    fprintf(stderr, "canonical name = %s\n", realhost);
     return ret;
 }
 
@@ -361,6 +379,14 @@ static void mactcp_flush(Socket s)
     fatalbox("sk_tcp_flush");
 }
 
+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)
 {
@@ -381,7 +407,6 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
     ip_addr dstaddr;
     size_t buflen;
 
-    fprintf(stderr, "Opening socket, port = %d\n", port);
     /*
      * Create Socket structure.
      */
@@ -417,22 +442,22 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
     upb.csParam.mtu.remoteHost = dstaddr;
     upb.csParam.mtu.userDataPtr = NULL;
     ret->err = PBControlSync((ParmBlkPtr)&upb);
-    fprintf(stderr, "getting mtu, err = %d\n", ret->err);
     if (ret->err != noErr) return (Socket)ret;
-    fprintf(stderr, "Got MTU = %d\n", upb.csParam.mtu.mtuSize);
 
     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;
     ret->s = pb.tcpStream;
-    fprintf(stderr, "stream opened\n");
 
     /*
      * Open the connection.
@@ -466,12 +491,18 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
     /* Add this to the list of all sockets */
     ret->next = mactcp.socklist;
     ret->prev = &mactcp.socklist;
+    ret->next->prev = &ret->next;
     mactcp.socklist = ret;
 
-    fprintf(stderr, "Socket connected\n");
     return (Socket)ret;
 }
 
+Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only)
+{
+
+    fatalbox("sk_newlistener");
+}
+
 static void mactcp_close(Socket sock)
 {
     Actual_Socket s = (Actual_Socket)sock;
@@ -542,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.
  */
@@ -552,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:
+	;
     }
 }
 
@@ -755,6 +799,14 @@ OSErr CloseResolver(void)
     return noErr;
 }
 
+/* MacTCP doesn't have a services database. */
+int net_service_lookup(char *service)
+{
+
+    return 0;
+}
+
+
 /*
  * Local Variables:
  * c-file-style: "simon"