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 3159 by maya, Tue Nov 18 06:24:09 2008 UTC revision 3163 by doda, Wed Nov 19 14:00:14 2008 UTC
# Line 96  static TInstVar FAR *pvar; Line 96  static TInstVar FAR *pvar;
96    
97    /* WIN32 allows multiple instances of a DLL */    /* WIN32 allows multiple instances of a DLL */
98  static TInstVar InstVar;  static TInstVar InstVar;
 #define GET_VAR()  
99    
100  /*  /*
101  This code makes lots of assumptions about the order in which Tera Term  This code makes lots of assumptions about the order in which Tera Term
# Line 521  static int PASCAL FAR TTXconnect(SOCKET Line 520  static int PASCAL FAR TTXconnect(SOCKET
520                                   const struct sockaddr FAR * name,                                   const struct sockaddr FAR * name,
521                                   int namelen)                                   int namelen)
522  {  {
         GET_VAR();  
   
523  #ifndef NO_INET6  #ifndef NO_INET6
524          if (pvar->socket == INVALID_SOCKET) {          if (pvar->socket == INVALID_SOCKET) {
525                  struct sockaddr_storage ss;                  struct sockaddr_storage ss;
# Line 580  static int PASCAL FAR TTXconnect(SOCKET Line 577  static int PASCAL FAR TTXconnect(SOCKET
577  static int PASCAL FAR TTXWSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,  static int PASCAL FAR TTXWSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
578                                          long lEvent)                                          long lEvent)
579  {  {
         GET_VAR();  
   
580          if (s == pvar->socket) {          if (s == pvar->socket) {
581                  pvar->notification_events = lEvent;                  pvar->notification_events = lEvent;
582                  pvar->notification_msg = wMsg;                  pvar->notification_msg = wMsg;
# Line 597  static int PASCAL FAR TTXWSAAsyncSelect( Line 592  static int PASCAL FAR TTXWSAAsyncSelect(
592    
593  static int PASCAL FAR TTXrecv(SOCKET s, char FAR * buf, int len, int flags)  static int PASCAL FAR TTXrecv(SOCKET s, char FAR * buf, int len, int flags)
594  {  {
         GET_VAR();  
   
595          if (s == pvar->socket) {          if (s == pvar->socket) {
596                  int ret;                  int ret;
597    
# Line 615  static int PASCAL FAR TTXrecv(SOCKET s, Line 608  static int PASCAL FAR TTXrecv(SOCKET s,
608  static int PASCAL FAR TTXsend(SOCKET s, char const FAR * buf, int len,  static int PASCAL FAR TTXsend(SOCKET s, char const FAR * buf, int len,
609                                int flags)                                int flags)
610  {  {
         GET_VAR();  
   
611          if (s == pvar->socket) {          if (s == pvar->socket) {
612                  ssh_heartbeat_lock();                  ssh_heartbeat_lock();
613                  SSH_send(pvar, buf, len);                  SSH_send(pvar, buf, len);
# Line 753  void notify_verbose_message(PTInstVar pv Line 744  void notify_verbose_message(PTInstVar pv
744    
745  static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks)  static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks)
746  {  {
         GET_VAR();  
   
747          if (pvar->settings.Enabled) {          if (pvar->settings.Enabled) {
748                  char buf[1024] = "\n---------------------------------------------------------------------\nInitiating SSH session at ";                  char buf[1024] = "\n---------------------------------------------------------------------\nInitiating SSH session at ";
749                  struct tm FAR *newtime;                  struct tm FAR *newtime;
# Line 801  static void PASCAL FAR TTXOpenTCP(TTXSoc Line 790  static void PASCAL FAR TTXOpenTCP(TTXSoc
790    
791  static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks)  static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks)
792  {  {
         GET_VAR();  
   
793          if (pvar->session_settings.Enabled) {          if (pvar->session_settings.Enabled) {
794                  pvar->socket = INVALID_SOCKET;                  pvar->socket = INVALID_SOCKET;
795    
# Line 951  static BOOL CALLBACK TTXHostDlg(HWND dlg Line 938  static BOOL CALLBACK TTXHostDlg(HWND dlg
938          static HWND hwndHostname     = NULL; // HOSTNAME dropdown          static HWND hwndHostname     = NULL; // HOSTNAME dropdown
939          static HWND hwndHostnameEdit = NULL; // Edit control on HOSTNAME dropdown          static HWND hwndHostnameEdit = NULL; // Edit control on HOSTNAME dropdown
940    
         GET_VAR();  
   
941          switch (msg) {          switch (msg) {
942          case WM_INITDIALOG:          case WM_INITDIALOG:
943                  GetHNRec = (PGetHNRec) lParam;                  GetHNRec = (PGetHNRec) lParam;
# Line 1382  static BOOL FAR PASCAL TTXGetHostName(HW Line 1367  static BOOL FAR PASCAL TTXGetHostName(HW
1367    
1368  static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks)  static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks)
1369  {  {
         GET_VAR();  
   
1370          *hooks->GetHostName = TTXGetHostName;          *hooks->GetHostName = TTXGetHostName;
1371  }  }
1372    
1373  static void FAR PASCAL TTXReadINIFile(PCHAR fileName, PTTSet ts)  static void FAR PASCAL TTXReadINIFile(PCHAR fileName, PTTSet ts)
1374  {  {
         GET_VAR();  
   
1375          (pvar->ReadIniFile) (fileName, ts);          (pvar->ReadIniFile) (fileName, ts);
1376          read_ssh_options(pvar, fileName);          read_ssh_options(pvar, fileName);
1377          pvar->settings = *pvar->ts_SSH;          pvar->settings = *pvar->ts_SSH;
# Line 1400  static void FAR PASCAL TTXReadINIFile(PC Line 1381  static void FAR PASCAL TTXReadINIFile(PC
1381    
1382  static void FAR PASCAL TTXWriteINIFile(PCHAR fileName, PTTSet ts)  static void FAR PASCAL TTXWriteINIFile(PCHAR fileName, PTTSet ts)
1383  {  {
         GET_VAR();  
   
1384          (pvar->WriteIniFile) (fileName, ts);          (pvar->WriteIniFile) (fileName, ts);
1385          *pvar->ts_SSH = pvar->settings;          *pvar->ts_SSH = pvar->settings;
1386          clear_local_settings(pvar);          clear_local_settings(pvar);
# Line 1613  static void FAR PASCAL TTXParseParam(PCH Line 1592  static void FAR PASCAL TTXParseParam(PCH
1592          BOOL inQuotes = FALSE;          BOOL inQuotes = FALSE;
1593          BOOL inFileParam = FALSE;          BOOL inFileParam = FALSE;
1594          PCHAR option = NULL;          PCHAR option = NULL;
         GET_VAR();  
1595    
1596          if (pvar->hostdlg_activated) {          if (pvar->hostdlg_activated) {
1597                  pvar->settings.Enabled = pvar->hostdlg_Enabled;                  pvar->settings.Enabled = pvar->hostdlg_Enabled;
# Line 1711  static void FAR PASCAL TTXParseParam(PCH Line 1689  static void FAR PASCAL TTXParseParam(PCH
1689    
1690  static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks)  static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks)
1691  {  {
         GET_VAR();  
   
1692          pvar->ReadIniFile = *hooks->ReadIniFile;          pvar->ReadIniFile = *hooks->ReadIniFile;
1693          pvar->WriteIniFile = *hooks->WriteIniFile;          pvar->WriteIniFile = *hooks->WriteIniFile;
1694          pvar->ParseParam = *hooks->ParseParam;          pvar->ParseParam = *hooks->ParseParam;
# Line 1724  static void PASCAL FAR TTXGetSetupHooks( Line 1700  static void PASCAL FAR TTXGetSetupHooks(
1700    
1701  static void PASCAL FAR TTXSetWinSize(int rows, int cols)  static void PASCAL FAR TTXSetWinSize(int rows, int cols)
1702  {  {
         GET_VAR();  
   
1703          SSH_notify_win_size(pvar, cols, rows);          SSH_notify_win_size(pvar, cols, rows);
1704  }  }
1705    
# Line 1748  static void insertMenuBeforeItem(HMENU m Line 1722  static void insertMenuBeforeItem(HMENU m
1722    
1723  static void PASCAL FAR TTXModifyMenu(HMENU menu)  static void PASCAL FAR TTXModifyMenu(HMENU menu)
1724  {  {
         GET_VAR();  
   
1725          /* inserts before ID_HELP_ABOUT */          /* inserts before ID_HELP_ABOUT */
1726          UTIL_get_lang_msg("MENU_ABOUT", pvar, "About &TTSSH...");          UTIL_get_lang_msg("MENU_ABOUT", pvar, "About &TTSSH...");
1727          insertMenuBeforeItem(menu, 50990, MF_ENABLED, ID_ABOUTMENU, pvar->ts->UIMsg);          insertMenuBeforeItem(menu, 50990, MF_ENABLED, ID_ABOUTMENU, pvar->ts->UIMsg);
# Line 3500  static int PASCAL FAR TTXProcessCommand( Line 3472  static int PASCAL FAR TTXProcessCommand(
3472  {  {
3473          char uimsg[MAX_UIMSG];          char uimsg[MAX_UIMSG];
3474    
         GET_VAR();  
   
3475          if (pvar->fatal_error) {          if (pvar->fatal_error) {
3476                  return 0;                  return 0;
3477          }          }
# Line 3645  static void PASCAL FAR TTXSetCommandLine Line 3615  static void PASCAL FAR TTXSetCommandLine
3615          char *buf;          char *buf;
3616          char *p;          char *p;
3617          int i;          int i;
         GET_VAR();  
3618    
3619          GetTempPath(sizeof(tmpPath), tmpPath);          GetTempPath(sizeof(tmpPath), tmpPath);
3620          GetTempFileName(tmpPath, "TTX", 0, tmpFile);          GetTempFileName(tmpPath, "TTX", 0, tmpFile);
# Line 3759  static void PASCAL FAR TTXSetCommandLine Line 3728  static void PASCAL FAR TTXSetCommandLine
3728  */  */
3729  static void PASCAL FAR TTXEnd(void)  static void PASCAL FAR TTXEnd(void)
3730  {  {
         GET_VAR();  
   
3731          uninit_TTSSH(pvar);          uninit_TTSSH(pvar);
3732    
3733          if (pvar->err_msg != NULL) {          if (pvar->err_msg != NULL) {
Legend:
Removed from v.3159  
changed lines
  Added in v.3163
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help