From 4dd63e3840820adc5dd99d1cde26676d1694d863 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 6 Apr 2005 13:56:54 +0000 Subject: [PATCH] Better error messages. --- CHANGES | 5 +++++ apps/silcd/command_reply.c | 21 ++++++++++++++++----- apps/silcd/packet_receive.c | 4 ++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 1b555aac..5f5d5587 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +Wed Apr 6 16:56:53 EEST 2005 Pekka Riikonen + + * Added some better error messages. Affected file + silcd/command_reply.c and packet_receive.c. + Wed Apr 6 09:10:31 CEST 2005 Pekka Riikonen * Added pkg-config .pc file creation for silc core library diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c index bff83174..5213596d 100644 --- a/apps/silcd/command_reply.c +++ b/apps/silcd/command_reply.c @@ -245,7 +245,9 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd) nickname = silc_identifier_check(nick, strlen(nick), SILC_STRING_UTF8, 128, NULL); if (!nickname) { - SILC_LOG_ERROR(("Malformed nickname received in WHOIS reply")); + SILC_LOG_ERROR(("Malformed nickname '%s' received in WHOIS reply " + "from %s", + cmd->sock->hostname ? cmd->sock->hostname : "", nick)); silc_free(nick); silc_free(servername); return FALSE; @@ -257,7 +259,9 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd) silc_free(tmp); silc_free(nick); silc_free(servername); - SILC_LOG_ERROR(("Malformed username received in WHOIS reply")); + SILC_LOG_ERROR(("Malformed username '%s' received in WHOIS reply " + "from %s", + cmd->sock->hostname ? cmd->sock->hostname : "", tmp)); return FALSE; } silc_free(tmp); @@ -521,7 +525,9 @@ silc_server_command_reply_whowas_save(SilcServerCommandReplyContext cmd) nickname = silc_identifier_check(nick, strlen(nick), SILC_STRING_UTF8, 128, NULL); if (!nickname) { - SILC_LOG_ERROR(("Malformed nickname received in WHOWAS reply")); + SILC_LOG_ERROR(("Malformed nickname '%s' received in WHOWAS reply " + "from %s", + cmd->sock->hostname ? cmd->sock->hostname : "", nick)); silc_free(nick); silc_free(servername); return FALSE; @@ -533,7 +539,9 @@ silc_server_command_reply_whowas_save(SilcServerCommandReplyContext cmd) silc_free(tmp); silc_free(nick); silc_free(servername); - SILC_LOG_ERROR(("Malformed username received in WHOWAS reply")); + SILC_LOG_ERROR(("Malformed username '%s' received in WHOWAS reply " + "from %s", + cmd->sock->hostname ? cmd->sock->hostname : "", tmp)); return FALSE; } silc_free(tmp); @@ -689,7 +697,10 @@ silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd) name = silc_identifier_check(nick, strlen(nick), SILC_STRING_UTF8, 128, NULL); if (!name) { - SILC_LOG_ERROR(("Malformed nickname received in IDENTIFY reply")); + SILC_LOG_ERROR(("Malformed nickname '%s' received in IDENTIFY reply " + "from %s", + cmd->sock->hostname ? + cmd->sock->hostname : "", nick)); return FALSE; } diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c index 9c2378bf..97340d5f 100644 --- a/apps/silcd/packet_receive.c +++ b/apps/silcd/packet_receive.c @@ -2345,8 +2345,8 @@ SilcClientEntry silc_server_new_client(SilcServer server, if (!nicknamec) { silc_free(username); silc_free(realname); - SILC_LOG_ERROR(("Client %s (%s) sent bad username string, closing " - "connection", sock->hostname, sock->ip)); + SILC_LOG_ERROR(("Client %s (%s) sent bad username string '%s', closing " + "connection", sock->hostname, sock->ip, username)); silc_server_disconnect_remote(server, sock, SILC_STATUS_ERR_INCOMPLETE_INFORMATION, NULL); -- 2.43.0