ports/libssh2
ports/libssh2
1
1
Форкнуть 0
Код Релизы 1 Активность

remove use of libssh2_channel_receive_window_adjust

Просмотр исходного кода 
_libssh2_channel_receive_window_adjust is the new replacement that
is both the correct internal version instead of the external API one,
and it has the return code flaw fixed. I also fixed more return
codes to pass long the correct error found.
Этот коммит содержится в:
Daniel Stenberg 2009-08-24 23:24:35 +02:00
родитель b3418bb1eb
Коммит 1a157d27cc
1 изменённых файлов: 16 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

35
src/packet.c
Просмотреть файл

@ -60,6 +60,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "transport.h" #include "transport.h"
#include "channel.h"
/* /*
* libssh2_packet_queue_listener * libssh2_packet_queue_listener
@ -208,11 +209,11 @@ packet_queue_listener(LIBSSH2_SESSION * session, unsigned char *data,
if (rc == PACKET_EAGAIN) if (rc == PACKET_EAGAIN)
return PACKET_EAGAIN; return PACKET_EAGAIN;
else if (rc) { else if (rc) {
libssh2_error(session, LIBSSH2_ERROR_SOCKET_SEND, libssh2_error(session, rc,
"Unable to send channel open confirmation", "Unable to send channel "
0); "open confirmation", 0);
listen_state->state = libssh2_NB_state_idle; listen_state->state = libssh2_NB_state_idle;
return -1; return rc;
} }
/* Link the channel into the end of the queue list */ /* Link the channel into the end of the queue list */
@ -249,10 +250,9 @@ packet_queue_listener(LIBSSH2_SESSION * session, unsigned char *data,
if (rc == PACKET_EAGAIN) { if (rc == PACKET_EAGAIN) {
return PACKET_EAGAIN; return PACKET_EAGAIN;
} else if (rc) { } else if (rc) {
libssh2_error(session, LIBSSH2_ERROR_SOCKET_SEND, libssh2_error(session, rc, "Unable to send open failure", 0);
"Unable to send open failure", 0);
listen_state->state = libssh2_NB_state_idle; listen_state->state = libssh2_NB_state_idle;
return -1; return rc;
} }
listen_state->state = libssh2_NB_state_idle; listen_state->state = libssh2_NB_state_idle;
return 0; return 0;
@ -406,10 +406,9 @@ packet_x11_open(LIBSSH2_SESSION * session, unsigned char *data,
if (rc == PACKET_EAGAIN) { if (rc == PACKET_EAGAIN) {
return PACKET_EAGAIN; return PACKET_EAGAIN;
} else if (rc) { } else if (rc) {
libssh2_error(session, LIBSSH2_ERROR_SOCKET_SEND, libssh2_error(session, rc, "Unable to send open failure", 0);
"Unable to send open failure", 0);
x11open_state->state = libssh2_NB_state_idle; x11open_state->state = libssh2_NB_state_idle;
return -1; return rc;
} }
x11open_state->state = libssh2_NB_state_idle; x11open_state->state = libssh2_NB_state_idle;
return 0; return 0;
@ -631,15 +630,13 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
/* Adjust the window based on the block we just freed */ /* Adjust the window based on the block we just freed */
libssh2_packet_add_jump_point1: libssh2_packet_add_jump_point1:
session->packAdd_state = libssh2_NB_state_jump1; session->packAdd_state = libssh2_NB_state_jump1;
rc = libssh2_channel_receive_window_adjust(session-> rc = _libssh2_channel_receive_window_adjust(session->
packAdd_channel, packAdd_channel,
datalen - 13, datalen - 13,
0); 0, NULL);
if (rc == PACKET_EAGAIN) { if (rc == PACKET_EAGAIN)
session->socket_block_directions = return rc;
LIBSSH2_SESSION_BLOCK_OUTBOUND;
return PACKET_EAGAIN;
}
session->packAdd_state = libssh2_NB_state_idle; session->packAdd_state = libssh2_NB_state_idle;
return 0; return 0;
} }