updates

diff --git a/CHANGES b/CHANGES
index 79fbf61dff97d6bc6bbd1fc98440452721cfaa46..ca81ae067f9a649433393c8823d49adf1039c236 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,20 @@
+Tue Jul 25 20:46:13 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Fixed the private message sending between server and router.
+         The private message sending should now work inside a cell.
+
+       * Added silc_server_replace_id into server.[ch] to replace
+         existing ID in the SILC network.
+
+       * Added silc_idlist_find_server_by, silc_idlist_replace_client_id
+         and silc_idlist_replace_server_id into idlist.[ch] in server.
+
+Mon Jul 24 18:33:31 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Fixed the server to server connections.  Server can again now
+         connect to router.  Router to router connections probably does
+         not work just yet.
+
 Thu Jul 20 13:15:01 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Added dynamic protocol registering support.  Now protocols can

diff --git a/TODO b/TODO
index 4543660f2c610e42ccd110e6b3d15f2c674fd7a0..464e8704a248929347140396de87683572ef48c1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -82,10 +82,6 @@ TODO In SILC Client
    Currently there cannot be private keys for channels.  Normal channel
    keys (generated by server) are used.  This is required by the protocol.
 
- o Public and private key generation is now done everytime the program
-   is run.  Now, this is only for testing period as I've been lazy to
-   do it any better for now.  This must be fixed.
-
  o I guess, public key authentication (when connecting to a server)
    is not working currently.  It is just matter of loading the keys
    from file and using them (see corresponding code in server, it should
@@ -133,7 +129,7 @@ TODO In SILC Server
    own resolver stuff (through scheduler, if possible without writing
    too much own stuff) or use threads.
 
- o Lenght of the packet processing timeouts needs to be checked whether
+ o Length of the packet processing timeouts needs to be checked whether
    they are too short or too long.  I haven't really tested whether they
    are suitable.  They should be tested on high load which I haven't done
    at all yet.
@@ -141,17 +137,9 @@ TODO In SILC Server
  o INVITE command must set the channel's invite list if channel is 
    invite-only channel.
 
- o Public and private key generation is now done everytime the program
-   is run.  Now, this is only for testing period as I've been lazy to
-   do it any better for now.  This must be fixed.
-
  o Server says that it is able to listen on multiple ports but currently
    that is bogus.  It can, but internals are for single server.
 
- o Command lagging must implemented.  Those commands (all currently) that
-   has the LAG flag set they must not be allowed to be executed more than
-   once, say, in 2 seconds.
-
  o Command flag usage in general is not implemented yet.
 
  o Client history must be implemented.  Protocol says that server must
@@ -162,10 +150,6 @@ TODO In SILC Server
 
  o Protocol execution timeouts are hard coded, should be configurable.
 
- o Channel message sending routines uses a lot of common code.  Should
-   create a common function for those instead of writing the same code
-   again everytime, as done now.
-
  o serverutil.c I guess should be created for util-like functions that
    now resides in server.c, which is getting too big.
 

diff --git a/apps/silcd/server_version.c b/apps/silcd/server_version.c
index b80d2ec9f3ba90f1c04f5dc7003f1593284f4ea5..d648e8a69f2dd9bc80bfafa716d5dc556b4008ec 100644 (file)
--- a/apps/silcd/server_version.c
+++ b/apps/silcd/server_version.c
@@ -20,4 +20,4 @@
 
 #include "serverincludes.h"
 
-const char server_version[] = "19072000";
+const char server_version[] = "26072000";

diff --git a/configure.in b/configure.in
index 6520cda84ba4288a4caf54f1d2f44710132cd367..17eccb52dbcbe3e3463ad28f6d791a5bb0a18b1e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ case "$target" in
     ;;
 esac
 
-AM_INIT_AUTOMAKE(silc, 19072000)
+AM_INIT_AUTOMAKE(silc, 26072000)
 AC_PREREQ(2.3)
 AM_CONFIG_HEADER(includes/silcdefs.h)
 

diff --git a/doc/draft-riikonen-silc-pp-00.nroff b/doc/draft-riikonen-silc-pp-00.nroff
index 1ed4915b805bdf25c312706fd9e3581eeffbea70..a77583b52feeb08e203c01769cc6accc8b0f85db 100644 (file)
--- a/doc/draft-riikonen-silc-pp-00.nroff
+++ b/doc/draft-riikonen-silc-pp-00.nroff
@@ -448,7 +448,8 @@ List of SILC Packet types are defined as follows.
           This packet is sent when an error occurs.  Server may
           send this packet.  Client never sends this packet.  The
           client may entirely ignore the packet, however, server is
-          most likely to take action anyway.
+          most likely to take action anyway.  This packet may be sent
+          to entity that is indirectly connected to the sender.
 
           Payload of the packet:  See section 2.3.7 Error Payload.
 

diff --git a/includes/version.h b/includes/version.h
index 1ba132b3dcb02de38f4c9f8b22e34031fee41008..d724ec3293e89867ce1c2e4b57e1364fe2ba7990 100644 (file)
--- a/includes/version.h
+++ b/includes/version.h
@@ -33,8 +33,8 @@ typedef unsigned char SilcVersion;
 #define SILC_VERSION_1 '\1'
 
 /* SILC version string */
-const char *silc_version = "19072000";
-const char *silc_version_string = "SILC-1.0-19072000";
+const char *silc_version = "26072000";
+const char *silc_version_string = "SILC-1.0-26072000";
 const char *silc_name = "SILC";
 const char *silc_fullname = "Secure Internet Live Conferencing";