nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-15 10:07:39 -05:00
Code Issues Projects Releases Wiki Activity

Make the backend_init error message dynamic. (NFC)

Browse Source 
Now, instead of a 'const char *' in the static data segment, error
messages returned from backend setup are dynamically allocated and
freed by the caller.

This will allow me to make the messages much more specific (including
errno values and the like). However, this commit is pure refactoring:
I've _just_ changed the allocation policy, and left all the messages
alone.
This commit is contained in:
Simon Tatham
2020-04-18 13:28:33 +01:00
parent d9c4ce9fd8
commit df2994a05a
14 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ssh.c
View File

@ -704,7 +704,7 @@ static const PlugVtable Ssh_plugvt = {
* Also places the canonical host name into `realhost'. It must be
* freed by the caller.
*/
static const char *connect_to_host(
static char *connect_to_host(
Ssh *ssh, const char *host, int port, char **realhost,
bool nodelay, bool keepalive)
{
@ -765,7 +765,7 @@ static const char *connect_to_host(
ssh->logctx, "SSH connection");
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
return dupstr(err);
}
ssh->fullhostname = dupstr(*realhost); /* save in case of GSSAPI */
@ -775,7 +775,7 @@ static const char *connect_to_host(
if ((err = sk_socket_error(ssh->s)) != NULL) {
ssh->s = NULL;
seat_notify_remote_exit(ssh->seat);
return err;
return dupstr(err);
}
}
@ -870,12 +870,11 @@ bool ssh_is_bare(Ssh *ssh)
*
* Returns an error message, or NULL on success.
*/
static const char *ssh_init(const BackendVtable *vt, Seat *seat,
Backend **backend_handle, LogContext *logctx,
Conf *conf, const char *host, int port,
char **realhost, bool nodelay, bool keepalive)
static char *ssh_init(const BackendVtable *vt, Seat *seat,
Backend **backend_handle, LogContext *logctx,
Conf *conf, const char *host, int port,
char **realhost, bool nodelay, bool keepalive)
{
const char *p;
Ssh *ssh;
ssh = snew(Ssh);
@ -906,15 +905,16 @@ static const char *ssh_init(const BackendVtable *vt, Seat *seat,
random_ref(); /* do this now - may be needed by sharing setup code */
ssh->need_random_unref = true;
p = connect_to_host(ssh, host, port, realhost, nodelay, keepalive);
if (p != NULL) {
char *conn_err = connect_to_host(
ssh, host, port, realhost, nodelay, keepalive);
if (conn_err) {
/* Call random_unref now instead of waiting until the caller
* frees this useless Ssh object, in case the caller is
* impatient and just exits without bothering, in which case
* the random seed won't be re-saved. */
ssh->need_random_unref = false;
random_unref();
return p;
return conn_err;
}
return NULL;