nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Robert de Bath's TCP Urgent / Telnet SYNCH patch.

Browse Source 
[originally from svn r912]
This commit is contained in:
Simon Tatham 2001-01-29 14:49:21 +00:00
parent d3185a40a0
commit 930fcdadeb
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
telnet.c
View File

@ -478,6 +478,7 @@ static int telnet_receive(Socket skt, int urgent, char *data, int len) {
s = NULL; s = NULL;
return 0; return 0;
} }
if(urgent) in_synch = TRUE;
do_telnet_read (data, len); do_telnet_read (data, len);
return 1; return 1;
} }

29
winnet.c
View File

@ -62,7 +62,7 @@ struct Socket_tag {
void *private_ptr; void *private_ptr;
struct buffer *head, *tail; struct buffer *head, *tail;
int writable; int writable;
int in_oob, sending_oob; int sending_oob;
}; };
struct SockAddr_tag { struct SockAddr_tag {
@ -308,7 +308,6 @@ Socket sk_new(SockAddr addr, int port, int privport, sk_receiver_t receiver) {
ret->receiver = receiver; ret->receiver = receiver;
ret->head = ret->tail = NULL; ret->head = ret->tail = NULL;
ret->writable = 1; /* to start with */ ret->writable = 1; /* to start with */
ret->in_oob = FALSE;
ret->sending_oob = 0; ret->sending_oob = 0;
/* /*
@ -322,6 +321,10 @@ Socket sk_new(SockAddr addr, int port, int privport, sk_receiver_t receiver) {
ret->error = winsock_error_string(err); ret->error = winsock_error_string(err);
return ret; return ret;
} }
{
BOOL b = TRUE;
setsockopt (s, SOL_SOCKET, SO_OOBINLINE, (void *)&b, sizeof(b));
}
/* /*
* Bind to local address. * Bind to local address.
@ -580,6 +583,12 @@ int select_result(WPARAM wParam, LPARAM lParam) {
switch (WSAGETSELECTEVENT(lParam)) { switch (WSAGETSELECTEVENT(lParam)) {
case FD_READ: case FD_READ:
atmark = 1;
/* Some WinSock wrappers don't support this call, so we
* deliberately don't check the return value. If the call
* fails and does nothing, we will get back atmark==1,
* which is good enough to keep going at least. */
ioctlsocket(s->s, SIOCATMARK, &atmark);
ret = recv(s->s, buf, sizeof(buf), 0); ret = recv(s->s, buf, sizeof(buf), 0);
if (ret < 0) { if (ret < 0) {
err = WSAGetLastError(); err = WSAGetLastError();
@ -590,8 +599,11 @@ int select_result(WPARAM wParam, LPARAM lParam) {
if (ret < 0) { if (ret < 0) {
return s->receiver(s, 3, winsock_error_string(err), err); return s->receiver(s, 3, winsock_error_string(err), err);
} else { } else {
int type = s->in_oob ? 2 : 0; int type = 0;
s->in_oob = FALSE; if (atmark==0) {
ioctlsocket(s->s, SIOCATMARK, &atmark);
if(atmark) type = 2; else type = 1;
}
return s->receiver(s, type, buf, ret); return s->receiver(s, type, buf, ret);
} }
break; break;
@ -600,20 +612,13 @@ int select_result(WPARAM wParam, LPARAM lParam) {
* Read all data up to the OOB marker, and send it to the * Read all data up to the OOB marker, and send it to the
* receiver with urgent==1 (OOB pending). * receiver with urgent==1 (OOB pending).
*/ */
atmark = 1;
s->in_oob = TRUE;
/* Some WinSock wrappers don't support this call, so we
* deliberately don't check the return value. If the call
* fails and does nothing, we will get back atmark==1,
* which is good enough to keep going at least. */
ioctlsocket(s->s, SIOCATMARK, &atmark);
ret = recv(s->s, buf, sizeof(buf), MSG_OOB); ret = recv(s->s, buf, sizeof(buf), MSG_OOB);
noise_ultralight(ret); noise_ultralight(ret);
if (ret <= 0) { if (ret <= 0) {
fatalbox(ret == 0 ? "Internal networking trouble" : fatalbox(ret == 0 ? "Internal networking trouble" :
winsock_error_string(WSAGetLastError())); winsock_error_string(WSAGetLastError()));
} else { } else {
return s->receiver(s, atmark ? 2 : 1, buf, ret); return s->receiver(s, 2, buf, ret);
} }
break; break;
case FD_WRITE: case FD_WRITE: