Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

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

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

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

revision 2739 by yutakakn, Wed Dec 1 15:37:49 2004 UTC revision 2748 by yutakakn, Sat Dec 11 07:31:00 2004 UTC
# Line 35  SOFTWARE, EVEN IF ADVISED OF THE POSSIBI Line 35  SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
35  #include "ttxssh.h"  #include "ttxssh.h"
36  #include "fwdui.h"  #include "fwdui.h"
37  #include "util.h"  #include "util.h"
38    #include "ssh.h"
39    
40  #include <stdlib.h>  #include <stdlib.h>
41  #include <stdio.h>  #include <stdio.h>
# Line 171  static void init_TTSSH(PTInstVar pvar) Line 172  static void init_TTSSH(PTInstVar pvar)
172          HOSTS_init(pvar);          HOSTS_init(pvar);
173          FWD_init(pvar);          FWD_init(pvar);
174          FWDUI_init(pvar);          FWDUI_init(pvar);
175    
176            ssh_heartbeat_lock_initialize();
177  }  }
178    
179  static void uninit_TTSSH(PTInstVar pvar)  static void uninit_TTSSH(PTInstVar pvar)
# Line 365  static void read_ssh_options(PTInstVar p Line 368  static void read_ssh_options(PTInstVar p
368          // default is SSH2 (2004.11.30 yutaka)          // default is SSH2 (2004.11.30 yutaka)
369          settings->ssh_protocol_version = GetPrivateProfileInt("TTSSH", "ProtocolVersion", 2, fileName);          settings->ssh_protocol_version = GetPrivateProfileInt("TTSSH", "ProtocolVersion", 2, fileName);
370    
371            // SSH heartbeat time(second) (2004.12.11 yutaka)
372            settings->ssh_heartbeat_overtime = GetPrivateProfileInt("TTSSH", "HeartBeat", 60, fileName);
373    
374          clear_local_settings(pvar);          clear_local_settings(pvar);
375  }  }
376    
# Line 422  static void write_ssh_options(PTInstVar Line 428  static void write_ssh_options(PTInstVar
428                  settings->ssh_protocol_version==2 ? "2" : "1",                  settings->ssh_protocol_version==2 ? "2" : "1",
429                  fileName);                  fileName);
430    
431            // SSH heartbeat time(second) (2004.12.11 yutaka)
432            _snprintf(buf, sizeof(buf), "%d", settings->ssh_heartbeat_overtime);
433            WritePrivateProfileString("TTSSH", "HeartBeat", buf, fileName);
434    
435  }  }
436    
437    
438  /* find free port in all protocol family */  /* find free port in all protocol family */
439  static unsigned short find_local_port(PTInstVar pvar)  static unsigned short find_local_port(PTInstVar pvar)
440  {  {
# Line 602  static int PASCAL FAR TTXrecv(SOCKET s, Line 613  static int PASCAL FAR TTXrecv(SOCKET s,
613          GET_VAR();          GET_VAR();
614    
615          if (s == pvar->socket) {          if (s == pvar->socket) {
616                  return PKT_recv(pvar, buf, len);                  int ret;
617    
618                    ssh_heartbeat_lock();
619                    ret = PKT_recv(pvar, buf, len);
620                    ssh_heartbeat_unlock();
621                    return (ret);
622    
623          } else {          } else {
624                  return (pvar->Precv) (s, buf, len, flags);                  return (pvar->Precv) (s, buf, len, flags);
625          }          }
# Line 614  static int PASCAL FAR TTXsend(SOCKET s, Line 631  static int PASCAL FAR TTXsend(SOCKET s,
631          GET_VAR();          GET_VAR();
632    
633          if (s == pvar->socket) {          if (s == pvar->socket) {
634                    ssh_heartbeat_lock();
635                  SSH_send(pvar, buf, len);                  SSH_send(pvar, buf, len);
636                    ssh_heartbeat_unlock();
637                  return len;                  return len;
638          } else {          } else {
639                  return (pvar->Psend) (s, buf, len, flags);                  return (pvar->Psend) (s, buf, len, flags);
# Line 2001  int CALLBACK LibMain(HANDLE hInstance, W Line 2020  int CALLBACK LibMain(HANDLE hInstance, W
2020    
2021  /*  /*
2022   * $Log: not supported by cvs2svn $   * $Log: not supported by cvs2svn $
2023     * Revision 1.4  2004/12/01 15:37:49  yutakakn
2024     * SSH2自動ログイン機能を追加。
2025     * 現状、パスワード認証のみに対応。
2026     * ・コマンドライン
2027     *   /ssh /auth=認証メソッド /user=ユーザ名 /passwd=パスワード
2028     *
2029   * Revision 1.3  2004/11/29 15:52:37  yutakakn   * Revision 1.3  2004/11/29 15:52:37  yutakakn
2030   * SSHのdefault protocolをSSH2にした。   * SSHのdefault protocolをSSH2にした。
2031   *   *
Legend:
Removed from v.2739  
changed lines
  Added in v.2748
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help