Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

/[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2986 by maya, Tue Jul 24 17:09:29 2007 UTC revision 2987 by maya, Thu Jul 26 08:33:53 2007 UTC
# Line 45  SOFTWARE, EVEN IF ADVISED OF THE POSSIBI Line 45  SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
45  #include "buffer.h"  #include "buffer.h"
46  #include "ssh.h"  #include "ssh.h"
47  #include "crypt.h"  #include "crypt.h"
48    #include "fwd.h"
49    
50  // SSH2 macro  // SSH2 macro
51  #ifdef _DEBUG  #ifdef _DEBUG
# Line 3355  void SSH_open_channel(PTInstVar pvar, ui Line 3356  void SSH_open_channel(PTInstVar pvar, ui
3356                          // changed window size from 128KB to 32KB. (2006.3.6 yutaka)                          // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
3357                          c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, local_channel_num);                          c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, local_channel_num);
3358                          if (c == NULL) {                          if (c == NULL) {
3359                                    // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
3360                                    FWD_free_channel(pvar, local_channel_num);
3361  #ifndef NO_I18N  #ifndef NO_I18N
3362                                  strcpy(pvar->ts->UIMsg, "Could not open new channel. TTSSH is already opening too many channels.");                                  strcpy(pvar->ts->UIMsg, "Could not open new channel. TTSSH is already opening too many channels.");
3363                                  UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar);                                  UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar);
# Line 6871  static BOOL handle_SSH2_open_failure(PTI Line 6874  static BOOL handle_SSH2_open_failure(PTI
6874    
6875          free(cstring);          free(cstring);
6876    
6877            // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
6878            FWD_free_channel(pvar, c->local_num);
6879    
6880          // チャネルの解放漏れを修正 (2007.5.1 maya)          // チャネルの解放漏れを修正 (2007.5.1 maya)
6881          ssh2_channel_delete(c);          ssh2_channel_delete(c);
6882    
# Line 7207  static BOOL handle_SSH2_channel_open(PTI Line 7213  static BOOL handle_SSH2_channel_open(PTI
7213                  // changed window size from 128KB to 32KB. (2006.3.6 yutaka)                  // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
7214                  c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);                  c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
7215                  if (c == NULL) {                  if (c == NULL) {
7216                            // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
7217                            FWD_free_channel(pvar, chan_num);
7218  #ifndef NO_I18N  #ifndef NO_I18N
7219                          strcpy(pvar->ts->UIMsg, "Could not open new channel. TTSSH is already opening too many channels.");                          strcpy(pvar->ts->UIMsg, "Could not open new channel. TTSSH is already opening too many channels.");
7220                          UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar);                          UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar);
# Line 7238  static BOOL handle_SSH2_channel_open(PTI Line 7246  static BOOL handle_SSH2_channel_open(PTI
7246                  // changed window size from 128KB to 32KB. (2006.3.6 yutaka)                  // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
7247                  c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);                  c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
7248                  if (c == NULL) {                  if (c == NULL) {
7249                            // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
7250                            FWD_free_channel(pvar, chan_num);
7251  #ifndef NO_I18N  #ifndef NO_I18N
7252                          strcpy(pvar->ts->UIMsg, "Could not open new channel. TTSSH is already opening too many channels.");                          strcpy(pvar->ts->UIMsg, "Could not open new channel. TTSSH is already opening too many channels.");
7253                          UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar);                          UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar);
# Line 7307  static BOOL handle_SSH2_channel_close(PT Line 7317  static BOOL handle_SSH2_channel_close(PT
7317                  notify_closed_connection(pvar);                  notify_closed_connection(pvar);
7318    
7319          } else if (c->type == TYPE_PORTFWD) {          } else if (c->type == TYPE_PORTFWD) {
7320                    // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
7321                    FWD_free_channel(pvar, c->local_num);
7322    
7323                  // チャネルの解放漏れを修正 (2007.4.26 yutaka)                  // チャネルの解放漏れを修正 (2007.4.26 yutaka)
7324                  ssh2_channel_delete(c);                  ssh2_channel_delete(c);
7325    
# Line 7425  static BOOL handle_SSH2_window_adjust(PT Line 7438  static BOOL handle_SSH2_window_adjust(PT
7438    
7439  /*  /*
7440   * $Log: not supported by cvs2svn $   * $Log: not supported by cvs2svn $
7441     * Revision 1.81  2007/07/24 17:09:29  maya
7442     * リモートからの転送接続が失敗したときに SSH 接続が切れる問題を修正した。
7443     * SSH_MSG_CHANNEL_OPEN_FAILURE のパケットが正しく作成されていなかったため。
7444     *
7445   * Revision 1.80  2007/07/12 14:12:33  yutakapon   * Revision 1.80  2007/07/12 14:12:33  yutakapon
7446   * keyboard-interactive methodでの認証失敗後のパスワード認証の   * keyboard-interactive methodでの認証失敗後のパスワード認証の
7447   * 無条件トライを止めるようにした。   * 無条件トライを止めるようにした。
Legend:
Removed from v.2986  
changed lines
  Added in v.2987
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help