~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops - one missing set of the ssh1 throttling indicator
[sgt/putty]
/
rlogin.c
diff --git
a/rlogin.c
b/rlogin.c
index
8010852
..
cee653a
100644
(file)
--- a/
rlogin.c
+++ b/
rlogin.c
@@
-12,13
+12,17
@@
#define TRUE 1
#endif
#define TRUE 1
#endif
+#define RLOGIN_MAX_BACKLOG 4096
+
static Socket s = NULL;
static Socket s = NULL;
+static int rlogin_bufsize;
static void rlogin_size(void);
static void c_write(char *buf, int len)
{
static void rlogin_size(void);
static void c_write(char *buf, int len)
{
- from_backend(0, buf, len);
+ int backlog = from_backend(0, buf, len);
+ sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG);
}
static int rlogin_closing(Plug plug, char *error_msg, int error_code,
}
static int rlogin_closing(Plug plug, char *error_msg, int error_code,
@@
-69,6
+73,11
@@
static int rlogin_receive(Plug plug, int urgent, char *data, int len)
return 1;
}
return 1;
}
+static void rlogin_sent(Plug plug, int bufsize)
+{
+ rlogin_bufsize = bufsize;
+}
+
/*
* Called to set up the rlogin connection.
*
/*
* Called to set up the rlogin connection.
*
@@
-81,7
+90,8
@@
static char *rlogin_init(char *host, int port, char **realhost)
{
static struct plug_function_table fn_table = {
rlogin_closing,
{
static struct plug_function_table fn_table = {
rlogin_closing,
- rlogin_receive
+ rlogin_receive,
+ rlogin_sent
}, *fn_table_ptr = &fn_table;
SockAddr addr;
}, *fn_table_ptr = &fn_table;
SockAddr addr;
@@
-90,6
+100,11
@@
static char *rlogin_init(char *host, int port, char **realhost)
/*
* Try to find host.
*/
/*
* Try to find host.
*/
+ {
+ char buf[200];
+ sprintf(buf, "Looking up host \"%.170s\"", host);
+ logevent(buf);
+ }
addr = sk_namelookup(host, realhost);
if ((err = sk_addr_error(addr)))
return err;
addr = sk_namelookup(host, realhost);
if ((err = sk_addr_error(addr)))
return err;
@@
-100,6
+115,12
@@
static char *rlogin_init(char *host, int port, char **realhost)
/*
* Open socket.
*/
/*
* Open socket.
*/
+ {
+ char buf[200], addrbuf[100];
+ sk_getaddr(addr, addrbuf, 100);
+ sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+ logevent(buf);
+ }
s = sk_new(addr, port, 1, 0, &fn_table_ptr);
if ((err = sk_socket_error(s)))
return err;
s = sk_new(addr, port, 1, 0, &fn_table_ptr);
if ((err = sk_socket_error(s)))
return err;
@@
-122,7
+143,7
@@
static char *rlogin_init(char *host, int port, char **realhost)
sk_write(s, "/", 1);
for (p = cfg.termspeed; isdigit(*p); p++);
sk_write(s, cfg.termspeed, p - cfg.termspeed);
sk_write(s, "/", 1);
for (p = cfg.termspeed; isdigit(*p); p++);
sk_write(s, cfg.termspeed, p - cfg.termspeed);
- sk_write(s, &z, 1);
+
rlogin_bufsize =
sk_write(s, &z, 1);
}
return NULL;
}
return NULL;
@@
-131,13
+152,22
@@
static char *rlogin_init(char *host, int port, char **realhost)
/*
* Called to send data down the rlogin connection.
*/
/*
* Called to send data down the rlogin connection.
*/
-static
void
rlogin_send(char *buf, int len)
+static
int
rlogin_send(char *buf, int len)
{
{
-
if (s == NULL)
if (s == NULL)
- return;
+ return
0
;
- sk_write(s, buf, len);
+ rlogin_bufsize = sk_write(s, buf, len);
+
+ return rlogin_bufsize;
+}
+
+/*
+ * Called to query the current socket sendability status.
+ */
+static int rlogin_sendbuffer(void)
+{
+ return rlogin_bufsize;
}
/*
}
/*
@@
-147,11
+177,14
@@
static void rlogin_size(void)
{
char b[12] = { '\xFF', '\xFF', 0x73, 0x73, 0, 0, 0, 0, 0, 0, 0, 0 };
{
char b[12] = { '\xFF', '\xFF', 0x73, 0x73, 0, 0, 0, 0, 0, 0, 0, 0 };
+ if (s == NULL)
+ return;
+
b[6] = cols >> 8;
b[7] = cols & 0xFF;
b[4] = rows >> 8;
b[5] = rows & 0xFF;
b[6] = cols >> 8;
b[7] = cols & 0xFF;
b[4] = rows >> 8;
b[5] = rows & 0xFF;
- sk_write(s, b, 12);
+
rlogin_bufsize =
sk_write(s, b, 12);
return;
}
return;
}
@@
-174,6
+207,11
@@
static int rlogin_sendok(void)
return 1;
}
return 1;
}
+static void rlogin_unthrottle(int backlog)
+{
+ sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG);
+}
+
static int rlogin_ldisc(int option)
{
return 0;
static int rlogin_ldisc(int option)
{
return 0;
@@
-182,10
+220,12
@@
static int rlogin_ldisc(int option)
Backend rlogin_backend = {
rlogin_init,
rlogin_send,
Backend rlogin_backend = {
rlogin_init,
rlogin_send,
+ rlogin_sendbuffer,
rlogin_size,
rlogin_special,
rlogin_socket,
rlogin_sendok,
rlogin_ldisc,
rlogin_size,
rlogin_special,
rlogin_socket,
rlogin_sendok,
rlogin_ldisc,
+ rlogin_unthrottle,
1
};
1
};