X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/92cfdc708c5db1d0ed679d262e943fffe20f680b..dbf58cfaacdf65821233c608b834bd46a65d5467:/unix/uxnet.c

diff --git a/unix/uxnet.c b/unix/uxnet.c
index 0654050f..5d4ace44 100644
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -22,6 +22,11 @@
 #include "network.h"
 #include "tree234.h"
 
+/* Solaris needs <sys/sockio.h> for SIOCATMARK. */
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
 #ifndef X11_UNIX_PATH
 # define X11_UNIX_PATH "/tmp/.X11-unix/X"
 #endif
@@ -34,7 +39,7 @@ struct Socket_tag {
     Plug plug;
     void *private_ptr;
     bufchain output_data;
-    int connected;
+    int connected;		       /* irrelevant for listening sockets */
     int writable;
     int frozen; /* this causes readability notifications to be ignored */
     int frozen_readable; /* this means we missed at least one readability
@@ -418,6 +423,7 @@ Socket sk_register(OSSocket sockfd, Plug plug)
     ret->oobpending = FALSE;
     ret->listener = 0;
     ret->addr = NULL;
+    ret->connected = 1;
 
     ret->s = sockfd;
 
@@ -575,6 +581,7 @@ static int try_connect(Actual_Socket sock)
 
       default:
 	assert(0 && "unknown address family");
+	exit(1); /* XXX: GCC doesn't understand assert() on some systems. */
     }
 
     fl = fcntl(s, F_GETFL);
@@ -678,7 +685,6 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i
     ret->oobpending = FALSE;
     ret->listener = 1;
     ret->addr = NULL;
-    ret->connected = 0;
 
     /*
      * Translate address_family from platform-independent constants
@@ -744,9 +750,8 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i
         if (a.sin_addr.s_addr != (in_addr_t)(-1)) {
             /* Override localhost_only with specified listen addr. */
             ret->localhost_only = ipv4_is_loopback(a.sin_addr);
-            got_addr = 1;
         }
-        addr = (struct sockaddr *)a;
+        addr = (struct sockaddr *)&a;
         addrlen = sizeof(a);
         retcode = 0;
 #endif
@@ -812,16 +817,6 @@ static void sk_tcp_close(Socket sock)
     sfree(s);
 }
 
-#define PUT_32BIT_MSB_FIRST(cp, value) ( \
-  (cp)[0] = (char)((value) >> 24), \
-  (cp)[1] = (char)((value) >> 16), \
-  (cp)[2] = (char)((value) >> 8), \
-  (cp)[3] = (char)(value) )
-
-#define PUT_16BIT_MSB_FIRST(cp, value) ( \
-  (cp)[0] = (char)((value) >> 8), \
-  (cp)[1] = (char)(value) )
-
 void *sk_getxdmdata(void *sock, int *lenp)
 {
     Actual_Socket s = (Actual_Socket) sock;
@@ -911,11 +906,9 @@ void try_send(Actual_Socket s)
 		 */
 		s->writable = FALSE;
 		return;
-	    } else if (nsent == 0 ||
-		       err == ECONNABORTED || err == ECONNRESET) {
+	    } else {
 		/*
-		 * If send() returns CONNABORTED or CONNRESET, we
-		 * unfortunately can't just call plug_closing(),
+		 * We unfortunately can't just call plug_closing(),
 		 * because it's quite likely that we're currently
 		 * _in_ a call from the code we'd be calling back
 		 * to, so we'd have to make half the SSH code
@@ -925,11 +918,6 @@ void try_send(Actual_Socket s)
 		 */
 		s->pending_error = err;
 		return;
-	    } else {
-		/* We're inside the Unix frontend here, so we know
-		 * that the frontend handle is unnecessary. */
-		logevent(NULL, strerror(err));
-		fatalbox("%s", strerror(err));
 	    }
 	} else {
 	    if (s->sending_oob) {
@@ -1024,12 +1012,9 @@ static int net_select_result(int fd, int event)
 	    ret = recv(s->s, buf, sizeof(buf), MSG_OOB);
 	    noise_ultralight(ret);
 	    if (ret <= 0) {
-		const char *str = (ret == 0 ? "Internal networking trouble" :
-				   strerror(errno));
-		/* We're inside the Unix frontend here, so we know
-		 * that the frontend handle is unnecessary. */
-		logevent(NULL, str);
-		fatalbox("%s", str);
+                return plug_closing(s->plug,
+				    ret == 0 ? "Internal networking trouble" :
+				    strerror(errno), errno, 0);
 	    } else {
                 /*
                  * Receiving actual data on a socket means we can
@@ -1253,14 +1238,16 @@ static void sk_tcp_set_frozen(Socket sock, int is_frozen)
 static void uxsel_tell(Actual_Socket s)
 {
     int rwx = 0;
-    if (!s->connected)
-	rwx |= 2;		       /* write == connect */
-    if (s->connected && !s->frozen)
-	rwx |= 1 | 4;		       /* read, except */
-    if (bufchain_size(&s->output_data))
-	rwx |= 2;		       /* write */
-    if (s->listener)
-	rwx |= 1;		       /* read == accept */
+    if (s->listener) {
+	rwx |= 1;			/* read == accept */
+    } else {
+	if (!s->connected)
+	    rwx |= 2;			/* write == connect */
+	if (s->connected && !s->frozen)
+	    rwx |= 1 | 4;		/* read, except */
+	if (bufchain_size(&s->output_data))
+	    rwx |= 2;			/* write */
+    }
     uxsel_set(s->s, rwx, net_select_result);
 }