projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further tightening up in PSCP. Fixed a couple more holes whereby a
[u/mdw/putty]
/
rlogin.c
diff --git
a/rlogin.c
b/rlogin.c
index
688c159
..
5c55d5a
100644
(file)
--- a/
rlogin.c
+++ b/
rlogin.c
@@
-12,25
+12,26
@@
#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 rlogin_size(void);
-static int sb_opt, sb_len;
-static char *sb_buf = NULL;
-static int sb_size = 0;
-#define SB_DELTA 1024
-
static void c_write(char *buf, int len)
{
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,
int calling_back)
{
}
static int rlogin_closing(Plug plug, char *error_msg, int error_code,
int calling_back)
{
- sk_close(s);
- s = NULL;
+ if (s) {
+ sk_close(s);
+ s = NULL;
+ }
if (error_msg) {
/* A socket error has occurred. */
connection_fatal(error_msg);
if (error_msg) {
/* A socket error has occurred. */
connection_fatal(error_msg);
@@
-77,7
+78,8
@@
static int rlogin_receive(Plug plug, int urgent, char *data, int len)
*
* Returns an error message, or NULL on success.
*
*
* Returns an error message, or NULL on success.
*
- * Also places the canonical host name into `realhost'.
+ * Also places the canonical host name into `realhost'. It must be
+ * freed by the caller.
*/
static char *rlogin_init(char *host, int port, char **realhost)
{
*/
static char *rlogin_init(char *host, int port, char **realhost)
{
@@
-124,7
+126,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;
@@
-133,13
+135,23
@@
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)
return;
{
if (s == NULL)
return;
- 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;
}
/*
}
/*
@@
-153,7
+165,7
@@
static void rlogin_size(void)
b[7] = cols & 0xFF;
b[4] = rows >> 8;
b[5] = rows & 0xFF;
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;
}
@@
-176,6
+188,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;
@@
-184,10
+201,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
};