projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve handling of oobinline sockets; Plink in telnet mode now
[u/mdw/putty]
/
unix
/
uxnet.c
diff --git
a/unix/uxnet.c
b/unix/uxnet.c
index
44b09c1
..
2c9c7f1
100644
(file)
--- a/
unix/uxnet.c
+++ b/
unix/uxnet.c
@@
-810,10
+810,12
@@
int select_result(int fd, int event)
/*
* If we reach here, this is an oobinline socket, which
/*
* If we reach here, this is an oobinline socket, which
- * means we should set s->oobpending and then fall through
- * to the read case.
+ * means we should set s->oobpending and then deal with it
+ * when we get called for the readability event (which
+ * should also occur).
*/
s->oobpending = TRUE;
*/
s->oobpending = TRUE;
+ break;
case 1: /* readable; also acceptance */
if (s->listener) {
/*
case 1: /* readable; also acceptance */
if (s->listener) {
/*
@@
-864,7
+866,7
@@
int select_result(int fd, int event)
} else
atmark = 1;
} else
atmark = 1;
- ret = recv(s->s, buf, sizeof(buf), 0);
+ ret = recv(s->s, buf, s
->oobpending ? 1 : s
izeof(buf), 0);
noise_ultralight(ret);
if (ret < 0) {
if (errno == EWOULDBLOCK) {
noise_ultralight(ret);
if (ret < 0) {
if (errno == EWOULDBLOCK) {