Improve channel_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@692 7dcaeef0-15fb-0310-b436-a5af3365683c
Этот коммит содержится в:
родитель
137669db3f
Коммит
a08c56baf4
@ -1008,21 +1008,16 @@ static int channel_request(CHANNEL *channel, const char *request,
|
|||||||
if (req == NULL) {
|
if (req == NULL) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_REQUEST) < 0) {
|
|
||||||
goto error;
|
if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_REQUEST) < 0 ||
|
||||||
}
|
buffer_add_u32(session->out_buffer, htonl(channel->remote_channel)) < 0 ||
|
||||||
if (buffer_add_u32(session->out_buffer, htonl(channel->remote_channel)) < 0) {
|
buffer_add_ssh_string(session->out_buffer, req) < 0 ||
|
||||||
goto error;
|
buffer_add_u8(session->out_buffer, reply == 0 ? 0 : 1) < 0) {
|
||||||
}
|
|
||||||
if (buffer_add_ssh_string(session->out_buffer, req) < 0) {
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
if (buffer_add_u8(session->out_buffer, reply ? 1 : 0) < 0) {
|
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
string_free(req);
|
string_free(req);
|
||||||
|
|
||||||
if (buffer) {
|
if (buffer != NULL) {
|
||||||
if (buffer_add_data(session->out_buffer, buffer_get(buffer),
|
if (buffer_add_data(session->out_buffer, buffer_get(buffer),
|
||||||
buffer_get_len(buffer)) < 0) {
|
buffer_get_len(buffer)) < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
@ -1036,7 +1031,7 @@ static int channel_request(CHANNEL *channel, const char *request,
|
|||||||
|
|
||||||
ssh_log(session, SSH_LOG_RARE,
|
ssh_log(session, SSH_LOG_RARE,
|
||||||
"Sent a SSH_MSG_CHANNEL_REQUEST %s", request);
|
"Sent a SSH_MSG_CHANNEL_REQUEST %s", request);
|
||||||
if (! reply) {
|
if (reply == 0) {
|
||||||
leave_function();
|
leave_function();
|
||||||
return SSH_OK;
|
return SSH_OK;
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user