From 230e96803ef1a3428e9b6a237a6b538207af82cd Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 17 Aug 2020 16:10:43 +0200 Subject: nDPIsrvd: log ip:port for distributor connection fails Signed-off-by: Toni Uhlig --- nDPIsrvd.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/nDPIsrvd.c b/nDPIsrvd.c index 7c6455593..f5a038b5a 100644 --- a/nDPIsrvd.c +++ b/nDPIsrvd.c @@ -35,7 +35,8 @@ struct remote_desc enum ev_type type; int fd; struct io_buffer buf; - union { + union + { struct { int json_sockfd; @@ -539,21 +540,31 @@ int main(int argc, char ** argv) if (bytes_written < 0 || errno != 0) { syslog(LOG_DAEMON | LOG_ERR, - "Distributor connection closed, send failed: %s", + "Distributor connection to %.*s:%u closed, send failed: %s", + (int)sizeof(remotes.desc[i].event_serv.peer_addr), + remotes.desc[i].event_serv.peer_addr, + ntohs(remotes.desc[i].event_serv.peer.sin_port), strerror(errno)); disconnect_client(epollfd, &remotes.desc[i]); continue; } if (bytes_written == 0) { - syslog(LOG_DAEMON, "Distributor connection closed during write"); + syslog(LOG_DAEMON, + "Distributor connection to %.*s:%u closed during write", + (int)sizeof(remotes.desc[i].event_serv.peer_addr), + remotes.desc[i].event_serv.peer_addr, + ntohs(remotes.desc[i].event_serv.peer.sin_port)); disconnect_client(epollfd, &remotes.desc[i]); continue; } if ((size_t)bytes_written < remotes.desc[i].buf.used) { syslog(LOG_DAEMON, - "Distributor write less than expected: %zd < %zu", + "Distributor wrote less than expected to %.*s:%u: %zd < %zu", + (int)sizeof(remotes.desc[i].event_serv.peer_addr), + remotes.desc[i].event_serv.peer_addr, + ntohs(remotes.desc[i].event_serv.peer.sin_port), bytes_written, remotes.desc[i].buf.used); memmove(remotes.desc[i].buf.ptr, -- cgit v1.2.3