const char *channels, int automatic)
{
char **list, **tmp, *channel;
+ SILC_CHANNEL_REC *chanrec;
list = g_strsplit(channels, ",", -1);
for (tmp = list; *tmp != NULL; tmp++) {
channel = **tmp == '#' ? g_strdup(*tmp) :
g_strconcat("#", *tmp, NULL);
- silc_channel_create(server, channel, FALSE);
+
+ chanrec = silc_channel_find(server, channel);
+ if (chanrec) {
+ g_free(channel);
+ continue;
+ }
+
silc_command_exec(server, "JOIN", channel);
g_free(channel);
}
+
g_strfreev(list);
}
static void sig_server_quit(SILC_SERVER_REC *server, const char *msg)
{
- if (IS_SILC_SERVER(server))
+ if (IS_SILC_SERVER(server) && server->conn && server->conn->sock)
silc_command_exec(server, "QUIT", msg);
}
{
SilcClientEntry client;
SilcChannelEntry channel;
+ char *channel_name;
- client = va_arg(va, SilcClientEntry);
channel = va_arg(va, SilcChannelEntry);
+ channel_name = va_arg(va, char *);
+ client = va_arg(va, SilcClientEntry);
- signal_emit("message invite", 4, server, channel->channel_name,
- client->nickname, client->username);
+ signal_emit("message invite", 4, server, channel ? channel->channel_name :
+ channel_name, client->nickname, client->username);
}
/*
static void event_cmode(SILC_SERVER_REC *server, va_list va)
{
SILC_CHANNEL_REC *chanrec;
+ void *entry;
SilcClientEntry client;
+ SilcServerEntry server_entry;
SilcChannelEntry channel;
char *mode;
uint32 modei;
+ SilcIdType idtype;
- client = va_arg(va, SilcClientEntry);
+ idtype = va_arg(va, int);
+ entry = va_arg(va, void *);
modei = va_arg(va, uint32);
(void)va_arg(va, char *);
(void)va_arg(va, char *);
channel = va_arg(va, SilcChannelEntry);
- mode = silc_client_chmode(modei, channel);
+ mode = silc_client_chmode(modei,
+ channel->channel_key->cipher->name,
+ channel->hmac->hmac->name);
chanrec = silc_channel_find_entry(server, channel);
if (chanrec != NULL) {
signal_emit("channel mode changed", 1, chanrec);
}
- printformat_module("fe-common/silc", server, channel->channel_name,
- MSGLEVEL_MODES, SILCTXT_CHANNEL_CMODE,
- channel->channel_name, mode ? mode : "removed all",
- client->nickname);
+ if (idtype == SILC_ID_CLIENT) {
+ client = (SilcClientEntry)entry;
+ printformat_module("fe-common/silc", server, channel->channel_name,
+ MSGLEVEL_MODES, SILCTXT_CHANNEL_CMODE,
+ channel->channel_name, mode ? mode : "removed all",
+ client->nickname);
+ } else {
+ server_entry = (SilcServerEntry)entry;
+ printformat_module("fe-common/silc", server, channel->channel_name,
+ MSGLEVEL_MODES, SILCTXT_CHANNEL_CMODE,
+ channel->channel_name, mode ? mode : "removed all",
+ server_entry->server_name);
+ }
g_free(mode);
}
nick = silc_nicklist_find(chanrec, destclient);
if (nick != NULL) {
nick->op = (mode & SILC_CHANNEL_UMODE_CHANOP) != 0;
+ nick->founder = (mode & SILC_CHANNEL_UMODE_CHANFO) != 0;
signal_emit("nick mode changed", 2, chanrec, nick);
}
}
static void event_channel_change(SILC_SERVER_REC *server, va_list va)
{
-
+ /* Nothing interesting to do */
}
/*
static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
{
-
+ SilcClientEntry *clients;
+ uint32 clients_count;
+ int i;
+
+ (void)va_arg(va, void *);
+ clients = va_arg(va, SilcClientEntry *);
+ clients_count = va_arg(va, uint32);
+
+ for (i = 0; i < clients_count; i++)
+ signal_emit("message quit", 4, server, clients[i]->nickname,
+ clients[i]->username ? clients[i]->username : "",
+ "server signoff");
}
/*
static void event_kick(SILC_SERVER_REC *server, va_list va)
{
+ SilcClientConnection conn = server->conn;
+ SilcClientEntry client_entry;
+ SilcChannelEntry channel_entry;
+ char *tmp;
+ SILC_CHANNEL_REC *chanrec;
+
+ client_entry = va_arg(va, SilcClientEntry);
+ tmp = va_arg(va, char *);
+ channel_entry = va_arg(va, SilcChannelEntry);
+ chanrec = silc_channel_find_entry(server, channel_entry);
+
+ if (client_entry == conn->local_entry) {
+ printformat_module("fe-common/silc", server, channel_entry->channel_name,
+ MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED_YOU,
+ channel_entry->channel_name, tmp ? tmp : "");
+ if (chanrec) {
+ chanrec->kicked = TRUE;
+ channel_destroy((CHANNEL_REC *)chanrec);
+ }
+ } else {
+ printformat_module("fe-common/silc", server, channel_entry->channel_name,
+ MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED,
+ client_entry->nickname,
+ channel_entry->channel_name, tmp ? tmp : "");
+
+ if (chanrec) {
+ SILC_NICK_REC *nickrec = silc_nicklist_find(chanrec, client_entry);
+ if (nickrec != NULL)
+ nicklist_remove(CHANNEL(chanrec), NICK(nickrec));
+ }
+ }
}
/*
static void event_kill(SILC_SERVER_REC *server, va_list va)
{
+ SilcClientConnection conn = server->conn;
+ SilcClientEntry client_entry;
+ char *tmp;
-}
-
-/*
- * "event ban". Someone was banned or ban list was modified.
- */
-
-static void event_ban(SILC_SERVER_REC *server, va_list va)
-{
+ client_entry = va_arg(va, SilcClientEntry);
+ tmp = va_arg(va, char *);
+
+ if (client_entry == conn->local_entry) {
+ printformat_module("fe-common/silc", server, NULL,
+ MSGLEVEL_CRAP, SILCTXT_CHANNEL_KILLED_YOU,
+ tmp ? tmp : "");
+ } else {
+ GSList *nicks, *tmpn;
+ nicks = nicklist_get_same_unique(SERVER(server), client_entry);
+ for (tmpn = nicks; tmpn != NULL; tmpn = tmpn->next->next) {
+ CHANNEL_REC *channel = tmpn->data;
+ NICK_REC *nickrec = tmpn->next->data;
+ nicklist_remove(channel, nickrec);
+ }
+ printformat_module("fe-common/silc", server, NULL,
+ MSGLEVEL_CRAP, SILCTXT_CHANNEL_KILLED,
+ client_entry->nickname,
+ tmp ? tmp : "");
+ }
}
/* PART (LEAVE) command. */
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
- if (*data == '\0') {
+ if (!strcmp(data, "*") || *data == '\0') {
if (!IS_SILC_CHANNEL(item))
cmd_return_error(CMDERR_NOT_JOINED);
data = item->name;
argv[1], argv_lens[1], TRUE);
printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
- MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION, argv[1]);
+ MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION,
+ server->conn->local_entry->nickname, argv[1]);
+
+ for (i = 0; i < argc; i++)
+ silc_free(argv[i]);
+ silc_free(argv_lens);
+ silc_free(argv_types);
+}
+
+/* ACTION local command. Same as ME but takes the channel as mandatory
+ argument. */
+
+static void command_action(const char *data, SILC_SERVER_REC *server,
+ WI_ITEM_REC *item)
+{
+ SILC_CHANNEL_REC *chanrec;
+ char *tmpcmd = "ME", *tmp;
+ uint32 argc = 0;
+ unsigned char **argv;
+ uint32 *argv_lens, *argv_types;
+ int i;
+
+ if (!IS_SILC_SERVER(server) || !server->connected)
+ cmd_return_error(CMDERR_NOT_CONNECTED);
+
+ if (!IS_SILC_CHANNEL(item))
+ cmd_return_error(CMDERR_NOT_JOINED);
+
+ /* Now parse all arguments */
+ tmp = g_strconcat(tmpcmd, " ", data, NULL);
+ silc_parse_command_line(tmp, &argv, &argv_lens,
+ &argv_types, &argc, 3);
+ g_free(tmp);
+
+ if (argc < 3)
+ cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+ chanrec = silc_channel_find(server, argv[1]);
+ if (chanrec == NULL)
+ cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+
+ /* 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);
+
+ printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
+ MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION,
+ server->conn->local_entry->nickname, argv[2]);
for (i = 0; i < argc; i++)
silc_free(argv[i]);
argv[1], argv_lens[1], TRUE);
printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
- MSGLEVEL_NOTICES, SILCTXT_CHANNEL_OWNNOTICE, argv[1]);
+ MSGLEVEL_NOTICES, SILCTXT_CHANNEL_OWNNOTICE,
+ server->conn->local_entry->nickname, argv[1]);
for (i = 0; i < argc; i++)
silc_free(argv[i]);
static void command_away(const char *data, SILC_SERVER_REC *server,
WI_ITEM_REC *item)
{
+ bool set;
+
if (!IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
- /* XXX TODO */
+ if (*data == '\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,
+ SILCTXT_UNSET_AWAY);
+ } else {
+ /* Set the away message */
+ silc_client_set_away_message(silc_client, server->conn, (char *)data);
+ set = TRUE;
+
+ printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+ SILCTXT_SET_AWAY, data);
+ }
+
+ signal_emit("away mode changed", 1, server);
+
+ silc_command_exec(server, "UMODE", set ? "+g" : "-g");
}
typedef struct {
int type; /* 1 = msg, 2 = channel */
+ bool responder;
SILC_SERVER_REC *server;
} *KeyInternal;
/* 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);
+ NULL, key, i->responder);
printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES,
SILCTXT_KEY_AGREEMENT_PRIVMSG,
client_entry->nickname);
SilcClientConnection conn = server->conn;
SilcClientEntry client_entry = NULL;
SilcChannelEntry channel_entry = NULL;
- uint32 num = 0;
- char *nickname = NULL, *serv = NULL, *tmp;
+ char *nickname = NULL, *tmp;
int command = 0, port = 0, type = 0;
char *hostname = NULL;
KeyInternal internal = NULL;
g_free(tmp);
if (argc < 4) {
- silc_say(silc_client, conn, "Usage: /KEY msg|channel <nickname|channel> "
+ silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
+ "Usage: /KEY msg|channel <nickname|channel> "
"set|unset|agreement|negotiate [<arguments>]");
return;
}
type = 2;
if (type == 0) {
- silc_say(silc_client, conn, "Usage: /KEY msg|channel <nickname|channel> "
+ silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
+ "Usage: /KEY msg|channel <nickname|channel> "
"set|unset|agreement|negotiate [<arguments>]");
return;
}
nickname = "*";
} else {
/* Parse the typed nickname. */
- if (!silc_parse_nickname(argv[2], &nickname, &serv, &num)) {
+ if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]);
return;
/* Find client entry */
client_entry = silc_idlist_get_client(silc_client, conn, nickname,
- serv, num, TRUE);
+ argv[2], TRUE);
if (!client_entry) {
KeyGetClients inter = silc_calloc(1, sizeof(*inter));
inter->server = server;
if (argv[2][0] == '*') {
if (!conn->current_channel) {
- if (nickname)
- silc_free(nickname);
- if (serv)
- silc_free(serv);
+ silc_free(nickname);
cmd_return_error(CMDERR_NOT_JOINED);
}
name = conn->current_channel->channel_name;
channel_entry = silc_client_get_channel(silc_client, conn, name);
if (!channel_entry) {
- if (nickname)
- silc_free(nickname);
- if (serv)
- silc_free(serv);
+ silc_free(nickname);
cmd_return_error(CMDERR_NOT_JOINED);
}
}
argv[5], argv[4],
argv_lens[4],
(argv[4][0] == '*' ?
- TRUE : FALSE));
+ 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));
+ TRUE : FALSE), FALSE);
/* Send the key to the remote client so that it starts using it
too. */
else
strcat(buf, "*generated*");
- silc_say(silc_client, conn, "%s", buf);
+ silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
}
} else {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
else
strcat(buf, "*generated*");
- silc_say(silc_client, conn, "%s", buf);
+ silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
}
}
strcat(buf, "<hidden>");
- silc_say(silc_client, conn, "%s", buf);
+ silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
}
silc_client_free_channel_private_keys(keys, keys_count);
}
if (command == 0) {
- silc_say(silc_client, conn, "Usage: /KEY msg|channel <nickname|channel> "
+ silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
+ "Usage: /KEY msg|channel <nickname|channel> "
"set|unset|agreement|negotiate [<arguments>]");
goto out;
}
if (command == 4 && client_entry) {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_NOTICES,
SILCTXT_KEY_AGREEMENT, argv[2]);
+ internal->responder = TRUE;
silc_client_send_key_agreement(silc_client, conn, client_entry, hostname,
port, 120, keyagr_completion, internal);
+ if (!hostname)
+ silc_free(internal);
goto out;
}
if (command == 5 && client_entry && hostname) {
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_NOTICES,
SILCTXT_KEY_AGREEMENT_NEGOTIATE, argv[2]);
+ internal->responder = FALSE;
silc_client_perform_key_agreement(silc_client, conn, client_entry,
hostname, port, keyagr_completion,
internal);
}
out:
- if (nickname)
- silc_free(nickname);
- if (serv)
- silc_free(serv);
+ silc_free(nickname);
+}
+
+/* Lists locally saved client and server public keys. */
+
+static void command_listkeys(const char *data, SILC_SERVER_REC *server,
+ WI_ITEM_REC *item)
+{
+
}
void silc_channels_init(void)
signal_add("silc event server_signoff", (SIGNAL_FUNC) event_server_signoff);
signal_add("silc event kick", (SIGNAL_FUNC) event_kick);
signal_add("silc event kill", (SIGNAL_FUNC) event_kill);
- signal_add("silc event ban", (SIGNAL_FUNC) event_ban);
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);
silc_nicklist_init();
}
(SIGNAL_FUNC) event_server_signoff);
signal_remove("silc event kick", (SIGNAL_FUNC) event_kick);
signal_remove("silc event kill", (SIGNAL_FUNC) event_kill);
- signal_remove("silc event ban", (SIGNAL_FUNC) event_ban);
command_unbind("part", (SIGNAL_FUNC) command_part);
command_unbind("me", (SIGNAL_FUNC) command_me);
+ command_unbind("action", (SIGNAL_FUNC) command_action);
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);
silc_nicklist_deinit();
}
projects / silc.git / blobdiff