/*
silc-channels.c : irssi
- Copyright (C) 2000 - 2001 Timo Sirainen
+ Copyright (C) 2000 - 2001, 2004 Timo Sirainen
Pekka Riikonen <priikone@poseidon.pspt.fi>
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.
-
+
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.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
memset(type, 0, sizeof(type));
memset(enc, 0, sizeof(enc));
-
+
if (!silc_mime_parse(message, message_len, NULL, 0, type, sizeof(type) - 1,
enc, sizeof(enc) - 1, &data, &data_len)) {
silc_free(message);
return;
}
- printformat_module("fe-common/silc", server,
+ printformat_module("fe-common/silc", server,
channel == NULL ? NULL : channel->name,
MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
nick == NULL ? "[<unknown>]" : nick, type);
const char *channels, int automatic)
{
char **list, **tmp;
+ char *channel, *key;
SILC_CHANNEL_REC *chanrec;
+ CHANNEL_SETUP_REC *schannel;
+ GString *tmpstr;
list = g_strsplit(channels, ",", -1);
for (tmp = list; *tmp != NULL; tmp++) {
if (chanrec)
continue;
- silc_command_exec(server, "JOIN", *tmp);
+ channel = *tmp;
+ key = strchr(channel, ' ');
+ if (key != NULL) {
+ *key = '\0';
+ key++;
+ }
+ tmpstr = g_string_new(NULL);
+
+ schannel = channel_setup_find(channel, server->connrec->chatnet);
+ if (key && *key != '\0')
+ g_string_sprintfa(tmpstr, "%s %s", channel, key);
+ else if (schannel && schannel->password && schannel->password[0] != '\0')
+ g_string_sprintfa(tmpstr, "%s %s", channel, schannel->password);
+ else
+ g_string_sprintfa(tmpstr, "%s", channel);
+
+ silc_command_exec(server, "JOIN", tmpstr->str);
+
+ g_string_free(tmpstr, FALSE);
}
g_strfreev(list);
{
SILC_CHANNEL_REC *chanrec;
char userhost[256];
-
+
CMD_SILC_SERVER(server);
if (!IS_SILC_SERVER(server) || !server->connected)
}
chanrec = silc_channel_find(server, data);
- if (chanrec == NULL)
+ if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
memset(userhost, 0, sizeof(userhost));
snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
- server->conn->local_entry->username,
+ server->conn->local_entry->username,
server->conn->local_entry->hostname);
signal_emit("message part", 5, server, chanrec->name,
server->nick, userhost, "");
-
+
chanrec->left = TRUE;
silc_command_exec(server, "LEAVE", chanrec->name);
/* enable queueing because we destroy the channel immedially */
cmd_return_error(CMDERR_NOT_JOINED);
/* Now parse all arguments */
- if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
- PARAM_FLAG_GETREST,
+ if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
+ PARAM_FLAG_GETREST,
"action", &optlist, &target, &msg))
return;
if (item == NULL)
cmd_param_error(CMDERR_NOT_JOINED);
- target_type = IS_SILC_CHANNEL(item) ?
+ target_type = IS_SILC_CHANNEL(item) ?
SEND_TARGET_CHANNEL : SEND_TARGET_NICK;
target = (char *)window_item_get_target(item);
} else if (g_hash_table_lookup(optlist, "channel") != NULL)
if (!silc_term_utf8()) {
int len = silc_utf8_encoded_len(msg, strlen(msg),
- SILC_STRING_LANGUAGE);
+ SILC_STRING_LOCALE);
message = silc_calloc(len + 1, sizeof(*message));
g_return_if_fail(message != NULL);
- silc_utf8_encode(msg, strlen(msg), SILC_STRING_LANGUAGE,
+ silc_utf8_encode(msg, strlen(msg), SILC_STRING_LOCALE,
message, len);
}
(g_hash_table_lookup(optlist, "sign") != NULL ?
SILC_MESSAGE_FLAG_SIGNED : 0))) {
if (g_hash_table_lookup(optlist, "sign"))
- signal_emit("message silc signed_own_private_action", 3,
+ signal_emit("message silc signed_own_private_action", 3,
server, msg, target);
else
signal_emit("message silc own_private_action", 3,
if (!IS_SILC_CHANNEL(item) && !IS_SILC_QUERY(item))
cmd_return_error(CMDERR_NOT_JOINED);
- if (IS_SILC_CHANNEL(item))
+ if (IS_SILC_CHANNEL(item))
tmpcmd = g_strdup_printf("-channel %s %s", item->visible_name, data);
else
tmpcmd = g_strdup_printf("%s %s", item->visible_name, data);
cmd_return_error(CMDERR_NOT_JOINED);
/* Now parse all arguments */
- if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
- PARAM_FLAG_GETREST,
+ if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
+ PARAM_FLAG_GETREST,
"notice", &optlist, &target, &msg))
return;
if (item == NULL)
cmd_param_error(CMDERR_NOT_JOINED);
- target_type = IS_SILC_CHANNEL(item) ?
+ target_type = IS_SILC_CHANNEL(item) ?
SEND_TARGET_CHANNEL : SEND_TARGET_NICK;
target = (char *)window_item_get_target(item);
} else if (g_hash_table_lookup(optlist, "channel") != NULL)
if (!silc_term_utf8()) {
int len = silc_utf8_encoded_len(msg, strlen(msg),
- SILC_STRING_LANGUAGE);
+ SILC_STRING_LOCALE);
message = silc_calloc(len + 1, sizeof(*message));
g_return_if_fail(message != NULL);
- silc_utf8_encode(msg, strlen(msg), SILC_STRING_LANGUAGE,
+ silc_utf8_encode(msg, strlen(msg), SILC_STRING_LOCALE,
message, len);
}
(g_hash_table_lookup(optlist, "sign") != NULL ?
SILC_MESSAGE_FLAG_SIGNED : 0))) {
if (g_hash_table_lookup(optlist, "sign"))
- signal_emit("message silc signed_own_private_notice", 3,
+ signal_emit("message silc signed_own_private_notice", 3,
server, msg, target);
else
signal_emit("message silc own_private_notice", 3,
bool silc_set_away(const char *reason, SILC_SERVER_REC *server)
{
bool set;
-
+
if (!IS_SILC_SERVER(server) || !server->connected)
return FALSE;
-
+
if (*reason == '\0') {
/* Remove any possible away message */
silc_client_set_away_message(silc_client, server->conn, NULL);
set = FALSE;
- printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+ printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_UNSET_AWAY);
} else {
/* Set the away message */
silc_client_set_away_message(silc_client, server->conn, (char *)reason);
set = TRUE;
- printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+ printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_SET_AWAY, reason);
}
g_free_and_null(server->away_reason);
if ((data) && (*data != '\0'))
server->away_reason = g_strdup(data);
-
- silc_command_exec(server, "UMODE",
+
+ silc_command_exec(server, "UMODE",
(server->away_reason != NULL) ? "+g" : "-g");
}
silc_client_add_private_message_key_ske(client, conn, client_entry,
NULL, NULL, key, i->responder);
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
- SILCTXT_KEY_AGREEMENT_PRIVMSG,
+ SILCTXT_KEY_AGREEMENT_PRIVMSG,
client_entry->nickname);
silc_ske_free_key_material(key);
}
-
+
break;
-
+
case SILC_KEY_AGREEMENT_ERROR:
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_ERROR, client_entry->nickname);
break;
-
+
case SILC_KEY_AGREEMENT_FAILURE:
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_FAILURE, client_entry->nickname);
break;
-
+
case SILC_KEY_AGREEMENT_TIMEOUT:
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_TIMEOUT, client_entry->nickname);
break;
-
+
case SILC_KEY_AGREEMENT_ABORTED:
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_ABORTED, client_entry->nickname);
SILCTXT_KEY_AGREEMENT_ALREADY_STARTED,
client_entry->nickname);
break;
-
+
case SILC_KEY_AGREEMENT_SELF_DENIED:
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_SELF_DENIED);
break;
-
+
default:
break;
- }
+ }
if (i)
silc_free(i);
KeyGetClients internal = (KeyGetClients)context;
if (!clients) {
- printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s",
+ printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s",
internal->nick);
silc_free(internal->data);
silc_free(internal->nick);
unsigned char **argv;
SilcUInt32 *argv_lens, *argv_types;
char *bindhost = NULL;
-
+
CMD_SILC_SERVER(server);
if (!server || !IS_SILC_SERVER(server) || !server->connected)
MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]);
return;
}
-
+
/* Find client entry */
entrys = silc_client_get_clients_local(silc_client, conn, nickname,
argv[2], &entry_count);
if (type == 1 && client_entry) {
/* Set private message key */
bool responder = FALSE;
-
+
silc_client_del_private_message_key(silc_client, conn, client_entry);
if (argc >= 6) {
too. */
/* XXX for now we don't do this. This feature is pretty stupid
and should perhaps be removed altogether from SILC.
- silc_client_send_private_message_key(silc_client, conn,
+ silc_client_send_private_message_key(silc_client, conn,
client_entry, TRUE);
*/
} else if (type == 2) {
/* Set private channel key */
if (!(channel_entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
- SILCTXT_CH_PRIVATE_KEY_NOMODE,
+ SILCTXT_CH_PRIVATE_KEY_NOMODE,
channel_entry->channel_name);
goto out;
}
if (argc >= 7)
hmac = argv[6];
- if (!silc_client_add_channel_private_key(silc_client, conn,
+ if (!silc_client_add_channel_private_key(silc_client, conn,
channel_entry, NULL,
cipher, hmac,
argv[4],
- argv_lens[4])) {
+ argv_lens[4], NULL)) {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
- SILCTXT_CH_PRIVATE_KEY_ERROR,
+ SILCTXT_CH_PRIVATE_KEY_ERROR,
channel_entry->channel_name);
goto out;
}
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
- SILCTXT_CH_PRIVATE_KEY_ADD,
+ SILCTXT_CH_PRIVATE_KEY_ADD,
channel_entry->channel_name);
}
}
goto out;
}
-
+
/* Unset command */
if (!strcasecmp(argv[3], "unset")) {
command = 2;
int number;
if (argc == 4)
- silc_client_del_channel_private_keys(silc_client, conn,
+ silc_client_del_channel_private_keys(silc_client, conn,
channel_entry);
if (argc > 4) {
number = atoi(argv[4]);
- keys = silc_client_list_channel_private_keys(silc_client, conn,
+ keys = silc_client_list_channel_private_keys(silc_client, conn,
channel_entry,
&keys_count);
if (!keys)
int k, i, len;
char buf[1024];
- keys = silc_client_list_private_message_keys(silc_client, conn,
+ keys = silc_client_list_private_message_keys(silc_client, conn,
&keys_count);
if (!keys)
goto out;
for (i = 0; i < 30 - len; i++)
strcat(buf, " ");
strcat(buf, " ");
-
+
len = strlen(keys[k].cipher);
strncat(buf, keys[k].cipher, len > 14 ? 14 : len);
if (len < 14)
for (i = 0; i < 30 - len; i++)
strcat(buf, " ");
strcat(buf, " ");
-
+
len = strlen(keys[k].cipher);
strncat(buf, keys[k].cipher, len > 14 ? 14 : len);
if (len < 14)
int k, i, len;
char buf[1024];
- keys = silc_client_list_channel_private_keys(silc_client, conn,
+ keys = silc_client_list_channel_private_keys(silc_client, conn,
channel_entry,
&keys_count);
if (!keys)
goto out;
-
+
for (k = 0; k < keys_count; k++) {
memset(buf, 0, sizeof(buf));
strncat(buf, " ", 2);
for (i = 0; i < 16 - len; i++)
strcat(buf, " ");
strcat(buf, " ");
-
+
len = strlen(silc_hmac_get_name(keys[k]->hmac));
strncat(buf, silc_hmac_get_name(keys[k]->hmac), len > 16 ? 16 : len);
if (len < 16)
for (i = 0; i < 16 - len; i++)
strcat(buf, " ");
strcat(buf, " ");
-
+
strcat(buf, "<hidden>");
silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
}
-
+
silc_client_free_channel_private_keys(keys, keys_count);
}
internal = silc_calloc(1, sizeof(*internal));
internal->type = type;
internal->server = server;
-
+
if (!hostname) {
if (settings_get_bool("use_auto_addr")) {
-
+
hostname = (char *)settings_get_str("auto_public_ip");
- /* If the hostname isn't set, treat this case as if auto_public_ip
+ /* If the hostname isn't set, treat this case as if auto_public_ip
wasn't set. */
if ((hostname) && (*hostname == '\0')) {
hostname = NULL;
} else {
bindhost = (char *)settings_get_str("auto_bind_ip");
-
+
/* if the bind_ip isn't set, but the public_ip IS, then assume then
public_ip is the same value as the bind_ip. */
if ((bindhost) && (*bindhost == '\0'))
SilcUInt32 keys_count;
int number;
- keys = silc_client_list_channel_private_keys(silc_client, conn,
+ keys = silc_client_list_channel_private_keys(silc_client, conn,
channel_entry,
&keys_count);
if (!keys)
}
/* Set the current channel private key */
- silc_client_current_channel_private_key(silc_client, conn,
- channel_entry,
+ silc_client_current_channel_private_key(silc_client, conn,
+ channel_entry,
keys[chanrec->cur_key]);
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_CH_PRIVATE_KEY_CHANGE, chanrec->cur_key + 1,
SILCTXT_KEY_AGREEMENT, argv[2]);
internal->responder = TRUE;
silc_client_send_key_agreement(
- silc_client, conn, client_entry, hostname,
- bindhost, port,
- settings_get_int("key_exchange_timeout_secs"),
+ silc_client, conn, client_entry, hostname,
+ bindhost, port,
+ settings_get_int("key_exchange_timeout_secs"),
keyagr_completion, internal);
if (!hostname)
silc_free(internal);
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_NEGOTIATE, argv[2]);
internal->responder = FALSE;
- silc_client_perform_key_agreement(silc_client, conn, client_entry,
- hostname, port, keyagr_completion,
+ silc_client_perform_key_agreement(silc_client, conn, client_entry,
+ hostname, port, keyagr_completion,
internal);
goto out;
}
}
ident = silc_pkcs_decode_identifier(public_key->identifier);
-
+
pk = silc_pkcs_public_key_encode(public_key, &pk_len);
fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
-
+
if (silc_pkcs_alloc(public_key->name, &pkcs)) {
key_len = silc_pkcs_public_key_set(pkcs, public_key);
silc_pkcs_free(pkcs);
filename);
if (!stat(path, &buf) && S_ISREG(buf.st_mode))
goto list_key;
-
+
snprintf(path,sizeof(path) - 1, "%s/serverkeys/%s", get_irssi_dir(),
filename);
if (!stat(path, &buf) && S_ISREG(buf.st_mode))
command_bind_silc("notice", MODULE_NAME, (SIGNAL_FUNC) command_notice);
command_bind_silc("away", MODULE_NAME, (SIGNAL_FUNC) command_away);
command_bind_silc("key", MODULE_NAME, (SIGNAL_FUNC) command_key);
- command_bind("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys);
+ command_bind("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys);
command_set_options("listkeys", "clients servers");
command_set_options("action", "sign channel");
projects / silc.git / blobdiff