X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fpacket_send.c;h=8062551faa4d9393e83a1745095ec68ee961391e;hb=386c883d8774999c6e74d7c6c37e52e4163a4cb1;hp=0278ff1c64e1cc2a037bd82b5f877d58e0860d8e;hpb=6b9bd8ef71943b580d26d0a686bc2ebdc55f2731;p=silc.git diff --git a/apps/silcd/packet_send.c b/apps/silcd/packet_send.c index 0278ff1c..8062551f 100644 --- a/apps/silcd/packet_send.c +++ b/apps/silcd/packet_send.c @@ -476,6 +476,10 @@ silc_server_packet_send_to_channel_real(SilcServer server, bool force_send) { int block_len; + + if (!sock) + return; + packet->truelen = data_len + SILC_PACKET_HEADER_LEN + packet->src_id_len + packet->dst_id_len; @@ -657,6 +661,7 @@ void silc_server_packet_send_to_channel(SilcServer server, force_send); } + silc_hash_table_list_reset(&htl); silc_free(routed); silc_free(packetdata.src_id); silc_free(packetdata.dst_id); @@ -870,8 +875,7 @@ void silc_server_packet_relay_to_channel(SilcServer server, /* If private key mode is not set then decrypt the packet and re-encrypt it */ if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) { - unsigned char *tmp = silc_calloc(data_len, sizeof(*data)); - memcpy(tmp, data, data_len); + unsigned char *tmp = silc_memdup(data, data_len); /* Decrypt the channel message (we don't check the MAC) */ if (channel->channel_key && @@ -939,6 +943,7 @@ void silc_server_packet_relay_to_channel(SilcServer server, force_send); } + silc_hash_table_list_reset(&htl); silc_free(routed); silc_free(packetdata.src_id); silc_free(packetdata.dst_id); @@ -977,6 +982,7 @@ void silc_server_packet_send_local_channel(SilcServer server, force_send); } } + silc_hash_table_list_reset(&htl); } /* Routine used to send (relay, route) private messages to some destination. @@ -1029,13 +1035,14 @@ void silc_server_send_private_message(SilcServer server, void silc_server_send_motd(SilcServer server, SilcSocketConnection sock) { - char *motd; + char *motd, *motd_file = NULL; uint32 motd_len; - if (server->config && server->config->motd && - server->config->motd->motd_file) { + if (server->config) + motd_file = server->config->server_info->motd_file; - motd = silc_file_readfile(server->config->motd->motd_file, &motd_len); + if (motd_file) { + motd = silc_file_readfile(motd_file, &motd_len); if (!motd) return; @@ -1263,7 +1270,7 @@ void silc_server_send_notify_signoff(SilcServer server, SilcSocketConnection sock, bool broadcast, SilcClientID *client_id, - char *message) + const char *message) { SilcBuffer idp; @@ -1309,16 +1316,21 @@ void silc_server_send_notify_kicked(SilcServer server, bool broadcast, SilcChannelEntry channel, SilcClientID *client_id, + SilcClientID *kicker, char *comment) { - SilcBuffer idp; + SilcBuffer idp1; + SilcBuffer idp2; - idp = silc_id_payload_encode((void *)client_id, SILC_ID_CLIENT); + 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, - comment ? 2 : 1, idp->data, idp->len, - comment, comment ? strlen(comment) : 0); - silc_buffer_free(idp); + SILC_ID_CHANNEL, SILC_NOTIFY_TYPE_KICKED, 3, + idp1->data, idp1->len, + comment, comment ? strlen(comment) : 0, + idp2->data, idp2->len); + silc_buffer_free(idp1); + silc_buffer_free(idp2); } /* Send KILLED notify type. This tells that the `client_id' client was @@ -1604,8 +1616,10 @@ void silc_server_send_notify_on_channels(SilcServer server, sent_clients[sent_clients_count++] = c; } } + silc_hash_table_list_reset(&htl2); } + silc_hash_table_list_reset(&htl); silc_free(routed); silc_free(sent_clients); silc_free(packetdata.src_id); @@ -1645,9 +1659,8 @@ void silc_server_send_new_id(SilcServer server, } /* Send New Channel Payload to notify about newly created channel in the - SILC network. Normal server nevers sends this packet. Router uses this - to notify other routers in the network about new channel. This packet - is broadcasted. */ + 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, @@ -1677,7 +1690,8 @@ void silc_server_send_new_channel(SilcServer server, /* Send to backup routers if this is being broadcasted to primary router. */ - if (server->router && server->router->connection && + 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); @@ -1704,7 +1718,7 @@ void silc_server_send_channel_key(SilcServer server, unsigned char *chid; uint32 tmp_len; - SILC_LOG_DEBUG(("Start")); + SILC_LOG_DEBUG(("Sending key to channel %s", channel->channel_name)); chid = silc_id_id2str(channel->id, SILC_ID_CHANNEL); if (!chid) @@ -1769,6 +1783,32 @@ void silc_server_send_command_reply(SilcServer server, va_end(ap); } +/* 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 *dst_id, + SilcIdType dst_id_type, + SilcCommand command, + SilcCommandStatus status, + uint16 ident, + uint32 argc, ...) +{ + SilcBuffer packet; + va_list ap; + + va_start(ap, argc); + + packet = silc_command_reply_payload_encode_vap(command, status, 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); + silc_buffer_free(packet); + va_end(ap); +} + /* Send the heartbeat packet. */ void silc_server_send_heartbeat(SilcServer server,