diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2013-02-11 21:35:16 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2013-07-13 14:00:18 +0200 |
commit | 6bc64c368d49d2c775fa4a0e94dc65fcee746710 (patch) | |
tree | 43be9d404624665a0024c5933299cbd87984a040 /src/messages.c | |
parent | ab2e641b4a68e31390510f020d939107bef53b37 (diff) | |
download | libssh-6bc64c368d49d2c775fa4a0e94dc65fcee746710.tar.gz libssh-6bc64c368d49d2c775fa4a0e94dc65fcee746710.tar.xz libssh-6bc64c368d49d2c775fa4a0e94dc65fcee746710.zip |
server: added channel callbacks
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/messages.c')
-rw-r--r-- | src/messages.c | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/src/messages.c b/src/messages.c index 5fcdd04e..eab275b9 100644 --- a/src/messages.c +++ b/src/messages.c @@ -930,26 +930,18 @@ end: return SSH_PACKET_USED; } -/* TODO: make this function accept a ssh_channel */ -ssh_channel ssh_message_channel_request_open_reply_accept(ssh_message msg) { +int ssh_message_channel_request_open_reply_accept_channel(ssh_message msg, ssh_channel chan) { ssh_session session; - ssh_channel chan = NULL; enter_function(); if (msg == NULL) { leave_function(); - return NULL; + return SSH_ERROR; } session = msg->session; - chan = ssh_channel_new(session); - if (chan == NULL) { - leave_function(); - return NULL; - } - chan->local_channel = ssh_channel_new_id(session); chan->local_maxpacket = 35000; chan->local_window = 32000; @@ -982,12 +974,33 @@ ssh_channel ssh_message_channel_request_open_reply_accept(ssh_message msg) { } leave_function(); - return chan; -error: - ssh_channel_free(chan); + return SSH_OK; + error: leave_function(); - return NULL; + return SSH_ERROR; +} + + +ssh_channel ssh_message_channel_request_open_reply_accept(ssh_message msg) { + ssh_channel chan; + int rc; + + if (msg == NULL) { + return NULL; + } + + chan = ssh_channel_new(msg->session); + if (chan == NULL) { + return NULL; + } + rc = ssh_message_channel_request_open_reply_accept_channel(msg, chan); + if (rc < 0) { + ssh_channel_free(chan); + chan = NULL; + } + return chan; + } /** |