diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2013-03-13 20:44:55 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2013-07-13 14:51:00 +0200 |
commit | e933d1e1b120dfb73f44795c6ccae640b793e708 (patch) | |
tree | 4bb2227d9816945be3803a303dda2866db5f73b9 /src/messages.c | |
parent | e76442b650428425a1fbb97d621420216145a3bf (diff) | |
download | libssh-e933d1e1b120dfb73f44795c6ccae640b793e708.tar.gz libssh-e933d1e1b120dfb73f44795c6ccae640b793e708.tar.xz libssh-e933d1e1b120dfb73f44795c6ccae640b793e708.zip |
callbacks: make the channel accept callback more logical
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/messages.c')
-rw-r--r-- | src/messages.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/messages.c b/src/messages.c index a82cb5c7..6e4d7e0f 100644 --- a/src/messages.c +++ b/src/messages.c @@ -121,16 +121,12 @@ static int ssh_execute_server_callbacks(ssh_session session, ssh_message msg){ case SSH_REQUEST_CHANNEL_OPEN: if (msg->channel_request_open.type == SSH_CHANNEL_SESSION){ if(ssh_callbacks_exists(session->server_callbacks, channel_open_request_session_function)){ - channel = ssh_channel_new(session); - rc = session->server_callbacks->channel_open_request_session_function(session, channel, + channel = session->server_callbacks->channel_open_request_session_function(session, session->server_callbacks->userdata); - if(rc==0) { + if(channel != NULL) { rc = ssh_message_channel_request_open_reply_accept_channel(msg, channel); - if (rc == SSH_ERROR) - ssh_channel_free(channel); return SSH_OK; } else { - ssh_channel_free(channel); ssh_message_reply_default(msg); } return SSH_OK; |