diff options
author | Gangadhar Sandrani <gangadhar.sandrani@gmail.com> | 2014-04-22 09:35:33 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2014-04-22 09:35:33 +0200 |
commit | d6e6a453fc2b362174e9e0a8669574283b515245 (patch) | |
tree | 81dd0ad1d15f9b6b31b4f6883ba315afc71b4ee4 | |
parent | eb86fd8cdfd69f46c60bf0885a2125285e4a22b3 (diff) | |
download | libssh-d6e6a453fc2b362174e9e0a8669574283b515245.tar.gz libssh-d6e6a453fc2b362174e9e0a8669574283b515245.tar.xz libssh-d6e6a453fc2b362174e9e0a8669574283b515245.zip |
log: Fix log levels.
Signed-off-by: Gangadhar Sandrani <gangadhar.sandrani@gmail.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r-- | src/channels.c | 10 | ||||
-rw-r--r-- | src/client.c | 7 | ||||
-rw-r--r-- | src/config.c | 2 | ||||
-rw-r--r-- | src/packet.c | 2 | ||||
-rw-r--r-- | src/packet1.c | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/src/channels.c b/src/channels.c index dd91bae1..71ef3901 100644 --- a/src/channels.c +++ b/src/channels.c @@ -507,7 +507,7 @@ SSH_PACKET_CALLBACK(channel_rcv_data){ } len = ssh_string_len(str); - SSH_LOG(SSH_LOG_PROTOCOL, + SSH_LOG(SSH_LOG_PACKET, "Channel receiving %" PRIdS " bytes data in %d (local win=%d remote win=%d)", len, is_stderr, @@ -535,7 +535,7 @@ SSH_PACKET_CALLBACK(channel_rcv_data){ channel->local_window = 0; /* buggy remote */ } - SSH_LOG(SSH_LOG_PROTOCOL, + SSH_LOG(SSH_LOG_PACKET, "Channel windows are now (local win=%d remote win=%d)", channel->local_window, channel->remote_window); @@ -870,7 +870,7 @@ int channel_default_bufferize(ssh_channel channel, void *data, int len, return -1; } - SSH_LOG(SSH_LOG_RARE, + SSH_LOG(SSH_LOG_PACKET, "placing %d bytes into channel buffer (stderr=%d)", len, is_stderr); if (is_stderr == 0) { /* stdout */ @@ -1405,7 +1405,7 @@ static int channel_write_common(ssh_channel channel, return SSH_ERROR; } - SSH_LOG(SSH_LOG_RARE, + SSH_LOG(SSH_LOG_PACKET, "channel_write wrote %ld bytes", (long int) effectivelen); channel->remote_window -= effectivelen; @@ -2810,7 +2810,7 @@ int ssh_channel_read_timeout(ssh_channel channel, * We may have problem if the window is too small to accept as much data * as asked */ - SSH_LOG(SSH_LOG_PROTOCOL, + SSH_LOG(SSH_LOG_PACKET, "Read (%d) buffered : %d bytes. Window: %d", count, buffer_get_rest_len(stdbuf), diff --git a/src/client.c b/src/client.c index af525c1e..c0a9d871 100644 --- a/src/client.c +++ b/src/client.c @@ -506,7 +506,12 @@ int ssh_connect(ssh_session session) { ssh_set_error(session, SSH_FATAL, "Couldn't apply options"); return SSH_ERROR; } - SSH_LOG(SSH_LOG_RARE,"libssh %s, using threading %s", ssh_copyright(), ssh_threads_get_type()); + + SSH_LOG(SSH_LOG_PROTOCOL, + "libssh %s, using threading %s", + ssh_copyright(), + ssh_threads_get_type()); + session->ssh_connection_callback = ssh_client_connection_callback; session->session_state=SSH_SESSION_STATE_CONNECTING; ssh_socket_set_callbacks(session->socket,&session->socket_callbacks); diff --git a/src/config.c b/src/config.c index 3d8dd414..4c966ed3 100644 --- a/src/config.c +++ b/src/config.c @@ -383,7 +383,7 @@ int ssh_config_parse_file(ssh_session session, const char *filename) { return 0; } - SSH_LOG(SSH_LOG_RARE, "Reading configuration data from %s", filename); + SSH_LOG(SSH_LOG_PACKET, "Reading configuration data from %s", filename); parsing = 1; while (fgets(line, sizeof(line), f)) { diff --git a/src/packet.c b/src/packet.c index bac4a0fc..1e267275 100644 --- a/src/packet.c +++ b/src/packet.c @@ -343,7 +343,7 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user) return processed; case PACKET_STATE_PROCESSING: - SSH_LOG(SSH_LOG_RARE, "Nested packet processing. Delaying."); + SSH_LOG(SSH_LOG_PACKET, "Nested packet processing. Delaying."); return 0; } diff --git a/src/packet1.c b/src/packet1.c index 3284f17a..eac70084 100644 --- a/src/packet1.c +++ b/src/packet1.c @@ -241,7 +241,7 @@ int ssh_packet_socket_callback1(const void *data, size_t receivedlen, void *user return processed; case PACKET_STATE_PROCESSING: - SSH_LOG(SSH_LOG_RARE, "Nested packet processing. Delaying."); + SSH_LOG(SSH_LOG_PACKET, "Nested packet processing. Delaying."); return 0; } |