From 74fd660c1ca27049b09e715ce324f86f3609fdd5 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Fri, 22 Nov 2002 20:07:41 +0000
Subject: [PATCH] 	Channel/Private Message unify updates.

---
 CHANGES                  | 33 +++++++++++++++++++++++++++++++++
 TODO                     |  8 +++++++-
 apps/silcd/packet_send.c | 10 +++++-----
 apps/silcd/server.c      |  2 --
 configure.in.pre         |  1 +
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 739dd96f..69d1d07f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,36 @@
+Fri Nov 22 18:34:20 EET 2002  Pekka Riikonen <priikone@silcnet.org>
+
+	* Added support to backup router protocol for backup to tell
+	  normal server that it cannot use the backup router as primary
+	  because the primary isn't really down.  Updated protocol
+	  specs.
+
+	* Added support for primary router to tell backup router that
+	  resuming is not possible because the backup really isn't primary
+	  in the cell.  For example if backup disconnected itself the
+	  resuming is not allowed since the primary really did not
+	  go down.  Updated protocol specs.
+
+	* Removed MARS from crypto library.
+
+	* Defined the CTR mode and Randomized CBC mode in SILC.  The
+	  CTR mode is RECOMMENDED now in specification.  Defined also
+	  Serpent cipher as optional cipher.  Updated the protocol specs.
+
+Thu Nov 21 12:43:28 EET 2002  Pekka Riikonen <priikone@silcnet.org>
+
+	* Added support for inviting/banning by IP/MASK, public key,
+	  and explicit Client ID.  Redefined the command and notify
+	  types to allow easier forwards support for other methods
+	  of inviting/banning.  Updated protocol specs.
+
+	* Remove the client from channel's invite lists if the client
+	  is kicked or killed.  Updated protocol specs.
+
+	* Unified the Channel Message Payload and Private Message
+	  into one Message Payload.  Updated protocol specs and
+	  implemented.
+
 Tue Nov 19 22:30:56 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 
 	* Don't wait for EOF after socket error has occurred, but
diff --git a/TODO b/TODO
index 458afafe..2e639ffb 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,8 @@ TODO for Irssi SILC Client 1.0
 
  o SILC protocol version 1.2 integration
 
+ o Signed message payload handling
+
  o Testing - See test plan:
      http://silcnet.org/docs/silc-client-1.0-test.pdf
      http://silcnet.org/docs/silc-client-1.0-test.ps
@@ -15,7 +17,11 @@ TODO for Irssi SILC Client 1.0
 TODO for SILC Server 1.0
 ========================
 
- o WHOIS search by public key in attrs.
+ o New INVITE and BAN commands and notify types.
+
+ o Remove client from invite lists in KICKED and KILLED.
+
+ o 1.2 backup router support
 
  o Backup router related issues:
 
diff --git a/apps/silcd/packet_send.c b/apps/silcd/packet_send.c
index f9a7b2fe..cc0bf758 100644
--- a/apps/silcd/packet_send.c
+++ b/apps/silcd/packet_send.c
@@ -760,8 +760,8 @@ silc_server_packet_relay_to_channel_encrypt(SilcServer server,
     }
 
     memcpy(iv, data + (data_len - iv_len - mac_len), iv_len);
-    silc_channel_message_payload_encrypt(data, data_len - iv_len, iv, iv_len,
-					 channel->channel_key, channel->hmac);
+    silc_message_payload_encrypt(data, data_len - iv_len, iv, iv_len,
+				 channel->channel_key, channel->hmac);
   }
 
   return TRUE;
@@ -937,9 +937,9 @@ void silc_server_packet_relay_to_channel(SilcServer server,
 	  memcpy(tmp, data, data_len);
 
 	  /* Decrypt the channel message (we don't check the MAC) */
-	  silc_channel_message_payload_decrypt(tmp, data_len,
-					       channel->channel_key,
-					       channel->hmac, FALSE);
+	  silc_message_payload_decrypt(tmp, data_len, FALSE, FALSE,
+				       channel->channel_key,
+				       channel->hmac, FALSE);
 
 	  /* Now re-encrypt and send it to the router */
 	  silc_server_packet_send_srcdest(server, sock,
diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index f54f2169..c4af351c 100644
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -3204,8 +3204,6 @@ void silc_server_free_sock_user_data(SilcServer server,
       } else if (backup_router) {
 	SILC_LOG_INFO(("Enabling the use of backup router %s",
 		       backup_router->server_name));
-	SILC_LOG_DEBUG(("Enabling the use of backup router %s",
-			backup_router->server_name));
 
 	/* Mark this connection as replaced */
 	silc_server_backup_replaced_add(server, user_data->id,
diff --git a/configure.in.pre b/configure.in.pre
index 03da5967..0e37c1a4 100644
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -60,6 +60,7 @@ if test "$GCC"; then
   CFLAGS="-Wall -finline-functions $CFLAGS"
 fi
 
+#
 # Program checking
 #
 AC_PROG_INSTALL
-- 
2.24.0