From: Pekka Riikonen <priikone@silcnet.org>
Date: Fri, 15 Dec 2000 23:04:00 +0000 (+0000)
Subject: 	Send ID in channel key payload as ID payload.
X-Git-Tag: SILC.0.1~299
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=fc96145b7c309302f26c0952cdf3a2e68a4e6763

	Send ID in channel key payload as ID payload.
---

diff --git a/apps/silcd/packet_send.c b/apps/silcd/packet_send.c
index 5e478577..6f258e14 100644
--- a/apps/silcd/packet_send.c
+++ b/apps/silcd/packet_send.c
@@ -1124,26 +1124,25 @@ void silc_server_send_channel_key(SilcServer server,
 				  SilcChannelEntry channel,
 				  unsigned char route)
 {
-  SilcBuffer packet;
-  unsigned char *chid;
+  SilcBuffer packet, idp;
   unsigned int tmp_len;
 
   SILC_LOG_DEBUG(("Start"));
 
-  chid = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
-  if (!chid)
+  idp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL);
+  if (!idp)
     return;
 
   /* Encode channel key packet */
   tmp_len = strlen(channel->channel_key->cipher->name);
-  packet = silc_channel_key_payload_encode(SILC_ID_CHANNEL_LEN, chid, tmp_len,
+  packet = silc_channel_key_payload_encode(idp->len, idp->data, tmp_len,
 					   channel->channel_key->cipher->name,
 					   channel->key_len / 8, channel->key);
 
   silc_server_packet_send_to_channel(server, channel, SILC_PACKET_CHANNEL_KEY,
 				     route, packet->data, packet->len, FALSE);
   silc_buffer_free(packet);
-  silc_free(chid);
+  silc_buffer_free(idp);
 }
 
 /* Generic function to send any command. The arguments must be sent already