From: Pekka Riikonen <priikone@silcnet.org>
Date: Fri, 6 Jul 2001 06:40:58 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: robodoc-323~107
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=897cdbe24ca3ac469d5ffe51ce6db52236b1e6cd;p=silc.git

	updates.
---

diff --git a/CHANGES b/CHANGES
index e3e718fc..f96b88fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Fri Jul  6 09:39:35 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+	* Do not show the error "Error receiving packet bla bla"
+	  in server if it really was not an error (-2 means that reading
+	  is pending).  Affected file silcd/server.c.
+
 Thu Jul  5 21:22:32 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
 
 	* Fixed a possible crash in silc_server_remove_clients_by_server
diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 8947435e..fed4e9c0 100644
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -1421,12 +1421,14 @@ SILC_TASK_CALLBACK(silc_server_packet_process)
   /* Read some data from connection */
   ret = silc_packet_receive(sock);
   if (ret < 0) {
-    SILC_LOG_ERROR(("Error receiving packet from connection "
-		    "%s:%d [%s]", sock->hostname, sock->port,  
-		    (sock->type == SILC_SOCKET_TYPE_UNKNOWN ? "Unknown" :
-		     sock->type == SILC_SOCKET_TYPE_CLIENT ? "Client" :
-		     sock->type == SILC_SOCKET_TYPE_SERVER ? "Server" :
-		     "Router")));
+
+    if (ret == -1)
+      SILC_LOG_ERROR(("Error receiving packet from connection "
+		      "%s:%d [%s]", sock->hostname, sock->port,  
+		      (sock->type == SILC_SOCKET_TYPE_UNKNOWN ? "Unknown" :
+		       sock->type == SILC_SOCKET_TYPE_CLIENT ? "Client" :
+		       sock->type == SILC_SOCKET_TYPE_SERVER ? "Server" :
+		       "Router")));
     return;
   }