Merge commit 'origin/silc.1.1.branch'
[silc.git] / apps / silcd / packet_send.c
index 14e46bd5cf53e9f82feae2a0191cd4b04a174cca..efc334cd1069803872a5df09a4eef7ccf511d821 100644 (file)
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2002 Pekka Riikonen
+  Copyright (C) 1997 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
 */
-/*
- * Server packet routines to send packets. 
- */
-/* $Id$ */
 
 #include "serverincludes.h"
 #include "server_internal.h"
 
-/* Routine that sends packet or marks packet to be sent. This is used
-   directly only in special cases. Normal cases should use
-   silc_server_packet_send. Returns < 0 error. */
-
-int silc_server_packet_send_real(SilcServer server,
-                                SilcSocketConnection sock,
-                                bool force_send)
-{
-  int ret;
-
-  /* If disconnecting, ignore the data */
-  if (SILC_IS_DISCONNECTING(sock))
-    return -1;
-
-  /* If rekey protocol is active we must assure that all packets are
-     sent through packet queue. */
-  if (SILC_SERVER_IS_REKEY(sock))
-    force_send = FALSE;
-
-  /* If outbound data is already pending do not force send */
-  if (SILC_IS_OUTBUF_PENDING(sock))
-    force_send = FALSE;
-
-  /* Send the packet */
-  ret = silc_packet_send(sock, force_send);
-  if (ret != -2)
-    return ret;
-
-  /* Mark that there is some outgoing data available for this connection. 
-     This call sets the connection both for input and output (the input
-     is set always and this call keeps the input setting, actually). 
-     Actual data sending is performed by silc_server_packet_process. */
-  SILC_SET_CONNECTION_FOR_OUTPUT(server->schedule, sock->sock);
-
-  /* Mark to socket that data is pending in outgoing buffer. This flag
-     is needed if new data is added to the buffer before the earlier
-     put data is sent to the network. */
-  SILC_SET_OUTBUF_PENDING(sock);
-
-  return 0;
-}
+/* Send packet to remote connection */
 
