From 17c2e1bdddb70a81209666862d3655378871ed15 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Mon, 7 Sep 2015 09:13:04 +0200 Subject: packet: Improve logging output Signed-off-by: Aris Adamantiadis Reviewed-by: Andreas Schneider --- src/packet.c | 2 ++ src/socket.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/packet.c b/src/packet.c index f4ed8fac..46b54c75 100644 --- a/src/packet.c +++ b/src/packet.c @@ -367,6 +367,8 @@ static void ssh_packet_socket_controlflow_callback(int code, void *userdata) ssh_channel channel; if (code == SSH_SOCKET_FLOW_WRITEWONTBLOCK) { + SSH_LOG(SSH_LOG_TRACE, "sending channel_write_wontblock callback"); + /* the out pipe is empty so we can forward this to channels */ it = ssh_list_get_iterator(session->channels); while (it != NULL) { diff --git a/src/socket.c b/src/socket.c index 022c9a76..9e928bed 100644 --- a/src/socket.c +++ b/src/socket.c @@ -227,6 +227,11 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, if (!ssh_socket_is_open(s)) { return -1; } + SSH_LOG(SSH_LOG_TRACE, "Poll callback on socket %d (%s%s%s), out buffer %d",fd, + (revents & POLLIN) ? "POLLIN ":"", + (revents & POLLOUT) ? "POLLOUT ":"", + (revents & POLLERR) ? "POLLERR":"", + buffer_get_rest_len(s->out_buffer)); if (revents & POLLERR || revents & POLLHUP) { /* Check if we are in a connecting state */ if (s->state == SSH_SOCKET_CONNECTING) { @@ -334,6 +339,7 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, ssh_socket_nonblocking_flush(s); } else if (s->callbacks && s->callbacks->controlflow) { /* Otherwise advertise the upper level that write can be done */ + SSH_LOG(SSH_LOG_TRACE,"sending control flow event"); s->callbacks->controlflow(SSH_SOCKET_FLOW_WRITEWONTBLOCK, s->callbacks->userdata); } -- cgit v1.2.3