X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-channels.c;h=fa50947d524c06187b2fe04d821043e89d3f6ca5;hb=9a85416f729ef965606a688fffb6baa9d22927a5;hp=81696eeecbd0b160cd02b0358c29d669c0208e89;hpb=9c4f7f18c31afa9dbaf4540c30cafd980b29c318;p=silc.git diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c index 81696eee..fa50947d 100644 --- a/apps/irssi/src/silc/core/silc-channels.c +++ b/apps/irssi/src/silc/core/silc-channels.c @@ -151,14 +151,9 @@ static void event_join(SILC_SERVER_REC *server, va_list va) } else { chanrec = silc_channel_find_entry(server, channel); if (chanrec != NULL) { - SilcChannelUser user; - - silc_list_start(chanrec->entry->clients); - while ((user = silc_list_get(chanrec->entry->clients)) != NULL) - if (user->client == client) { - nickrec = silc_nicklist_insert(chanrec, user, TRUE); - break; - } + SilcChannelUser chu = silc_client_on_channel(channel, client); + if (chu) + nickrec = silc_nicklist_insert(chanrec, chu, TRUE); } } @@ -216,6 +211,8 @@ static void event_signoff(SILC_SERVER_REC *server, va_list va) client = va_arg(va, SilcClientEntry); message = va_arg(va, char *); + silc_server_free_ftp(server, client); + memset(userhost, 0, sizeof(userhost)); if (client->username) snprintf(userhost, sizeof(userhost) - 1, "%s@%s", @@ -240,12 +237,16 @@ static void event_signoff(SILC_SERVER_REC *server, va_list va) static void event_topic(SILC_SERVER_REC *server, va_list va) { SILC_CHANNEL_REC *chanrec; + void *entry; SilcClientEntry client; + SilcServerEntry server_entry; SilcChannelEntry channel; char *topic; char userhost[256]; + SilcIdType idtype; - client = va_arg(va, SilcClientEntry); + idtype = va_arg(va, int); + entry = va_arg(va, void *); topic = va_arg(va, char *); channel = va_arg(va, SilcChannelEntry); @@ -256,11 +257,23 @@ static void event_topic(SILC_SERVER_REC *server, va_list va) signal_emit("channel topic changed", 1, chanrec); } - memset(userhost, 0, sizeof(userhost)); - snprintf(userhost, sizeof(userhost) - 1, "%s@%s", - client->username, client->hostname); - signal_emit("message topic", 5, server, channel->channel_name, - topic, client->nickname, userhost); + if (idtype == SILC_ID_CLIENT) { + client = (SilcClientEntry)entry; + memset(userhost, 0, sizeof(userhost)); + snprintf(userhost, sizeof(userhost) - 1, "%s@%s", + client->username, client->hostname); + signal_emit("message topic", 5, server, channel->channel_name, + topic, client->nickname, userhost); + } else if (idtype == SILC_ID_SERVER) { + server_entry = (SilcServerEntry)entry; + signal_emit("message topic", 5, server, channel->channel_name, + topic, server_entry->server_name, + server_entry->server_name); + } else { + channel = (SilcChannelEntry)entry; + signal_emit("message topic", 5, server, channel->channel_name, + topic, channel->channel_name, channel->channel_name); + } } /* @@ -445,6 +458,8 @@ static void event_server_signoff(SILC_SERVER_REC *server, va_list va) clients_count = va_arg(va, uint32); for (i = 0; i < clients_count; i++) { + GSList *nicks, *tmp; + memset(userhost, 0, sizeof(userhost)); if (clients[i]->username) snprintf(userhost, sizeof(userhost) - 1, "%s@%s", @@ -452,6 +467,15 @@ static void event_server_signoff(SILC_SERVER_REC *server, va_list va) signal_emit("message quit", 4, server, clients[i]->nickname, clients[i]->username ? userhost : "", "server signoff"); + + silc_server_free_ftp(server, clients[i]); + + nicks = nicklist_get_same_unique(SERVER(server), clients[i]); + for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) { + CHANNEL_REC *channel = tmp->data; + NICK_REC *nickrec = tmp->next->data; + nicklist_remove(channel, nickrec); + } } } @@ -462,13 +486,14 @@ static void event_server_signoff(SILC_SERVER_REC *server, va_list va) static void event_kick(SILC_SERVER_REC *server, va_list va) { SilcClientConnection conn = server->conn; - SilcClientEntry client_entry; + SilcClientEntry client_entry, kicker; SilcChannelEntry channel_entry; char *tmp; SILC_CHANNEL_REC *chanrec; client_entry = va_arg(va, SilcClientEntry); tmp = va_arg(va, char *); + kicker = va_arg(va, SilcClientEntry); channel_entry = va_arg(va, SilcChannelEntry); chanrec = silc_channel_find_entry(server, channel_entry); @@ -476,6 +501,7 @@ static void event_kick(SILC_SERVER_REC *server, va_list va) if (client_entry == conn->local_entry) { printformat_module("fe-common/silc", server, channel_entry->channel_name, MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED_YOU, + kicker->nickname, channel_entry->channel_name, tmp ? tmp : ""); if (chanrec) { chanrec->kicked = TRUE; @@ -485,6 +511,7 @@ static void event_kick(SILC_SERVER_REC *server, va_list va) printformat_module("fe-common/silc", server, channel_entry->channel_name, MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED, client_entry->nickname, + kicker->nickname, channel_entry->channel_name, tmp ? tmp : ""); if (chanrec) { @@ -761,7 +788,7 @@ static void keyagr_completion(SilcClient client, switch(status) { case SILC_KEY_AGREEMENT_OK: - printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES, + printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP, SILCTXT_KEY_AGREEMENT_OK, client_entry->nickname); if (i->type == 1) { @@ -769,7 +796,7 @@ static void keyagr_completion(SilcClient 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); - printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES, + printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP, SILCTXT_KEY_AGREEMENT_PRIVMSG, client_entry->nickname); silc_ske_free_key_material(key); @@ -778,20 +805,25 @@ static void keyagr_completion(SilcClient client, break; case SILC_KEY_AGREEMENT_ERROR: - printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES, + 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_NOTICES, + 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_NOTICES, + 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); + break; + default: break; } @@ -811,26 +843,44 @@ static void keyagr_completion(SilcClient client, typedef struct { SILC_SERVER_REC *server; char *data; + char *nick; WI_ITEM_REC *item; } *KeyGetClients; /* Callback to be called after client information is resolved from the server. */ -SILC_CLIENT_CMD_FUNC(key_get_clients) +static void silc_client_command_key_get_clients(SilcClient client, + SilcClientConnection conn, + SilcClientEntry *clients, + uint32 clients_count, + void *context) { KeyGetClients internal = (KeyGetClients)context; + + if (!clients) { + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s", + internal->nick); + silc_free(internal->data); + silc_free(internal->nick); + silc_free(internal); + return; + } + signal_emit("command key", 3, internal->data, internal->server, internal->item); + silc_free(internal->data); + silc_free(internal->nick); silc_free(internal); } static void command_key(const char *data, SILC_SERVER_REC *server, WI_ITEM_REC *item) { - SilcClientConnection conn = server->conn; - SilcClientEntry client_entry = NULL; + SilcClientConnection conn; + SilcClientEntry *entrys, client_entry = NULL; + uint32 entry_count; SilcChannelEntry channel_entry = NULL; char *nickname = NULL, *tmp; int command = 0, port = 0, type = 0; @@ -839,21 +889,20 @@ static void command_key(const char *data, SILC_SERVER_REC *server, uint32 argc = 0; unsigned char **argv; uint32 *argv_lens, *argv_types; + char *bindhost = NULL; - if (!IS_SILC_SERVER(server) || !server->connected) + if (!server || !IS_SILC_SERVER(server) || !server->connected) cmd_return_error(CMDERR_NOT_CONNECTED); + conn = server->conn; + /* Now parse all arguments */ tmp = g_strconcat("KEY", " ", data, NULL); silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 7); g_free(tmp); - if (argc < 4) { - silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, - "Usage: /KEY msg|channel " - "set|unset|agreement|negotiate []"); - return; - } + if (argc < 4) + cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); /* Get type */ if (!strcasecmp(argv[1], "msg")) @@ -861,16 +910,12 @@ static void command_key(const char *data, SILC_SERVER_REC *server, if (!strcasecmp(argv[1], "channel")) type = 2; - if (type == 0) { - silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, - "Usage: /KEY msg|channel " - "set|unset|agreement|negotiate []"); - return; - } + if (type == 0) + cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); if (type == 1) { if (argv[2][0] == '*') { - nickname = "*"; + nickname = strdup("*"); } else { /* Parse the typed nickname. */ if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) { @@ -880,22 +925,20 @@ static void command_key(const char *data, SILC_SERVER_REC *server, } /* Find client entry */ - client_entry = silc_idlist_get_client(silc_client, conn, nickname, - argv[2], TRUE); - if (!client_entry) { + entrys = silc_client_get_clients_local(silc_client, conn, nickname, + argv[2], &entry_count); + if (!entrys) { KeyGetClients inter = silc_calloc(1, sizeof(*inter)); inter->server = server; inter->data = strdup(data); + inter->nick = strdup(nickname); inter->item = item; - - /* Client entry not found, it was requested thus mark this to be - pending command. */ - silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, - conn->cmd_ident, - NULL, silc_client_command_key_get_clients, - inter); + silc_client_get_clients(silc_client, conn, nickname, argv[2], + silc_client_command_key_get_clients, inter); goto out; } + client_entry = entrys[0]; + silc_free(entrys); } } @@ -1099,6 +1142,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server, } silc_client_free_private_message_keys(keys, keys_count); + } else if (type == 2) { SilcChannelPrivateKey *keys; uint32 keys_count; @@ -1108,12 +1152,14 @@ static void command_key(const char *data, SILC_SERVER_REC *server, keys = silc_client_list_channel_private_keys(silc_client, conn, channel_entry, &keys_count); - if (!keys) - goto out; - + printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP, SILCTXT_CH_PRIVATE_KEY_LIST, channel_entry->channel_name); + + if (!keys) + goto out; + for (k = 0; k < keys_count; k++) { memset(buf, 0, sizeof(buf)); strncat(buf, " ", 2); @@ -1155,6 +1201,31 @@ static void command_key(const char *data, SILC_SERVER_REC *server, 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 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')) { + bindhost = hostname; + } + port = settings_get_int("auto_bind_port"); + } + } /* if use_auto_addr */ + } } /* Start command is used to start key agreement (after receiving the @@ -1180,18 +1251,19 @@ static void command_key(const char *data, SILC_SERVER_REC *server, } if (command == 4 && client_entry) { - printformat_module("fe-common/silc", server, NULL, MSGLEVEL_NOTICES, + printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP, SILCTXT_KEY_AGREEMENT, argv[2]); internal->responder = TRUE; silc_client_send_key_agreement(silc_client, conn, client_entry, hostname, - port, 120, keyagr_completion, internal); + bindhost, 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, + 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,