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

session: Remove obsolete status variables.

Просмотр исходного кода 
BUG: https://red.libssh.org/issues/121
Этот коммит содержится в:
Andreas Schneider 2013-09-16 10:37:09 +02:00
родитель 8823dee51a
Коммит 20658abc78
2 изменённых файлов: 4 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
include/libssh/session.h
Просмотреть файл

@ -97,9 +97,6 @@ struct ssh_session_struct {
int openssh; int openssh;
uint32_t send_seq; uint32_t send_seq;
uint32_t recv_seq; uint32_t recv_seq;
/* status flags */
int closed;
int closed_by_except;
int connected; int connected;
/* !=0 when the user got a session handle */ /* !=0 when the user got a session handle */

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

@ -575,7 +575,7 @@ int ssh_get_status(ssh_session session) {
socketstate = ssh_socket_get_status(session->socket); socketstate = ssh_socket_get_status(session->socket);
if (session->closed) { if (session->session_state == SSH_SESSION_STATE_DISCONNECTED) {
r |= SSH_CLOSED; r |= SSH_CLOSED;
} }
if (socketstate & SSH_READ_PENDING) { if (socketstate & SSH_READ_PENDING) {
@ -584,7 +584,8 @@ int ssh_get_status(ssh_session session) {
if (socketstate & SSH_WRITE_PENDING) { if (socketstate & SSH_WRITE_PENDING) {
r |= SSH_WRITE_PENDING; r |= SSH_WRITE_PENDING;
} }
if ((session->closed && (socketstate & SSH_CLOSED_ERROR)) || if ((session->session_state == SSH_SESSION_STATE_DISCONNECTED &&
(socketstate & SSH_CLOSED_ERROR)) ||
session->session_state == SSH_SESSION_STATE_ERROR) { session->session_state == SSH_SESSION_STATE_ERROR) {
r |= SSH_CLOSED_ERROR; r |= SSH_CLOSED_ERROR;
} }
@ -608,12 +609,9 @@ const char *ssh_get_disconnect_message(ssh_session session) {
return NULL; return NULL;
} }
if (!session->closed) { if (session->session_state != SSH_SESSION_STATE_DISCONNECTED) {
ssh_set_error(session, SSH_REQUEST_DENIED, ssh_set_error(session, SSH_REQUEST_DENIED,
"Connection not closed yet"); "Connection not closed yet");
} else if(session->closed_by_except) {
ssh_set_error(session, SSH_REQUEST_DENIED,
"Connection closed by socket error");
} else if(!session->discon_msg) { } else if(!session->discon_msg) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Connection correctly closed but no disconnect message"); "Connection correctly closed but no disconnect message");