updates.

diff --git a/CHANGES b/CHANGES
index 74492cea9781e4a5de2309c5e54aa2914c42fcb7..27be3f4c2f72d5026b59fe8c4761951af187744b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,15 +1,41 @@
+Sun Apr 22 21:13:28 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * Preliminary SILC Server 1.1 changes committed to apps/silcd/.
+
+       * Added SILC_SKR_USAGE_SERVICE_AUTHORIZATION SKR key usage type.
+         Changed silc_skr_find to have SilcSchedule argument and removed
+         it from silc_skr_[alloc|init].  Affected files are
+         lib/silcskr/silcskr.[ch].
+
+       * Allow NULL id for silc_idcache_add.  Affected file is
+         lib/silcapputil/silcidcache.c.
+
+       * Added silc_packet_stream_is_valid, silc_packet_get_ids and
+         silc_packet_engine_get_streams to lib/silccore/silcpacket.[ch].
+         Fixed also channel message encryption with router-to-router
+         packets.
+
+       * Added silc_id_str2id2 to lib/silccore/silcid.[ch].
+
+       * Added silc_net_get_error_string, silc_net_listener_get_ip and
+         silc_net_listener_get_hostname to lib/silcutil/silcnet.[ch].
+
 Tue Apr 10 15:55:42 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
 
        * Add option --enable-silc-plugin.  Affected files are
          apps/irssi/configure.{ad,in}
+
        * Only compile the SILC Plugin if required.  Affected files are
          apps/irssi/src/Makefile.am, apps/irssi/src/fe-common/Makefile.am
+
        * Conditionally build the SILC Plugin.  Affected files are
-         apps/irssi/src/silc/core/Makefile.am, 
+         apps/irssi/src/silc/core/Makefile.am,
          apps/irssi/src/fe-common/silc/Makefile.am
+
        * Backout delayed protocol exit and replace with a lame busy
          wait.  Affected files are apps/irssi/src/fe-text/silc.c,
          apps/irssi/src/silc/core/silc-core.c
+
        * Fix key generation for SILC Plugin.  Affected file
          apps/irssi/src/silc/core/clientutil.c
 
@@ -17,6 +43,7 @@ Tue Apr 10 12:40:19 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
 
        * Only pass -rpath to libtool when building shared libraries.
          Affected file lib/Makefile.ad
+
        * Removing the stray "s" in configure.ad
 
 Sat Mar 24 19:13:58 CET 2007  Jochen Eisinger <coffee@silcnet.org>
@@ -28,7 +55,7 @@ Sun Mar 18 15:54:10 EET 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Added SILC Client setting /set nickname_format that specifies
          the nickname format string.  Changed default nickname format
-         string to "%n#%a".  Affected file is 
+         string to "%n#%a".  Affected file is
           apps/irssi/src/silc/core/silc-core.c, apps/irssi/silc.conf.
 
        * Fixed nickname parsing with WHOIS command to accept formatted
@@ -91,7 +118,7 @@ Sun Mar 11 13:50:53 CET 2007  Jochen Eisinger <coffee@silcnet.org>
 
 Tue Feb 27 17:07:34 EET 2007  Pekka Riikonen <priikone@silcnet.org>
 
-       * Added silc_thread_yield.  Affected file is 
+       * Added silc_thread_yield.  Affected file is
          lib/silcutil/silcmutex.h.
 
 Wed Feb 21 17:01:01 EET 2007  Pekka Riikonen <priikone@silcnet.org>
@@ -110,7 +137,7 @@ Tue Feb 20 08:31:28 EET 2007  Pekka Riikonen <priikone@silcnet.org>
 Mon Feb 19 16:06:27 EET 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed client to properly abort TCP stream creation when
-         giving /QUIT.  Affected file 
+         giving /QUIT.  Affected file
          apps/irssi/src/silc/core/silc-servers.c.
 
        * Fixed several connecting aborting crashes from the client

diff --git a/TODO b/TODO
index 0286afdc2eee38c60e5a20dd9c327db88845023c..627b4b0d7fd46a09261c8d91bca621d09ba5ab0b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,16 +11,20 @@ apps/silcd, The SILC Server ****PARTLY DONE****
 
  o Port all code to use SILC Toolkit 1.1 APIs.
 
- o Remove protocol.[ch].
+ o Remove protocol.[ch].  ***DONE
 
  o Rewrite connecting accepting.
 
- o Rewrite async connecting
+ o Rewrite async connecting.
 
  o Connecting from SILC router to SILC server.
 
  o Rewrite rehash, HUP.
 
+ o Test backup router resuming protocol.
+
+ o Check all packet receive routines that they call silc_packet_free.
+
  o Add Web statistics module using lib/silchttp.  Give out server
    statistics.
 
@@ -157,6 +161,8 @@ lib/silcskr
 lib/silcske/silcske.[ch]       ***PARTLY DONE****
 ========================
 
+ o Responder rekey
+
  o Ratelimit to UDP/IP transport for incoming packets.
 
  o IV Included flag support in SKE (***DONE)

diff --git a/distdir/default b/distdir/default
index 9915fc74f6cffe7c5dee20b9c0a24f5ec5b993b3..9c3a9060884bb9a6417e5c83191872d5faefb3ba 100644 (file)
--- a/distdir/default
+++ b/distdir/default
@@ -10,7 +10,7 @@ option no-dist
 # Default distribution for preparing raw CVS sources.
 inherit common
 inherit client
-#inherit server
+inherit server
 inherit toolkit
 
 define SILC_DIST_INPLACE

diff --git a/distdir/server b/distdir/server
index 173c077be42faab84b8a561a9f16dc47f2f2ee48..fd3f71d57f647c416ce09caaeead36842a6cc277 100644 (file)
--- a/distdir/server
+++ b/distdir/server
@@ -4,7 +4,7 @@ bug-report silc-devel@lists.silcnet.org
 
 inherit common
 define SILC_DIST_SERVER
-define SILC_DIST_SERVERLIB
+#define SILC_DIST_SERVERLIB
 define SILC_DIST_HTTP
 undef SILC_DIST_SFTP