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

OSDN > Find 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

|  Revision Log



|  Patch














revision 3056 by yutakapon,
Sun Oct 28 15:36:45 2007 UTC




revision 3057 by maya,
Sun Oct 28 15:55:48 2007 UTC






#

Line 97 
 static void start_ssh_heartbeat_thread(P


Line 97 
 static void start_ssh_heartbeat_thread(P












97
 // SSH2 data structure
 // SSH2 data structure

















98
 //
 //

















99
 
 














 /* default window/packet sizes for tcp/x11-fwd-channel */
 










 #define CHAN_SES_PACKET_DEFAULT (32*1024)
 










 #define CHAN_SES_WINDOW_DEFAULT (2*CHAN_SES_PACKET_DEFAULT) // READAMOUNT @ pkt.cと同期を取ること
 










 #define CHAN_TCP_PACKET_DEFAULT (32*1024)
 










 #define CHAN_TCP_WINDOW_DEFAULT (4*CHAN_TCP_PACKET_DEFAULT)
 










 #define CHAN_X11_PACKET_DEFAULT (16*1024)
 










 #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)
 










 
 













100
 // channel data structure
 // channel data structure

















101
 #define CHANNEL_MAX 100
 #define CHANNEL_MAX 100

















102
 
 











#

Line 3269 
 void SSH_open_channel(PTInstVar pvar, ui


Line 3261 
 void SSH_open_channel(PTInstVar pvar, ui












3261
                         }
                         }

















3262
 
 

















3263
                         // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
                         // changed window size from 128KB to 32KB. (2006.3.6 yutaka)















3264


                         c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, local_channel_num);


                         // changed window size from 32KB to 128KB. (2007.10.29 maya)













3265


 


                         c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, local_channel_num);















