updates.

diff --git a/CHANGES b/CHANGES
index e3e718fc513311f4145bb569e0ad19c1c9c00128..f96b88fb3de08c9d9016393e56a29c53b426cda8 100644 (file)
--- 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 8947435ee9a033e8b9189bdbfb0e93e29f50eeb6..fed4e9c0aaa048c04c7a48e565a91f6705a8e60f 100644 (file)
--- 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;
   }