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 6808 by doda, Mon Jun 19 12:50:21 2017 UTC revision 6809 by doda, Mon Jun 19 12:50:42 2017 UTC
# Line 846  void notify_established_secure_connectio Line 846  void notify_established_secure_connectio
846                  SetCustomNotifyIcon(SecureNotifyIcon);                  SetCustomNotifyIcon(SecureNotifyIcon);
847          }          }
848    
849          notify_verbose_message(pvar, "Entering secure mode",          logputs(LOG_LEVEL_VERBOSE, "Entering secure mode");
                                LOG_LEVEL_VERBOSE);  
850  }  }
851    
852  void notify_closed_connection(PTInstVar pvar, char *send_msg)  void notify_closed_connection(PTInstVar pvar, char *send_msg)
# Line 893  void notify_nonfatal_error(PTInstVar pva Line 892  void notify_nonfatal_error(PTInstVar pva
892                  }                  }
893          }          }
894          if (msg[0] != 0) {          if (msg[0] != 0) {
895                  notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);                  logputs(LOG_LEVEL_ERROR, msg);
896                  add_err_msg(pvar, msg);                  add_err_msg(pvar, msg);
897          }          }
898  }  }
# Line 901  void notify_nonfatal_error(PTInstVar pva Line 900  void notify_nonfatal_error(PTInstVar pva
900  void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect)  void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect)
901  {  {
902          if (msg[0] != 0) {          if (msg[0] != 0) {
903                  notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);                  logputs(LOG_LEVEL_FATAL, msg);
904                  add_err_msg(pvar, msg);                  add_err_msg(pvar, msg);
905          }          }
906    
# Line 920  void notify_fatal_error(PTInstVar pvar, Line 919  void notify_fatal_error(PTInstVar pvar,
919          }          }
920  }  }
921    
922  void notify_verbose_message(PTInstVar pvar, char *msg, int level)  void logputs(int level, char *msg)
923  {  {
924          if (level <= pvar->session_settings.LogLevel) {          if (level <= pvar->session_settings.LogLevel) {
925                  char buf[1024];                  char buf[1024];
# Line 956  void logprintf(int level, char *fmt, ... Line 955  void logprintf(int level, char *fmt, ...
955                  vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);                  vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
956                  va_end(params);                  va_end(params);
957    
958                  notify_verbose_message(pvar, buff, level);                  logputs(level, buff);
959          }          }
960  }  }
961    
# Line 1014  void logprintf_hexdump(int level, char * Line 1013  void logprintf_hexdump(int level, char *
1013                  vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);                  vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
1014                  va_end(params);                  va_end(params);
1015    
1016                  notify_verbose_message(pvar, buff, level);                  logputs(level, buff);
1017    
1018                  addr = 0;                  addr = 0;
1019                  byte_cnt = 0;                  byte_cnt = 0;
# Line 1026  void logprintf_hexdump(int level, char * Line 1025  void logprintf_hexdump(int level, char *
1025    
1026                          if (byte_cnt == 16) {                          if (byte_cnt == 16) {
1027                                  format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);                                  format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);
1028                                  notify_verbose_message(pvar, buff, level);                                  logputs(level, buff);
1029    
1030                                  addr += 16;                                  addr += 16;
1031                                  byte_cnt = 0;                                  byte_cnt = 0;
# Line 1036  void logprintf_hexdump(int level, char * Line 1035  void logprintf_hexdump(int level, char *
1035    
1036                  if (byte_cnt > 0) {                  if (byte_cnt > 0) {
1037                          format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);                          format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);
1038                          notify_verbose_message(pvar, buff, level);                          logputs(level, buff);
1039                  }                  }
1040          }          }
1041  }  }
# Line 1050  static void PASCAL TTXOpenTCP(TTXSockHoo Line 1049  static void PASCAL TTXOpenTCP(TTXSockHoo
1049    
1050                  pvar->session_settings = pvar->settings;                  pvar->session_settings = pvar->settings;
1051    
1052                  notify_verbose_message(pvar, "---------------------------------------------------------------------", LOG_LEVEL_VERBOSE);                  logputs(LOG_LEVEL_VERBOSE, "---------------------------------------------------------------------");
1053                  notify_verbose_message(pvar, "Initiating SSH session", LOG_LEVEL_VERBOSE);                  logputs(LOG_LEVEL_VERBOSE, "Initiating SSH session");
1054    
1055                  FWDUI_load_settings(pvar);                  FWDUI_load_settings(pvar);
1056    
# Line 1091  static void PASCAL TTXCloseTCP(TTXSockHo Line 1090  static void PASCAL TTXCloseTCP(TTXSockHo
1090          if (pvar->session_settings.Enabled) {          if (pvar->session_settings.Enabled) {
1091                  pvar->socket = INVALID_SOCKET;                  pvar->socket = INVALID_SOCKET;
1092    
1093                  notify_verbose_message(pvar, "Terminating SSH session...",                  logputs(LOG_LEVEL_VERBOSE, "Terminating SSH session...");
                                        LOG_LEVEL_VERBOSE);  
1094    
1095                  *hooks->Precv = pvar->Precv;                  *hooks->Precv = pvar->Precv;
1096                  *hooks->Psend = pvar->Psend;                  *hooks->Psend = pvar->Psend;
# Line 1656  static void PASCAL TTXReadINIFile(PCHAR Line 1654  static void PASCAL TTXReadINIFile(PCHAR
1654          (pvar->ReadIniFile) (fileName, ts);          (pvar->ReadIniFile) (fileName, ts);
1655          read_ssh_options(pvar, fileName);          read_ssh_options(pvar, fileName);
1656          pvar->settings = *pvar->ts_SSH;          pvar->settings = *pvar->ts_SSH;
1657          notify_verbose_message(pvar, "Reading INI file", LOG_LEVEL_VERBOSE);          logputs(LOG_LEVEL_VERBOSE, "Reading INI file");
1658          FWDUI_load_settings(pvar);          FWDUI_load_settings(pvar);
1659  }  }
1660    
# Line 1665  static void PASCAL TTXWriteINIFile(PCHAR Line 1663  static void PASCAL TTXWriteINIFile(PCHAR
1663          (pvar->WriteIniFile) (fileName, ts);          (pvar->WriteIniFile) (fileName, ts);
1664          *pvar->ts_SSH = pvar->settings;          *pvar->ts_SSH = pvar->settings;
1665          clear_local_settings(pvar);          clear_local_settings(pvar);
1666          notify_verbose_message(pvar, "Writing INI file", LOG_LEVEL_VERBOSE);          logputs(LOG_LEVEL_VERBOSE, "Writing INI file");
1667          write_ssh_options(pvar, fileName, pvar->ts_SSH, TRUE);          write_ssh_options(pvar, fileName, pvar->ts_SSH, TRUE);
1668  }  }
1669    
Legend:
Removed from v.6808  
changed lines
  Added in v.6809
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help