projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jacob's patch to make passphrase boxes work more sanely
[u/mdw/putty]
/
telnet.c
diff --git
a/telnet.c
b/telnet.c
index
e9db210
..
29daf0f
100644
(file)
--- a/
telnet.c
+++ b/
telnet.c
@@
-174,7
+174,7
@@
static void deactivate_option (struct Opt *o) {
static void option_side_effects(struct Opt *o, int enabled) {
if (o->option == TELOPT_ECHO && o->send == DO)
echoing = !enabled;
static void option_side_effects(struct Opt *o, int enabled) {
if (o->option == TELOPT_ECHO && o->send == DO)
echoing = !enabled;
- else if (o->option = TELOPT_SGA && o->send == DO)
+ else if (o->option =
=
TELOPT_SGA && o->send == DO)
editing = !enabled;
ldisc_send(NULL, 0); /* cause ldisc to notice the change */
}
editing = !enabled;
ldisc_send(NULL, 0); /* cause ldisc to notice the change */
}
@@
-465,19
+465,17
@@
static void do_telnet_read (char *buf, int len) {
}
}
}
}
-static int telnet_receive(Socket skt, int urgent, char *data, int len) {
- if (urgent==3) {
+static int telnet_closing (Plug plug, char *error_msg, int error_code, int calling_back) {
+ sk_close(s);
+ s = NULL;
+ if (error_msg) {
/* A socket error has occurred. */
/* A socket error has occurred. */
- sk_close(s);
- s = NULL;
- connection_fatal(data);
- return 0;
- } else if (!len) {
- /* Connection has closed. */
- sk_close(s);
- s = NULL;
- return 0;
- }
+ connection_fatal (error_msg);
+ } /* Otherwise, the remote side closed the connection normally. */
+ return 0;
+}
+
+static int telnet_receive(Plug plug, int urgent, char *data, int len) {
if(urgent) in_synch = TRUE;
do_telnet_read (data, len);
return 1;
if(urgent) in_synch = TRUE;
do_telnet_read (data, len);
return 1;
@@
-491,6
+489,11
@@
static int telnet_receive(Socket skt, int urgent, char *data, int len) {
* Also places the canonical host name into `realhost'.
*/
static char *telnet_init (char *host, int port, char **realhost) {
* Also places the canonical host name into `realhost'.
*/
static char *telnet_init (char *host, int port, char **realhost) {
+ static struct plug_function_table fn_table = {
+ telnet_closing,
+ telnet_receive
+ }, *fn_table_ptr = &fn_table;
+
SockAddr addr;
char *err;
SockAddr addr;
char *err;
@@
-507,7
+510,7
@@
static char *telnet_init (char *host, int port, char **realhost) {
/*
* Open socket.
*/
/*
* Open socket.
*/
- s = sk_new(addr, port, 0,
telnet_receive
);
+ s = sk_new(addr, port, 0,
1, &fn_table_ptr
);
if ( (err = sk_socket_error(s)) )
return err;
if ( (err = sk_socket_error(s)) )
return err;