ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 13:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return errstring on connect failure

Browse Source
This commit is contained in:
Matt Johnston 2021-03-05 21:13:20 +08:00
parent f193e95a3e
commit 3c2f113a78
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channel.h
View File

@ -104,7 +104,7 @@ struct ChanType {
void (*cleanup)(const struct Channel*); void (*cleanup)(const struct Channel*);
}; };
/* Callback for connect_remote */ /* Callback for connect_remote. errstring may be NULL if result == DROPBEAR_SUCCESS */
void channel_connect_done(int result, int sock, void* user_data, const char* errstring); void channel_connect_done(int result, int sock, void* user_data, const char* errstring);
void chaninitialise(const struct ChanType *chantypes[]); void chaninitialise(const struct ChanType *chantypes[]);

7
common-channel.c
View File

@ -356,8 +356,7 @@ static void check_close(struct Channel *channel) {
* if so, set up the channel properly. Otherwise, the channel is cleaned up, so * if so, set up the channel properly. Otherwise, the channel is cleaned up, so
* it is important that the channel reference isn't used after a call to this * it is important that the channel reference isn't used after a call to this
* function */ * function */
void channel_connect_done(int result, int sock, void* user_data, const char* UNUSED(errstring)) { void channel_connect_done(int result, int sock, void* user_data, const char* errstring) {
struct Channel *channel = user_data; struct Channel *channel = user_data;
TRACE(("enter channel_connect_done")) TRACE(("enter channel_connect_done"))
@ -373,9 +372,9 @@ void channel_connect_done(int result, int sock, void* user_data, const char* UNU
else else
{ {
send_msg_channel_open_failure(channel->remotechan, send_msg_channel_open_failure(channel->remotechan,
SSH_OPEN_CONNECT_FAILED, "", ""); SSH_OPEN_CONNECT_FAILED, errstring, "");
remove_channel(channel); remove_channel(channel);
TRACE(("leave check_in_progress: fail")) TRACE(("leave check_in_progress: fail. internal errstring: %s", errstring))
} }
} }