&o_we_sga, &o_they_sga, NULL
};
+static int echoing = TRUE, editing = TRUE;
+
static int in_synch;
static int sb_opt, sb_len;
static char *sb_buf = NULL;
o->state = REALLY_INACTIVE;
}
+/*
+ * Generate side effects of enabling or disabling an option.
+ */
+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)
+ editing = !enabled;
+ ldisc_send(NULL, 0); /* cause ldisc to notice the change */
+}
+
static void activate_option (struct Opt *o) {
if (o->send == WILL && o->option == TELOPT_NAWS)
telnet_size();
*/
deactivate_option (o->option==TELOPT_NEW_ENVIRON ? &o_oenv : &o_nenv);
}
- if (o->option == TELOPT_ECHO && cfg.ldisc_term)
- ldisc = &ldisc_simple;
+ option_side_effects(o, 1);
}
static void refused_option (struct Opt *o) {
send_opt (WILL, TELOPT_OLD_ENVIRON);
o_oenv.state = REQUESTED;
}
- if (o->option == TELOPT_ECHO && cfg.ldisc_term)
- ldisc = &ldisc_term;
+ option_side_effects(o, 0);
}
static void proc_rec_opt (int cmd, int option) {
case ACTIVE:
(*o)->state = INACTIVE;
send_opt ((*o)->nsend, option);
+ option_side_effects(*o, 0);
break;
case INACTIVE:
case REALLY_INACTIVE:
}
}
-static int telnet_receive(Socket s, int urgent, char *data, int len) {
- if (!len) {
- /* Connection has closed. */
- sk_close(s);
- s = NULL;
- return 0;
- }
+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. */
+ 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;
}
* 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;
/*
* Open socket.
*/
- s = sk_new(addr, port, telnet_receive);
+ s = sk_new(addr, port, 0, 1, &fn_table_ptr);
if ( (err = sk_socket_error(s)) )
return err;
/*
* Initialise option states.
*/
- if( cfg.ldisc_term )
- {
- struct Opt **o;
-
- for (o = opts; *o; o++)
- if ((*o)->state == REQUESTED)
- (*o)->state = INACTIVE;
- }
- else
{
struct Opt **o;
*/
in_synch = FALSE;
- /*
- * We have no pre-session phase.
- */
- begin_session();
-
return NULL;
}
static int telnet_sendok(void) { return 1; }
+static int telnet_ldisc(int option) {
+ if (option == LD_ECHO) return echoing;
+ if (option == LD_EDIT) return editing;
+ return FALSE;
+}
+
Backend telnet_backend = {
telnet_init,
telnet_send,
telnet_special,
telnet_socket,
telnet_sendok,
+ telnet_ldisc,
23
};