#include "rawlog.h"
#include "misc.h"
#include "settings.h"
+#include "special-vars.h"
#include "channels-setup.h"
silc_command_exec(server, "QUIT", msg);
}
+static void sig_silc_channel_joined(SILC_CHANNEL_REC *channel)
+{
+ CHANNEL_SETUP_REC *rec;
+
+ if (!IS_SILC_CHANNEL(channel))
+ return;
+ if (channel->server && channel->server->disconnected)
+ return;
+ if (channel->session_rejoin)
+ return;
+
+ rec = channel_setup_find(channel->name, channel->server->connrec->chatnet);
+
+ if (rec == NULL || rec->autosendcmd == NULL || !*rec->autosendcmd)
+ return;
+
+ eval_special_string(rec->autosendcmd, "", (SERVER_REC*)channel->server, (CHANNEL_REC*)channel);
+}
+
/* Find Irssi channel entry by SILC channel entry */
SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
SilcDList clients;
SILC_CHANNEL_REC *chanrec = NULL;
SilcChannelEntry channel_entry = NULL;
- char nickname[128 + 1], *tmp;
+ char *nickname = NULL, *tmp;
int command = 0, port = 0, type = 0;
char *hostname = NULL;
KeyInternal internal = NULL;
if (type == 1) {
if (argv[2][0] == '*') {
- strcpy(nickname, "*");
+ nickname = strdup("*");
} else {
/* Parse the typed nickname. */
- if (!silc_parse_userfqdn(argv[2], nickname, sizeof(nickname), NULL, 0)) {
- printformat_module("fe-common/silc", server, NULL,
- MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]);
- return;
- }
+ silc_client_nickname_parse(silc_client, conn, argv[2], &nickname);
+ if (!nickname)
+ nickname = strdup(argv[2]);
/* Find client entry */
- clients = silc_client_get_clients_local(silc_client, conn, nickname,
- argv[2]);
+ clients = silc_client_get_clients_local(silc_client, conn, argv[2],
+ FALSE);
if (!clients) {
KeyGetClients inter = silc_calloc(1, sizeof(*inter));
inter->server = server;
inter->data = strdup(data);
inter->nick = strdup(nickname);
inter->item = item;
- silc_client_get_clients(silc_client, conn, nickname, argv[2],
+ silc_client_get_clients(silc_client, conn, nickname, NULL,
silc_client_command_key_get_clients, inter);
goto out;
}
char *name;
if (argv[2][0] == '*') {
- if (!conn->current_channel) {
- silc_free(nickname);
+ if (!conn->current_channel)
cmd_return_error(CMDERR_NOT_JOINED);
- }
name = conn->current_channel->channel_name;
} else {
name = argv[2];
}
chanrec = silc_channel_find(server, name);
- if (chanrec == NULL) {
- silc_free(nickname);
+ if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
- }
channel_entry = chanrec->entry;
}
argv[4], argv_lens[4]);
} else if (type == 2) {
/* Set private channel key */
- if (!(channel_entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
+ if (!(channel_entry) || !(channel_entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_CH_PRIVATE_KEY_NOMODE,
channel_entry->channel_name);
if (!ckeys)
goto out;
+ silc_dlist_start(ckeys);
if (!number || number > silc_dlist_count(ckeys)) {
silc_dlist_uninit(ckeys);
goto out;
if (!ckeys)
goto out;
+ silc_dlist_start(ckeys);
while ((ch = silc_dlist_get(ckeys))) {
memset(buf, 0, sizeof(buf));
strncat(buf, " ", 2);
- len = strlen(silc_cipher_get_name(ch->cipher));
- strncat(buf, silc_cipher_get_name(ch->cipher),
+ len = strlen(silc_cipher_get_name(ch->send_key));
+ strncat(buf, silc_cipher_get_name(ch->send_key),
len > 16 ? 16 : len);
if (len < 16)
for (i = 0; i < 16 - len; i++)
if (!ckeys)
goto out;
+ silc_dlist_start(ckeys);
if (argc == 4) {
chanrec->cur_key++;
if (chanrec->cur_key >= silc_dlist_count(ckeys))
}
out:
+ silc_free(nickname);
return;
}
ident = &silc_pubkey->identifier;
pk = silc_pkcs_public_key_encode(public_key, &pk_len);
+ if (!pk)
+ return;
fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
key_len = silc_pkcs_public_key_get_len(public_key);
signal_add("server connected", (SIGNAL_FUNC) sig_connected);
signal_add("server quit", (SIGNAL_FUNC) sig_server_quit);
signal_add("mime", (SIGNAL_FUNC) sig_mime);
+ signal_add("channel joined", (SIGNAL_FUNC) sig_silc_channel_joined);
command_bind_silc("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
command_bind_silc("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
signal_remove("mime", (SIGNAL_FUNC) sig_mime);
+ signal_remove("channel joined", (SIGNAL_FUNC) sig_silc_channel_joined);
command_unbind("part", (SIGNAL_FUNC) command_part);
command_unbind("me", (SIGNAL_FUNC) command_me);