3266
                         if (c == NULL) {
                         if (c == NULL) {

















3267
                                 // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
                                 // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)

















3268
                                 FWD_free_channel(pvar, local_channel_num);
                                 FWD_free_channel(pvar, local_channel_num);











#

Line 6336 
 static BOOL handle_SSH2_userauth_success


Line 6329 
 static BOOL handle_SSH2_userauth_success












6329
         // チャネル設定
         // チャネル設定

















6330
         // FWD_prep_forwarding()でshell IDを使うので、先に設定を持ってくる。(2005.7.3 yutaka)
         // FWD_prep_forwarding()でshell IDを使うので、先に設定を持ってくる。(2005.7.3 yutaka)

















6331
         // changed window size from 64KB to 32KB. (2006.3.6 yutaka)
         // changed window size from 64KB to 32KB. (2006.3.6 yutaka)















6332


         c = ssh2_channel_new(CHAN_SES_PACKET_DEFAULT, CHAN_SES_PACKET_DEFAULT, TYPE_SHELL, -1);


         // changed window size from 32KB to 128KB. (2007.10.29 maya)













6333


 


         c = ssh2_channel_new(CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT, TYPE_SHELL, -1);















6334
         if (c == NULL) {
         if (c == NULL) {

















6335
                 UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
                 UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,

















6336
                                   "Could not open new channel. TTSSH is already opening too many channels.");
                                   "Could not open new channel. TTSSH is already opening too many channels.");











#

Line 7084 
 static BOOL handle_SSH2_channel_open(PTI


Line 7078 
 static BOOL handle_SSH2_channel_open(PTI












7078
 
 

















7079
                 // channelをアロケートし、必要な情報（remote window size）をここで取っておく。
                 // channelをアロケートし、必要な情報（remote window size）をここで取っておく。

















7080
                 // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
                 // changed window size from 128KB to 32KB. (2006.3.6 yutaka)















7081


                 c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);


                 // changed window size from 32KB to 128KB. (2007.10.29 maya)













7082


 


                 c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);















7083
                 if (c == NULL) {
                 if (c == NULL) {

















7084
                         // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
                         // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)

















7085
                         FWD_free_channel(pvar, chan_num);
                         FWD_free_channel(pvar, chan_num);











#

Line 7113 
 static BOOL handle_SSH2_channel_open(PTI


Line 7108 
 static BOOL handle_SSH2_channel_open(PTI












7108
 
 

















7109
                 // channelをアロケートし、必要な情報（remote window size）をここで取っておく。
                 // channelをアロケートし、必要な情報（remote window size）をここで取っておく。

















7110
                 // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
                 // changed window size from 128KB to 32KB. (2006.3.6 yutaka)















7111


                 c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);


                 // changed window size from 32KB to 128KB. (2007.10.29 maya)













7112


 


                 c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);















7113
                 if (c == NULL) {
                 if (c == NULL) {

















7114
                         // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
                         // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)

















7115
                         FWD_free_channel(pvar, chan_num);
                         FWD_free_channel(pvar, chan_num);





























Legend:



Removed from v.3056
 


changed lines


 
Added in v.3057













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c
-revision 3056 by yutakapon,
Sun Oct 28 15:36:45 2007 UTC
+revision 3057 by maya,
Sun Oct 28 15:55:48 2007 UTC
 Line 97 
 static void start_ssh_heartbeat_thread(P
  // SSH2 data structure
  //
- /* default window/packet sizes for tcp/x11-fwd-channel */
- #define CHAN_SES_PACKET_DEFAULT (32*1024)
- #define CHAN_SES_WINDOW_DEFAULT (2*CHAN_SES_PACKET_DEFAULT) // READAMOUNT @ pkt.cと同期を取ること
- #define CHAN_TCP_PACKET_DEFAULT (32*1024)
- #define CHAN_TCP_WINDOW_DEFAULT (4*CHAN_TCP_PACKET_DEFAULT)
- #define CHAN_X11_PACKET_DEFAULT (16*1024)
- #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)
  // channel data structure
  #define CHANNEL_MAX 100
-Line 3269 
 void SSH_open_channel(PTInstVar pvar, ui
+Line 3261 
 void SSH_open_channel(PTInstVar pvar, ui
                          }
                          // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
-                         c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, local_channel_num);
+                         // changed window size from 32KB to 128KB. (2007.10.29 maya)
+                         c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, local_channel_num);
                          if (c == NULL) {
                                  // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
                                  FWD_free_channel(pvar, local_channel_num);
-Line 6336 
 static BOOL handle_SSH2_userauth_success
+Line 6329 
 static BOOL handle_SSH2_userauth_success
          // チャネル設定
          // FWD_prep_forwarding()でshell IDを使うので、先に設定を持ってくる。(2005.7.3 yutaka)
          // changed window size from 64KB to 32KB. (2006.3.6 yutaka)
-         c = ssh2_channel_new(CHAN_SES_PACKET_DEFAULT, CHAN_SES_PACKET_DEFAULT, TYPE_SHELL, -1);
+         // changed window size from 32KB to 128KB. (2007.10.29 maya)
+         c = ssh2_channel_new(CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT, TYPE_SHELL, -1);
          if (c == NULL) {
                  UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
                                    "Could not open new channel. TTSSH is already opening too many channels.");
-Line 7084 
 static BOOL handle_SSH2_channel_open(PTI
+Line 7078 
 static BOOL handle_SSH2_channel_open(PTI
                  // channelをアロケートし、必要な情報（remote window size）をここで取っておく。
                  // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
-                 c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
+                 // changed window size from 32KB to 128KB. (2007.10.29 maya)
+                 c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
                  if (c == NULL) {
                          // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
                          FWD_free_channel(pvar, chan_num);
-Line 7113 
 static BOOL handle_SSH2_channel_open(PTI
+Line 7108 
 static BOOL handle_SSH2_channel_open(PTI
                  // channelをアロケートし、必要な情報（remote window size）をここで取っておく。
                  // changed window size from 128KB to 32KB. (2006.3.6 yutaka)
-                 c = ssh2_channel_new(CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
+                 // changed window size from 32KB to 128KB. (2007.10.29 maya)
+                 c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
                  if (c == NULL) {
                          // 転送チャネル内にあるソケットの解放漏れを修正 (2007.7.26 maya)
                          FWD_free_channel(pvar, chan_num);
 Legend:



Removed from v.3056
 


changed lines


 
Added in v.3057
 Legend:



Removed from v.3056
 


changed lines


 
Added in v.3057
-Removed from v.3056
+Added in v.3057
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository