comparison cli-session.c @ 970:0bb16232e7c4

Make keepalive handling more robust, this should now match what OpenSSH does
author Matt Johnston <matt@ucc.asn.au>
date Tue, 19 Aug 2014 23:08:56 +0800
parents f7f6c15b0ec3
children 73ea0dce9a57 02baa0b334e8 38d2f6b2d1b8
comparison
equal deleted inserted replaced
969:939944f0fca9 970:0bb16232e7c4
68 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation}, 68 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation},
69 {SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure}, 69 {SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure},
70 {SSH_MSG_USERAUTH_BANNER, recv_msg_userauth_banner}, /* client */ 70 {SSH_MSG_USERAUTH_BANNER, recv_msg_userauth_banner}, /* client */
71 {SSH_MSG_USERAUTH_SPECIFIC_60, recv_msg_userauth_specific_60}, /* client */ 71 {SSH_MSG_USERAUTH_SPECIFIC_60, recv_msg_userauth_specific_60}, /* client */
72 {SSH_MSG_GLOBAL_REQUEST, recv_msg_global_request_cli}, 72 {SSH_MSG_GLOBAL_REQUEST, recv_msg_global_request_cli},
73 {SSH_MSG_CHANNEL_SUCCESS, ignore_recv_response},
74 {SSH_MSG_CHANNEL_FAILURE, ignore_recv_response},
73 #ifdef ENABLE_CLI_REMOTETCPFWD 75 #ifdef ENABLE_CLI_REMOTETCPFWD
74 {SSH_MSG_REQUEST_SUCCESS, cli_recv_msg_request_success}, /* client */ 76 {SSH_MSG_REQUEST_SUCCESS, cli_recv_msg_request_success}, /* client */
75 {SSH_MSG_REQUEST_FAILURE, cli_recv_msg_request_failure}, /* client */ 77 {SSH_MSG_REQUEST_FAILURE, cli_recv_msg_request_failure}, /* client */
76 #else 78 #else
77 {SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */ 79 /* For keepalive */
80 {SSH_MSG_REQUEST_SUCCESS, ignore_recv_response},
81 {SSH_MSG_REQUEST_FAILURE, ignore_recv_response},
78 #endif 82 #endif
79 {0, 0} /* End */ 83 {0, 0} /* End */
80 }; 84 };
81 85
82 static const struct ChanType *cli_chantypes[] = { 86 static const struct ChanType *cli_chantypes[] = {