#include "fe-common/core/printtext.h"
#include "fe-common/silc/module-formats.h"
+#include "silc-commands.h"
+
+void sig_mime(SILC_SERVER_REC *server, SILC_CHANNEL_REC *channel,
+ const char *blob, const char *enc, const char *type,
+ const char *nick)
+{
+
+ if (!(IS_SILC_SERVER(server)))
+ return;
+
+ printformat_module("fe-common/silc", server,
+ channel == NULL ? NULL : channel->name,
+ MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+ nick == NULL ? "[<unknown>]" : nick, type);
+
+}
+
SILC_CHANNEL_REC *silc_channel_create(SILC_SERVER_REC *server,
- const char *name, int automatic)
+ const char *name,
+ const char *visible_name,
+ int automatic)
{
SILC_CHANNEL_REC *rec;
rec = g_new0(SILC_CHANNEL_REC, 1);
rec->chat_type = SILC_PROTOCOL;
- rec->name = g_strdup(name);
- rec->server = server;
-
- channel_init((CHANNEL_REC *) rec, automatic);
+ channel_init((CHANNEL_REC *)rec, (SERVER_REC *)server, name, name,
+ automatic);
return rec;
}
{
if (!IS_SILC_CHANNEL(channel))
return;
+ if (channel->server && channel->server->disconnected)
+ return;
if (channel->server != NULL && !channel->left && !channel->kicked) {
/* destroying channel record without actually
having left the channel yet */
- silc_command_exec(channel->server, "PART", channel->name);
+ silc_command_exec(channel->server, "LEAVE", channel->name);
}
}
silc_command_exec(server, "QUIT", msg);
}
+static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
+{
+ silc_client_stop(silc_client);
+}
+
/* Find Irssi channel entry by SILC channel entry */
SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
SILC_CHANNEL_REC *chanrec;
char userhost[256];
+ CMD_SILC_SERVER(server);
+
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (!strcmp(data, "*") || *data == '\0') {
if (!IS_SILC_CHANNEL(item))
cmd_return_error(CMDERR_NOT_JOINED);
- data = item->name;
+ data = item->visible_name;
}
chanrec = silc_channel_find(server, data);
signal_emit("message part", 5, server, chanrec->name,
server->nick, userhost, "");
+ chanrec->left = TRUE;
silc_command_exec(server, "LEAVE", chanrec->name);
signal_stop();
-
+
channel_destroy(CHANNEL(chanrec));
}
{
SILC_CHANNEL_REC *chanrec;
char *tmpcmd = "ME", *tmp;
- uint32 argc = 0;
+ SilcUInt32 argc = 0;
+ unsigned char *message = NULL;
unsigned char **argv;
- uint32 *argv_lens, *argv_types;
+ SilcUInt32 *argv_lens, *argv_types;
int i;
+ CMD_SILC_SERVER(server);
+
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (argc < 2)
cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
- chanrec = silc_channel_find(server, item->name);
+ chanrec = silc_channel_find(server, item->visible_name);
if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+ if (!silc_term_utf8()) {
+ int len = silc_utf8_encoded_len(argv[1], argv_lens[1],
+ SILC_STRING_LANGUAGE);
+ message = silc_calloc(len + 1, sizeof(*message));
+ g_return_if_fail(message != NULL);
+ silc_utf8_encode(argv[1], argv_lens[1], SILC_STRING_LANGUAGE,
+ message, len);
+ }
+
/* Send the action message */
silc_client_send_channel_message(silc_client, server->conn,
chanrec->entry, NULL,
- SILC_MESSAGE_FLAG_ACTION,
- argv[1], argv_lens[1], TRUE);
+ SILC_MESSAGE_FLAG_ACTION |
+ SILC_MESSAGE_FLAG_UTF8,
+ message ? message : argv[1],
+ message ? strlen(message) : argv_lens[1],
+ TRUE);
printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION,
silc_free(argv[i]);
silc_free(argv_lens);
silc_free(argv_types);
+ silc_free(message);
}
/* ACTION local command. Same as ME but takes the channel as mandatory
{
SILC_CHANNEL_REC *chanrec;
char *tmpcmd = "ME", *tmp;
- uint32 argc = 0;
+ SilcUInt32 argc = 0;
+ unsigned char *message = NULL;
unsigned char **argv;
- uint32 *argv_lens, *argv_types;
+ SilcUInt32 *argv_lens, *argv_types;
int i;
+ CMD_SILC_SERVER(server);
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+ if (!silc_term_utf8()) {
+ int len = silc_utf8_encoded_len(argv[2], argv_lens[2],
+ SILC_STRING_LANGUAGE);
+ message = silc_calloc(len + 1, sizeof(*message));
+ g_return_if_fail(message != NULL);
+ silc_utf8_encode(argv[2], argv_lens[2], SILC_STRING_LANGUAGE,
+ message, len);
+ }
+
/* Send the action message */
silc_client_send_channel_message(silc_client, server->conn,
chanrec->entry, NULL,
- SILC_MESSAGE_FLAG_ACTION,
- argv[2], argv_lens[2], TRUE);
+ SILC_MESSAGE_FLAG_ACTION |
+ SILC_MESSAGE_FLAG_UTF8,
+ message ? message : argv[2],
+ message ? strlen(message) : argv_lens[2],
+ TRUE);
printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION,
silc_free(argv[i]);
silc_free(argv_lens);
silc_free(argv_types);
+ silc_free(message);
}
/* NOTICE local command. */
{
SILC_CHANNEL_REC *chanrec;
char *tmpcmd = "ME", *tmp;
- uint32 argc = 0;
+ SilcUInt32 argc = 0;
+ unsigned char *message = NULL;
unsigned char **argv;
- uint32 *argv_lens, *argv_types;
+ SilcUInt32 *argv_lens, *argv_types;
int i;
+ CMD_SILC_SERVER(server);
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (argc < 2)
cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
- chanrec = silc_channel_find(server, item->name);
+ chanrec = silc_channel_find(server, item->visible_name);
if (chanrec == NULL)
cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+ if (!silc_term_utf8()) {
+ int len = silc_utf8_encoded_len(argv[1], argv_lens[1],
+ SILC_STRING_LANGUAGE);
+ message = silc_calloc(len + 1, sizeof(*message));
+ g_return_if_fail(message != NULL);
+ silc_utf8_encode(argv[1], argv_lens[1], SILC_STRING_LANGUAGE,
+ message, len);
+ }
+
/* Send the action message */
silc_client_send_channel_message(silc_client, server->conn,
chanrec->entry, NULL,
- SILC_MESSAGE_FLAG_NOTICE,
- argv[1], argv_lens[1], TRUE);
+ SILC_MESSAGE_FLAG_NOTICE |
+ SILC_MESSAGE_FLAG_UTF8,
+ message ? message : argv[1],
+ message ? strlen(message) : argv_lens[1],
+ TRUE);
printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
MSGLEVEL_NOTICES, SILCTXT_CHANNEL_OWNNOTICE,
silc_free(argv[i]);
silc_free(argv_lens);
silc_free(argv_types);
+ silc_free(message);
}
/* AWAY local command. Sends UMODE command that sets the SILC_UMODE_GONE
flag. */
-static void command_away(const char *data, SILC_SERVER_REC *server,
- WI_ITEM_REC *item)
+bool silc_set_away(const char *reason, SILC_SERVER_REC *server)
{
bool set;
-
+
if (!IS_SILC_SERVER(server) || !server->connected)
- cmd_return_error(CMDERR_NOT_CONNECTED);
-
- if (*data == '\0') {
+ return FALSE;
+
+ if (*reason == '\0') {
/* Remove any possible away message */
silc_client_set_away_message(silc_client, server->conn, NULL);
set = FALSE;
SILCTXT_UNSET_AWAY);
} else {
/* Set the away message */
- silc_client_set_away_message(silc_client, server->conn, (char *)data);
+ silc_client_set_away_message(silc_client, server->conn, (char *)reason);
set = TRUE;
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
- SILCTXT_SET_AWAY, data);
+ SILCTXT_SET_AWAY, reason);
}
+ server->usermode_away = set;
+ g_free_and_null(server->away_reason);
+ if (set)
+ server->away_reason = g_strdup((char *)reason);
+
signal_emit("away mode changed", 1, server);
- silc_command_exec(server, "UMODE", set ? "+g" : "-g");
+ return set;
+}
+
+static void command_away(const char *data, SILC_SERVER_REC *server,
+ WI_ITEM_REC *item)
+{
+ CMD_SILC_SERVER(server);
+
+ if (!IS_SILC_SERVER(server) || !server->connected)
+ cmd_return_error(CMDERR_NOT_CONNECTED);
+
+ g_free_and_null(server->away_reason);
+ if ((data) && (*data != '\0'))
+ server->away_reason = g_strdup(data);
+
+ silc_command_exec(server, "UMODE",
+ (server->away_reason != NULL) ? "+g" : "-g");
}
typedef struct {
/* Set the private key for this client */
silc_client_del_private_message_key(client, conn, client_entry);
silc_client_add_private_message_key_ske(client, conn, client_entry,
- NULL, key, i->responder);
+ NULL, NULL, key, i->responder);
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_PRIVMSG,
client_entry->nickname);
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
SILCTXT_KEY_AGREEMENT_ABORTED, client_entry->nickname);
break;
+
+ case SILC_KEY_AGREEMENT_ALREADY_STARTED:
+ printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+ 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;
static void silc_client_command_key_get_clients(SilcClient client,
SilcClientConnection conn,
SilcClientEntry *clients,
- uint32 clients_count,
+ SilcUInt32 clients_count,
void *context)
{
KeyGetClients internal = (KeyGetClients)context;
{
SilcClientConnection conn;
SilcClientEntry *entrys, client_entry = NULL;
- uint32 entry_count;
+ SilcUInt32 entry_count;
+ SILC_CHANNEL_REC *chanrec = NULL;
SilcChannelEntry channel_entry = NULL;
char *nickname = NULL, *tmp;
int command = 0, port = 0, type = 0;
char *hostname = NULL;
KeyInternal internal = NULL;
- uint32 argc = 0;
+ SilcUInt32 argc = 0;
unsigned char **argv;
- uint32 *argv_lens, *argv_types;
+ SilcUInt32 *argv_lens, *argv_types;
char *bindhost = NULL;
+ CMD_SILC_SERVER(server);
+
if (!server || !IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
name = argv[2];
}
- channel_entry = silc_client_get_channel(silc_client, conn, name);
- if (!channel_entry) {
+ chanrec = silc_channel_find(server, name);
+ if (chanrec == NULL) {
silc_free(nickname);
- cmd_return_error(CMDERR_NOT_JOINED);
+ cmd_return_error(CMDERR_CHAN_NOT_FOUND);
}
+ channel_entry = chanrec->entry;
}
/* Set command */
command = 1;
if (argc >= 5) {
+ char *cipher = NULL, *hmac = NULL;
+
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)
- silc_client_add_private_message_key(silc_client, conn, client_entry,
- argv[5], argv[4],
- argv_lens[4],
- (argv[4][0] == '*' ?
- TRUE : FALSE), FALSE);
- else
- silc_client_add_private_message_key(silc_client, conn, client_entry,
- NULL, argv[4],
- argv_lens[4],
- (argv[4][0] == '*' ?
- TRUE : FALSE), FALSE);
+ if (argc >= 6) {
+ if (!strcasecmp(argv[5], "-responder"))
+ responder = TRUE;
+ else
+ cipher = argv[5];
+ }
+ if (argc >= 7) {
+ if (!strcasecmp(argv[6], "-responder"))
+ responder = TRUE;
+ else
+ hmac = argv[6];
+ }
+ if (argc >= 8) {
+ if (!strcasecmp(argv[7], "-responder"))
+ responder = TRUE;
+ }
+
+ silc_client_add_private_message_key(silc_client, conn, client_entry,
+ cipher, hmac,
+ argv[4], argv_lens[4],
+ (argv[4][0] == '*' ?
+ TRUE : FALSE), responder);
/* Send the key to the remote client so that it starts using it
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,
client_entry, TRUE);
+ */
} else if (type == 2) {
/* Set private channel key */
- char *cipher = NULL, *hmac = NULL;
-
if (!(channel_entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_CH_PRIVATE_KEY_NOMODE,
hmac = argv[6];
if (!silc_client_add_channel_private_key(silc_client, conn,
- channel_entry,
+ channel_entry, NULL,
cipher, hmac,
argv[4],
argv_lens[4])) {
} else if (type == 2) {
/* Unset channel key(s) */
SilcChannelPrivateKey *keys;
- uint32 keys_count;
+ SilcUInt32 keys_count;
int number;
if (argc == 4)
if (type == 1) {
SilcPrivateMessageKeys keys;
- uint32 keys_count;
+ SilcUInt32 keys_count;
int k, i, len;
char buf[1024];
} else if (type == 2) {
SilcChannelPrivateKey *keys;
- uint32 keys_count;
+ SilcUInt32 keys_count;
int k, i, len;
char buf[1024];
memset(buf, 0, sizeof(buf));
strncat(buf, " ", 2);
- len = strlen(keys[k]->cipher->cipher->name);
- strncat(buf, keys[k]->cipher->cipher->name, len > 16 ? 16 : len);
+ len = strlen(silc_cipher_get_name(keys[k]->cipher));
+ strncat(buf, silc_cipher_get_name(keys[k]->cipher),
+ len > 16 ? 16 : len);
if (len < 16)
for (i = 0; i < 16 - len; i++)
strcat(buf, " ");
hostname = (char *)settings_get_str("auto_public_ip");
-/* If the hostname isn't set, treat this case as if auto_public_ip wasn't
- * set.
- */
+ /* If the hostname isn't set, treat this case as if auto_public_ip
+ wasn't set. */
if ((hostname) && (*hostname == '\0')) {
hostname = NULL;
- }
- else {
+ } 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')) {
+ /* 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'))
bindhost = hostname;
- }
- port = settings_get_int("auto_bind_port");
+ port = settings_get_int("auto_bind_port");
}
} /* if use_auto_addr */
}
internal->server = server;
}
+ /* Change current channel private key */
+ if (!strcasecmp(argv[3], "change")) {
+ command = 6;
+ if (type == 2) {
+ /* Unset channel key(s) */
+ SilcChannelPrivateKey *keys;
+ SilcUInt32 keys_count;
+ int number;
+
+ keys = silc_client_list_channel_private_keys(silc_client, conn,
+ channel_entry,
+ &keys_count);
+ if (!keys)
+ goto out;
+
+ if (argc == 4) {
+ chanrec->cur_key++;
+ if (chanrec->cur_key >= keys_count)
+ chanrec->cur_key = 0;
+ }
+
+ if (argc > 4) {
+ number = atoi(argv[4]);
+ if (!number || number > keys_count)
+ chanrec->cur_key = 0;
+ else
+ chanrec->cur_key = number - 1;
+ }
+
+ /* Set the current channel private key */
+ 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,
+ channel_entry->channel_name);
+
+ silc_client_free_channel_private_keys(keys, keys_count);
+ goto out;
+ }
+ }
+
if (command == 0) {
silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
"Usage: /KEY msg|channel <nickname|channel> "
signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
signal_add("server connected", (SIGNAL_FUNC) sig_connected);
signal_add("server quit", (SIGNAL_FUNC) sig_server_quit);
+ signal_add("gui exit", (SIGNAL_FUNC) sig_gui_quit);
+ signal_add("mime", (SIGNAL_FUNC) sig_mime);
- command_bind("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
- command_bind("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
- command_bind("action", MODULE_NAME, (SIGNAL_FUNC) command_action);
- command_bind("notice", MODULE_NAME, (SIGNAL_FUNC) command_notice);
- command_bind("away", MODULE_NAME, (SIGNAL_FUNC) command_away);
- command_bind("key", MODULE_NAME, (SIGNAL_FUNC) command_key);
- command_bind("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys);
+ command_bind_silc("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
+ command_bind_silc("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
+ command_bind_silc("action", MODULE_NAME, (SIGNAL_FUNC) command_action);
+ 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_silc("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys); */
silc_nicklist_init();
}
signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
+ signal_remove("gui exit", (SIGNAL_FUNC) sig_gui_quit);
+ signal_remove("mime", (SIGNAL_FUNC) sig_mime);
command_unbind("part", (SIGNAL_FUNC) command_part);
command_unbind("me", (SIGNAL_FUNC) command_me);
command_unbind("notice", (SIGNAL_FUNC) command_notice);
command_unbind("away", (SIGNAL_FUNC) command_away);
command_unbind("key", (SIGNAL_FUNC) command_key);
- command_unbind("listkeys", (SIGNAL_FUNC) command_listkeys);
+/* command_unbind("listkeys", (SIGNAL_FUNC) command_listkeys); */
silc_nicklist_deinit();
}
projects / silc.git / blobdiff