#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#define DEFINE_PLUG_METHOD_MACROS
#include "putty.h"
#include "network.h"
#include "tree234.h"
-#define BUFFER_GRANULE 512
-
struct Socket_tag {
struct socket_function_table *fn;
/* the above variable absolutely *must* be the first in this structure */
SOCKET s;
Plug plug;
void *private_ptr;
- struct buffer *head, *tail;
+ bufchain output_data;
+ int connected;
int writable;
- int frozen; /* this tells the write stuff not to even bother trying to send at this point */
+ int frozen; /* this causes readability notifications to be ignored */
+ int frozen_readable; /* this means we missed at least one readability
+ * notification while we were frozen */
+ char oobdata[1];
int sending_oob;
int oobinline;
};
#endif
};
-struct buffer {
- struct buffer *next;
- int buflen, bufpos;
- char buf[BUFFER_GRANULE];
-};
-
static tree234 *sktree;
static int cmpfortree(void *av, void *bv)
return ret;
}
+void sk_getaddr(SockAddr addr, char *buf, int buflen)
+{
+#ifdef IPV6
+ if (addr->family == AF_INET) {
+#endif
+ struct in_addr a;
+ a.s_addr = htonl(addr->address);
+ strncpy(buf, inet_ntoa(a), buflen);
+#ifdef IPV6
+ } else {
+ FIXME; /* I don't know how to get a text form of an IPv6 address. */
+ }
+#endif
+}
+
void sk_addr_free(SockAddr addr)
{
sfree(addr);
}
static void sk_tcp_close(Socket s);
-static void sk_tcp_write(Socket s, char *data, int len);
-static void sk_tcp_write_oob(Socket s, char *data, int len);
+static int sk_tcp_write(Socket s, char *data, int len);
+static int sk_tcp_write_oob(Socket s, char *data, int len);
static char *sk_tcp_socket_error(Socket s);
extern char *do_select(SOCKET skt, int startup);
ret->fn = &fn_table;
ret->error = NULL;
ret->plug = plug;
- ret->head = ret->tail = NULL;
+ bufchain_init(&ret->output_data);
ret->writable = 1; /* to start with */
ret->sending_oob = 0;
ret->frozen = 1;
+ ret->frozen_readable = 0;
ret->s = (SOCKET)sock;
ret->fn = &fn_table;
ret->error = NULL;
ret->plug = plug;
- ret->head = ret->tail = NULL;
- ret->writable = 1; /* to start with */
+ bufchain_init(&ret->output_data);
+ ret->connected = 0; /* to start with */
+ ret->writable = 0; /* to start with */
ret->sending_oob = 0;
ret->frozen = 0;
+ ret->frozen_readable = 0;
/*
* Open socket.
a.sin_addr.s_addr = htonl(addr->address);
a.sin_port = htons((short) port);
}
+
+ /* Set up a select mechanism. This could be an AsyncSelect on a
+ * window, or an EventSelect on an event object. */
+ errstr = do_select(s, 1);
+ if (errstr) {
+ ret->error = errstr;
+ return (Socket) ret;
+ }
+
if ((
#ifdef IPV6
connect(s, ((addr->family == AF_INET6) ?
#endif
) == SOCKET_ERROR) {
err = WSAGetLastError();
- ret->error = winsock_error_string(err);
- return (Socket) ret;
- }
-
- /* Set up a select mechanism. This could be an AsyncSelect on a
- * window, or an EventSelect on an event object. */
- errstr = do_select(s, 1);
- if (errstr) {
- ret->error = errstr;
- return (Socket) ret;
+ /*
+ * We expect a potential EWOULDBLOCK here, because the
+ * chances are the front end has done a select for
+ * FD_CONNECT, so that connect() will complete
+ * asynchronously.
+ */
+ if ( err != WSAEWOULDBLOCK ) {
+ ret->error = winsock_error_string(err);
+ return (Socket) ret;
+ }
+ } else {
+ /*
+ * If we _don't_ get EWOULDBLOCK, the connect has completed
+ * and we should set the socket as writable.
+ */
+ ret->writable = 1;
}
add234(sktree, ret);
return (Socket) ret;
}
-Socket sk_newlistenner(int port, Plug plug)
+Socket sk_newlistener(int port, Plug plug, int local_host_only)
{
static struct socket_function_table fn_table = {
sk_tcp_plug,
ret->fn = &fn_table;
ret->error = NULL;
ret->plug = plug;
- ret->head = ret->tail = NULL;
+ bufchain_init(&ret->output_data);
ret->writable = 0; /* to start with */
ret->sending_oob = 0;
ret->frozen = 0;
+ ret->frozen_readable = 0;
/*
* Open socket.
if (addr->family == AF_INET6) {
memset(&a6, 0, sizeof(a6));
a6.sin6_family = AF_INET6;
-/*a6.sin6_addr = in6addr_any; *//* == 0 */
+ if (local_host_only)
+ a6.sin6_addr = in6addr_loopback;
+ else
+ a6.sin6_addr = in6addr_any;
a6.sin6_port = htons(port);
} else
#endif
{
a.sin_family = AF_INET;
- a.sin_addr.s_addr = htonl(INADDR_ANY);
+ if (local_host_only)
+ a.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ else
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
a.sin_port = htons((short)port);
}
#ifdef IPV6
*/
void try_send(Actual_Socket s)
{
- if (s->frozen) return;
- while (s->head) {
+ while (s->sending_oob || bufchain_size(&s->output_data) > 0) {
int nsent;
DWORD err;
+ void *data;
int len, urgentflag;
if (s->sending_oob) {
urgentflag = MSG_OOB;
len = s->sending_oob;
+ data = &s->oobdata;
} else {
urgentflag = 0;
- len = s->head->buflen - s->head->bufpos;
+ bufchain_prefix(&s->output_data, &data, &len);
}
- nsent =
- send(s->s, s->head->buf + s->head->bufpos, len, urgentflag);
+ nsent = send(s->s, data, len, urgentflag);
noise_ultralight(nsent);
if (nsent <= 0) {
err = (nsent < 0 ? WSAGetLastError() : 0);
- if ((err == 0 && nsent < 0) || err == WSAEWOULDBLOCK) {
+ if ((err < WSABASEERR && nsent < 0) || err == WSAEWOULDBLOCK) {
/*
* Perfectly normal: we've sent all we can for the moment.
*
- * (Apparently some WinSocks can return <0 but
- * leave no error indication - WSAGetLastError() is
- * called but returns zero - so we check that case
- * and treat it just like WSAEWOULDBLOCK.)
+ * (Some WinSock send() implementations can return
+ * <0 but leave no sensible error indication -
+ * WSAGetLastError() is called but returns zero or
+ * a small number - so we check that case and treat
+ * it just like WSAEWOULDBLOCK.)
*/
s->writable = FALSE;
return;
fatalbox(winsock_error_string(err));
}
} else {
- s->head->bufpos += nsent;
- if (s->sending_oob)
- s->sending_oob -= nsent;
- if (s->head->bufpos >= s->head->buflen) {
- struct buffer *tmp = s->head;
- s->head = tmp->next;
- sfree(tmp);
- if (!s->head)
- s->tail = NULL;
+ if (s->sending_oob) {
+ if (nsent < len) {
+ memmove(s->oobdata, s->oobdata+nsent, len-nsent);
+ s->sending_oob = len - nsent;
+ } else {
+ s->sending_oob = 0;
+ }
+ } else {
+ bufchain_consume(&s->output_data, nsent);
}
}
}
}
-static void sk_tcp_write(Socket sock, char *buf, int len)
+static int sk_tcp_write(Socket sock, char *buf, int len)
{
Actual_Socket s = (Actual_Socket) sock;
/*
* Add the data to the buffer list on the socket.
*/
- if (s->tail && s->tail->buflen < BUFFER_GRANULE) {
- int copylen = min(len, BUFFER_GRANULE - s->tail->buflen);
- memcpy(s->tail->buf + s->tail->buflen, buf, copylen);
- buf += copylen;
- len -= copylen;
- s->tail->buflen += copylen;
- }
- while (len > 0) {
- int grainlen = min(len, BUFFER_GRANULE);
- struct buffer *newbuf;
- newbuf = smalloc(sizeof(struct buffer));
- newbuf->bufpos = 0;
- newbuf->buflen = grainlen;
- memcpy(newbuf->buf, buf, grainlen);
- buf += grainlen;
- len -= grainlen;
- if (s->tail)
- s->tail->next = newbuf;
- else
- s->head = s->tail = newbuf;
- newbuf->next = NULL;
- s->tail = newbuf;
- }
+ bufchain_add(&s->output_data, buf, len);
/*
* Now try sending from the start of the buffer list.
*/
if (s->writable)
try_send(s);
+
+ return bufchain_size(&s->output_data);
}
-static void sk_tcp_write_oob(Socket sock, char *buf, int len)
+static int sk_tcp_write_oob(Socket sock, char *buf, int len)
{
Actual_Socket s = (Actual_Socket) sock;
/*
* Replace the buffer list on the socket with the data.
*/
- if (!s->head) {
- s->head = smalloc(sizeof(struct buffer));
- } else {
- struct buffer *walk = s->head->next;
- while (walk) {
- struct buffer *tmp = walk;
- walk = tmp->next;
- sfree(tmp);
- }
- }
- s->head->next = NULL;
- s->tail = s->head;
- s->head->buflen = len;
- memcpy(s->head->buf, buf, len);
-
- /*
- * Set the Urgent marker.
- */
+ bufchain_clear(&s->output_data);
+ assert(len <= sizeof(s->oobdata));
+ memcpy(s->oobdata, buf, len);
s->sending_oob = len;
/*
*/
if (s->writable)
try_send(s);
+
+ return s->sending_oob;
}
int select_result(WPARAM wParam, LPARAM lParam)
noise_ultralight(lParam);
switch (WSAGETSELECTEVENT(lParam)) {
+ case FD_CONNECT:
+ s->connected = s->writable = 1;
+ break;
case FD_READ:
-
/* In the case the socket is still frozen, we don't even bother */
- if (s->frozen)
+ if (s->frozen) {
+ s->frozen_readable = 1;
break;
+ }
/*
* We have received data on the socket. For an oobinline
}
break;
case FD_WRITE:
- s->writable = 1;
- try_send(s);
+ {
+ int bufsize_before, bufsize_after;
+ s->writable = 1;
+ bufsize_before = s->sending_oob + bufchain_size(&s->output_data);
+ try_send(s);
+ bufsize_after = s->sending_oob + bufchain_size(&s->output_data);
+ if (bufsize_after < bufsize_before)
+ plug_sent(s->plug, bufsize_after);
+ }
break;
case FD_CLOSE:
/* Signal a close on the socket. First read any outstanding data. */
return open;
case FD_ACCEPT:
{
- struct sockaddr isa;
- int addrlen = sizeof(struct sockaddr);
- SOCKET t; /* socket of connection */
-
- memset(&isa, 0, sizeof(struct sockaddr));
- err = 0;
- t = accept(s->s,&isa,&addrlen);
- if (t == INVALID_SOCKET)
- {
- err = WSAGetLastError();
- if (err == WSATRY_AGAIN)
- break;
- }
-
- if (plug_accepting(s->plug, &isa, (void*)t)) {
- closesocket(t); // denied or error
- }
+ struct sockaddr isa;
+ int addrlen = sizeof(struct sockaddr);
+ SOCKET t; /* socket of connection */
+
+ memset(&isa, 0, sizeof(struct sockaddr));
+ err = 0;
+ t = accept(s->s,&isa,&addrlen);
+ if (t == INVALID_SOCKET)
+ {
+ err = WSAGetLastError();
+ if (err == WSATRY_AGAIN)
+ break;
+ }
+
+ if (plug_accepting(s->plug, (void*)t)) {
+ closesocket(t); /* denied or error */
+ }
}
}
void sk_set_frozen(Socket sock, int is_frozen)
{
Actual_Socket s = (Actual_Socket) sock;
+ if (s->frozen == is_frozen)
+ return;
s->frozen = is_frozen;
- if (!is_frozen) {
+ if (!is_frozen && s->frozen_readable) {
char c;
recv(s->s, &c, 1, MSG_PEEK);
}
+ s->frozen_readable = 0;
}
/*
projects / u / mdw / putty / blobdiff