-/* Assembles a new packet to be sent out to network. This doesn't actually
-   send the packet but creates the packet and fills the outgoing data
-   buffer and marks the packet ready to be sent to network. However, If 
-   argument force_send is TRUE the packet is sent immediately and not put 
-   to queue. Normal case is that the packet is not sent immediately. */
-
-void silc_server_packet_send(SilcServer server,
-                            SilcSocketConnection sock, 
-                            SilcPacketType type, 
-                            SilcPacketFlags flags,
-                            unsigned char *data, 
-                            SilcUInt32 data_len,
-                            bool force_send)
+SilcBool silc_server_packet_send(SilcServer server,
+                                SilcPacketStream sock,
+                                SilcPacketType type,
+                                SilcPacketFlags flags,
+                                unsigned char *data,
+                                SilcUInt32 data_len)
 {
-  void *dst_id = NULL;
-  SilcIdType dst_id_type = SILC_ID_NONE;
-  SilcIDListData idata = (SilcIDListData)sock->user_data;
+  SilcIDListData idata;
 
   if (!sock)
-    return;
+    return FALSE;
 
-  /* If disconnecting, ignore the data */
-  if (SILC_IS_DISCONNECTING(sock))
-    return;
+  idata = silc_packet_get_context(sock);
 
-  /* If entry is disabled do not sent anything. */
-  if (idata && idata->status & SILC_IDLIST_STATUS_DISABLED)
-    return;
-
-  /* Get data used in the packet sending, keys and stuff */
-  switch(sock->type) {
-  case SILC_SOCKET_TYPE_CLIENT:
-    if (sock->user_data) {
-      dst_id = ((SilcClientEntry)sock->user_data)->id;
-      dst_id_type = SILC_ID_CLIENT;
-    }
-    break;
-  case SILC_SOCKET_TYPE_SERVER:
-  case SILC_SOCKET_TYPE_ROUTER:
-    if (sock->user_data) {
-      dst_id = ((SilcServerEntry)sock->user_data)->id;
-      dst_id_type = SILC_ID_SERVER;
-    }
-    break;
-  default:
-    break;
+  /* If entry is disabled do not sent anything.  Allow hearbeat though */
+  if ((idata && idata->status & SILC_IDLIST_STATUS_DISABLED &&
+       type != SILC_PACKET_HEARTBEAT) ||
+      ((SilcServerEntry)idata == server->id_entry)) {
+    SILC_LOG_DEBUG(("Connection is disabled"));
+    return FALSE;
   }
 
-  silc_server_packet_send_dest(server, sock, type, flags, dst_id,
-                              dst_id_type, data, data_len, force_send);
-}
+  SILC_LOG_DEBUG(("Sending %s packet", silc_get_packet_name(type)));
 
-/* Assembles a new packet to be sent out to network. This doesn't actually
-   send the packet but creates the packet and fills the outgoing data
-   buffer and marks the packet ready to be sent to network. However, If 
-   argument force_send is TRUE the packet is sent immediately and not put 
-   to queue. Normal case is that the packet is not sent immediately. 
-   Destination information is sent as argument for this function. */
-
-void silc_server_packet_send_dest(SilcServer server,
-                                 SilcSocketConnection sock, 
-                                 SilcPacketType type, 
-                                 SilcPacketFlags flags,
-                                 void *dst_id,
-                                 SilcIdType dst_id_type,
-                                 unsigned char *data, 
-                                 SilcUInt32 data_len,
-                                 bool force_send)
-{
-  SilcPacketContext packetdata;
-  const SilcBufferStruct packet;
-  SilcIDListData idata = (SilcIDListData)sock->user_data;
-  SilcCipher cipher = NULL;
-  SilcHmac hmac = NULL;
-  SilcUInt32 sequence = 0;
-  unsigned char *dst_id_data = NULL;
-  SilcUInt32 dst_id_len = 0;
-  int block_len = 0;
-
-  /* If disconnecting, ignore the data */
-  if (SILC_IS_DISCONNECTING(sock))
-    return;
+  return silc_packet_send(sock, type, flags, (const unsigned char *)data,
+                         data_len);
+}
 
-  /* If entry is disabled do not sent anything. */
-  if (idata && idata->status & SILC_IDLIST_STATUS_DISABLED)
-    return;
+/* Send packet to remote connection with specific destination ID. */
 
-  SILC_LOG_DEBUG(("Sending packet, type %d", type));
+SilcBool silc_server_packet_send_dest(SilcServer server,
+                                     SilcPacketStream sock,
+                                     SilcPacketType type,
+                                     SilcPacketFlags flags,
+                                     void *dst_id,
+                                     SilcIdType dst_id_type,
+                                     unsigned char *data,
+                                     SilcUInt32 data_len)
+{
+  SilcIDListData idata;
 
-  if (dst_id) {
-    dst_id_data = silc_id_id2str(dst_id, dst_id_type);
-    dst_id_len = silc_id_get_len(dst_id, dst_id_type);
-  }
+  if (!sock)
+    return FALSE;
 
-  if (idata) {
-    cipher = idata->send_key;
-    hmac = idata->hmac_send;
-    sequence = idata->psn_send++;
-    block_len = silc_cipher_get_block_len(cipher);
-  }
+  idata = silc_packet_get_context(sock);
 
-  /* Set the packet context pointers */
-  packetdata.type = type;
-  packetdata.flags = flags;
-  packetdata.src_id = silc_id_id2str(server->id, server->id_type);
-  packetdata.src_id_len = silc_id_get_len(server->id, server->id_type);
-  packetdata.src_id_type = server->id_type;
-  packetdata.dst_id = dst_id_data;
-  packetdata.dst_id_len = dst_id_len;
-  packetdata.dst_id_type = dst_id_type;
-  data_len = SILC_PACKET_DATALEN(data_len, (SILC_PACKET_HEADER_LEN +
-                                           packetdata.src_id_len + 
-                                           packetdata.dst_id_len));
-  packetdata.truelen = data_len + SILC_PACKET_HEADER_LEN + 
-    packetdata.src_id_len + dst_id_len;
-  packetdata.padlen = SILC_PACKET_PADLEN(packetdata.truelen, block_len);
-
-  /* Create the outgoing packet */
-  if (!silc_packet_assemble(&packetdata, NULL, cipher, hmac, sock,
-                            data, data_len, (const SilcBuffer)&packet)) {
-    SILC_LOG_ERROR(("Cannot assemble packet"));
-    goto out;
+  /* If entry is disabled do not sent anything.  Allow hearbeat though */
+  if ((idata && idata->status & SILC_IDLIST_STATUS_DISABLED &&
+       type != SILC_PACKET_HEARTBEAT) ||
+      ((SilcServerEntry)idata == server->id_entry)) {
+    SILC_LOG_DEBUG(("Connection is disabled"));
+    return FALSE;
   }
 
-  /* Encrypt the packet */
-  silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&packet, packet.len);
-
-  SILC_LOG_HEXDUMP(("Outgoing packet (%d), len %d", sequence, packet.len),
-                  packet.data, packet.len);
-
-  /* Now actually send the packet */
-  silc_server_packet_send_real(server, sock, force_send);
+  SILC_LOG_DEBUG(("Sending %s packet", silc_get_packet_name(type)));
 
- out:
-  if (packetdata.src_id)
-    silc_free(packetdata.src_id);
-  if (packetdata.dst_id)
-    silc_free(packetdata.dst_id);
+  return silc_packet_send_ext(sock, type, flags, 0, NULL, dst_id_type, dst_id,
+                             (const unsigned char *)data, data_len,
+                             NULL, NULL);
 }
 
-/* Assembles a new packet to be sent out to network. This doesn't actually
-   send the packet but creates the packet and fills the outgoing data
-   buffer and marks the packet ready to be sent to network. However, If 
-   argument force_send is TRUE the packet is sent immediately and not put 
-   to queue. Normal case is that the packet is not sent immediately. 
-   The source and destination information is sent as argument for this
-   function. */
-
-void silc_server_packet_send_srcdest(SilcServer server,
-                                    SilcSocketConnection sock, 
-                                    SilcPacketType type, 
-                                    SilcPacketFlags flags,
-                                    void *src_id,
-                                    SilcIdType src_id_type,
-                                    void *dst_id,
-                                    SilcIdType dst_id_type,
-                                    unsigned char *data, 
-                                    SilcUInt32 data_len,
-                                    bool force_send)
+/* Send packet to remote connection with specific source and destination
+   IDs. */
+
+SilcBool silc_server_packet_send_srcdest(SilcServer server,
+                                        SilcPacketStream sock,
+                                        SilcPacketType type,
+                                        SilcPacketFlags flags,
+                                        void *src_id,
+                                        SilcIdType src_id_type,
+                                        void *dst_id,
+                                        SilcIdType dst_id_type,
+                                        unsigned char *data,
+                                        SilcUInt32 data_len)
 {
-  SilcPacketContext packetdata;
-  const SilcBufferStruct packet;
   SilcIDListData idata;
-  SilcCipher cipher = NULL;
-  SilcHmac hmac = NULL;
-  SilcUInt32 sequence = 0;
-  unsigned char *dst_id_data = NULL;
-  SilcUInt32 dst_id_len = 0;
-  unsigned char *src_id_data = NULL;
-  SilcUInt32 src_id_len = 0;
-  int block_len = 0;
-
-  SILC_LOG_DEBUG(("Sending packet, type %d", type));
-
-  /* Get data used in the packet sending, keys and stuff */
-  idata = (SilcIDListData)sock->user_data;
-
-  if (dst_id) {
-    dst_id_data = silc_id_id2str(dst_id, dst_id_type);
-    dst_id_len = silc_id_get_len(dst_id, dst_id_type);
-  }
 
-  if (src_id) {
-    src_id_data = silc_id_id2str(src_id, src_id_type);
-    src_id_len = silc_id_get_len(src_id, src_id_type);
-  }
+  if (!sock)
+    return FALSE;
 
-  if (idata) {
-    cipher = idata->send_key;
-    hmac = idata->hmac_send;
-    sequence = idata->psn_send++;
-    block_len = silc_cipher_get_block_len(cipher);
-  }
+  idata = silc_packet_get_context(sock);
 
-  /* Set the packet context pointers */
-  packetdata.type = type;
-  packetdata.flags = flags;
-  packetdata.src_id = src_id_data;
-  packetdata.src_id_len = src_id_len;
-  packetdata.src_id_type = src_id_type;
-  packetdata.dst_id = dst_id_data;
-  packetdata.dst_id_len = dst_id_len;
-  packetdata.dst_id_type = dst_id_type;
-  data_len = SILC_PACKET_DATALEN(data_len, (SILC_PACKET_HEADER_LEN +
-                                           packetdata.src_id_len + 
-                                           dst_id_len));
-  packetdata.truelen = data_len + SILC_PACKET_HEADER_LEN + 
-    packetdata.src_id_len + dst_id_len;
-  packetdata.padlen = SILC_PACKET_PADLEN(packetdata.truelen, block_len);
-
-  /* Create the outgoing packet */
-  if (!silc_packet_assemble(&packetdata, NULL, cipher, hmac, sock, data,
-                            data_len, (const SilcBuffer)&packet)) {
-    SILC_LOG_ERROR(("Cannot assemble packe"));
-    goto out;
+  /* If entry is disabled do not sent anything.  Allow hearbeat though */
+  if ((idata && idata->status & SILC_IDLIST_STATUS_DISABLED &&
+       type != SILC_PACKET_HEARTBEAT) ||
+      ((SilcServerEntry)idata == server->id_entry)) {
+    SILC_LOG_DEBUG(("Connection is disabled"));
+    return FALSE;
   }
 
-  /* Encrypt the packet */
-  silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&packet, packet.len);
+  SILC_LOG_DEBUG(("Sending %s packet", silc_get_packet_name(type)));
 
-  SILC_LOG_HEXDUMP(("Outgoing packet (%d), len %d", sequence, packet.len),
-                   packet.data, packet.len);
-
-  /* Now actually send the packet */
-  silc_server_packet_send_real(server, sock, force_send);
-
- out:
-  if (packetdata.src_id)
-    silc_free(packetdata.src_id);
-  if (packetdata.dst_id)
-    silc_free(packetdata.dst_id);
+  return silc_packet_send_ext(sock, type, flags, src_id_type, src_id,
+                             dst_id_type, dst_id,
+                             (const unsigned char *)data, data_len,
+                             NULL, NULL);
 }
 
 /* Broadcast received packet to our primary route. This function is used
@@ -305,79 +125,65 @@ void silc_server_packet_send_srcdest(SilcServer server,
    that the broadcast flag from the packet is checked before calling this
    function. This does not test or set the broadcast flag. */
 
-void silc_server_packet_broadcast(SilcServer server,
-                                 SilcSocketConnection sock,
-                                 SilcPacketContext *packet)
+SilcBool silc_server_packet_broadcast(SilcServer server,
+                                     SilcPacketStream primary_route,
+                                     SilcPacket packet)
 {
-  SilcBuffer buffer = packet->buffer;
-  SilcIDListData idata;
-  void *id;
+  SilcServerID src_id, dst_id;
 
-  SILC_LOG_DEBUG(("Broadcasting received broadcast packet"));
-
-  /* If the packet is originated from our primary route we are
-     not allowed to send the packet. */
-  id = silc_id_str2id(packet->src_id, packet->src_id_len, packet->src_id_type);
-  if (id && !SILC_ID_SERVER_COMPARE(id, server->router->id)) {
-    const SilcBufferStruct p;
-
-    idata = (SilcIDListData)sock->user_data;
+  if (!primary_route)
+    return FALSE;
 
-    silc_buffer_push(buffer, buffer->data - buffer->head);
-    if (!silc_packet_send_prepare(sock, 0, 0, buffer->len, idata->hmac_send,
-                                  (const SilcBuffer)&p)) {
-      SILC_LOG_ERROR(("Cannot send packet"));
-      silc_free(id);
-      return;
-    }
-    silc_buffer_put((SilcBuffer)&p, buffer->data, buffer->len);
-    silc_packet_encrypt(idata->send_key, idata->hmac_send, idata->psn_send++,
-                       (SilcBuffer)&p, p.len);
-
-    SILC_LOG_HEXDUMP(("Broadcasted packet (%d), len %d", idata->psn_send - 1,
-                     p.len), p.data, p.len);
+  SILC_LOG_DEBUG(("Broadcasting received broadcast packet"));
 
-    /* Now actually send the packet */
-    silc_server_packet_send_real(server, sock, TRUE);
-    silc_free(id);
-    return;
+  if (!silc_id_str2id(packet->src_id, packet->src_id_len, packet->src_id_type,
+                     &src_id, sizeof(src_id)))
+    return FALSE;
+  if (!silc_id_str2id(packet->dst_id, packet->dst_id_len, packet->dst_id_type,
+                     &dst_id, sizeof(dst_id)))
+    return FALSE;
+
+  /* If the packet is originated from our primary route we are not allowed
+     to send the packet. */
+  if (SILC_ID_SERVER_COMPARE(&src_id, server->router->id)) {
+    SILC_LOG_DEBUG(("Will not broadcast to primary route since it is the "
+                   "original sender of this packet"));
+    return FALSE;
   }
 
-  SILC_LOG_DEBUG(("Will not broadcast to primary route since it is the "
-                 "original sender of this packet"));
-  silc_free(id);
+  /* Send the packet */
+  return silc_server_packet_send_srcdest(server, primary_route, packet->type,
+                                        packet->flags, &src_id,
+                                        SILC_ID_SERVER, &dst_id,
+                                        SILC_ID_SERVER,
+                                        packet->buffer.data,
+                                        silc_buffer_len(&packet->buffer));
 }
 
 /* Routes received packet to `sock'. This is used to route the packets that
    router receives but are not destined to it. */
 
-void silc_server_packet_route(SilcServer server,
-                             SilcSocketConnection sock,
-                             SilcPacketContext *packet)
+SilcBool silc_server_packet_route(SilcServer server,
+                                 SilcPacketStream sock,
+                                 SilcPacket packet)
 {
-  SilcBuffer buffer = packet->buffer;
-  const SilcBufferStruct p;
-  SilcIDListData idata;
-
-  SILC_LOG_DEBUG(("Routing received packet"));
-
-  idata = (SilcIDListData)sock->user_data;
-
-  silc_buffer_push(buffer, buffer->data - buffer->head);
-  if (!silc_packet_send_prepare(sock, 0, 0, buffer->len, idata->hmac_send,
-                                (const SilcBuffer)&p)) {
-    SILC_LOG_ERROR(("Cannot send packet"));
-    return;
-  }
-  silc_buffer_put((SilcBuffer)&p, buffer->data, buffer->len);
-  silc_packet_encrypt(idata->send_key, idata->hmac_send, idata->psn_send++,
-                     (SilcBuffer)&p, p.len);
-
-  SILC_LOG_HEXDUMP(("Routed packet (%d), len %d", idata->psn_send - 1, 
-                  p.len), p.data, p.len);
-
-  /* Now actually send the packet */
-  silc_server_packet_send_real(server, sock, TRUE);
+  SilcID src_id, dst_id;
+
+  if (!silc_id_str2id2(packet->src_id, packet->src_id_len, packet->src_id_type,
+                      &src_id))
+    return FALSE;
+  if (!silc_id_str2id2(packet->dst_id, packet->dst_id_len, packet->dst_id_type,
+                      &dst_id))
+    return FALSE;
+
+  return silc_server_packet_send_srcdest(server, sock, packet->type,
+                                        packet->flags,
+                                        SILC_ID_GET_ID(src_id),
+                                        src_id.type,
+                                        SILC_ID_GET_ID(dst_id),
+                                        dst_id.type,
+                                        packet->buffer.data,
+                                        silc_buffer_len(&packet->buffer));
 }
 
 /* This routine can be used to send a packet to table of clients provided
@@ -385,32 +191,35 @@ void silc_server_packet_route(SilcServer server,
    clients (for server locally connected, and for router local cell). */
 
 void silc_server_packet_send_clients(SilcServer server,
-                                    SilcClientEntry *clients,
-                                    SilcUInt32 clients_count,
-                                    SilcPacketType type, 
+                                    SilcHashTable clients,
+                                    SilcPacketType type,
                                     SilcPacketFlags flags,
-                                    bool route,
-                                    unsigned char *data, 
-                                    SilcUInt32 data_len,
-                                    bool force_send)
+                                    SilcBool route,
+                                    unsigned char *data,
+                                    SilcUInt32 data_len)
 {
-  SilcSocketConnection sock = NULL;
+  SilcPacketStream sock = NULL;
+  SilcIDListData idata;
+  SilcHashTableList htl;
   SilcClientEntry client = NULL;
   SilcServerEntry *routed = NULL;
   SilcUInt32 routed_count = 0;
-  bool gone = FALSE;
-  int i, k;
+  SilcBool gone = FALSE;
+  int k;
 
-  SILC_LOG_DEBUG(("Sending packet to list of clients"));
+  if (!silc_hash_table_count(clients))
+    return;
 
-  /* Send to all clients in table */
-  for (i = 0; i < clients_count; i++) {
-    client = clients[i];
+  SILC_LOG_DEBUG(("Sending packet to %d clients",
+                 silc_hash_table_count(clients)));
 
+  /* Send to all clients in table */
+  silc_hash_table_list(clients, &htl);
+  while (silc_hash_table_get(&htl, NULL, (void *)&client)) {
     /* If client has router set it is not locally connected client and
        we will route the message to the router set in the client. Though,
        send locally connected server in all cases. */
-    if (server->server_type == SILC_ROUTER && client->router && 
+    if (server->server_type == SILC_ROUTER && client->router &&
        ((!route && client->router->router == server->id_entry) || route)) {
 
       /* Check if we have sent the packet to this route already */
@@ -421,8 +230,9 @@ void silc_server_packet_send_clients(SilcServer server,
        continue;
 
       /* Route only once to router */
-      sock = (SilcSocketConnection)client->router->connection;
-      if (sock->type == SILC_SOCKET_TYPE_ROUTER) {
+      sock = client->router->connection;
+      idata = silc_packet_get_context(sock);
+      if (idata->conn_type == SILC_CONN_ROUTER) {
        if (gone)
          continue;
        gone = TRUE;
@@ -431,7 +241,7 @@ void silc_server_packet_send_clients(SilcServer server,
       /* Send the packet */
       silc_server_packet_send_dest(server, sock, type, flags,
                                   client->router->id, SILC_ID_SERVER,
-                                  data, data_len, force_send);
+                                  data, data_len);
 
       /* Mark this route routed already */
       routed = silc_realloc(routed, sizeof(*routed) * (routed_count + 1));
@@ -443,82 +253,22 @@ void silc_server_packet_send_clients(SilcServer server,
       continue;
 
     /* Send to locally connected client */
-    sock = (SilcSocketConnection)client->connection;
+    sock = client->connection;
     if (!sock)
       continue;
 
     silc_server_packet_send_dest(server, sock, type, flags,
                                 client->id, SILC_ID_CLIENT,
-                                data, data_len, force_send);
+                                data, data_len);
   }
-
+  silc_hash_table_list_reset(&htl);
   silc_free(routed);
 }
 
-/* Internal routine to actually create the channel packet and send it
-   to network. This is common function in channel message sending. If
-   `channel_message' is TRUE this encrypts the message as it is strictly
-   a channel message. If FALSE normal encryption process is used. */
-
-static void
-silc_server_packet_send_to_channel_real(SilcServer server,
-                                       SilcSocketConnection sock,
-                                       SilcPacketContext *packet,
-                                       SilcCipher cipher,
-                                       SilcHmac hmac,
-                                       SilcUInt32 sequence,
-                                       unsigned char *data,
-                                       SilcUInt32 data_len,
-                                       bool channel_message,
-                                       bool force_send)
-{
-  int block_len;
-  const SilcBufferStruct p;
-
-  if (!sock)
-    return;
-
-  data_len = SILC_PACKET_DATALEN(data_len, (SILC_PACKET_HEADER_LEN +
-                                           packet->src_id_len + 
-                                           packet->dst_id_len));
-  packet->truelen = data_len + SILC_PACKET_HEADER_LEN + 
-    packet->src_id_len + packet->dst_id_len;
-
-  block_len = cipher ? silc_cipher_get_block_len(cipher) : 0;
-  if (channel_message)
-    packet->padlen = SILC_PACKET_PADLEN((SILC_PACKET_HEADER_LEN +
-                                        packet->src_id_len +
-                                        packet->dst_id_len), block_len);
-  else
-    packet->padlen = SILC_PACKET_PADLEN(packet->truelen, block_len);
-
-  /* Put the data to buffer, assemble and encrypt the packet. The packet
-     is encrypted with normal session key shared with the client, unless
-     the `channel_message' is TRUE. */
-  if (!silc_packet_assemble(packet, NULL, cipher, hmac, sock, data,
-                            data_len, (const SilcBuffer)&p)) {
-    SILC_LOG_ERROR(("Cannot assemble packet"));
-    return;
-  }
-
-  if (channel_message)
-    silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&p, 
-                       SILC_PACKET_HEADER_LEN + packet->src_id_len + 
-                       packet->dst_id_len + packet->padlen);
-  else
-    silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&p, p.len);
-    
-  SILC_LOG_HEXDUMP(("Channel packet (%d), len %d", sequence, p.len),
-                  p.data, p.len);
-
-  /* Now actually send the packet */
-  silc_server_packet_send_real(server, sock, force_send);
-}
-
-/* This routine is used by the server to send packets to channel. The 
+/* This routine is used by the server to send packets to channel. The
    packet sent with this function is distributed to all clients on
    the channel. Usually this is used to send notify messages to the
-   channel, things like notify about new user joining to the channel. 
+   channel, things like notify about new user joining to the channel.
    If `route' is FALSE then the packet is sent only locally and will not
    be routed anywhere (for router locally means cell wide). If `sender'
    is provided then the packet is not sent to that connection since it
@@ -526,64 +276,48 @@ silc_server_packet_send_to_channel_real(SilcServer server,
    packet is not sent clients, only servers. */
 
 void silc_server_packet_send_to_channel(SilcServer server,
-                                       SilcSocketConnection sender,
+                                       SilcPacketStream sender,
                                        SilcChannelEntry channel,
                                        SilcPacketType type,
-                                       bool route,
+                                       SilcBool route,
+                                       SilcBool send_to_clients,
                                        unsigned char *data,
-                                       SilcUInt32 data_len,
-                                       bool force_send)
+                                       SilcUInt32 data_len)
 {
-  SilcSocketConnection sock = NULL;
-  SilcPacketContext packetdata;
+  SilcPacketStream sock = NULL;
   SilcClientEntry client = NULL;
   SilcServerEntry *routed = NULL;
   SilcChannelClientEntry chl;
   SilcHashTableList htl;
   SilcIDListData idata;
   SilcUInt32 routed_count = 0;
-  bool gone = FALSE;
+  SilcBool gone = FALSE;
   int k;
 
   /* This doesn't send channel message packets */
-  assert(type != SILC_PACKET_CHANNEL_MESSAGE);
-  
-  SILC_LOG_DEBUG(("Sending packet to channel"));
-
-  /* Set the packet context pointers. */
-  packetdata.flags = 0;
-  packetdata.type = type;
-  packetdata.src_id = silc_id_id2str(server->id, SILC_ID_SERVER);
-  packetdata.src_id_len = silc_id_get_len(server->id, SILC_ID_SERVER);
-  packetdata.src_id_type = SILC_ID_SERVER;
-  packetdata.dst_id = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
-  packetdata.dst_id_len = silc_id_get_len(channel->id, SILC_ID_CHANNEL);
-  packetdata.dst_id_type = SILC_ID_CHANNEL;
+  SILC_ASSERT(type != SILC_PACKET_CHANNEL_MESSAGE);
 
   /* If there are global users in the channel we will send the message
      first to our router for further routing. */
   if (route && server->server_type != SILC_ROUTER && !server->standalone &&
       channel->global_users) {
-    SilcServerEntry router;
-
-    /* Get data used in packet header encryption, keys and stuff. */
-    router = server->router;
-    sock = (SilcSocketConnection)router->connection;
-    idata = (SilcIDListData)router;
-    
+    sock = server->router->connection;
     if (sock != sender) {
       SILC_LOG_DEBUG(("Sending packet to router for routing"));
-      
-      silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                             idata->send_key, 
-                                             idata->hmac_send, 
-                                             idata->psn_send++,
-                                             data, data_len, FALSE, 
-                                             force_send);
+      silc_server_packet_send_dest(server, sock, type, 0, channel->id,
+                                  SILC_ID_CHANNEL, data, data_len);
     }
   }
 
-  routed = silc_calloc(silc_hash_table_count(channel->user_list), 
+  if (!silc_hash_table_count(channel->user_list)) {
+    SILC_LOG_DEBUG(("Channel %s is empty", channel->channel_name));
+    goto out;
+  }
+
+  SILC_LOG_DEBUG(("Sending %s to channel %s",
+                 silc_get_packet_name(type), channel->channel_name));
+
+  routed = silc_calloc(silc_hash_table_count(channel->user_list),
                       sizeof(*routed));
 
   /* Send the message to clients on the channel's client list. */
@@ -596,7 +330,7 @@ void silc_server_packet_send_to_channel(SilcServer server,
     /* If client has router set it is not locally connected client and
        we will route the message to the router set in the client. Though,
        send locally connected server in all cases. */
-    if (server->server_type == SILC_ROUTER && client->router && 
+    if (server->server_type == SILC_ROUTER && client->router &&
        ((!route && client->router->router == server->id_entry) || route)) {
 
       /* Check if we have sent the packet to this route already */
@@ -607,7 +341,7 @@ void silc_server_packet_send_to_channel(SilcServer server,
        continue;
 
       /* Get data used in packet header encryption, keys and stuff. */
-      sock = (SilcSocketConnection)client->router->connection;
+      sock = client->router->connection;
       idata = (SilcIDListData)client->router;
 
       if (sender && sock == sender)
@@ -615,85 +349,119 @@ void silc_server_packet_send_to_channel(SilcServer server,
 
       /* Route only once to router. Protocol prohibits sending channel
         messages to more than one router. */
-      if (sock->type == SILC_SOCKET_TYPE_ROUTER) {
+      if (idata->conn_type == SILC_CONN_ROUTER) {
        if (gone)
          continue;
        gone = TRUE;
       }
 
+      SILC_LOG_DEBUG(("Sending packet to client %s",
+                     client->nickname ? client->nickname :
+                     (unsigned char *)""));
+
       /* Send the packet */
-      silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                             idata->send_key, 
-                                             idata->hmac_send, 
-                                             idata->psn_send++,
-                                             data, data_len, FALSE, 
-                                             force_send);
+      silc_server_packet_send_dest(server, sock, type, 0, channel->id,
+                                  SILC_ID_CHANNEL, data, data_len);
 
       /* Mark this route routed already */
       routed[routed_count++] = client->router;
       continue;
     }
 
-    if (client->router)
+    if (client->router || !send_to_clients)
       continue;
 
     /* Send to locally connected client */
 
     /* Get data used in packet header encryption, keys and stuff. */
-    sock = (SilcSocketConnection)client->connection;
-    idata = (SilcIDListData)client;
-    
+    sock = client->connection;
     if (!sock || (sender && sock == sender))
       continue;
 
+    SILC_LOG_DEBUG(("Sending packet to client %s",
+                   client->nickname ? client->nickname :
+                   (unsigned char *)""));
+
     /* Send the packet */
-    silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                           idata->send_key, 
-                                           idata->hmac_send, 
-                                           idata->psn_send++, 
-                                           data, data_len, FALSE, 
-                                           force_send);
+    silc_server_packet_send_dest(server, sock, type, 0, channel->id,
+                                SILC_ID_CHANNEL, data, data_len);
   }
-
   silc_hash_table_list_reset(&htl);
+
+ out:
   silc_free(routed);
-  silc_free(packetdata.src_id);
-  silc_free(packetdata.dst_id);
 }
 
 /* This checks whether the relayed packet came from router. If it did
    then we'll need to encrypt it with the channel key. This is called
    from the silc_server_packet_relay_to_channel. */
 
-static bool
+static SilcBool
 silc_server_packet_relay_to_channel_encrypt(SilcServer server,
-                                           SilcSocketConnection sock,
+                                           SilcPacketStream sender,
+                                           void *sender_id,
+                                           SilcIdType sender_type,
                                            SilcChannelEntry channel,
                                            unsigned char *data,
                                            unsigned int data_len)
 {
+  SilcIDListData idata;
+  SilcUInt32 mac_len, iv_len;
+  unsigned char iv[SILC_CIPHER_MAX_IV_SIZE];
+  SilcUInt16 totlen, len;
+  SilcID src_id, dst_id;
+
+  idata = silc_packet_get_context(sender);
+
   /* If we are router and the packet came from router and private key
      has not been set for the channel then we must encrypt the packet
      as it was decrypted with the session key shared between us and the
      router which sent it. This is so, because cells does not share the
      same channel key. */
   if (server->server_type == SILC_ROUTER &&
-      sock->type == SILC_SOCKET_TYPE_ROUTER &&
-      !(channel->mode & SILC_CHANNEL_MODE_PRIVKEY) &&
-      channel->channel_key) {
-    SilcUInt32 mac_len = silc_hmac_len(channel->hmac);
-    SilcUInt32 iv_len = silc_cipher_get_block_len(channel->channel_key);
-    unsigned char iv[SILC_CIPHER_MAX_IV_SIZE];
+      idata->conn_type == SILC_CONN_ROUTER &&
+      !(channel->mode & SILC_CHANNEL_MODE_PRIVKEY) && channel->key) {
+
+    /* If we are backup router and remote is our primary router and
+       we are currently doing backup resuming protocol we must not
+       re-encrypt message with session key. */
+    if (server->backup_router && idata->sconn->backup_resuming &&
+       SILC_PRIMARY_ROUTE(server) == sender)
+      return TRUE;
+
+    mac_len = silc_hmac_len(channel->hmac);
+    iv_len = silc_cipher_get_block_len(channel->send_key);
 
     if (data_len <= mac_len + iv_len) {
       SILC_LOG_WARNING(("Corrupted channel message, cannot relay it"));
       return FALSE;
     }
 
-    memcpy(iv, data + (data_len - iv_len), iv_len);
-    silc_channel_message_payload_encrypt(data, data_len - iv_len - mac_len,
-                                        data_len, iv, iv_len,
-                                        channel->channel_key, channel->hmac);
+    totlen = 2;
+    SILC_GET16_MSB(len, data + totlen);
+    totlen += 2 + len;
+    if (totlen + iv_len + mac_len + 2 > data_len) {
+      SILC_LOG_WARNING(("Corrupted channel message, cannot relay it"));
+      return FALSE;
+    }
+    SILC_GET16_MSB(len, data + totlen);
+    totlen += 2 + len;
+    if (totlen + iv_len + mac_len > data_len) {
+      SILC_LOG_WARNING(("Corrupted channel message, cannot relay it"));
+      return FALSE;
+    }
+
+    memcpy(iv, data + (data_len - iv_len - mac_len), iv_len);
+
+    SILC_ASSERT(sender_type == SILC_ID_CLIENT);
+    src_id.type = SILC_ID_CLIENT;
+    src_id.u.client_id = *((SilcClientID *)sender_id);
+    dst_id.type = SILC_ID_CHANNEL;
+    dst_id.u.channel_id = *channel->id;
+
+    return silc_message_payload_encrypt(data, totlen, data_len - mac_len,
+                                       iv, &src_id, &dst_id,
+                                       channel->send_key, channel->hmac);
   }
 
   return TRUE;
@@ -702,57 +470,46 @@ silc_server_packet_relay_to_channel_encrypt(SilcServer server,
 /* This routine is explicitly used to relay messages to some channel.
    Packets sent with this function we have received earlier and are
    totally encrypted. This just sends the packet to all clients on
-   the channel. If the sender of the packet is someone on the channel 
+   the channel. If the sender of the packet is someone on the channel
    the message will not be sent to that client. The SILC Packet header
    is encrypted with the session key shared between us and the client.
    MAC is also computed before encrypting the header. Rest of the
    packet will be untouched. */
 
 void silc_server_packet_relay_to_channel(SilcServer server,
-                                        SilcSocketConnection sender_sock,
+                                        SilcPacketStream sender_sock,
                                         SilcChannelEntry channel,
                                         void *sender_id,
                                         SilcIdType sender_type,
                                         SilcClientEntry sender_entry,
                                         unsigned char *data,
-                                        SilcUInt32 data_len,
-                                        bool force_send)
+                                        SilcUInt32 data_len)
 {
-  SilcSocketConnection sock = NULL;
-  SilcPacketContext packetdata;
+  SilcPacketStream sock = NULL;
   SilcClientEntry client = NULL;
   SilcServerEntry *routed = NULL;
   SilcChannelClientEntry chl, chl_sender;
   SilcUInt32 routed_count = 0;
   SilcIDListData idata;
   SilcHashTableList htl;
-  bool gone = FALSE;
+  SilcBool gone = FALSE;
   int k;
 
-  SILC_LOG_DEBUG(("Relaying packet to channel"));
-
   if (!silc_server_client_on_channel(sender_entry, channel, &chl_sender))
     return;
 
-  /* This encrypts the packet, if needed. It will be encrypted if
+  SILC_LOG_DEBUG(("Relaying packet to channel %s", channel->channel_name));
+
+  /* This encrypts the message, if needed. It will be encrypted if
      it came from the router thus it needs to be encrypted with the
      channel key. If the channel key does not exist, then we know we
      don't have a single local user on the channel. */
   if (!silc_server_packet_relay_to_channel_encrypt(server, sender_sock,
+                                                  sender_id, sender_type,
                                                   channel, data,
                                                   data_len))
     return;
 
-  /* Set the packet context pointers. */
-  packetdata.flags = 0;
-  packetdata.type = SILC_PACKET_CHANNEL_MESSAGE;
-  packetdata.src_id = silc_id_id2str(sender_id, sender_type);
-  packetdata.src_id_len = silc_id_get_len(sender_id, sender_type);
-  packetdata.src_id_type = sender_type;
-  packetdata.dst_id = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
-  packetdata.dst_id_len = silc_id_get_len(channel->id, SILC_ID_CHANNEL);
-  packetdata.dst_id_type = SILC_ID_CHANNEL;
-
   /* If there are global users in the channel we will send the message
      first to our router for further routing. */
   if (server->server_type != SILC_ROUTER && !server->standalone &&
@@ -760,24 +517,18 @@ void silc_server_packet_relay_to_channel(SilcServer server,
     SilcServerEntry router = server->router;
 
     /* Check that the sender is not our router. */
-    if (sender_sock != (SilcSocketConnection)router->connection) {
-
-      /* Get data used in packet header encryption, keys and stuff. */
-      sock = (SilcSocketConnection)router->connection;
-      idata = (SilcIDListData)router;
-
-      SILC_LOG_DEBUG(("Sending channel message to router for routing"));
-
-      silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                             idata->send_key, 
-                                             idata->hmac_send, 
-                                             idata->psn_send++, 
-                                             data, data_len, TRUE, 
-                                             force_send);
+    if (sender_sock != router->connection) {
+      SILC_LOG_DEBUG(("Sending message to router for routing"));
+      sock = router->connection;
+      silc_server_packet_send_srcdest(server, sock,
+                                     SILC_PACKET_CHANNEL_MESSAGE, 0,
+                                     sender_id, sender_type,
+                                     channel->id, SILC_ID_CHANNEL,
+                                     data, data_len);
     }
   }
 
-  routed = silc_calloc(silc_hash_table_count(channel->user_list), 
+  routed = silc_calloc(silc_hash_table_count(channel->user_list),
                       sizeof(*routed));
 
   /* Assure we won't route the message back to the sender's way. */
@@ -814,7 +565,7 @@ void silc_server_packet_relay_to_channel(SilcServer server,
        continue;
 
       /* Get data used in packet header encryption, keys and stuff. */
-      sock = (SilcSocketConnection)client->router->connection;
+      sock = client->router->connection;
       idata = (SilcIDListData)client->router;
 
       /* Check if the sender socket is the same as this client's router
@@ -822,14 +573,13 @@ void silc_server_packet_relay_to_channel(SilcServer server,
       if (sender_sock && sock == sender_sock)
        continue;
 
-      SILC_LOG_DEBUG(("Relaying packet to client ID(%s) %s (%s)", 
-                     silc_id_render(client->id, SILC_ID_CLIENT),
-                     sock->hostname, sock->ip));
+      SILC_LOG_DEBUG(("Relaying packet to client ID(%s)",
+                     silc_id_render(client->id, SILC_ID_CLIENT)));
 
       /* Mark this route routed already. */
       routed[routed_count++] = client->router;
-       
-      if (sock->type == SILC_SOCKET_TYPE_ROUTER) {
+
+      if (idata->conn_type == SILC_CONN_ROUTER) {
        /* The remote connection is router then we'll decrypt the
           channel message and re-encrypt it with the session key shared
           between us and the remote router. This is done because the
@@ -842,28 +592,47 @@ void silc_server_packet_relay_to_channel(SilcServer server,
          continue;
        gone = TRUE;
 
+       /* If we are backup router and remote is our primary router and
+          we are currently doing backup resuming protocol we must not
+          re-encrypt message with session key. */
+       if (server->backup_router && idata->sconn->backup_resuming &&
+           SILC_PRIMARY_ROUTE(server) == sock) {
+         silc_server_packet_send_srcdest(server, sock,
+                                         SILC_PACKET_CHANNEL_MESSAGE, 0,
+                                         sender_id, sender_type,
+                                         channel->id, SILC_ID_CHANNEL,
+                                         data, data_len);
+         continue;
+       }
+
        SILC_LOG_DEBUG(("Remote is router, encrypt with session key"));
 
        /* If private key mode is not set then decrypt the packet
           and re-encrypt it */
-       if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY) && 
-           channel->channel_key) {
-         unsigned char tmp[SILC_PACKET_MAX_LEN];
+       if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY) &&
+           channel->receive_key) {
+         unsigned char tmp[SILC_PACKET_MAX_LEN], sid[32], rid[32];
+         SilcUInt32 sid_len, rid_len;
 
          if (data_len > SILC_PACKET_MAX_LEN)
            data_len = SILC_PACKET_MAX_LEN;
          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, NULL);
+         silc_id_id2str(sender_id, sender_type, sid, sizeof(sid), &sid_len);
+         silc_id_id2str(channel->id, SILC_ID_CHANNEL, rid, sizeof(rid),
+                        &rid_len);
+         silc_message_payload_decrypt(tmp, data_len, FALSE, FALSE,
+                                      channel->receive_key,
+                                      channel->hmac, sid, sid_len,
+                                      rid, rid_len, FALSE);
 
          /* Now re-encrypt and send it to the router */
          silc_server_packet_send_srcdest(server, sock,
                                          SILC_PACKET_CHANNEL_MESSAGE, 0,
                                          sender_id, sender_type,
                                          channel->id, SILC_ID_CHANNEL,
-                                         tmp, data_len, force_send);
+                                         tmp, data_len);
        } else {
          /* Private key mode is set, we don't have the channel key, so
             just re-encrypt the entire packet and send it to the router. */
@@ -871,16 +640,15 @@ void silc_server_packet_relay_to_channel(SilcServer server,
                                          SILC_PACKET_CHANNEL_MESSAGE, 0,
                                          sender_id, sender_type,
                                          channel->id, SILC_ID_CHANNEL,
-                                         data, data_len, force_send);
+                                         data, data_len);
        }
       } else {
        /* Send the packet to normal server */
-       silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                               idata->send_key,
-                                               idata->hmac_send,
-                                               idata->psn_send++,
-                                               data, data_len, TRUE,
-                                               force_send);
+       silc_server_packet_send_srcdest(server, sock,
+                                       SILC_PACKET_CHANNEL_MESSAGE, 0,
+                                       sender_id, sender_type,
+                                       channel->id, SILC_ID_CHANNEL,
+                                       data, data_len);
       }
 
       continue;
@@ -890,34 +658,28 @@ void silc_server_packet_relay_to_channel(SilcServer server,
       continue;
 
     /* Get data used in packet header encryption, keys and stuff. */
-    sock = (SilcSocketConnection)client->connection;
-    idata = (SilcIDListData)client;
-
+    sock = client->connection;
     if (!sock || (sender_sock && sock == sender_sock))
       continue;
 
-    SILC_LOG_DEBUG(("Sending packet to client ID(%s) %s (%s)", 
-                   silc_id_render(client->id, SILC_ID_CLIENT),
-                   sock->hostname, sock->ip));
+    SILC_LOG_DEBUG(("Sending packet to client ID(%s)",
+                   silc_id_render(client->id, SILC_ID_CLIENT)));
 
     /* Send the packet */
-    silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                           idata->send_key, 
-                                           idata->hmac_send, 
-                                           idata->psn_send++, 
-                                           data, data_len, TRUE, 
-                                           force_send);
+    silc_server_packet_send_srcdest(server, sock,
+                                   SILC_PACKET_CHANNEL_MESSAGE, 0,
+                                   sender_id, sender_type,
+                                   channel->id, SILC_ID_CHANNEL,
+                                   data, data_len);
   }
 
   silc_hash_table_list_reset(&htl);
   silc_free(routed);
-  silc_free(packetdata.src_id);
-  silc_free(packetdata.dst_id);
 }
 
 /* This function is used to send packets strictly to all local clients
    on a particular channel.  This is used for example to distribute new
-   channel key to all our locally connected clients on the channel. 
+   channel key to all our locally connected clients on the channel.
    The packets are always encrypted with the session key shared between
    the client, this means these are not _to the channel_ but _to the client_
    on the channel. */
@@ -927,74 +689,33 @@ void silc_server_packet_send_local_channel(SilcServer server,
                                           SilcPacketType type,
                                           SilcPacketFlags flags,
                                           unsigned char *data,
-                                          SilcUInt32 data_len,
-                                          bool force_send)
+                                          SilcUInt32 data_len)
 {
   SilcChannelClientEntry chl;
   SilcHashTableList htl;
-  SilcSocketConnection sock = NULL;
+  SilcPacketStream sock = NULL;
 
-  SILC_LOG_DEBUG(("Start"));
+  SILC_LOG_DEBUG(("Send packet to local clients on channel %s",
+                 channel->channel_name));
 
   /* Send the message to clients on the channel's client list. */
   silc_hash_table_list(channel->user_list, &htl);
   while (silc_hash_table_get(&htl, NULL, (void *)&chl)) {
-    if (chl->client && !chl->client->router) {
-      sock = (SilcSocketConnection)chl->client->connection;
+    if (chl->client && SILC_IS_LOCAL(chl->client)) {
+      sock = chl->client->connection;
 
       /* Send the packet to the client */
       silc_server_packet_send_dest(server, sock, type, flags, chl->client->id,
-                                  SILC_ID_CLIENT, data, data_len,
-                                  force_send);
+                                  SILC_ID_CLIENT, data, data_len);
     }
   }
   silc_hash_table_list_reset(&htl);
 }
 
-/* Routine used to send (relay, route) private messages to some destination.
-   If the private message key does not exist then the message is re-encrypted,
-   otherwise we just pass it along. This really is not used to send new
-   private messages (as server does not send them) but to relay received
-   private messages. */
-
-void silc_server_send_private_message(SilcServer server,
-                                     SilcSocketConnection dst_sock,
-                                     SilcCipher cipher,
-                                     SilcHmac hmac,
-                                     SilcUInt32 sequence,
-                                     SilcPacketContext *packet)
-{
-  SilcBuffer buffer = packet->buffer;
-  const SilcBufferStruct p;
-
-  silc_buffer_push(buffer, SILC_PACKET_HEADER_LEN + packet->src_id_len 
-                  + packet->dst_id_len + packet->padlen);
-  if (!silc_packet_send_prepare(dst_sock, 0, 0, buffer->len, hmac,
-                                (const SilcBuffer)&p)) {
-    SILC_LOG_ERROR(("Cannot send packet"));
-    return;
-  }
-  silc_buffer_put((SilcBuffer)&p, buffer->data, buffer->len);
-
-  /* Re-encrypt and send if private messge key does not exist */
-  if (!(packet->flags & SILC_PACKET_FLAG_PRIVMSG_KEY)) {
-    /* Re-encrypt packet */
-    silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&p, buffer->len);
-  } else {
-    /* Key exist so encrypt just header and send it */
-    silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&p, 
-                       SILC_PACKET_HEADER_LEN + packet->src_id_len + 
-                       packet->dst_id_len + packet->padlen);
-  }
-
-  /* Send the packet */
-  silc_server_packet_send_real(server, dst_sock, FALSE);
-}
-
 /* Sends current motd to client */
 
 void silc_server_send_motd(SilcServer server,
-                          SilcSocketConnection sock)
+                          SilcPacketStream sock)
 {
   char *motd, *motd_file = NULL;
   SilcUInt32 motd_len;
@@ -1007,17 +728,18 @@ void silc_server_send_motd(SilcServer server,
     if (!motd)
       return;
 
+    motd[motd_len] = 0;
     silc_server_send_notify(server, sock, FALSE, SILC_NOTIFY_TYPE_MOTD, 1,
                            motd, motd_len);
     silc_free(motd);
   }
 }
 
