X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/9b57f6ea289c28eddc723d91ae1cafd257d06666..9546c9c6fd9b1c67c92f4ea2f0039039c63d2f8e:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 60dd84e3..543caa14 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -142,6 +142,19 @@ enum { uppAddrToStrProcInfo = kCStackBased
 
 /* End of AddressXlation.h bits */
 
+/* TCP connection states, mysteriously missing from <MacTCP.h> */
+#define TCPS_CLOSED		0
+#define TCPS_LISTEN		2
+#define TCPS_SYN_RECEIVED	4
+#define TCPS_SYN_SENT		6
+#define TCPS_ESTABLISHED	8
+#define TCPS_FIN_WAIT_1		10
+#define TCPS_FIN_WAIT_2		12
+#define TCPS_CLOSE_WAIT		14
+#define TCPS_CLOSING		16
+#define TCPS_LAST_ACK		18
+#define TCPS_TIME_WAIT		20
+
 struct Socket_tag {
     struct socket_function_table *fn;
     /* the above variable absolutely *must* be the first in this structure */
@@ -231,7 +244,7 @@ OSErr mactcp_init(void)
     return noErr;
 }
 
-void mactcp_shutdown(void)
+void mactcp_cleanup(void)
 {
     Actual_Socket s, next;
 
@@ -257,7 +270,7 @@ void mactcp_shutdown(void)
 
 static ResultUPP mactcp_lookupdone_upp;
 
-SockAddr sk_namelookup(char *host, char **canonicalname)
+SockAddr mactcp_namelookup(char *host, char **canonicalname)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
     OSErr err;
@@ -295,7 +308,7 @@ static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie)
     *donep = TRUE;
 }
 
-SockAddr sk_nonamelookup(char *host)
+SockAddr mactcp_nonamelookup(char *host)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
 
@@ -306,7 +319,7 @@ SockAddr sk_nonamelookup(char *host)
     return ret;
 }
 
-void sk_getaddr(SockAddr addr, char *buf, int buflen)
+void mactcp_getaddr(SockAddr addr, char *buf, int buflen)
 {
     char mybuf[16];
     OSErr err;
@@ -325,13 +338,13 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
 
 /* I think "local" here really means "loopback" */
 
-int sk_hostname_is_local(char *name)
+int mactcp_hostname_is_local(char *name)
 {
 
     return !strcmp(name, "localhost");
 }
 
-int sk_address_is_local(SockAddr addr)
+int mactcp_address_is_local(SockAddr addr)
 {
     int i;
 
@@ -342,7 +355,7 @@ int sk_address_is_local(SockAddr addr)
     return FALSE;
 }
 
-int sk_addrtype(SockAddr addr)
+int mactcp_addrtype(SockAddr addr)
 {
 
     if (addr->resolved)
@@ -350,14 +363,14 @@ int sk_addrtype(SockAddr addr)
     return ADDRTYPE_NAME;
 }
 
-void sk_addrcopy(SockAddr addr, char *buf)
+void mactcp_addrcopy(SockAddr addr, char *buf)
 {
 
     /* XXX only return first address */
     memcpy(buf, &addr->hostinfo.addr[0], 4);
 }
 
-void sk_addr_free(SockAddr addr)
+void mactcp_addr_free(SockAddr addr)
 {
 
     sfree(addr);
@@ -376,18 +389,18 @@ static Plug mactcp_plug(Socket sock, Plug p)
 static void mactcp_flush(Socket s)
 {
 
-    fatalbox("sk_tcp_flush");
+    fatalbox("mactcp_flush");
 }
 
-Socket sk_register(void *sock, Plug plug)
+Socket mactcp_register(void *sock, Plug plug)
 {
 
-    fatalbox("sk_register");
+    fatalbox("mactcp_register");
 }
 
 static TCPNotifyUPP mactcp_asr_upp;
 
-Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
+Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline,
 	      int nodelay, Plug plug)
 {
     static struct socket_function_table fn_table = {
@@ -491,16 +504,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;
+    if (ret->next != NULL)
+	ret->next->prev = &ret->next;
     mactcp.socklist = ret;
 
     return (Socket)ret;
 }
 
-Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only)
+Socket mactcp_newlistener(char *srcaddr, int port, Plug plug,
+			  int local_host_only)
 {
 
-    fatalbox("sk_newlistener");
+    fatalbox("mactcp_newlistener");
 }
 
 static void mactcp_close(Socket sock)
@@ -590,11 +605,11 @@ static pascal void mactcp_asr(StreamPtr str, unsigned short event, Ptr cookie,
  */
 void mactcp_poll(void)
 {
-    Actual_Socket s;
+    Actual_Socket s, next;
     TCPiopb pb;
 
-    for (s = mactcp.socklist; s != NULL; s = s->next) {
-	/* XXX above can't handle sockets being deleted. */
+    for (s = mactcp.socklist; s != NULL; s = next) {
+	next = s->next;
 	do {
 	    pb.ioCRefNum = mactcp.refnum;
 	    pb.csCode = TCPStatus;
@@ -606,8 +621,12 @@ void mactcp_poll(void)
 	    if (pb.csParam.status.amtUnreadData == 0)
 		break;
 	    mactcp_recv(s, pb.csParam.status.amtUnreadData);
-	    /* Should check connectionState in case remote has closed */
 	} while (TRUE);
+	switch (pb.csParam.status.connectionState) {
+	  case TCPS_CLOSE_WAIT:
+	    /* Remote end has sent us a FIN */
+	    plug_closing(s->plug, NULL, 0, 0);
+	}
       next_socket:
 	;
     }
@@ -657,11 +676,11 @@ static void *mactcp_get_private_ptr(Socket sock)
 }
 
 /*
- * Special error values are returned from sk_namelookup and sk_new
- * if there's a problem. These functions extract an error message,
- * or return NULL if there's no problem.
+ * Special error values are returned from mactcp_namelookup and
+ * mactcp_new if there's a problem. These functions extract an error
+ * message, or return NULL if there's no problem.
  */
-char *sk_addr_error(SockAddr addr)
+char *mactcp_addr_error(SockAddr addr)
 {
     static char buf[64];