svnno****@sourc*****
svnno****@sourc*****
2017年 6月 19日 (月) 21:50:42 JST
Tera TermRevision: 6809
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6809
Author: doda
Date: 2017-06-19 21:50:42 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
ログ関連を見直し。
・_snprintf_s() + notify_verbose_message() を logprintf() に置き換え。
・固定メッセージの notify_verbose_message() を logputs() に置き換え。
pvar を渡す必要が無くなったので、pvar が使えない状況でもログ出力が行える。
全体的に LOGLEVEL を見直したい……
Modified Paths:
--------------
trunk/ttssh2/ttxssh/auth.c
trunk/ttssh2/ttxssh/dns.c
trunk/ttssh2/ttxssh/fwd.c
trunk/ttssh2/ttxssh/key.c
trunk/ttssh2/ttxssh/sftp.c
trunk/ttssh2/ttxssh/ssh.c
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.h
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/auth.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -943,14 +943,8 @@
int AUTH_set_supported_auth_types(PTInstVar pvar, int types)
{
- char buf[1024];
+ logprintf(LOG_LEVEL_VERBOSE, "Server reports supported authentication method mask = %d", types);
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "Server reports supported authentication method mask = %d",
- types);
- buf[sizeof(buf) - 1] = 0;
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
-
if (SSHv1(pvar)) {
types &= (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA)
| (1 << SSH_AUTH_RHOSTS_RSA) | (1 << SSH_AUTH_RHOSTS)
@@ -973,8 +967,7 @@
return 0;
} else {
if (pvar->auth_state.auth_dialog != NULL) {
- update_server_supported_types(pvar,
- pvar->auth_state.auth_dialog);
+ update_server_supported_types(pvar, pvar->auth_state.auth_dialog);
}
return 1;
Modified: trunk/ttssh2/ttxssh/dns.c
===================================================================
--- trunk/ttssh2/ttxssh/dns.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/dns.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -96,7 +96,8 @@
"verify_hostkey_dns: SSHFP RR: Algorithm = %d, Digest type = %d",
t->Algorithm, t->DigestType);
if (t->Algorithm == SSHFP_KEY_RESERVED) {
- notify_verbose_message(pvar, "verify_hostkey_dns: Invalid key algorithm (SSHFP_KEY_RESERVED)", LOG_LEVEL_WARNING);
+ logputs(LOG_LEVEL_WARNING,
+ "verify_hostkey_dns: Invalid key algorithm (SSHFP_KEY_RESERVED)");
continue; // skip invalid record
}
if (t->Algorithm == hostkey_alg) {
@@ -108,8 +109,7 @@
logprintf(LOG_LEVEL_VERBOSE,
"verify_hostkey_dns: not allowed digest type. "
"Algorithm = %d, Digest type = %d",
- t->Algorithm,
- t->DigestType);
+ t->Algorithm, t->DigestType);
dgst_alg = -1;
}
else {
@@ -134,10 +134,10 @@
}
if (hostkey_dlen == p->wDataLength-2 && memcmp(hostkey_digest, t->Digest, hostkey_dlen) == 0) {
found = DNS_VERIFY_MATCH;
- notify_verbose_message(pvar, "verify_hostkey_dns: key matched", LOG_LEVEL_INFO);
+ logputs(LOG_LEVEL_INFO, "verify_hostkey_dns: key matched");
}
else {
- notify_verbose_message(pvar, "verify_hostkey_dns: key mismatched", LOG_LEVEL_WARNING);
+ logputs(LOG_LEVEL_WARNING, "verify_hostkey_dns: key mismatched");
found = DNS_VERIFY_MISMATCH;
break;
}
@@ -154,7 +154,7 @@
DnsRecordListFree(rec, DnsFreeRecordList);
}
else {
- notify_verbose_message(pvar, "verify_hostkey_dns: DnsQuery failed.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "verify_hostkey_dns: DnsQuery failed.");
}
free(hostkey_digest);
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/fwd.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -618,11 +618,10 @@
strport, sizeof(strport), NI_NUMERICHOST | NI_NUMERICSERV)) {
/* NOT REACHED */
}
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
+ logprintf(LOG_LEVEL_VERBOSE,
"Host %s connecting to port %d; forwarding to %s:%d",
hname, request->spec.from_port, request->spec.to_host,
request->spec.to_port);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
strncpy_s(buf, sizeof(buf), hname, _TRUNCATE);
@@ -1056,9 +1055,7 @@
"Some socket(s) required for port forwarding could not be initialized.\n"
"Some port forwarding services may not be available.\n"
"(errno %d)");
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- pvar->ts->UIMsg, WSAGetLastError());
- notify_verbose_message(pvar,buf,LOG_LEVEL_WARNING);
+ logprintf(LOG_LEVEL_WARNING, buf, pvar->ts->UIMsg, WSAGetLastError());
}
freeaddrinfo(res0);
/* free(request->listening_sockets); /* DO NOT FREE HERE, listening_sockets'll be freed in FWD_end */
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/key.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -2232,7 +2232,6 @@
{
size_t i;
int dlgresult;
- char msg[1024];
char *host;
host = pvar->ssh_state.hostname;
@@ -2239,8 +2238,7 @@
// "/nosecuritywarning"\x82\xAA\x8Ew\x92肳\x82\xEA\x82Ă\xA2\x82\xE9\x8Fꍇ\x81A\x8DX\x90V\x82͈\xEA\x90؍s\x82\xED\x82Ȃ\xA2\x81B
if (pvar->nocheck_known_hosts) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was not updated because `/nosecuritywarning' option was specified.");
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Hostkey was not updated because `/nosecuritywarning' option was specified.");
goto error;
}
@@ -2253,8 +2251,7 @@
cur_active != NULL ? cur_active : pvar->NotificationWindow,
hosts_updatekey_dlg_proc, (LPARAM)pvar);
if (dlgresult != 1) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was not updated because a user cancelled.");
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Hostkey was not updated because a user cancelled.");
goto error;
}
}
@@ -2266,8 +2263,7 @@
for (i = 0; i < ctx->nkeys; i++) {
HOSTS_add_host_key(pvar, ctx->keys[i]);
}
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was successfully updated to known_hosts file.");
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Hostkey was successfully updated to known_hosts file.");
error:
return;
@@ -2276,7 +2272,6 @@
static void client_global_hostkeys_private_confirm(PTInstVar pvar, int type, u_int32_t seq, void *_ctx)
{
struct hostkeys_update_ctx *ctx = (struct hostkeys_update_ctx *)_ctx;
- char msg[128];
char *data;
int len;
unsigned char *blob = NULL;
@@ -2307,18 +2302,19 @@
memcpy(cp, data, len);
if (ctx->nnew == 0) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey can not be updated because ctx->nnew %d(program bug).", ctx->nnew);
- notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
+ logprintf(LOG_LEVEL_FATAL,
+ "Hostkey can not be updated because ctx->nnew %d(program bug).", ctx->nnew);
goto error;
}
if (type != SSH2_MSG_REQUEST_SUCCESS) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Server failed to confirm ownership of private host keys(type %d)", type);
- notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
+ logprintf(LOG_LEVEL_ERROR,
+ "Server failed to confirm ownership of private host keys(type %d)", type);
goto error;
}
if (pvar->session_id_len == 0) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey can not be updated because pvar->session_id_len %d(program bug).", pvar->session_id_len);
- notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
+ logprintf(LOG_LEVEL_FATAL,
+ "Hostkey can not be updated because pvar->session_id_len %d(program bug).",
+ pvar->session_id_len);
goto error;
}
@@ -2345,9 +2341,9 @@
free(sig);
sig = NULL;
if (ret != 1) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "server gave bad signature for %s key %u",
+ logprintf(LOG_LEVEL_ERROR,
+ "server gave bad signature for %s key %u",
get_sshname_from_key(ctx->keys[i]), i);
- notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
goto error;
}
ndone++;
@@ -2354,9 +2350,9 @@
}
if (ndone != ctx->nnew) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey can not be updated because ndone != ctx->nnew (%u / %u)(program bug).",
+ logprintf(LOG_LEVEL_FATAL,
+ "Hostkey can not be updated because ndone != ctx->nnew (%u / %u)(program bug).",
ndone, ctx->nnew);
- notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
goto error;
}
@@ -2381,7 +2377,6 @@
int len;
size_t i;
char *cp, *fp;
- char msg[128];
unsigned char *blob = NULL;
buffer_t *b = NULL;
struct hostkeys_update_ctx *ctx = NULL;
@@ -2390,8 +2385,7 @@
// Tera Term\x82̐ݒ\xE8\x82ŁA\x93\x96\x8AY\x8B@\x94\\x82̃I\x83\x93\x83I\x83t\x82𐧌\xE4\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
if (pvar->settings.UpdateHostkeys == SSH_UPDATE_HOSTKEYS_NO) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was not updated because ts.UpdateHostkeys is disabled.");
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Hostkey was not updated because ts.UpdateHostkeys is disabled.");
return 1;
}
@@ -2413,8 +2407,7 @@
blob = buffer_get_string_msg(b, &len);
key = key_from_blob(blob, len);
if (key == NULL) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Not found host key into blob %p (%d)", blob, len);
- notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
+ logprintf(LOG_LEVEL_ERROR, "Not found host key into blob %p (%d)", blob, len);
goto error;
}
free(blob);
@@ -2421,16 +2414,13 @@
blob = NULL;
fp = key_fingerprint(key, SSH_FP_HEX, SSH_DIGEST_MD5);
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Received %s host key %s",
- get_sshname_from_key(key), fp);
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "Received %s host key %s", get_sshname_from_key(key), fp);
free(fp);
// \x8B\x96\x89‚\xB3\x82ꂽ\x83z\x83X\x83g\x83L\x81[\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xA9\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81B
if (check_hostkey_algorithm(pvar, key) == 0) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "%s host key is not permitted by ts.HostKeyOrder",
+ logprintf(LOG_LEVEL_VERBOSE, "%s host key is not permitted by ts.HostKeyOrder",
get_sshname_from_key(key));
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
continue;
}
@@ -2439,9 +2429,8 @@
// \x8Fd\x95\xA1\x82\xB5\x82\xBD\x83L\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xBD\x82\xE7\x83G\x83\x89\x81[\x82Ƃ\xB7\x82\xE9\x81B
for (i = 0; i < ctx->nkeys; i++) {
if (HOSTS_compare_public_key(key, ctx->keys[i]) == 1) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Received duplicated %s host key",
+ logprintf(LOG_LEVEL_ERROR, "Received duplicated %s host key",
get_sshname_from_key(key));
- notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
goto error;
}
}
@@ -2449,9 +2438,8 @@
// \x83L\x81[\x82\xF0\x93o\x98^\x82\xB7\x82\xE9\x81B
tmp = realloc(ctx->keys, (ctx->nkeys + 1)*sizeof(*ctx->keys));
if (tmp == NULL) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Not memory: realloc ctx->keys %d",
+ logprintf(LOG_LEVEL_FATAL, "Not memory: realloc ctx->keys %d",
ctx->nkeys);
- notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
goto error;
}
ctx->keys = tmp;
@@ -2460,15 +2448,13 @@
}
if (ctx->nkeys == 0) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "No host rotation key");
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "No host rotation key");
goto error;
}
if ((ctx->keys_seen = calloc(ctx->nkeys, sizeof(*ctx->keys_seen))) == NULL) {
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "Not memory: calloc ctx->keys %d",
+ logprintf(LOG_LEVEL_FATAL, "Not memory: calloc ctx->keys %d",
ctx->nkeys);
- notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
goto error;
}
@@ -2480,9 +2466,8 @@
if (!ctx->keys_seen[i])
ctx->nnew++;
}
- _snprintf_s(msg, sizeof(msg), _TRUNCATE, "%u keys from server: %u new, %u retained. %u to remove",
+ logprintf(LOG_LEVEL_VERBOSE, "%u keys from server: %u new, %u retained. %u to remove",
ctx->nkeys, ctx->nnew, ctx->nkeys - ctx->nnew, ctx->nold);
- notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
// \x90V\x8BK\x92lj\xC1\x82\xB7\x82錮\x82̓[\x83\x8D\x82\xBE\x82\xAA\x81Adeprecated\x82Ȍ\xAE\x82\xAA\x91\xB6\x8D݂\xB7\x82\xE9\x81B
if (ctx->nnew == 0 && ctx->nold != 0) {
Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/sftp.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -147,33 +147,12 @@
va_end(arg);
SendMessage(c->sftp.console_window, WM_USER_CONSOLE, 0, (LPARAM)tmp);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, tmp);
}
-static void sftp_do_syslog(PTInstVar pvar, int level, char *fmt, ...)
-{
- char tmp[1024];
- va_list arg;
+#define sftp_do_syslog(pvar, level, ...) logprintf(level, __VA_ARGS__)
+#define sftp_syslog(pvar, ...) logprintf(LOG_LEVEL_VERBOSE, __VA_ARGS__)
- va_start(arg, fmt);
- _vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
- va_end(arg);
-
- notify_verbose_message(pvar, tmp, level);
-}
-
-static void sftp_syslog(PTInstVar pvar, char *fmt, ...)
-{
- char tmp[1024];
- va_list arg;
-
- va_start(arg, fmt);
- _vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
- va_end(arg);
-
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
-}
-
// SFTP\x90\xEA\x97p\x83o\x83b\x83t\x83@\x82\xF0\x8Am\x95ۂ\xB7\x82\xE9\x81BSCP\x82Ƃ͈قȂ\xE8\x81A\x90擪\x82Ɍ㑱\x82̃f\x81[\x83^\x83T\x83C\x83Y\x82ߍ\x9E\x82ށB
//
// buffer_t
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/ssh.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -1282,8 +1282,7 @@
static BOOL handle_auth_failure(PTInstVar pvar)
{
- notify_verbose_message(pvar, "Authentication failed",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Authentication failed");
// retry count\x82̒lj\xC1 (2005.7.15 yutaka)
pvar->userauth_retry_count++;
@@ -1319,8 +1318,7 @@
int len = get_payload_uint32(pvar, 0);
if (grab_payload(pvar, len)) {
- notify_verbose_message(pvar, "Received TIS challenge",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Received TIS challenge");
AUTH_set_TIS_mode(pvar, pvar->ssh_state.payload + 4, len);
AUTH_advance_to_next_cred(pvar);
@@ -1333,8 +1331,7 @@
static BOOL handle_auth_required(PTInstVar pvar)
{
- notify_verbose_message(pvar, "Server requires authentication",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Server requires authentication");
pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
try_send_credentials(pvar);
@@ -1346,7 +1343,7 @@
static BOOL handle_ignore(PTInstVar pvar)
{
if (SSHv1(pvar)) {
- notify_verbose_message(pvar, "SSH_MSG_IGNORE was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH_MSG_IGNORE was received.");
if (grab_payload(pvar, 4)
&& grab_payload(pvar, get_payload_uint32(pvar, 0))) {
@@ -1354,7 +1351,7 @@
}
}
else {
- notify_verbose_message(pvar, "SSH2_MSG_IGNORE was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_IGNORE was received.");
// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA SSH2_MSG_IGNORE \x82̎\x9E\x82͉\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2
// Cisco \x83\x8B\x81[\x83^\x91\xF4 (2006.11.28 maya)
@@ -1370,7 +1367,7 @@
char buf[2048];
if (SSHv1(pvar)) {
- notify_verbose_message(pvar, "SSH_MSG_DEBUG was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH_MSG_DEBUG was received.");
if (grab_payload(pvar, 4)
&& grab_payload(pvar, description_len =
@@ -1382,7 +1379,7 @@
return TRUE;
}
} else {
- notify_verbose_message(pvar, "SSH2_MSG_DEBUG was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_DEBUG was received.");
if (grab_payload(pvar, 5)
&& grab_payload(pvar,
@@ -1403,7 +1400,7 @@
if (always_display) {
notify_nonfatal_error(pvar, buf);
} else {
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, buf);
}
return TRUE;
}
@@ -1418,7 +1415,7 @@
char uimsg[MAX_UIMSG];
if (SSHv1(pvar)) {
- notify_verbose_message(pvar, "SSH_MSG_DISCONNECT was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH_MSG_DISCONNECT was received.");
if (grab_payload(pvar, 4)
&& grab_payload(pvar, description_len = get_payload_uint32(pvar, 0))) {
@@ -1429,7 +1426,7 @@
return TRUE;
}
} else {
- notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_DISCONNECT was received.");
if (grab_payload(pvar, 8)
&& grab_payload(pvar,
@@ -1491,15 +1488,13 @@
static BOOL handle_crypt_success(PTInstVar pvar)
{
- notify_verbose_message(pvar, "Secure mode successfully achieved",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Secure mode successfully achieved");
return FALSE;
}
static BOOL handle_noauth_success(PTInstVar pvar)
{
- notify_verbose_message(pvar, "Server does not require authentication",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Server does not require authentication");
prep_compression(pvar);
return FALSE;
}
@@ -1506,8 +1501,7 @@
static BOOL handle_auth_success(PTInstVar pvar)
{
- notify_verbose_message(pvar, "Authentication accepted",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Authentication accepted");
prep_compression(pvar);
// \x83n\x81[\x83g\x83r\x81[\x83g\x81E\x83X\x83\x8C\x83b\x83h\x82̊J\x8En (2004.12.11 yutaka)
@@ -1531,7 +1525,7 @@
Key hostkey;
int supported_types;
- notify_verbose_message(pvar, "SSH_SMSG_PUBLIC_KEY was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH_SMSG_PUBLIC_KEY was received.");
if (!grab_payload(pvar, 14))
return FALSE;
@@ -1732,7 +1726,7 @@
pvar->server_compat_flag = 0;
if ((server_swver = strchr(pvar->server_version_string+4, '-')) == NULL) {
- notify_verbose_message(pvar, "Can't get server software version string.", LOG_LEVEL_WARNING);
+ logputs(LOG_LEVEL_WARNING, "Can't get server software version string.");
return;
}
server_swver++;
@@ -1739,7 +1733,7 @@
if (strncmp(server_swver, "Cisco-1", 7) == 0) {
pvar->server_compat_flag |= SSH_BUG_DHGEX_LARGE;
- notify_verbose_message(pvar, "Server version string is matched to \"Cisco-1\", compatibility flag SSH_BUG_DHGEX_LARGE is enabled.", LOG_LEVEL_INFO);
+ logputs(LOG_LEVEL_INFO, "Server version string is matched to \"Cisco-1\", compatibility flag SSH_BUG_DHGEX_LARGE is enabled.");
}
}
@@ -1765,7 +1759,7 @@
strncpy_s(buf, buf_len, prefix, _TRUNCATE);
strncat_s(buf, buf_len, ID, _TRUNCATE);
chop_newlines(buf);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, buf);
free(buf);
if (ID[ID_len - 1] != '\n') {
@@ -1832,25 +1826,16 @@
// \x83T\x81[\x83o\x83o\x81[\x83W\x83\x87\x83\x93\x82̃`\x83F\x83b\x83N
server_version_check(pvar);
- if ((pvar->Psend) (pvar->socket, TTSSH_ID, TTSSH_ID_len,
- 0) != TTSSH_ID_len) {
+ if ((pvar->Psend) (pvar->socket, TTSSH_ID, TTSSH_ID_len, 0) != TTSSH_ID_len) {
UTIL_get_lang_msg("MSG_SSH_SEND_ID_ERROR", pvar,
"An error occurred while sending the SSH ID string.\n"
"The connection will close.");
notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
} else {
- // \x89\xFC\x8Ds\x83R\x81[\x83h\x82̏\x9C\x8B\x8E (2004.8.4 yutaka)
- pvar->client_version_string[--TTSSH_ID_len] = 0; // \n
- pvar->client_version_string[--TTSSH_ID_len] = 0; // \r
+ // \x89\xFC\x8Ds\x82̏\x9C\x8B\x8E
+ chop_newlines(pvar->client_version_string);
+ logprintf(LOG_LEVEL_VERBOSE, "Sent client identification string: %s", pvar->client_version_string);
- strncpy_s(prefix, sizeof(prefix), "Sent client identification string: ", _TRUNCATE);
- buf_len = strlen(prefix) + strlen(pvar->client_version_string) + 1;
- buf = (char *) malloc(buf_len);
- strncpy_s(buf, buf_len, prefix, _TRUNCATE);
- strncat_s(buf, buf_len, pvar->client_version_string, _TRUNCATE);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
- free(buf);
-
push_memdump("server ID", NULL, pvar->server_version_string, strlen(pvar->server_version_string));
push_memdump("client ID", NULL, pvar->client_version_string, strlen(pvar->client_version_string));
@@ -2151,7 +2136,7 @@
pvar->ssh_state.receiver_sequence_number - 1);
finish_send_packet(pvar);
- notify_verbose_message(pvar, "SSH2_MSG_UNIMPLEMENTED was sent at SSH_handle_packet().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_UNIMPLEMENTED was sent at SSH_handle_packet().");
/* XXX need to decompress incoming packet, but how? */
}
} else {
@@ -2487,9 +2472,7 @@
begin_send_packet(pvar, SSH_CMSG_AUTH_PASSWORD,
4 + len);
- notify_verbose_message(pvar,
- "Trying PASSWORD authentication...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Trying PASSWORD authentication...");
set_uint32(outmsg, len);
memcpy(outmsg + 4, cred->password, len);
@@ -2508,9 +2491,7 @@
unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS, 4 + len);
- notify_verbose_message(pvar,
- "Trying RHOSTS authentication...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Trying RHOSTS authentication...");
set_uint32(outmsg, len);
memcpy(outmsg + 4, cred->rhosts_client_user, len);
@@ -2523,9 +2504,7 @@
unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_RSA, 2 + len);
- notify_verbose_message(pvar,
- "Trying RSA authentication...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Trying RSA authentication...");
set_ushort16_MSBfirst(outmsg, len * 8);
BN_bn2bin(cred->key_pair->rsa->n, outmsg + 2);
@@ -2542,9 +2521,7 @@
begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS_RSA,
12 + mod_len + name_len + exp_len);
- notify_verbose_message(pvar,
- "Trying RHOSTS+RSA authentication...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Trying RHOSTS+RSA authentication...");
set_uint32(outmsg, name_len);
memcpy(outmsg + 4, cred->rhosts_client_user, name_len);
@@ -2589,9 +2566,7 @@
pubkey += 2;
outmsg = begin_send_packet(pvar, SSH_CMSG_AUTH_RSA, 2 + bn_bytes);
- notify_verbose_message(pvar,
- "Trying RSA authentication...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Trying RSA authentication...");
set_ushort16_MSBfirst(outmsg, bn_bytes * 8);
memcpy(outmsg + 2, pubkey, bn_bytes);
@@ -2607,9 +2582,7 @@
unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_TIS, 0);
- notify_verbose_message(pvar,
- "Trying TIS authentication...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Trying TIS authentication...");
enque_handlers(pvar, 2, TIS_msgs, TIS_handlers);
} else {
int len = strlen(cred->password);
@@ -2617,9 +2590,7 @@
begin_send_packet(pvar, SSH_CMSG_AUTH_TIS_RESPONSE,
4 + len);
- notify_verbose_message(pvar,
- "Sending TIS response",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Sending TIS response");
set_uint32(outmsg, len);
memcpy(outmsg + 4, cred->password, len);
@@ -2654,7 +2625,6 @@
int len = strlen(username);
unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_USER, 4 + len);
- char buf[1024] = "Sending user name: ";
static const int msgs[] =
{ SSH_SMSG_SUCCESS, SSH_SMSG_FAILURE };
static const SSHPacketHandler handlers[]
@@ -2666,8 +2636,7 @@
pvar->ssh_state.status_flags |= STATUS_DONT_SEND_USER_NAME;
- strncat_s(buf, sizeof(buf), username, _TRUNCATE);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "Sending user name: %s", username);
enque_handlers(pvar, 2, msgs, handlers);
}
@@ -2806,7 +2775,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was sent at SSH_notify_disconnecting().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_DISCONNECT was sent at SSH_notify_disconnecting().");
}
}
@@ -3292,7 +3261,6 @@
buffer_t *msg;
unsigned char *outmsg;
unsigned int len;
- char log[128];
// SSH2\x8C\xAE\x8C\xF0\x8A\xB7\x92\x86\x82̏ꍇ\x81A\x83p\x83P\x83b\x83g\x82\xF0\x8ÊĂ\xE9\x81B(2005.6.19 yutaka)
if (pvar->rekeying) {
@@ -3339,8 +3307,7 @@
buffer_free(msg);
//debug_print(1, pvar->ssh_state.outbuf, 7 + 4 + 1 + 1 + len);
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_DATA was sent at SSH2_send_channel_data(). local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_SSHDUMP);
+ logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was sent at SSH2_send_channel_data(). local:%d remote:%d", c->self_id, c->remote_id);
// remote window size\x82̒\xB2\x90\xAE
if (buflen <= c->remote_window) {
@@ -3438,7 +3405,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at SSH_fail_channel_open().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at SSH_fail_channel_open().");
}
}
@@ -3447,7 +3414,6 @@
buffer_t *msg;
unsigned char *outmsg;
int len;
- char log[128];
if (c == NULL)
return;
@@ -3468,8 +3434,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was sent at SSH_confirm_channel_open(). local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was sent at SSH_confirm_channel_open(). local:%d remote:%d", c->self_id, c->remote_id);
}
void SSH_confirm_channel_open(PTInstVar pvar, uint32 remote_channel_num,
@@ -3516,7 +3481,6 @@
buffer_t *msg;
unsigned char *outmsg;
int len;
- char log[128];
if (c == NULL)
return;
@@ -3543,8 +3507,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_EOF was sent at SSH2_channel_input_eof(). local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_EOF was sent at SSH2_channel_input_eof(). local:%d remote:%d", c->self_id, c->remote_id);
}
void SSH_channel_input_eof(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num)
@@ -3610,7 +3573,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_request_forwarding().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_request_forwarding().");
}
}
@@ -3640,7 +3603,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_cancel_request_forwarding().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_cancel_request_forwarding().");
}
}
@@ -3819,7 +3782,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_open_channel().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_open_channel().");
return;
@@ -3957,7 +3920,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_scp_transaction().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_scp_transaction().");
return TRUE;
@@ -4023,7 +3986,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_sftp_transaction().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_sftp_transaction().");
return TRUE;
@@ -4559,7 +4522,6 @@
buffer_t *msg;
unsigned char *outmsg;
int len, i;
- char log[1024];
msg = buffer_init();
if (msg == NULL) {
@@ -4586,45 +4548,37 @@
buffer_put_int(msg, 0);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: KEX algorithm: %s",
- myproposal[0]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: KEX algorithm: %s",
+ myproposal[0]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: server host key algorithm: %s",
- myproposal[1]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: server host key algorithm: %s",
+ myproposal[1]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: encryption algorithm client to server: %s",
- myproposal[2]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: encryption algorithm client to server: %s",
+ myproposal[2]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: encryption algorithm server to client: %s",
- myproposal[3]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: encryption algorithm server to client: %s",
+ myproposal[3]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: MAC algorithm client to server: %s",
- myproposal[4]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: MAC algorithm client to server: %s",
+ myproposal[4]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: MAC algorithm server to client: %s",
- myproposal[5]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: MAC algorithm server to client: %s",
+ myproposal[5]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: compression algorithm client to server: %s",
- myproposal[6]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: compression algorithm client to server: %s",
+ myproposal[6]);
- _snprintf_s(log, sizeof(log), _TRUNCATE,
- "client proposal: compression algorithm server to client: %s",
- myproposal[7]);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "client proposal: compression algorithm server to client: %s",
+ myproposal[7]);
len = buffer_len(msg);
@@ -4635,7 +4589,7 @@
// my_kex\x82Ɏ\xE6\x82\xC1\x82Ă\xA8\x82\xAD\x82\xBD\x82߁A\x83t\x83\x8A\x81[\x82\xB5\x82Ă͂\xA2\x82\xAF\x82Ȃ\xA2\x81B
//buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_KEXINIT was sent at SSH2_send_kexinit().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXINIT was sent at SSH2_send_kexinit().");
}
@@ -4834,7 +4788,7 @@
char tmp[1024+512];
char str_keytype[20];
- notify_verbose_message(pvar, "SSH2_MSG_KEXINIT was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXINIT was received.");
// \x82\xB7\x82łɃL\x81[\x8C\xF0\x8A\xB7\x82\xAA\x8FI\x82\xED\x82\xC1\x82Ă\xA2\x82\xE9\x82ɂ\xE0\x8Aւ\xED\x82炸\x81A\x83T\x81[\x83o\x82\xA9\x82\xE7 SSH2_MSG_KEXINIT \x82\xAA
// \x91\x97\x82\xE7\x82\xEA\x82Ă\xAD\x82\xE9\x8Fꍇ\x82́A\x83L\x81[\x8Dč쐬\x82\xF0\x8Ds\x82\xA4\x81B(2004.10.24 yutaka)
@@ -4899,8 +4853,7 @@
buf[i] = '\0'; // null-terminate
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: KEX algorithm: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: KEX algorithm: %s", buf);
pvar->kex_type = choose_SSH2_kex_algorithm(buf, myproposal[PROPOSAL_KEX_ALGS]);
if (pvar->kex_type == KEX_DH_UNKNOWN) { // not match
@@ -4920,8 +4873,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: server host key algorithm: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: server host key algorithm: %s", buf);
pvar->hostkey_type = KEY_UNSPEC;
choose_SSH2_proposal(buf, myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], str_keytype, sizeof(str_keytype));
@@ -4949,8 +4901,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: encryption algorithm client to server: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm client to server: %s", buf);
pvar->ctos_cipher = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_CTOS]);
if (pvar->ctos_cipher == SSH_CIPHER_NONE) {
@@ -4970,8 +4921,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: encryption algorithm server to client: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm server to client: %s", buf);
pvar->stoc_cipher = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_STOC]);
if (pvar->stoc_cipher == SSH_CIPHER_NONE) {
@@ -4991,8 +4941,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: MAC algorithm client to server: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: MAC algorithm client to server: %s", buf);
pvar->ctos_hmac = choose_SSH2_hmac_algorithm(buf, myproposal[PROPOSAL_MAC_ALGS_CTOS]);
if (pvar->ctos_hmac == HMAC_UNKNOWN) { // not match
@@ -5011,8 +4960,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: MAC algorithm server to client: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: MAC algorithm server to client: %s", buf);
pvar->stoc_hmac = choose_SSH2_hmac_algorithm(buf, myproposal[PROPOSAL_MAC_ALGS_STOC]);
if (pvar->stoc_hmac == HMAC_UNKNOWN) { // not match
@@ -5034,8 +4982,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: compression algorithm client to server: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: compression algorithm client to server: %s", buf);
pvar->ctos_compression = choose_SSH2_compression_algorithm(buf, myproposal[PROPOSAL_COMP_ALGS_CTOS]);
if (pvar->ctos_compression == COMP_UNKNOWN) { // not match
@@ -5054,8 +5001,7 @@
buf[i] = 0;
offset += size;
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: compression algorithm server to client: %s", buf);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "server proposal: compression algorithm server to client: %s", buf);
pvar->stoc_compression = choose_SSH2_compression_algorithm(buf, myproposal[PROPOSAL_COMP_ALGS_STOC]);
if (pvar->stoc_compression == COMP_UNKNOWN) { // not match
@@ -5067,44 +5013,36 @@
// \x8C\x88\x92\xE8
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "KEX algorithm: %s",
- get_kex_algorithm_name(pvar->kex_type));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "KEX algorithm: %s",
+ get_kex_algorithm_name(pvar->kex_type));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "server host key algorithm: %s",
- get_ssh_keytype_name(pvar->hostkey_type));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "server host key algorithm: %s",
+ get_ssh_keytype_name(pvar->hostkey_type));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "encryption algorithm client to server: %s",
- get_cipher_string(pvar->ctos_cipher));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "encryption algorithm client to server: %s",
+ get_cipher_string(pvar->ctos_cipher));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "encryption algorithm server to client: %s",
- get_cipher_string(pvar->stoc_cipher));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "encryption algorithm server to client: %s",
+ get_cipher_string(pvar->stoc_cipher));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "MAC algorithm client to server: %s",
- get_ssh2_mac_name(pvar->ctos_hmac));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "MAC algorithm client to server: %s",
+ get_ssh2_mac_name(pvar->ctos_hmac));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "MAC algorithm server to client: %s",
- get_ssh2_mac_name(pvar->stoc_hmac));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "MAC algorithm server to client: %s",
+ get_ssh2_mac_name(pvar->stoc_hmac));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "compression algorithm client to server: %s",
- get_ssh2_comp_name(pvar->ctos_compression));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "compression algorithm client to server: %s",
+ get_ssh2_comp_name(pvar->ctos_compression));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "compression algorithm server to client: %s",
- get_ssh2_comp_name(pvar->stoc_compression));
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "compression algorithm server to client: %s",
+ get_ssh2_comp_name(pvar->stoc_compression));
// we_need\x82̌\x88\x92\xE8 (2004.11.6 yutaka)
@@ -5205,7 +5143,7 @@
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_KEXDH_INIT was sent at SSH2_dh_kex_init().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXDH_INIT was sent at SSH2_dh_kex_init().");
return;
@@ -5253,11 +5191,9 @@
bits = max;
}
if (pvar->server_compat_flag & SSH_BUG_DHGEX_LARGE && bits > 4096) {
- unsigned char tmp[256];
- _snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
- "SSH_BUG_DHGEX_LARGE is enabled. DH-GEX group size is limited to 4096. (Original size is %d)",
- bits);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_NOTICE);
+ logprintf(LOG_LEVEL_NOTICE,
+ "SSH_BUG_DHGEX_LARGE is enabled. DH-GEX group size is limited to 4096. "
+ "(Original size is %d)", bits);
bits = 4096;
}
@@ -5290,7 +5226,7 @@
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_REQUEST was sent at SSH2_dh_gex_kex_init().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_REQUEST was sent at SSH2_dh_gex_kex_init().");
return;
@@ -5312,7 +5248,7 @@
unsigned char *outmsg;
char tmpbuf[256];
- notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_GROUP was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_GROUP was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -5328,9 +5264,8 @@
buffer_get_bignum2(&data, g); // \x90\xB6\x90\xAC\x8C\xB3\x82̎擾
grp_bits = BN_num_bits(p);
- _snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, "DH-GEX: Request: %d / %d / %d, Received: %d",
+ logprintf(LOG_LEVEL_VERBOSE, "DH-GEX: Request: %d / %d / %d, Received: %d",
pvar->kexgex_min, pvar->kexgex_bits, pvar->kexgex_max, BN_num_bits(p));
- notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_VERBOSE);
//
// (1) < GEX_GRP_MINSIZE <= (2) < kexgex_min <= (3) < kexgex_bits <= (4) <= kexgex_max < (5) <= GEX_GRP_MAXSIZE < (6)
@@ -5345,25 +5280,23 @@
}
else if (grp_bits < pvar->kexgex_min) {
// (2) \x83v\x83\x8D\x83g\x83R\x83\x8B\x82ŔF\x82߂\xE7\x82\xEA\x82Ă\xA2\x82\xE9\x94͈͓\xE0\x82\xBE\x82\xAA\x81A\x82\xB1\x82\xBF\x82\xE7\x82̐ݒ肵\x82\xBD\x8Dŏ\xAC\x92l\x82\xE6\x82菬\x82\xB3\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x81B
- _snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
+ logprintf(LOG_LEVEL_WARNING,
"DH-GEX: grp_bits(%d) < kexgex_min(%d)", grp_bits, pvar->kexgex_min);
- notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_WARNING);
UTIL_get_lang_msg("MSG_SSH_GEX_SIZE_SMALLER", pvar,
"Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accecpt received group?");
_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
- pvar->ts->UIMsg, pvar->kexgex_min, grp_bits);
+ pvar->ts->UIMsg, pvar->kexgex_min, grp_bits);
}
else if (grp_bits < pvar->kexgex_bits) {
// (3) \x97v\x8B\x81\x82̍ŏ\xAC\x92l\x82͖\x9E\x82\xBD\x82\xB7\x82\xAA\x81A\x97v\x8B\x81\x92l\x82\xE6\x82\xE8\x82͏\xAC\x82\xB3\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82͏o\x82\xB3\x82Ȃ\xA2\x81B
- _snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
- "DH-GEX: grp_bits(%d) < kexgex_bits(%d)", grp_bits, pvar->kexgex_bits);
- notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_NOTICE);
+ logprintf(LOG_LEVEL_NOTICE,
+ "DH-GEX: grp_bits(%d) < kexgex_bits(%d)", grp_bits, pvar->kexgex_bits);
#if 1
tmpbuf[0] = 0; // no message
#else
_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
- "Received group size is smaller than requested.\nrequested: %d, received: %d\nAccept this?",
- pvar->kexgex_bits, grp_bits);
+ "Received group size is smaller than requested.\nrequested: %d, received: %d\nAccept this?",
+ pvar->kexgex_bits, grp_bits);
#endif
}
else if (grp_bits <= pvar->kexgex_max) {
@@ -5373,13 +5306,12 @@
else {
// (5) \x82\xB1\x82\xBF\x82\xE7\x82̐ݒ肵\x82\xBD\x8Dő\xE5\x92l\x82\xE6\x82\xE8\x91傫\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x81B
// \x82\xBD\x82\xBE\x82\xB5\x8C\xBB\x8F\xF3\x82ł\xCD kexgex_max == GEX_GRP_MAXSIZE(8192) \x82ł\xA0\x82\xE9\x88ׂ\xB1\x82̏ɂȂ鎖\x82͖\xB3\x82\xA2\x81B
- _snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
- "DH-GEX: grp_bits(%d) > kexgex_max(%d)", grp_bits, pvar->kexgex_max);
- notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_WARNING);
+ logprintf(LOG_LEVEL_WARNING,
+ "DH-GEX: grp_bits(%d) > kexgex_max(%d)", grp_bits, pvar->kexgex_max);
UTIL_get_lang_msg("MSG_SSH_GEX_SIZE_LARGER", pvar,
"Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accecpt received group?");
_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
- pvar->ts->UIMsg, pvar->kexgex_max, grp_bits);
+ pvar->ts->UIMsg, pvar->kexgex_max, grp_bits);
}
if (tmpbuf[0] != 0) {
@@ -5413,7 +5345,7 @@
memcpy(outmsg, buffer_ptr(msg), len);
finish_send_packet(pvar);
- notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_INIT was sent at handle_SSH2_dh_gex_group().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_INIT was sent at handle_SSH2_dh_gex_group().");
// \x82\xB1\x82\xB1\x82ō쐬\x82\xB5\x82\xBDDH\x8C\xAE\x82́A\x82\xA0\x82ƂŃn\x83b\x83V\x83\x85\x8Cv\x8EZ\x82Ɏg\x82\xA4\x82\xBD\x82ߎ\xE6\x82\xC1\x82Ă\xA8\x82\xAD\x81B(2004.10.31 yutaka)
if (pvar->kexdh != NULL) {
@@ -5497,7 +5429,7 @@
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_KEX_ECDH_INIT was sent at SSH2_ecdh_kex_init().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_ECDH_INIT was sent at SSH2_ecdh_kex_init().");
return;
@@ -5548,7 +5480,7 @@
int ret, hashlen;
Key *hostkey; // hostkey
- notify_verbose_message(pvar, "SSH2_MSG_KEXDH_REPLY was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXDH_REPLY was received.");
memset(&hostkey, 0, sizeof(hostkey));
@@ -5693,7 +5625,7 @@
begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
finish_send_packet(pvar);
- notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_kex_reply().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_kex_reply().");
// SSH2_MSG_NEWKEYS\x82𑗂\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82ƂɃL\x81[\x82̐ݒ肨\x82\xE6\x82эĐݒ\xE8\x82\xF0\x8Ds\x82\xA4
// \x91\x97\x90M\x97p\x82̈Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82̑\x97\x90M\x8C\xE3\x82ɁA\x8E\xF3\x90M\x97p\x82̂\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -5774,7 +5706,7 @@
int ret, hashlen;
Key *hostkey = NULL; // hostkey
- notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_REPLY was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_REPLY was received.");
memset(&hostkey, 0, sizeof(hostkey));
@@ -5928,7 +5860,7 @@
begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
finish_send_packet(pvar);
- notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_gex_reply().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_gex_reply().");
// SSH2_MSG_NEWKEYS\x82𑗂\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82ƂɃL\x81[\x82̐ݒ肨\x82\xE6\x82эĐݒ\xE8\x82\xF0\x8Ds\x82\xA4
// \x91\x97\x90M\x97p\x82̈Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82̑\x97\x90M\x8C\xE3\x82ɁA\x8E\xF3\x90M\x97p\x82̂\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -6008,7 +5940,7 @@
int ret, hashlen;
Key *hostkey = NULL; // hostkey
- notify_verbose_message(pvar, "SSH2_MSG_KEX_ECDH_REPLY was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_ECDH_REPLY was received.");
memset(&hostkey, 0, sizeof(hostkey));
@@ -6160,7 +6092,7 @@
begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
finish_send_packet(pvar);
- notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_ecdh_kex_reply().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_ecdh_kex_reply().");
// SSH2_MSG_NEWKEYS\x82𑗂\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82ƂɃL\x81[\x82̐ݒ肨\x82\xE6\x82эĐݒ\xE8\x82\xF0\x8Ds\x82\xA4
// \x91\x97\x90M\x97p\x82̈Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82̑\x97\x90M\x8C\xE3\x82ɁA\x8E\xF3\x90M\x97p\x82̂\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -6307,7 +6239,7 @@
int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |
(1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);
- notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was received(DH key generation is completed).", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was received(DH key generation is completed).");
// \x83\x8D\x83O\x8D̎\xE6\x82̏I\x97\xB9 (2005.3.7 yutaka)
if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
@@ -6393,7 +6325,7 @@
SSH2_dispatch_add_message(SSH2_MSG_IGNORE); // XXX: Tru64 UNIX workaround (2005.3.5 yutaka)
SSH2_dispatch_add_message(SSH2_MSG_DEBUG);
- notify_verbose_message(pvar, "SSH2_MSG_SERVICE_REQUEST was sent at do_SSH2_userauth().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_REQUEST was sent at do_SSH2_userauth().");
return TRUE;
}
@@ -6401,14 +6333,13 @@
static BOOL handle_SSH2_service_accept(PTInstVar pvar)
{
- char *data, *s, tmp[100];
+ char *data, *s;
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
s = buffer_get_string(&data, NULL);
- _snprintf(tmp, sizeof(tmp), "SSH2_MSG_SERVICE_ACCEPT was received. service name=%s", s);
- notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_ACCEPT was received. service name=%s", s);
SSH2_dispatch_init(5);
SSH2_dispatch_add_message(SSH2_MSG_IGNORE); // XXX: Tru64 UNIX workaround (2005.3.5 yutaka)
@@ -6428,7 +6359,6 @@
SSH2_dispatch_add_message(SSH2_MSG_USERAUTH_BANNER);
SSH2_dispatch_add_message(SSH2_MSG_DEBUG); // support for authorized_keys command (2006.2.23 yutaka)
-
return do_SSH2_authrequest(pvar);
}
@@ -6584,7 +6514,6 @@
}
-
// \x83p\x83P\x83b\x83g\x91\x97\x90M
len = buffer_len(msg);
outmsg = begin_send_packet(pvar, SSH2_MSG_USERAUTH_REQUEST, len);
@@ -6593,11 +6522,9 @@
buffer_free(msg);
{
- char buf[128];
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "SSH2_MSG_USERAUTH_REQUEST was sent do_SSH2_authrequest(). (method %d)",
- pvar->auth_state.cur_cred.method);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "SSH2_MSG_USERAUTH_REQUEST was sent do_SSH2_authrequest(). (method %d)",
+ pvar->auth_state.cur_cred.method);
}
return TRUE;
@@ -6653,9 +6580,9 @@
finish_send_packet(pvar);
buffer_free(msg);
if (SSHv1(pvar)) {
- notify_verbose_message(pvar, "SSH_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().", LOG_LEVEL_SSHDUMP);
+ logputs(LOG_LEVEL_SSHDUMP, "SSH_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().");
} else {
- notify_verbose_message(pvar, "SSH2_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().", LOG_LEVEL_SSHDUMP);
+ logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().");
}
}
return TRUE;
@@ -6767,7 +6694,7 @@
int len;
Channel_t *c;
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_SUCCESS was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_SUCCESS was received.");
// \x83p\x83X\x83\x8F\x81[\x83h\x82̔j\x8A\xFC (2006.8.22 yutaka)
if (pvar->settings.remember_password == 0) {
@@ -6817,12 +6744,12 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at handle_SSH2_userauth_success().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at handle_SSH2_userauth_success().");
// \x83n\x81[\x83g\x83r\x81[\x83g\x81E\x83X\x83\x8C\x83b\x83h\x82̊J\x8En (2004.12.11 yutaka)
start_ssh_heartbeat_thread(pvar);
- notify_verbose_message(pvar, "User authentication is successful and SSH heartbeat thread is starting.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "User authentication is successful and SSH heartbeat thread is starting.");
return TRUE;
}
@@ -6834,9 +6761,8 @@
char *data;
char *cstring;
int partial;
- char buf[1024];
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_FAILURE was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_FAILURE was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -6876,8 +6802,7 @@
return FALSE;
pvar->ssh2_authlist = cstring; // \x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7\x83t\x83\x8A\x81[\x82\xB7\x82邱\x82\xC6
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "method list from server: %s", cstring);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "method list from server: %s", cstring);
if (pvar->ssh2_authmethod == SSH_AUTH_TIS &&
pvar->ask4passwd &&
@@ -6949,7 +6874,7 @@
static BOOL handle_SSH2_userauth_banner(PTInstVar pvar)
{
//
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_BANNER was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_BANNER was received.");
return TRUE;
}
@@ -6997,7 +6922,7 @@
char *name, *inst, *lang;
char lprompt[512];
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_INFO_REQUEST was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_INFO_REQUEST was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -7080,7 +7005,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_INFO_RESPONSE was sent at handle_SSH2_userauth_inforeq().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_INFO_RESPONSE was sent at handle_SSH2_userauth_inforeq().");
return TRUE;
}
@@ -7099,7 +7024,7 @@
unsigned char *signedmsg;
int signedlen;
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_PK_OK was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_PK_OK was received.");
username = pvar->auth_state.user; // \x83\x86\x81[\x83U\x96\xBC
@@ -7183,7 +7108,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_REQUEST was sent at handle_SSH2_userauth_inforeq().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_REQUEST was sent at handle_SSH2_userauth_inforeq().");
pvar->pageant_keyfinal = TRUE;
@@ -7307,10 +7232,9 @@
unsigned char *outmsg;
char *connect_id = "ssh-connection";
char *info, *lang;
- char buf[128];
struct change_password cp;
- notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ was received.");
memset(&cp, 0, sizeof(cp));
cp.pvar = pvar;
@@ -7332,8 +7256,7 @@
info = buffer_get_string(&data, NULL);
lang = buffer_get_string(&data, NULL);
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s: info %s lang %s\n", __FUNCTION__, info, lang);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": info %s lang %s\n", info, lang);
free(info);
free(lang);
@@ -7487,7 +7410,7 @@
buffer_free(msg);
buffer_free(ttymsg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().");
logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
"local: %d, remote: %d, request-type: %s, "
"term: %s, cols: %d, rows: %d, x: %d, y: %d, "
@@ -7519,7 +7442,7 @@
int want_reply = 1; // true
#endif
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -7632,7 +7555,7 @@
char tmpbuf[256];
char *rmsg;
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_FAILURE was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -7696,7 +7619,7 @@
unsigned char *outmsg;
int type;
- notify_verbose_message(pvar, "SSH2_MSG_GLOBAL_REQUEST was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was received.");
// SSH2 packet format:
// [size(4) + padding size(1) + type(1)] + [payload(N) + padding(X)]
@@ -7748,7 +7671,7 @@
static BOOL handle_SSH2_request_success(PTInstVar pvar)
{
// \x95K\x97v\x82ł\xA0\x82\xEA\x82\x8D\x83O\x82\xF0\x8E\xE6\x82\xE9\x81B\x93\xC1\x82ɉ\xBD\x82\xE0\x82\xB5\x82Ȃ\xAD\x82Ă\xE0\x82悢\x81B
- notify_verbose_message(pvar, "SSH2_MSG_REQUEST_SUCCESS was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_REQUEST_SUCCESS was received.");
client_global_request_reply(pvar, SSH2_MSG_REQUEST_SUCCESS, 0, NULL);
@@ -7759,7 +7682,7 @@
static BOOL handle_SSH2_request_failure(PTInstVar pvar)
{
// \x95K\x97v\x82ł\xA0\x82\xEA\x82\x8D\x83O\x82\xF0\x8E\xE6\x82\xE9\x81B\x93\xC1\x82ɉ\xBD\x82\xE0\x82\xB5\x82Ȃ\xAD\x82Ă\xE0\x82悢\x81B
- notify_verbose_message(pvar, "SSH2_MSG_REQUEST_FAILURE was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_REQUEST_FAILURE was received.");
client_global_request_reply(pvar, SSH2_MSG_REQUEST_FAILURE, 0, NULL);
@@ -7774,12 +7697,10 @@
#else
int want_reply = 1; // true
#endif
- char buf[128];
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "SSH2_MSG_CHANNEL_SUCCESS was received(nego_status %d).",
- pvar->session_nego_status);
- notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE,
+ "SSH2_MSG_CHANNEL_SUCCESS was received(nego_status %d).",
+ pvar->session_nego_status);
if (pvar->session_nego_status == 1) {
// find channel by shell id(2005.2.27 yutaka)
@@ -7828,7 +7749,7 @@
data = pvar->ssh_state.payload;
channel_id = get_uint32_MSBfirst(data);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_FAILURE was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_FAILURE was received.");
c = ssh2_channel_lookup(channel_id);
if (c == NULL) {
@@ -7849,9 +7770,7 @@
if (pvar->session_nego_status == 1) {
// \x83\x8A\x83\x82\x81[\x83g\x82\xC5 auth-****@opens***** \x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82ĂȂ\xA2\x82̂\xC5
// \x83G\x83\x89\x81[\x82͋C\x82ɂ\xB9\x82\xB8\x8E\x9F\x82i\x82\xDE
- notify_verbose_message(pvar,
- "auth-****@opens***** is not supported by remote host.",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "auth-****@opens***** is not supported by remote host.");
return send_pty_request(pvar, c);
}
@@ -7894,7 +7813,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was sent at do_SSH2_adjust_window_size().", LOG_LEVEL_SSHDUMP);
+ logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was sent at do_SSH2_adjust_window_size().");
// \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xCCwindow size\x82𑝂₷
c->local_window = c->local_window_max;
}
@@ -7908,7 +7827,6 @@
buffer_t *msg;
unsigned char *outmsg;
int len;
- char log[128];
// \x82\xB1\x82\xCCchannel\x82ɂ‚\xA2\x82\xC4close\x82𑗐M\x8Dς݂Ȃ瑗\x82\xE7\x82Ȃ\xA2
if (c->state & SSH_CHANNEL_STATE_CLOSE_SENT) {
@@ -7931,8 +7849,7 @@
c->state |= SSH_CHANNEL_STATE_CLOSE_SENT;
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_CLOSE was sent at ssh2_channel_send_close(). local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_CLOSE was sent at ssh2_channel_send_close(). local:%d remote:%d", c->self_id, c->remote_id);
}
}
@@ -8580,7 +8497,6 @@
int id;
unsigned int str_len;
Channel_t *c;
- char log[128];
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -8599,8 +8515,7 @@
return FALSE;
}
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_DATA was received. local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_SSHDUMP);
+ logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was received. local:%d remote:%d", c->self_id, c->remote_id);
// string length
str_len = get_uint32_MSBfirst(data);
@@ -8666,7 +8581,7 @@
Channel_t *c;
int data_type;
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_EXTENDED_DATA was received.", LOG_LEVEL_SSHDUMP);
+ logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_EXTENDED_DATA was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -8740,7 +8655,6 @@
char *data;
int id;
Channel_t *c;
- char log[128];
// \x90ؒf\x8E\x9E\x82ɃT\x81[\x83o\x82\xAA SSH2_MSG_CHANNEL_EOF \x82𑗂\xC1\x82Ă\xAD\x82\xE9\x82̂ŁA\x83`\x83\x83\x83l\x83\x8B\x82\xF0\x89\xF0\x95\xFA\x82\xB7\x82\xE9\x81B(2005.6.19 yutaka)
@@ -8759,8 +8673,7 @@
return FALSE;
}
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_EOF was received. local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_EOF was received. local:%d remote:%d", c->self_id, c->remote_id);
if (c->type == TYPE_PORTFWD) {
FWD_channel_input_eof(pvar, c->local_num);
@@ -8789,7 +8702,7 @@
buffer_t *msg;
unsigned char *outmsg;
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was received.", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -8905,7 +8818,7 @@
finish_send_packet(pvar);
buffer_free(msg);
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at handle_SSH2_channel_open().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at handle_SSH2_channel_open().");
}
} else {
@@ -8925,7 +8838,6 @@
char *data;
int id;
Channel_t *c;
- char log[128];
// \x83R\x83l\x83N\x83V\x83\x87\x83\x93\x90ؒf\x8E\x9E\x82ɁA\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x83t\x83@\x83C\x83\x8B\x82֑|\x82\xAB\x8Fo\x82\xB7\x81B
if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
@@ -8946,8 +8858,7 @@
return FALSE;
}
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_CLOSE was received. local:%d remote:%d", c->self_id, c->remote_id);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_CLOSE was received. local:%d remote:%d", c->self_id, c->remote_id);
if (c->type == TYPE_SHELL || c->type == TYPE_SUBSYSTEM_GEN) {
ssh2_channel_send_close(pvar, c);
@@ -8980,7 +8891,6 @@
return TRUE;
}
-
static BOOL handle_SSH2_channel_request(PTInstVar pvar)
{
int len;
@@ -8993,7 +8903,6 @@
char *emsg = "exit-status";
int estat = 0;
Channel_t *c;
- char log[128];
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
@@ -9019,8 +8928,7 @@
reply = data[0];
data += 1;
- _snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_REQUEST was received. local:%d remote:%d %s reply:%d", c->self_id, c->remote_id, str, reply);
- notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+ logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was received. local:%d remote:%d %s reply:%d", c->self_id, c->remote_id, str, reply);
// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xE9\x82Ȃ\xE7\x82\xCE
if (memcmp(str, emsg, strlen(emsg)) == 0) {
@@ -9054,9 +8962,9 @@
buffer_free(msg);
if (success) {
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_SUCCESS was sent at handle_SSH2_channel_request().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_SUCCESS was sent at handle_SSH2_channel_request().");
} else {
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_FAILURE was sent at handle_SSH2_channel_request().", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_FAILURE was sent at handle_SSH2_channel_request().");
}
}
@@ -9072,7 +8980,7 @@
unsigned int adjust;
Channel_t *c;
- notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was received.", LOG_LEVEL_SSHDUMP);
+ logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was received.");
// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88ȍ~\x82̃y\x83C\x83\x8D\x81[\x83h
data = pvar->ssh_state.payload;
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2017-06-19 12:50:42 UTC (rev 6809)
@@ -846,8 +846,7 @@
SetCustomNotifyIcon(SecureNotifyIcon);
}
- notify_verbose_message(pvar, "Entering secure mode",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Entering secure mode");
}
void notify_closed_connection(PTInstVar pvar, char *send_msg)
@@ -893,7 +892,7 @@
}
}
if (msg[0] != 0) {
- notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
+ logputs(LOG_LEVEL_ERROR, msg);
add_err_msg(pvar, msg);
}
}
@@ -901,7 +900,7 @@
void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect)
{
if (msg[0] != 0) {
- notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
+ logputs(LOG_LEVEL_FATAL, msg);
add_err_msg(pvar, msg);
}
@@ -920,7 +919,7 @@
}
}
-void notify_verbose_message(PTInstVar pvar, char *msg, int level)
+void logputs(int level, char *msg)
{
if (level <= pvar->session_settings.LogLevel) {
char buf[1024];
@@ -956,7 +955,7 @@
vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
va_end(params);
- notify_verbose_message(pvar, buff, level);
+ logputs(level, buff);
}
}
@@ -1014,7 +1013,7 @@
vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
va_end(params);
- notify_verbose_message(pvar, buff, level);
+ logputs(level, buff);
addr = 0;
byte_cnt = 0;
@@ -1026,7 +1025,7 @@
if (byte_cnt == 16) {
format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);
- notify_verbose_message(pvar, buff, level);
+ logputs(level, buff);
addr += 16;
byte_cnt = 0;
@@ -1036,7 +1035,7 @@
if (byte_cnt > 0) {
format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);
- notify_verbose_message(pvar, buff, level);
+ logputs(level, buff);
}
}
}
@@ -1050,8 +1049,8 @@
pvar->session_settings = pvar->settings;
- notify_verbose_message(pvar, "---------------------------------------------------------------------", LOG_LEVEL_VERBOSE);
- notify_verbose_message(pvar, "Initiating SSH session", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "---------------------------------------------------------------------");
+ logputs(LOG_LEVEL_VERBOSE, "Initiating SSH session");
FWDUI_load_settings(pvar);
@@ -1091,8 +1090,7 @@
if (pvar->session_settings.Enabled) {
pvar->socket = INVALID_SOCKET;
- notify_verbose_message(pvar, "Terminating SSH session...",
- LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Terminating SSH session...");
*hooks->Precv = pvar->Precv;
*hooks->Psend = pvar->Psend;
@@ -1656,7 +1654,7 @@
(pvar->ReadIniFile) (fileName, ts);
read_ssh_options(pvar, fileName);
pvar->settings = *pvar->ts_SSH;
- notify_verbose_message(pvar, "Reading INI file", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Reading INI file");
FWDUI_load_settings(pvar);
}
@@ -1665,7 +1663,7 @@
(pvar->WriteIniFile) (fileName, ts);
*pvar->ts_SSH = pvar->settings;
clear_local_settings(pvar);
- notify_verbose_message(pvar, "Writing INI file", LOG_LEVEL_VERBOSE);
+ logputs(LOG_LEVEL_VERBOSE, "Writing INI file");
write_ssh_options(pvar, fileName, pvar->ts_SSH, TRUE);
}
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h 2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/ttxssh.h 2017-06-19 12:50:42 UTC (rev 6809)
@@ -342,7 +342,7 @@
void notify_closed_connection(PTInstVar pvar, char *send_msg);
void notify_nonfatal_error(PTInstVar pvar, char *msg);
void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect);
-void notify_verbose_message(PTInstVar pvar, char *msg, int level);
+void logputs(int level, char *msg);
void logprintf(int level, char *fmt, ...);
void logprintf_hexdump(int level, char *data, int len, char *fmt, ...);