b[n++] = IAC;
b[n++] = SE;
telnet->bufsize = sk_write(telnet->s, (char *)b, n);
- logbuf = dupprintf("client:\tSB %s IS %s", telopt(telnet->sb_opt),
- n == 6 ? "<nothing>" : "<stuff>");
+ logbuf = dupprintf("client:\tSB %s IS %s%s%s%s",
+ telopt(telnet->sb_opt),
+ *telnet->cfg.username ? "USER=" : "",
+ telnet->cfg.username,
+ *telnet->cfg.username ? " " : "",
+ n == 6 ? "<nothing>" :
+ (*telnet->cfg.environmt ? "<stuff>" : ""));
logevent(telnet->frontend, logbuf);
sfree(logbuf);
}
static const char *telnet_init(void *frontend_handle, void **backend_handle,
Config *cfg,
char *host, int port, char **realhost,
- int nodelay)
+ int nodelay, int keepalive)
{
static const struct plug_function_table fn_table = {
telnet_closing,
sfree(buf);
}
addr = name_lookup(host, port, realhost, &telnet->cfg);
- if ((err = sk_addr_error(addr)) != NULL)
+ if ((err = sk_addr_error(addr)) != NULL) {
+ sk_addr_free(addr);
return err;
+ }
if (port < 0)
port = 23; /* default telnet port */
sfree(buf);
}
telnet->s = new_connection(addr, *realhost, port, 0, 1,
- nodelay, (Plug) telnet, &telnet->cfg);
+ nodelay, keepalive, (Plug) telnet, &telnet->cfg);
if ((err = sk_socket_error(telnet->s)) != NULL)
return err;
- sk_addr_free(addr);
-
/*
* Initialise option states.
*/
*/
telnet->in_synch = FALSE;
+ /*
+ * We can send special commands from the start.
+ */
+ update_specials_menu(telnet->frontend);
+
return NULL;
}
telnet->bufsize = sk_write(telnet->s, (char *)b, 2);
}
break;
+ default:
+ break; /* never heard of it */
}
}
{"Erase Line", TS_EL},
{"Go Ahead", TS_GA},
{"No Operation", TS_NOP},
- {"", 0},
+ {NULL, TS_SEP},
{"Abort Process", TS_ABORT},
{"Abort Output", TS_AO},
{"Interrupt Process", TS_IP},
{"Suspend Process", TS_SUSP},
- {"", 0},
+ {NULL, TS_SEP},
{"End Of Record", TS_EOR},
{"End Of File", TS_EOF},
- {NULL, 0}
+ {NULL, TS_EXITMENU}
};
return specials;
}