-/* Sends error message. Error messages may or may not have any 
+/* Sends error message. Error messages may or may not have any
    implications. */
 
 void silc_server_send_error(SilcServer server,
-                           SilcSocketConnection sock,
+                           SilcPacketStream sock,
                            const char *fmt, ...)
 {
   va_list ap;
@@ -1025,11 +747,11 @@ void silc_server_send_error(SilcServer server,
 
   memset(buf, 0, sizeof(buf));
   va_start(ap, fmt);
-  vsprintf(buf, fmt, ap);
+  vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
   va_end(ap);
 
-  silc_server_packet_send(server, sock, SILC_PACKET_ERROR, 0, 
-                         buf, strlen(buf), FALSE);
+  silc_server_packet_send(server, sock, SILC_PACKET_ERROR, 0,
+                         buf, strlen(buf));
 }
 
 /* Sends notify message. If format is TRUE the variable arguments are
@@ -1038,8 +760,8 @@ void silc_server_send_error(SilcServer server,
    in the argument list must be { argument data, argument length }. */
 
 void silc_server_send_notify(SilcServer server,
-                            SilcSocketConnection sock,
-                            bool broadcast,
+                            SilcPacketStream sock,
+                            SilcBool broadcast,
                             SilcNotifyType type,
                             SilcUInt32 argc, ...)
 {
@@ -1049,16 +771,22 @@ void silc_server_send_notify(SilcServer server,
   va_start(ap, argc);
 
   packet = silc_notify_payload_encode(type, argc, ap);
-  silc_server_packet_send(server, sock, SILC_PACKET_NOTIFY, 
+  if (!packet) {
+    va_end(ap);
+    return;
+  }
+  silc_server_packet_send(server, sock, SILC_PACKET_NOTIFY,
                          broadcast ? SILC_PACKET_FLAG_BROADCAST : 0,
-                         packet->data, packet->len, FALSE);
+                         packet->data, silc_buffer_len(packet));
 
   /* Send to backup routers if this is being broadcasted to primary
-     router. */
-  if (server->router && server->router->connection &&
-      sock == server->router->connection && broadcast)
+     router.  The silc_server_backup_send checks further whether to
+     actually send it or not. */
+  if ((broadcast && sock && sock == SILC_PRIMARY_ROUTE(server)) ||
+      (broadcast && !sock && !SILC_PRIMARY_ROUTE(server)))
     silc_server_backup_send(server, NULL, SILC_PACKET_NOTIFY, 0,
-                           packet->data, packet->len, FALSE, TRUE);
+                           packet->data, silc_buffer_len(packet),
+                           FALSE, TRUE);
 
   silc_buffer_free(packet);
   va_end(ap);
@@ -1068,8 +796,8 @@ void silc_server_send_notify(SilcServer server,
    Payloads. */
 
 void silc_server_send_notify_args(SilcServer server,
-                                 SilcSocketConnection sock,
-                                 bool broadcast,
+                                 SilcPacketStream sock,
+                                 SilcBool broadcast,
                                  SilcNotifyType type,
                                  SilcUInt32 argc,
                                  SilcBuffer args)
@@ -1077,9 +805,10 @@ void silc_server_send_notify_args(SilcServer server,
   SilcBuffer packet;
 
   packet = silc_notify_payload_encode_args(type, argc, args);
-  silc_server_packet_send(server, sock, SILC_PACKET_NOTIFY, 
-                         broadcast ? SILC_PACKET_FLAG_BROADCAST : 0,
-                         packet->data, packet->len, FALSE);
+  if (packet)
+    silc_server_packet_send(server, sock, SILC_PACKET_NOTIFY,
+                           broadcast ? SILC_PACKET_FLAG_BROADCAST : 0,
+                           packet->data, silc_buffer_len(packet));
   silc_buffer_free(packet);
 }
 
@@ -1087,8 +816,8 @@ void silc_server_send_notify_args(SilcServer server,
    `old_id' with the `new_id'. */
 
 void silc_server_send_notify_channel_change(SilcServer server,
-                                           SilcSocketConnection sock,
-                                           bool broadcast,
+                                           SilcPacketStream sock,
+                                           SilcBool broadcast,
                                            SilcChannelID *old_id,
                                            SilcChannelID *new_id)
 {
@@ -1097,9 +826,11 @@ void silc_server_send_notify_channel_change(SilcServer server,
   idp1 = silc_id_payload_encode((void *)old_id, SILC_ID_CHANNEL);
   idp2 = silc_id_payload_encode((void *)new_id, SILC_ID_CHANNEL);
 
-  silc_server_send_notify(server, sock, broadcast,
-                         SILC_NOTIFY_TYPE_CHANNEL_CHANGE,
-                         2, idp1->data, idp1->len, idp2->data, idp2->len);
+  if (idp1 && idp2)
+    silc_server_send_notify(server, sock, broadcast,
+                           SILC_NOTIFY_TYPE_CHANNEL_CHANGE,
+                           2, idp1->data, silc_buffer_len(idp1),
+                           idp2->data, silc_buffer_len(idp2));
   silc_buffer_free(idp1);
   silc_buffer_free(idp2);
 }
@@ -1108,8 +839,8 @@ void silc_server_send_notify_channel_change(SilcServer server,
    `old_id' with the `new_id'. */
 
 void silc_server_send_notify_nick_change(SilcServer server,
-                                        SilcSocketConnection sock,
-                                        bool broadcast,
+                                        SilcPacketStream sock,
+                                        SilcBool broadcast,
                                         SilcClientID *old_id,
                                         SilcClientID *new_id,
                                         const char *nickname)
@@ -1119,10 +850,12 @@ void silc_server_send_notify_nick_change(SilcServer server,
   idp1 = silc_id_payload_encode((void *)old_id, SILC_ID_CLIENT);
   idp2 = silc_id_payload_encode((void *)new_id, SILC_ID_CLIENT);
 
-  silc_server_send_notify(server, sock, broadcast, 
-                         SILC_NOTIFY_TYPE_NICK_CHANGE,
-                         3, idp1->data, idp1->len, idp2->data, idp2->len,
-                         nickname, nickname ? strlen(nickname) : 0);
+  if (idp1 && idp2)
+    silc_server_send_notify(server, sock, broadcast,
+                           SILC_NOTIFY_TYPE_NICK_CHANGE,
+                           3, idp1->data, silc_buffer_len(idp1),
+                           idp2->data, silc_buffer_len(idp2),
+                           nickname, nickname ? strlen(nickname) : 0);
   silc_buffer_free(idp1);
   silc_buffer_free(idp2);
 }
@@ -1131,8 +864,8 @@ void silc_server_send_notify_nick_change(SilcServer server,
    has joined to the `channel'. */
 
 void silc_server_send_notify_join(SilcServer server,
-                                 SilcSocketConnection sock,
-                                 bool broadcast,
+                                 SilcPacketStream sock,
+                                 SilcBool broadcast,
                                  SilcChannelEntry channel,
                                  SilcClientID *client_id)
 {
@@ -1140,9 +873,11 @@ void silc_server_send_notify_join(SilcServer server,
 
   idp1 = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT);
   idp2 = silc_id_payload_encode((void *)channel->id, SILC_ID_CHANNEL);
-  silc_server_send_notify(server, sock, broadcast, SILC_NOTIFY_TYPE_JOIN,
-                         2, idp1->data, idp1->len,
-                         idp2->data, idp2->len);
+
+  if (idp1 && idp2)
+    silc_server_send_notify(server, sock, broadcast, SILC_NOTIFY_TYPE_JOIN,
+                           2, idp1->data, silc_buffer_len(idp1),
+                           idp2->data, silc_buffer_len(idp2));
   silc_buffer_free(idp1);
   silc_buffer_free(idp2);
 }
@@ -1151,17 +886,18 @@ void silc_server_send_notify_join(SilcServer server,
    `channel'. The Notify packet is always destined to the channel. */
 
 void silc_server_send_notify_leave(SilcServer server,
-                                  SilcSocketConnection sock,
-                                  bool broadcast,
+                                  SilcPacketStream sock,
+                                  SilcBool broadcast,
                                   SilcChannelEntry channel,
                                   SilcClientID *client_id)
 {
   SilcBuffer idp;
 
   idp = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT);
-  silc_server_send_notify_dest(server, sock, broadcast, (void *)channel->id,
-                              SILC_ID_CHANNEL, SILC_NOTIFY_TYPE_LEAVE,
-                              1, idp->data, idp->len);
+  if (idp)
+    silc_server_send_notify_dest(server, sock, broadcast, (void *)channel->id,
+                                SILC_ID_CHANNEL, SILC_NOTIFY_TYPE_LEAVE,
+                                1, idp->data, silc_buffer_len(idp));
   silc_buffer_free(idp);
 }
 
@@ -1170,34 +906,46 @@ void silc_server_send_notify_leave(SilcServer server,
    the channel. */
 
 void silc_server_send_notify_cmode(SilcServer server,
-                                  SilcSocketConnection sock,
-                                  bool broadcast,
+                                  SilcPacketStream sock,
+                                  SilcBool broadcast,
                                   SilcChannelEntry channel,
                                   SilcUInt32 mode_mask,
                                   void *id, SilcIdType id_type,
                                   const char *cipher, const char *hmac,
                                   const char *passphrase,
-                                  SilcPublicKey founder_key)
+                                  SilcPublicKey founder_key,
+                                  SilcBuffer channel_pubkeys)
 {
-  SilcBuffer idp;
-  unsigned char mode[4], *key = NULL;
-  SilcUInt32 key_len = 0;
+  SilcBuffer idp, fkey = NULL;
+  unsigned char mode[4], ulimit[4];
 
   idp = silc_id_payload_encode((void *)id, id_type);
+  if (!idp)
+    return;
   SILC_PUT32_MSB(mode_mask, mode);
   if (founder_key)
-    key = silc_pkcs_public_key_encode(founder_key, &key_len);
+    fkey = silc_public_key_payload_encode(founder_key);
+  if (channel->mode & SILC_CHANNEL_MODE_ULIMIT)
+    SILC_PUT32_MSB(channel->user_limit, ulimit);
 
   silc_server_send_notify_dest(server, sock, broadcast, (void *)channel->id,
                               SILC_ID_CHANNEL, SILC_NOTIFY_TYPE_CMODE_CHANGE,
-                              6, idp->data, idp->len,
+                              8, idp->data, silc_buffer_len(idp),
                               mode, 4,
                               cipher, cipher ? strlen(cipher) : 0,
                               hmac, hmac ? strlen(hmac) : 0,
-                              passphrase, passphrase ? 
+                              passphrase, passphrase ?
                               strlen(passphrase) : 0,
-                              key, key_len);
-  silc_free(key);
+                              fkey ? fkey->data : NULL,
+                              fkey ? silc_buffer_len(fkey) : 0,
+                              channel_pubkeys ? channel_pubkeys->data : NULL,
+                              channel_pubkeys ?
+                              silc_buffer_len(channel_pubkeys) : 0,
+                              mode_mask & SILC_CHANNEL_MODE_ULIMIT ?
+                              ulimit : NULL,
+                              mode_mask & SILC_CHANNEL_MODE_ULIMIT ?
+                              sizeof(ulimit) : 0);
+  silc_buffer_free(fkey);
   silc_buffer_free(idp);
 }
 
@@ -1206,32 +954,34 @@ void silc_server_send_notify_cmode(SilcServer server,
    destined to the channel. */
 
 void silc_server_send_notify_cumode(SilcServer server,
-                                   SilcSocketConnection sock,
-                                   bool broadcast,
+                                   SilcPacketStream sock,
+                                   SilcBool broadcast,
                                    SilcChannelEntry channel,
                                    SilcUInt32 mode_mask,
                                    void *id, SilcIdType id_type,
                                    SilcClientID *target,
                                    SilcPublicKey founder_key)
 {
-  SilcBuffer idp1, idp2;
-  unsigned char mode[4], *key = NULL;
-  SilcUInt32 key_len = 0;
+  SilcBuffer idp1, idp2, fkey = NULL;
+  unsigned char mode[4];
 
   idp1 = silc_id_payload_encode((void *)id, id_type);
   idp2 = silc_id_payload_encode((void *)target, SILC_ID_CLIENT);
+  if (!idp1 || !idp2)
+    return;
   SILC_PUT32_MSB(mode_mask, mode);
   if (founder_key)
-    key = silc_pkcs_public_key_encode(founder_key, &key_len);
+    fkey = silc_public_key_payload_encode(founder_key);
 
   silc_server_send_notify_dest(server, sock, broadcast, (void *)channel->id,
-                              SILC_ID_CHANNEL, 
-                              SILC_NOTIFY_TYPE_CUMODE_CHANGE, 4, 
-                              idp1->data, idp1->len,
+                              SILC_ID_CHANNEL,
+                              SILC_NOTIFY_TYPE_CUMODE_CHANGE, 4,
+                              idp1->data, silc_buffer_len(idp1),
                               mode, 4,
-                              idp2->data, idp2->len,
-                              key, key_len);
-  silc_free(key);
+                              idp2->data, silc_buffer_len(idp2),
+                              fkey ? fkey->data : NULL,
+                              fkey ? silc_buffer_len(fkey) : 0);
+  silc_buffer_free(fkey);
   silc_buffer_free(idp1);
   silc_buffer_free(idp2);
 }
@@ -1242,18 +992,19 @@ void silc_server_send_notify_cumode(SilcServer server,
    client. The `message may be NULL. */
 
 void silc_server_send_notify_signoff(SilcServer server,
-                                    SilcSocketConnection sock,
-                                    bool broadcast,
+                                    SilcPacketStream sock,
+                                    SilcBool broadcast,
                                     SilcClientID *client_id,
                                     const char *message)
 {
   SilcBuffer idp;
 
   idp = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT);
-  silc_server_send_notify(server, sock, broadcast,
-                         SILC_NOTIFY_TYPE_SIGNOFF,
-                         message ? 2 : 1, idp->data, idp->len,
-                         message, message ? strlen(message): 0);
+  if (idp)
+    silc_server_send_notify(server, sock, broadcast,
+                           SILC_NOTIFY_TYPE_SIGNOFF,
+                           message ? 2 : 1, idp->data, silc_buffer_len(idp),
+                           message, message ? strlen(message): 0);
   silc_buffer_free(idp);
 }
 
@@ -1263,8 +1014,8 @@ void silc_server_send_notify_signoff(SilcServer server,
    between routers. */
 
 void silc_server_send_notify_topic_set(SilcServer server,
-                                      SilcSocketConnection sock,
-                                      bool broadcast,
+                                      SilcPacketStream sock,
+                                      SilcBool broadcast,
                                       SilcChannelEntry channel,
                                       void *id, SilcIdType id_type,
                                       char *topic)
@@ -1272,12 +1023,13 @@ void silc_server_send_notify_topic_set(SilcServer server,
   SilcBuffer idp;
 
   idp = silc_id_payload_encode(id, id_type);
-  silc_server_send_notify_dest(server, sock, broadcast,
-                              (void *)channel->id, SILC_ID_CHANNEL,
-                              SILC_NOTIFY_TYPE_TOPIC_SET,
-                              topic ? 2 : 1, 
-                              idp->data, idp->len, 
-                              topic, topic ? strlen(topic) : 0);
+  if (idp)
+    silc_server_send_notify_dest(server, sock, broadcast,
+                                (void *)channel->id, SILC_ID_CHANNEL,
+                                SILC_NOTIFY_TYPE_TOPIC_SET,
+                                topic ? 2 : 1,
+                                idp->data, silc_buffer_len(idp),
+                                topic, topic ? strlen(topic) : 0);
   silc_buffer_free(idp);
 }
 
@@ -1287,8 +1039,8 @@ void silc_server_send_notify_topic_set(SilcServer server,
    traffic. */
 
 void silc_server_send_notify_kicked(SilcServer server,
-                                   SilcSocketConnection sock,
-                                   bool broadcast,
+                                   SilcPacketStream sock,
+                                   SilcBool broadcast,
                                    SilcChannelEntry channel,
                                    SilcClientID *client_id,
                                    SilcClientID *kicker,
@@ -1299,11 +1051,13 @@ void silc_server_send_notify_kicked(SilcServer server,
 
   idp1 = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT);
   idp2 = silc_id_payload_encode((void *)kicker, SILC_ID_CLIENT);
-  silc_server_send_notify_dest(server, sock, broadcast, (void *)channel->id,
-                              SILC_ID_CHANNEL, SILC_NOTIFY_TYPE_KICKED, 3,
-                              idp1->data, idp1->len,
-                              comment, comment ? strlen(comment) : 0,
-                              idp2->data, idp2->len);
+
+  if (idp1 && idp2)
+    silc_server_send_notify_dest(server, sock, broadcast, (void *)channel->id,
+                                SILC_ID_CHANNEL, SILC_NOTIFY_TYPE_KICKED, 3,
+                                idp1->data, silc_buffer_len(idp1),
+                                comment, comment ? strlen(comment) : 0,
+                                idp2->data, silc_buffer_len(idp2));
   silc_buffer_free(idp1);
   silc_buffer_free(idp2);
 }
@@ -1313,8 +1067,8 @@ void silc_server_send_notify_kicked(SilcServer server,
    for the killing. */
 
 void silc_server_send_notify_killed(SilcServer server,
-                                   SilcSocketConnection sock,
-                                   bool broadcast,
+                                   SilcPacketStream sock,
+                                   SilcBool broadcast,
                                    SilcClientID *client_id,
                                    const char *comment,
                                    void *killer, SilcIdType killer_type)
@@ -1324,11 +1078,13 @@ void silc_server_send_notify_killed(SilcServer server,
 
   idp1 = silc_id_payload_encode(client_id, SILC_ID_CLIENT);
   idp2 = silc_id_payload_encode(killer, killer_type);
-  silc_server_send_notify_dest(server, sock, broadcast, (void *)client_id,
-                              SILC_ID_CLIENT, SILC_NOTIFY_TYPE_KILLED,
-                              3, idp1->data, idp1->len,
-                              comment, comment ? strlen(comment) : 0,
-                              idp2->data, idp2->len);
+
+  if (idp1 && idp2)
+    silc_server_send_notify_dest(server, sock, broadcast, (void *)client_id,
+                                SILC_ID_CLIENT, SILC_NOTIFY_TYPE_KILLED,
+                                3, idp1->data, silc_buffer_len(idp1),
+                                comment, comment ? strlen(comment) : 0,
+                                idp2->data, silc_buffer_len(idp2));
   silc_buffer_free(idp1);
   silc_buffer_free(idp2);
 }
@@ -1338,8 +1094,8 @@ void silc_server_send_notify_killed(SilcServer server,
    send the packet between routers as broadcast packet. */
 
 void silc_server_send_notify_umode(SilcServer server,
-                                  SilcSocketConnection sock,
-                                  bool broadcast,
+                                  SilcPacketStream sock,
+                                  SilcBool broadcast,
                                   SilcClientID *client_id,
                                   SilcUInt32 mode_mask)
 {
@@ -1349,10 +1105,11 @@ void silc_server_send_notify_umode(SilcServer server,
   idp = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT);
   SILC_PUT32_MSB(mode_mask, mode);
 
-  silc_server_send_notify(server, sock, broadcast,
-                         SILC_NOTIFY_TYPE_UMODE_CHANGE, 2,
-                         idp->data, idp->len, 
-                         mode, 4);
+  if (idp)
+    silc_server_send_notify(server, sock, broadcast,
+                           SILC_NOTIFY_TYPE_UMODE_CHANGE, 2,
+                           idp->data, silc_buffer_len(idp),
+                           mode, 4);
   silc_buffer_free(idp);
 }
 
@@ -1361,19 +1118,23 @@ void silc_server_send_notify_umode(SilcServer server,
    between routers as broadcast packet. */
 
 void silc_server_send_notify_ban(SilcServer server,
-                                SilcSocketConnection sock,
-                                bool broadcast,
+                                SilcPacketStream sock,
+                                SilcBool broadcast,
                                 SilcChannelEntry channel,
-                                char *add, char *del)
+                                unsigned char *action,
+                                SilcBuffer list)
 {
   SilcBuffer idp;
 
   idp = silc_id_payload_encode((void *)channel->id, SILC_ID_CHANNEL);
-  silc_server_send_notify(server, sock, broadcast,
-                         SILC_NOTIFY_TYPE_BAN, 3,
-                         idp->data, idp->len,
-                         add, add ? strlen(add) : 0,
-                         del, del ? strlen(del) : 0);
+
+  if (idp)
+    silc_server_send_notify(server, sock, broadcast,
+                           SILC_NOTIFY_TYPE_BAN, 3,
+                           idp->data, silc_buffer_len(idp),
+                           action ? action : NULL, action ? 1 : 0,
+                           list ? list->data : NULL,
+                           list ? silc_buffer_len(list) : 0);
   silc_buffer_free(idp);
 }
 
@@ -1383,23 +1144,28 @@ void silc_server_send_notify_ban(SilcServer server,
    packet. */
 
 void silc_server_send_notify_invite(SilcServer server,
-                                   SilcSocketConnection sock,
-                                   bool broadcast,
+                                   SilcPacketStream sock,
+                                   SilcBool broadcast,
                                    SilcChannelEntry channel,
                                    SilcClientID *client_id,
-                                   char *add, char *del)
+                                   unsigned char *action,
+                                   SilcBuffer list)
 {
   SilcBuffer idp, idp2;
 
   idp = silc_id_payload_encode((void *)channel->id, SILC_ID_CHANNEL);
   idp2 = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT);
-  silc_server_send_notify(server, sock, broadcast,
-                         SILC_NOTIFY_TYPE_INVITE, 5,
-                         idp->data, idp->len,
-                         channel->channel_name, strlen(channel->channel_name),
-                         idp2->data, idp2->len,
-                         add, add ? strlen(add) : 0,
-                         del, del ? strlen(del) : 0);
+
+  if (idp && idp2)
+    silc_server_send_notify(server, sock, broadcast,
+                           SILC_NOTIFY_TYPE_INVITE, 5,
+                           idp->data, silc_buffer_len(idp),
+                           channel->channel_name,
+                           strlen(channel->channel_name),
+                           idp2->data, silc_buffer_len(idp2),
+                           action ? action : NULL, action ? 1 : 0,
+                           list ? list->data : NULL,
+                           list ? silc_buffer_len(list) : 0);
   silc_buffer_free(idp);
   silc_buffer_free(idp2);
 }
@@ -1408,33 +1174,41 @@ void silc_server_send_notify_invite(SilcServer server,
    its status in the network has changed. */
 
 void silc_server_send_notify_watch(SilcServer server,
-                                  SilcSocketConnection sock,
+                                  SilcPacketStream sock,
                                   SilcClientEntry watcher,
                                   SilcClientEntry client,
                                   const char *nickname,
-                                  SilcNotifyType type)
+                                  SilcNotifyType type,
+                                  SilcPublicKey public_key)
 {
-  SilcBuffer idp;
+  SilcBuffer idp, pkp = NULL;
   unsigned char mode[4], n[2];
 
   idp = silc_id_payload_encode(client->id, SILC_ID_CLIENT);
+  if (!idp)
+    return;
   SILC_PUT16_MSB(type, n);
   SILC_PUT32_MSB(client->mode, mode);
+  if (public_key)
+    pkp = silc_public_key_payload_encode(public_key);
   silc_server_send_notify_dest(server, sock, FALSE, watcher->id,
                               SILC_ID_CLIENT, SILC_NOTIFY_TYPE_WATCH,
-                              4, idp->data, idp->len,
-                              nickname, strlen(nickname),
-                              mode, sizeof(mode), 
+                              5, idp->data, silc_buffer_len(idp),
+                              nickname, nickname ? strlen(nickname) : 0,
+                              mode, sizeof(mode),
                               type != SILC_NOTIFY_TYPE_NONE ?
-                              n : NULL, sizeof(n));
+                              n : NULL, sizeof(n),
+                              pkp ? pkp->data : NULL,
+                              pkp ? silc_buffer_len(pkp) : 0);
   silc_buffer_free(idp);
+  silc_buffer_free(pkp);
 }
 
 /* Sends notify message destined to specific entity. */
 
 void silc_server_send_notify_dest(SilcServer server,
-                                 SilcSocketConnection sock,
-                                 bool broadcast,
+                                 SilcPacketStream sock,
+                                 SilcBool broadcast,
                                  void *dest_id,
                                  SilcIdType dest_id_type,
                                  SilcNotifyType type,
@@ -1446,15 +1220,30 @@ void silc_server_send_notify_dest(SilcServer server,
   va_start(ap, argc);
 
   packet = silc_notify_payload_encode(type, argc, ap);
-  silc_server_packet_send_dest(server, sock, SILC_PACKET_NOTIFY, 
+  if (!packet) {
+    va_end(ap);
+    return;
+  }
+  silc_server_packet_send_dest(server, sock, SILC_PACKET_NOTIFY,
                               broadcast ? SILC_PACKET_FLAG_BROADCAST : 0,
                               dest_id, dest_id_type,
-                              packet->data, packet->len, FALSE);
+                              packet->data, silc_buffer_len(packet));
+
+  /* Send to backup routers if this is being broadcasted to primary
+     router.  The silc_server_backup_send checks further whether to
+     actually send it or not. */
+  if ((broadcast && sock && sock == SILC_PRIMARY_ROUTE(server)) ||
+      (broadcast && !sock && !SILC_PRIMARY_ROUTE(server)))
+    silc_server_backup_send_dest(server, NULL, SILC_PACKET_NOTIFY, 0,
+                                dest_id, dest_id_type,
+                                packet->data, silc_buffer_len(packet),
+                                FALSE, TRUE);
+
   silc_buffer_free(packet);
   va_end(ap);
 }
 
-/* Sends notify message to a channel. The notify message sent is 
+/* Sends notify message to a channel. The notify message sent is
    distributed to all clients on the channel. If `route_notify' is TRUE
    then the notify may be routed to primary route or to some other routers.
    If FALSE it is assured that the notify is sent only locally. If `sender'
@@ -1462,9 +1251,10 @@ void silc_server_send_notify_dest(SilcServer server,
    originally came from it. */
 
 void silc_server_send_notify_to_channel(SilcServer server,
-                                       SilcSocketConnection sender,
+                                       SilcPacketStream sender,
                                        SilcChannelEntry channel,
-                                       bool route_notify,
+                                       SilcBool route_notify,
+                                       SilcBool send_to_clients,
                                        SilcNotifyType type,
                                        SilcUInt32 argc, ...)
 {
@@ -1474,9 +1264,11 @@ void silc_server_send_notify_to_channel(SilcServer server,
   va_start(ap, argc);
 
   packet = silc_notify_payload_encode(type, argc, ap);
-  silc_server_packet_send_to_channel(server, sender, channel, 
-                                    SILC_PACKET_NOTIFY, route_notify,
-                                    packet->data, packet->len, FALSE);
+  if (packet)
+    silc_server_packet_send_to_channel(server, sender, channel,
+                                      SILC_PACKET_NOTIFY, route_notify,
+                                      send_to_clients,
+                                      packet->data, silc_buffer_len(packet));
   silc_buffer_free(packet);
   va_end(ap);
 }
@@ -1495,8 +1287,7 @@ void silc_server_send_notify_on_channels(SilcServer server,
                                         SilcUInt32 argc, ...)
 {
   int k;
-  SilcSocketConnection sock = NULL;
-  SilcPacketContext packetdata;
+  SilcPacketStream sock = NULL;
   SilcClientEntry c;
   SilcClientEntry *sent_clients = NULL;
   SilcUInt32 sent_clients_count = 0;
@@ -1505,29 +1296,26 @@ void silc_server_send_notify_on_channels(SilcServer server,
   SilcHashTableList htl, htl2;
   SilcChannelEntry channel;
   SilcChannelClientEntry chl, chl2;
-  SilcIDListData idata;
   SilcBuffer packet;
   unsigned char *data;
   SilcUInt32 data_len;
-  bool force_send = FALSE;
   va_list ap;
 
-  SILC_LOG_DEBUG(("Start"));
-
-  if (!silc_hash_table_count(client->channels))
+  if (!silc_hash_table_count(client->channels)) {
+    SILC_LOG_DEBUG(("Client is not joined to any channels"));
     return;
+  }
+
+  SILC_LOG_DEBUG(("Sending notify to joined channels"));
 
   va_start(ap, argc);
   packet = silc_notify_payload_encode(type, argc, ap);
+  if (!packet) {
+    va_end(ap);
+    return;
+  }
   data = packet->data;
-  data_len = packet->len;
-
-  /* Set the packet context pointers. */
-  packetdata.flags = 0;
-  packetdata.type = SILC_PACKET_NOTIFY;
-  packetdata.src_id = silc_id_id2str(server->id, SILC_ID_SERVER);
-  packetdata.src_id_len = silc_id_get_len(server->id, SILC_ID_SERVER);
-  packetdata.src_id_type = SILC_ID_SERVER;
+  data_len = silc_buffer_len(packet);
 
   silc_hash_table_list(client->channels, &htl);
   while (silc_hash_table_get(&htl, NULL, (void *)&chl)) {
@@ -1537,7 +1325,7 @@ void silc_server_send_notify_on_channels(SilcServer server,
     silc_hash_table_list(channel->user_list, &htl2);
     while (silc_hash_table_get(&htl2, NULL, (void *)&chl2)) {
       c = chl2->client;
-      
+
       if (sender && c == sender)
        continue;
 
@@ -1558,32 +1346,13 @@ void silc_server_send_notify_on_channels(SilcServer server,
            break;
        if (k < routed_count)
          continue;
-       
-       /* Get data used in packet header encryption, keys and stuff. */
-       sock = (SilcSocketConnection)c->router->connection;
-       idata = (SilcIDListData)c->router;
-
-       {
-         SILC_LOG_DEBUG(("*****************"));
-         SILC_LOG_DEBUG(("client->router->id %s",
-                         silc_id_render(c->router->id, SILC_ID_SERVER)));
-         SILC_LOG_DEBUG(("client->router->connection->user_data->id %s",
-                         silc_id_render(((SilcServerEntry)sock->user_data)->id, SILC_ID_SERVER)));
-       }
 
-       packetdata.dst_id = silc_id_id2str(c->router->id, SILC_ID_SERVER);
-       packetdata.dst_id_len = silc_id_get_len(c->router->id, SILC_ID_SERVER);
-       packetdata.dst_id_type = SILC_ID_SERVER;
+       sock = c->router->connection;
 
        /* Send the packet */
-       silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                               idata->send_key, 
-                                               idata->hmac_send, 
-                                               idata->psn_send++, 
-                                               data, data_len, FALSE, 
-                                               force_send);
-       
-       silc_free(packetdata.dst_id);
+       silc_server_packet_send_dest(server, sock, SILC_PACKET_NOTIFY, 0,
+                                    c->router->id, SILC_ID_SERVER,
+                                    data, data_len);
 
        /* We want to make sure that the packet is routed to same router
           only once. Mark this route as sent route. */
@@ -1597,30 +1366,16 @@ void silc_server_send_notify_on_channels(SilcServer server,
 
       /* Send to locally connected client */
       if (c) {
-       
-       /* Get data used in packet header encryption, keys and stuff. */
-       sock = (SilcSocketConnection)c->connection;
-       idata = (SilcIDListData)c;
-       
+       sock = c->connection;
         if (!sock)
           continue;
 
-       packetdata.dst_id = silc_id_id2str(c->id, SILC_ID_CLIENT);
-       packetdata.dst_id_len = silc_id_get_len(c->id, SILC_ID_CLIENT);
-       packetdata.dst_id_type = SILC_ID_CLIENT;
-
        /* Send the packet */
-       silc_server_packet_send_to_channel_real(server, sock, &packetdata,
-                                               idata->send_key, 
-                                               idata->hmac_send, 
-                                               idata->psn_send++, 
-                                               data, data_len, FALSE, 
-                                               force_send);
-
-       silc_free(packetdata.dst_id);
+       silc_server_packet_send_dest(server, sock, SILC_PACKET_NOTIFY, 0,
+                                    c->id, SILC_ID_CLIENT, data, data_len);
 
        /* Make sure that we send the notify only once per client. */
-       sent_clients = silc_realloc(sent_clients, sizeof(*sent_clients) * 
+       sent_clients = silc_realloc(sent_clients, sizeof(*sent_clients) *
                                    (sent_clients_count + 1));
        sent_clients[sent_clients_count++] = c;
       }
@@ -1631,81 +1386,64 @@ void silc_server_send_notify_on_channels(SilcServer server,
   silc_hash_table_list_reset(&htl);
   silc_free(routed);
   silc_free(sent_clients);
-  silc_free(packetdata.src_id);
   silc_buffer_free(packet);
   va_end(ap);
 }
 
 /* Sends New ID Payload to remote end. The packet is used to distribute
    information about new registered clients, servers, channel etc. usually
-   to routers so that they can keep these information up to date. 
+   to routers so that they can keep these information up to date.
    If the argument `broadcast' is TRUE then the packet is sent as
    broadcast packet. */
 
 void silc_server_send_new_id(SilcServer server,
-                            SilcSocketConnection sock,
-                            bool broadcast,
-                            void *id, SilcIdType id_type, 
+                            SilcPacketStream sock,
+                            SilcBool broadcast,
+                            void *id, SilcIdType id_type,
                             SilcUInt32 id_len)
 {
   SilcBuffer idp;
 
-  SILC_LOG_DEBUG(("Start"));
+  SILC_LOG_DEBUG(("Sending new ID"));
 
   idp = silc_id_payload_encode(id, id_type);
-  silc_server_packet_send(server, sock, SILC_PACKET_NEW_ID, 
-                         broadcast ? SILC_PACKET_FLAG_BROADCAST : 0, 
-                         idp->data, idp->len, FALSE);
-
-  /* Send to backup routers if this is being broadcasted to primary
-     router. */
-  if (server->router && server->router->connection &&
-      sock == server->router->connection && broadcast)
-    silc_server_backup_send(server, NULL, SILC_PACKET_NEW_ID, 0,
-                           idp->data, idp->len, FALSE, TRUE);
-
+  if (idp)
+    silc_server_packet_send(server, sock, SILC_PACKET_NEW_ID,
+                           broadcast ? SILC_PACKET_FLAG_BROADCAST : 0,
+                           idp->data, silc_buffer_len(idp));
   silc_buffer_free(idp);
 }
 
 /* Send New Channel Payload to notify about newly created channel in the
-   SILC network. Router uses this to notify other routers in the network 
+   SILC network. Router uses this to notify other routers in the network
    about new channel. This packet is broadcasted by router. */
 
 void silc_server_send_new_channel(SilcServer server,
-                                 SilcSocketConnection sock,
-                                 bool broadcast,
+                                 SilcPacketStream sock,
+                                 SilcBool broadcast,
                                  char *channel_name,
-                                 void *channel_id, 
+                                 void *channel_id,
                                  SilcUInt32 channel_id_len,
                                  SilcUInt32 mode)
 {
   SilcBuffer packet;
-  unsigned char *cid;
+  unsigned char cid[32];
   SilcUInt32 name_len = strlen(channel_name);
 
-  SILC_LOG_DEBUG(("Start"));
+  SILC_LOG_DEBUG(("Sending new channel"));
 
-  cid = silc_id_id2str(channel_id, SILC_ID_CHANNEL);
-  if (!cid)
+  if (!silc_id_id2str(channel_id, SILC_ID_CHANNEL, cid, sizeof(cid),
+                     &channel_id_len))
     return;
 
   /* Encode the channel payload */
   packet = silc_channel_payload_encode(channel_name, name_len,
                                       cid, channel_id_len, mode);
+  if (packet)
+    silc_server_packet_send(server, sock, SILC_PACKET_NEW_CHANNEL,
+                           broadcast ? SILC_PACKET_FLAG_BROADCAST : 0,
+                           packet->data, silc_buffer_len(packet));
 
-  silc_server_packet_send(server, sock, SILC_PACKET_NEW_CHANNEL, 
-                         broadcast ? SILC_PACKET_FLAG_BROADCAST : 0, 
-                         packet->data, packet->len, FALSE);
-
-  /* Send to backup routers if this is being broadcasted to primary
-     router. */
-  if (server->server_type == SILC_ROUTER &&
-      server->router && server->router->connection &&
-      sock == server->router->connection && broadcast)
-    silc_server_backup_send(server, NULL, SILC_PACKET_NEW_CHANNEL, 0,
-                           packet->data, packet->len, FALSE, TRUE);
-
-  silc_free(cid);
   silc_buffer_free(packet);
 }
 
@@ -1714,57 +1452,63 @@ void silc_server_send_new_channel(SilcServer server,
    sends this to the local server who sent the join command in case where
    the channel did not exist yet. Both normal and router servers uses this
    also to send this to locally connected clients on the channel. This
-   must not be broadcasted packet. Routers do not send this to each other. 
+   must not be broadcasted packet. Routers do not send this to each other.
    If `sender is provided then the packet is not sent to that connection since
    it originally came from it. */
 
 void silc_server_send_channel_key(SilcServer server,
-                                 SilcSocketConnection sender,
+                                 SilcPacketStream sender,
                                  SilcChannelEntry channel,
                                  unsigned char route)
 {
   SilcBuffer packet;
-  unsigned char *chid;
-  SilcUInt32 tmp_len;
+  unsigned char cid[32];
+  SilcUInt32 tmp_len, cid_len;
+  const char *cipher;
+
   SILC_LOG_DEBUG(("Sending key to channel %s", channel->channel_name));
-  chid = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
-  if (!chid)
+
+  if (!channel->key)
     return;
+
+  if (!silc_id_id2str(channel->id, SILC_ID_CHANNEL, cid, sizeof(cid),
+                     &cid_len))
+    return;
+
   /* Encode channel key packet */
-  tmp_len = strlen(channel->channel_key->cipher->name);
-  packet = silc_channel_key_payload_encode(silc_id_get_len(channel->id,
-                                                          SILC_ID_CHANNEL),
-                                          chid, tmp_len,
-                                           channel->channel_key->cipher->name,
+  cipher = silc_cipher_get_name(channel->send_key);
+  tmp_len = strlen(cipher);
+  packet = silc_channel_key_payload_encode(cid_len, cid, tmp_len, cipher,
                                            channel->key_len / 8, channel->key);
-  silc_server_packet_send_to_channel(server, sender, channel, 
-                                    SILC_PACKET_CHANNEL_KEY,
-                                     route, packet->data, packet->len, 
-                                    FALSE);
+  if (packet)
+    silc_server_packet_send_to_channel(server, sender, channel,
+                                      SILC_PACKET_CHANNEL_KEY,
+                                       route, TRUE, packet->data,
+                                      silc_buffer_len(packet));
   silc_buffer_free(packet);
-  silc_free(chid);
 }
 
 /* Generic function to send any command. The arguments must be sent already
    encoded into correct form in correct order. */
 
-void silc_server_send_command(SilcServer server, 
-                             SilcSocketConnection sock,
-                             SilcCommand command, 
+void silc_server_send_command(SilcServer server,
+                             SilcPacketStream sock,
+                             SilcCommand command,
                              SilcUInt16 ident,
                              SilcUInt32 argc, ...)
 {
   SilcBuffer packet;
   va_list ap;
 
+  /* Statistics */
+  server->stat.commands_sent++;
+
   va_start(ap, argc);
 
   packet = silc_command_payload_encode_vap(command, ident, argc, ap);
-  silc_server_packet_send(server, sock, SILC_PACKET_COMMAND, 0,
-                         packet->data, packet->len, TRUE);
+  if (packet)
+    silc_server_packet_send(server, sock, SILC_PACKET_COMMAND, 0,
+                           packet->data, silc_buffer_len(packet));
   silc_buffer_free(packet);
   va_end(ap);
 }
@@ -1772,9 +1516,9 @@ void silc_server_send_command(SilcServer server,
 /* Generic function to send any command reply. The arguments must be sent
    already encoded into correct form in correct order. */
 
-void silc_server_send_command_reply(SilcServer server, 
-                                   SilcSocketConnection sock,
-                                   SilcCommand command, 
+void silc_server_send_command_reply(SilcServer server,
+                                   SilcPacketStream sock,
+                                   SilcCommand command,
                                    SilcStatus status,
                                    SilcStatus error,
                                    SilcUInt16 ident,
@@ -1783,12 +1527,16 @@ void silc_server_send_command_reply(SilcServer server,
   SilcBuffer packet;
   va_list ap;
 
+  /* Statistics */
+  server->stat.commands_sent++;
+
   va_start(ap, argc);
 
   packet = silc_command_reply_payload_encode_vap(command, status, error,
                                                 ident, argc, ap);
-  silc_server_packet_send(server, sock, SILC_PACKET_COMMAND_REPLY, 0,
-                         packet->data, packet->len, TRUE);
+  if (packet)
+    silc_server_packet_send(server, sock, SILC_PACKET_COMMAND_REPLY, 0,
+                           packet->data, silc_buffer_len(packet));
   silc_buffer_free(packet);
   va_end(ap);
 }
@@ -1796,11 +1544,11 @@ void silc_server_send_command_reply(SilcServer server,
 /* Generic function to send any command reply. The arguments must be sent
    already encoded into correct form in correct order. */
 
-void silc_server_send_dest_command_reply(SilcServer server, 
-                                        SilcSocketConnection sock,
+void silc_server_send_dest_command_reply(SilcServer server,
+                                        SilcPacketStream sock,
                                         void *dst_id,
                                         SilcIdType dst_id_type,
-                                        SilcCommand command, 
+                                        SilcCommand command,
                                         SilcStatus status,
                                         SilcStatus error,
                                         SilcUInt16 ident,
@@ -1809,92 +1557,210 @@ void silc_server_send_dest_command_reply(SilcServer server,
   SilcBuffer packet;
   va_list ap;
 
+  /* Statistics */
+  server->stat.commands_sent++;
+
   va_start(ap, argc);
 
   packet = silc_command_reply_payload_encode_vap(command, status, error,
                                                 ident, argc, ap);
-  silc_server_packet_send_dest(server, sock, SILC_PACKET_COMMAND_REPLY, 0,
-                              dst_id, dst_id_type, packet->data, 
-                              packet->len, TRUE);
+  if (packet)
+    silc_server_packet_send_dest(server, sock, SILC_PACKET_COMMAND_REPLY, 0,
+                                dst_id, dst_id_type, packet->data,
+                                silc_buffer_len(packet));
   silc_buffer_free(packet);
   va_end(ap);
 }
 
-/* Send the heartbeat packet. */
-
-void silc_server_send_heartbeat(SilcServer server,
-                               SilcSocketConnection sock)
-{
-  silc_server_packet_send(server, sock, SILC_PACKET_HEARTBEAT, 0,
-                         NULL, 0, FALSE);
-}
-
-/* Generic function to relay packet we've received. This is used to relay
-   packets to a client but generally can be used to other purposes as well. */
-
-void silc_server_relay_packet(SilcServer server,
-                             SilcSocketConnection dst_sock,
-                             SilcCipher cipher,
-                             SilcHmac hmac,
-                             SilcUInt32 sequence,
-                             SilcPacketContext *packet,
-                             bool force_send)
-{
-  const SilcBufferStruct p;
-
-  silc_buffer_push(packet->buffer, SILC_PACKET_HEADER_LEN + packet->src_id_len 
-                  + packet->dst_id_len + packet->padlen);
-  if (!silc_packet_send_prepare(dst_sock, 0, 0, packet->buffer->len, hmac,
-                                (const SilcBuffer)&p)) {
-    SILC_LOG_ERROR(("Cannot send packet"));
-    return;
-  }
-  silc_buffer_put((SilcBuffer)&p, packet->buffer->data, packet->buffer->len);
-
-  /* Re-encrypt packet */
-  silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&p, p.len);
-  
-  /* Send the packet */
-  silc_server_packet_send_real(server, dst_sock, force_send);
-
-  silc_buffer_pull(packet->buffer, SILC_PACKET_HEADER_LEN + packet->src_id_len 
-                  + packet->dst_id_len + packet->padlen);
-}
-
 /* Routine used to send the connection authentication packet. */
 
 void silc_server_send_connection_auth_request(SilcServer server,
-                                             SilcSocketConnection sock,
+                                             SilcPacketStream sock,
                                              SilcUInt16 conn_type,
                                              SilcAuthMethod auth_meth)
 {
   SilcBuffer packet;
 
   packet = silc_buffer_alloc(4);
-  silc_buffer_pull_tail(packet, SILC_BUFFER_END(packet));
+  if (!packet)
+    return;
+
+  silc_buffer_pull_tail(packet, silc_buffer_truelen(packet));
   silc_buffer_format(packet,
                     SILC_STR_UI_SHORT(conn_type),
                     SILC_STR_UI_SHORT(auth_meth),
                     SILC_STR_END);
 
   silc_server_packet_send(server, sock, SILC_PACKET_CONNECTION_AUTH_REQUEST,
-                         0, packet->data, packet->len, FALSE);
+                         0, packet->data, silc_buffer_len(packet));
   silc_buffer_free(packet);
 }
 
-/* Purge the outgoing packet queue to the network if there is data. This
-   function can be used to empty the packet queue. It is guaranteed that
-   after this function returns the outgoing data queue is empty. */
-
-void silc_server_packet_queue_purge(SilcServer server,
-                                   SilcSocketConnection sock)
+/* Send packet to clients that are known to be operators.  If server
+   is router and `route' is TRUE then the packet would go to all operators
+   in the SILC network.  If `route' is FALSE then only local operators
+   (local for server and cell wide for router).  If `local' is TRUE then
+   only locally connected operators receive the packet.  If `local' is
+   TRUE then `route' is ignored.  If server is normal server and `route'
+   is FALSE it is equivalent to `local' being TRUE. */
+
+void silc_server_send_opers(SilcServer server,
+                           SilcPacketType type,
+                           SilcPacketFlags flags,
+                           SilcBool route, bool local,
+                           unsigned char *data,
+                           SilcUInt32 data_len)
 {
-  if (sock && SILC_IS_OUTBUF_PENDING(sock) && 
-      (SILC_IS_DISCONNECTED(sock) == FALSE)) {
-    server->stat.packets_sent++;
-    silc_packet_send(sock, TRUE);
-    SILC_SET_CONNECTION_FOR_INPUT(server->schedule, sock->sock);
-    SILC_UNSET_OUTBUF_PENDING(sock);
-    silc_buffer_clear(sock->outbuf);
+  SilcList list;
+  SilcIDCacheEntry id_cache = NULL;
+  SilcClientEntry client = NULL;
+  SilcIDListData idata;
+  SilcPacketStream sock;
+  SilcServerEntry *routed = NULL;
+  SilcUInt32 routed_count = 0;
+  SilcBool gone = FALSE;
+  int k;
+
+  SILC_LOG_DEBUG(("Sending %s packet to operators",
+                 silc_get_packet_name(type)));
+
+  /* If local was requested send only locally connected operators. */
+  if (local || (server->server_type == SILC_SERVER && !route)) {
+    if (!silc_idcache_get_all(server->local_list->clients, &list))
+      return;
+    silc_list_start(list);
+    while ((id_cache = silc_list_get(list))) {
+      client = (SilcClientEntry)id_cache->context;
+      if (!client->router && SILC_IS_LOCAL(client) &&
+         (client->mode & SILC_UMODE_SERVER_OPERATOR ||
+          client->mode & SILC_UMODE_ROUTER_OPERATOR)) {
+
+       /* Send the packet to locally connected operator */
+       silc_server_packet_send_dest(server, client->connection, type, flags,
+                                    client->id, SILC_ID_CLIENT,
+                                    data, data_len);
+      }
+    }
+    return;
+  }
+
+  if (!silc_idcache_get_all(server->local_list->clients, &list))
+    return;
+  silc_list_start(list);
+  while ((id_cache = silc_list_get(list))) {
+    client = (SilcClientEntry)id_cache->context;
+    if (!(client->mode & SILC_UMODE_SERVER_OPERATOR) &&
+       !(client->mode & SILC_UMODE_ROUTER_OPERATOR))
+      continue;
+
+    if (server->server_type != SILC_SERVER && client->router &&
+       ((!route && client->router->router == server->id_entry) || route)) {
+
+      /* Check if we have sent the packet to this route already */
+      for (k = 0; k < routed_count; k++)
+       if (routed[k] == client->router)
+         break;
+      if (k < routed_count)
+       continue;
+
+      /* Route only once to router */
+      sock = client->router->connection;
+      idata = silc_packet_get_context(sock);
+      if (idata->conn_type == SILC_CONN_ROUTER) {
+       if (gone)
+         continue;
+       gone = TRUE;
+      }
+
+      /* Send the packet */
+      silc_server_packet_send_dest(server, sock, type, flags,
+                                  client->id, SILC_ID_CLIENT,
+                                  data, data_len);
+
+      /* Mark this route routed already */
+      routed = silc_realloc(routed, sizeof(*routed) * (routed_count + 1));
+      routed[routed_count++] = client->router;
+      continue;
+    }
+
+    if (client->router || !client->connection)
+      continue;
+
+    /* Send to locally connected client */
+    sock = client->connection;
+    silc_server_packet_send_dest(server, sock, type, flags,
+                                client->id, SILC_ID_CLIENT,
+                                data, data_len);
+
+  }
+
+  if (!silc_idcache_get_all(server->global_list->clients, &list))
+    return;
+  silc_list_start(list);
+  while ((id_cache = silc_list_get(list))) {
+    client = (SilcClientEntry)id_cache->context;
+    if (!(client->mode & SILC_UMODE_SERVER_OPERATOR) &&
+       !(client->mode & SILC_UMODE_ROUTER_OPERATOR))
+      continue;
+
+    if (server->server_type != SILC_SERVER && client->router &&
+       ((!route && client->router->router == server->id_entry) || route)) {
+
+      /* Check if we have sent the packet to this route already */
+      for (k = 0; k < routed_count; k++)
+       if (routed[k] == client->router)
+         break;
+      if (k < routed_count)
+       continue;
+
+      /* Route only once to router */
+      sock = client->router->connection;
+      idata = silc_packet_get_context(sock);
+      if (idata->conn_type == SILC_CONN_ROUTER) {
+       if (gone)
+         continue;
+       gone = TRUE;
+      }
+
+      /* Send the packet */
+      silc_server_packet_send_dest(server, sock, type, flags,
+                                  client->id, SILC_ID_CLIENT,
+                                  data, data_len);
+
+      /* Mark this route routed already */
+      routed = silc_realloc(routed, sizeof(*routed) * (routed_count + 1));
+      routed[routed_count++] = client->router;
+      continue;
+    }
+
+    if (client->router || !client->connection)
+      continue;
+
+    /* Send to locally connected client */
+    sock = client->connection;
+    silc_server_packet_send_dest(server, sock, type, flags,
+                                client->id, SILC_ID_CLIENT,
+                                data, data_len);
   }
+  silc_free(routed);
+}
+
+/* Send a notify packet to operators */
+
+void silc_server_send_opers_notify(SilcServer server,
+                                  SilcBool route,
+                                  SilcBool local,
+                                  SilcNotifyType type,
+                                  SilcUInt32 argc, ...)
+{
+  va_list ap;
+  SilcBuffer packet;
+
+  va_start(ap, argc);
+  packet = silc_notify_payload_encode(type, argc, ap);
+  if (packet)
+    silc_server_send_opers(server, SILC_PACKET_NOTIFY, 0,
+                          route, local, packet->data, silc_buffer_len(packet));
+  silc_buffer_free(packet);
+  va_end(ap);
 }