From c3d40c8d4671c59414c737b00cc55eb5d44992c9 Mon Sep 17 00:00:00 2001 From: Test_User Date: Wed, 19 Jun 2024 07:27:15 -0400 Subject: More logging, CI fix --- .woodpecker/.debian.yaml | 2 +- protocols/inspircd2.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.debian.yaml b/.woodpecker/.debian.yaml index c3862b3..0da6f9a 100644 --- a/.woodpecker/.debian.yaml +++ b/.woodpecker/.debian.yaml @@ -8,6 +8,6 @@ steps: image: debian:sid commands: - apt update -y - - apt install --no-install-recommends -y binutils gcc libssl-dev pkg-config curl libgnutls*-dev ca-certificates + - apt install --no-install-recommends -y binutils make gcc libssl-dev pkg-config curl libgnutls*-dev ca-certificates - curl -o config.c 'https://paste.sr.ht/blob/09d145e35ce3b058e02f5a0c664046fb66ba67e3' - make GNUTLS_SERVER=1 OPENSSL_SERVER=1 INSPIRCD2_PROTOCOL=1 diff --git a/protocols/inspircd2.c b/protocols/inspircd2.c index 6541201..5a017af 100644 --- a/protocols/inspircd2.c +++ b/protocols/inspircd2.c @@ -210,6 +210,23 @@ void * inspircd2_protocol_connection(void *type) { char err; new_len = networks[net].recv(handle, data, sizeof(data), &err); if (err >= 2) { // Connection closed, or some uncorrected error + if (err == 2) { + if (ready) { + WRITES(2, STRING("[InspIRCd v2] [")); + WRITES(2, config->name); + WRITES(2, STRING("] Disconnected: recv failed (connection closed).\r\n\n")); + } else { + WRITES(2, STRING("[InspIRCd v2] [unidentified server] Disconnected: recv failed (connection closed).\r\n\n")); + } + } else { + if (ready) { + WRITES(2, STRING("[InspIRCd v2] [")); + WRITES(2, config->name); + WRITES(2, STRING("] Disconnected: recv failed (unknown network error).\r\n\n")); + } else { + WRITES(2, STRING("[InspIRCd v2] [unidentified server] Disconnected: recv failed (unknown network error).\r\n\n")); + } + } goto inspircd2_protocol_handle_connection_close; } else if (err == 1) { // Timed out if (ready) { -- cgit v1.2.3