Fixed QoS parsing in connparam blocks.

diff --git a/CHANGES b/CHANGES
index 36e1d6d46248f91f1557c60f827d24495d1a836e..acee17a84ee3db6d9188acb0255b1822ee86bf0e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,24 @@
+Tue Nov 23 16:54:35 CET 2004  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed Win32 scheduler to not stuck anymore.  A patch from
+         Juha Räsänen.  Affected file is
+         lib/silcutil/win32/silcwin32schedule.c.
+
+       * Fixed QoS parsing for connection blocks in server.  Affected
+         file is silcd/serverconfig.c.
+
+       * Fixed server statistics increasing in server.  Affected file
+         is silcd/server.c.
+
+       * The CLOSE command now marks backup router as self disconnected
+         to avoid resuming problems.  Affected file silcd/command.c.
+
 Wed Sep 22 19:46:32 CEST 2004  Patrik Weiskircher <pat@icore.at>
 
-  * When using silc_net_create_connection[_async], and your system can
-    create IPv6 sockets, it will try to connect to the IPv6 host. Now it
-    tries to connect to an IPv4 host if IPv6 fails. Affected file
-    lib/silcutil/unix/silcunixnet.c
+       * When using silc_net_create_connection[_async], and your system can
+         create IPv6 sockets, it will try to connect to the IPv6 host. 
+         Now it tries to connect to an IPv4 host if IPv6 fails. Affected 
+         file lib/silcutil/unix/silcunixnet.c
 
 Fri Jun 18 19:26:58 CEST 2004  Pekka Riikonen <priikone@silcnet.org>
 

diff --git a/apps/silcd/serverconfig.c b/apps/silcd/serverconfig.c
index 45ef86f720ad91ca23d322d5379cc9c2fc8e5155..ae67475b57ae78d6376e148c50519563f8e49074 100644 (file)
--- a/apps/silcd/serverconfig.c
+++ b/apps/silcd/serverconfig.c
@@ -1261,11 +1261,11 @@ static const SilcConfigTable table_connparam[] = {
   { "version_software",               SILC_CONFIG_ARG_STR,    fetch_connparam, NULL },
   { "version_software_vendor", SILC_CONFIG_ARG_STR,    fetch_connparam,        NULL },
   { "anonymous",               SILC_CONFIG_ARG_TOGGLE, fetch_connparam,        NULL },
-  { "qos",                    SILC_CONFIG_ARG_TOGGLE,  fetch_generic,  NULL },
-  { "qos_rate_limit",          SILC_CONFIG_ARG_INT,    fetch_generic,  NULL },
-  { "qos_bytes_limit",         SILC_CONFIG_ARG_INT,    fetch_generic,  NULL },
-  { "qos_limit_sec",           SILC_CONFIG_ARG_INT,    fetch_generic,  NULL },
-  { "qos_limit_usec",          SILC_CONFIG_ARG_INT,    fetch_generic,  NULL },
+  { "qos",                    SILC_CONFIG_ARG_TOGGLE, fetch_connparam, NULL },
+  { "qos_rate_limit",          SILC_CONFIG_ARG_INT,    fetch_connparam,        NULL },
+  { "qos_bytes_limit",         SILC_CONFIG_ARG_INT,    fetch_connparam,        NULL },
+  { "qos_limit_sec",           SILC_CONFIG_ARG_INT,    fetch_connparam,        NULL },
+  { "qos_limit_usec",          SILC_CONFIG_ARG_INT,    fetch_connparam,        NULL },
   { 0, 0, 0, 0 }
 };