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
ret->oobpending = FALSE;
ret->listener = 1;
ret->addr = NULL;
- ret->connected = 0;
/*
* Translate address_family from platform-independent constants
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
*/
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
*/
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) {
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
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);
}