X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-servers.c;h=9fdfd4a55bf22a24351000b2ec2aa7b69c33a9f7;hb=6394d86063413bc1c473723f3ef971840195bcd3;hp=d8085785adade075c7e8f48e13869d64f6dd75bb;hpb=8bedd95be03038c219f8a5ee9c7d0d02540c575c;p=silc.git diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c index d8085785..9fdfd4a5 100644 --- a/apps/irssi/src/silc/core/silc-servers.c +++ b/apps/irssi/src/silc/core/silc-servers.c @@ -37,6 +37,7 @@ #include "silc-servers.h" #include "silc-channels.h" #include "silc-queries.h" +#include "silc-nicklist.h" #include "window-item-def.h" #include "fe-common/core/printtext.h" @@ -61,6 +62,7 @@ static void silc_send_channel(SILC_SERVER_REC *server, typedef struct { char *nick; char *msg; + SILC_SERVER_REC *server; } PRIVMSG_REC; /* Callback function that sends the private message if the client was @@ -73,18 +75,50 @@ static void silc_send_msg_clients(SilcClient client, void *context) { PRIVMSG_REC *rec = context; + SILC_SERVER_REC *server = rec->server; SilcClientEntry target; - - if (clients_count == 0) { - printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s", rec->nick); + char *nickname = NULL; + + if (!clients_count) { + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, + "%s: There is no such client", rec->nick); } else { - target = clients[0]; /* FIXME: not a good idea :) */ - + if (clients_count > 1) { + silc_parse_userfqdn(rec->nick, &nickname, NULL); + + /* Find the correct one. The rec->nick might be a formatted nick + so this will find the correct one. */ + clients = silc_client_get_clients_local(silc_client, server->conn, + nickname, rec->nick, + &clients_count); + if (!clients) { + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, + "%s: There is no such client", rec->nick); + silc_free(nickname); + goto out; + } + silc_free(nickname); + } + + target = clients[0]; + + /* Still check for exact math for nickname, this compares the + real (formatted) nickname and the nick (maybe formatted) that + use gave. This is to assure that `nick' does not match + `nick@host'. */ + if (strcasecmp(rec->nick, clients[0]->nickname)) { + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, + "%s: There is no such client", rec->nick); + goto out; + } + + /* Send the private message */ silc_client_send_private_message(client, conn, target, 0, rec->msg, strlen(rec->msg), TRUE); } + out: g_free(rec->nick); g_free(rec->msg); g_free(rec); @@ -93,33 +127,36 @@ static void silc_send_msg_clients(SilcClient client, static void silc_send_msg(SILC_SERVER_REC *server, char *nick, char *msg) { PRIVMSG_REC *rec; - SilcClientEntry client_entry; - uint32 num = 0; - char *nickname = NULL, *serv = NULL; - - if (!silc_parse_nickname(nick, &nickname, &serv, &num)) { + SilcClientEntry *clients; + uint32 clients_count; + char *nickname = NULL; + + if (!silc_parse_userfqdn(nick, &nickname, NULL)) { printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP, SILCTXT_BAD_NICK, nick); return; } /* Find client entry */ - client_entry = silc_idlist_get_client(silc_client, server->conn, - nickname, serv, num, FALSE); - if (!client_entry) { + clients = silc_client_get_clients_local(silc_client, server->conn, + nickname, nick, &clients_count); + if (!clients) { rec = g_new0(PRIVMSG_REC, 1); rec->nick = g_strdup(nick); rec->msg = g_strdup(msg); + rec->server = server; /* Could not find client with that nick, resolve it from server. */ silc_client_get_clients(silc_client, server->conn, - nickname, serv, silc_send_msg_clients, rec); + nickname, NULL, silc_send_msg_clients, rec); + silc_free(nickname); return; } /* Send the private message directly */ - silc_client_send_private_message(silc_client, server->conn, client_entry, 0, - msg, strlen(msg), TRUE); + silc_free(nickname); + silc_client_send_private_message(silc_client, server->conn, + clients[0], 0, msg, strlen(msg), TRUE); } static int isnickflag_func(char flag) @@ -179,10 +216,10 @@ static void sig_connected(SILC_SERVER_REC *server) static void sig_disconnected(SILC_SERVER_REC *server) { - if (!IS_SILC_SERVER(server) || server->conn == NULL) + if (!IS_SILC_SERVER(server)) return; - if (server->conn->sock != NULL) { + if (server->conn && server->conn->sock != NULL) { silc_client_close_connection(silc_client, NULL, server->conn); /* SILC closes the handle */ @@ -217,6 +254,8 @@ SILC_SERVER_REC *silc_server_connect(SILC_SERVER_CONNECT_REC *conn) return NULL; } + server->ftp_sessions = silc_dlist_init(); + return server; } @@ -252,20 +291,20 @@ char *silc_server_get_channels(SILC_SERVER_REC *server) /* SYNTAX: BAN [+|-[[@[![@hostname>]]]]] */ /* SYNTAX: CMODE +|- [{ }] */ -/* SYNTAX: CUMODE +|- [@] [-pubkey|] */ -/* SYNTAX: GETKEY */ -/* SYNTAX: INVITE [[@server>] */ +/* SYNTAX: CUMODE +|- [@] [-pubkey|] */ +/* SYNTAX: GETKEY */ +/* SYNTAX: INVITE [[@hostname>] */ /* SYNTAX: INVITE [+|-[[@[![@hostname>]]]]] */ /* SYNTAX: KEY MSG set|unset|list|agreement|negotiate [] */ /* SYNTAX: KEY CHANNEL set|unset|list|agreement|negotiate [] */ -/* SYNTAX: KICK [@] [] */ -/* SYNTAX: KILL [@] [] */ -/* SYNTAX: OPER [] */ -/* SYNTAX: SILCOPER [] */ -/* SYNTAX: TOPIC [ */ +/* SYNTAX: KICK [@] [] */ +/* SYNTAX: KILL [@] [] */ +/* SYNTAX: OPER [-pubkey] */ +/* SYNTAX: SILCOPER [-pubkey] */ +/* SYNTAX: TOPIC [] */ /* SYNTAX: UMODE +|- */ -/* SYNTAX: WHOIS [@] [] */ -/* SYNTAX: WHOWAS [@] [] */ +/* SYNTAX: WHOIS [@] [] */ +/* SYNTAX: WHOWAS [@] [] */ /* SYNTAX: CLOSE [] */ /* SYNTAX: SHUTDOWN */ /* SYNTAX: MOTD [] */ @@ -277,9 +316,14 @@ char *silc_server_get_channels(SILC_SERVER_REC *server) /* SYNTAX: NICK */ /* SYNTAX: NOTICE */ /* SYNTAX: PART [] */ -/* SYNTAX: PING [] */ +/* SYNTAX: PING */ /* SYNTAX: SCONNECT [] */ /* SYNTAX: USERS */ +/* SYNTAX: FILE SEND [ []] */ +/* SYNTAX: FILE RECEIVE [] */ +/* SYNTAX: FILE CLOSE [] */ +/* SYNTAX: FILE */ +/* SYNTAX: JOIN [] [-cipher ] [-hmac ] [-founder <-pubkey|passwd>] */ void silc_command_exec(SILC_SERVER_REC *server, const char *command, const char *args) @@ -288,18 +332,18 @@ void silc_command_exec(SILC_SERVER_REC *server, unsigned char **argv; uint32 *argv_lens, *argv_types; char *data, *tmpcmd; - SilcClientCommand *cmd; + SilcClientCommand cmd; SilcClientCommandContext ctx; g_return_if_fail(server != NULL); tmpcmd = g_strdup(command); g_strup(tmpcmd); - cmd = silc_client_command_find(tmpcmd); + cmd = silc_client_command_find(silc_client, tmpcmd); g_free(tmpcmd); if (cmd == NULL) return; - + /* Now parse all arguments */ data = g_strconcat(command, " ", args, NULL); silc_parse_command_line(data, &argv, &argv_lens, @@ -318,7 +362,7 @@ void silc_command_exec(SILC_SERVER_REC *server, ctx->argv_types = argv_types; /* Execute command */ - (*cmd->cb)(ctx); + silc_client_command_call(cmd, ctx); } /* Generic command function to call any SILC command directly. */ @@ -370,7 +414,434 @@ static void event_text(const char *line, SILC_SERVER_REC *server, signal_emit("command msg", 3, str, server, item); g_free(str); - signal_stop(); + signal_stop(); +} + +/* FILE command */ + +SILC_TASK_CALLBACK(silc_client_file_close_later) +{ + FtpSession ftp = (FtpSession)context; + + SILC_LOG_DEBUG(("Start")); + + silc_client_file_close(silc_client, ftp->conn, ftp->session_id); + silc_free(ftp->filepath); + silc_free(ftp); +} + +static void silc_client_file_monitor(SilcClient client, + SilcClientConnection conn, + SilcClientMonitorStatus status, + SilcClientFileError error, + uint64 offset, + uint64 filesize, + SilcClientEntry client_entry, + uint32 session_id, + const char *filepath, + void *context) +{ + SILC_SERVER_REC *server = (SILC_SERVER_REC *)context; + FtpSession ftp; + char fsize[32]; + + snprintf(fsize, sizeof(fsize) - 1, "%llu", ((filesize + 1023) / 1024)); + + silc_dlist_start(server->ftp_sessions); + while ((ftp = silc_dlist_get(server->ftp_sessions)) != SILC_LIST_END) { + if (ftp->session_id == session_id) { + if (!ftp->filepath && filepath) + ftp->filepath = strdup(filepath); + break; + } + } + + if (ftp == SILC_LIST_END) + return; + + if (status == SILC_CLIENT_FILE_MONITOR_ERROR) { + if (error == SILC_CLIENT_FILE_NO_SUCH_FILE) + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_ERROR_NO_SUCH_FILE, + client_entry->nickname, + filepath ? filepath : "[N/A]"); + else if (error == SILC_CLIENT_FILE_PERMISSION_DENIED) + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_ERROR_PERMISSION_DENIED, + client_entry->nickname); + else + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_ERROR, client_entry->nickname); + silc_schedule_task_add(silc_client->schedule, 0, + silc_client_file_close_later, ftp, + 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + if (ftp == server->current_session) + server->current_session = NULL; + silc_dlist_del(server->ftp_sessions, ftp); + } + + if (status == SILC_CLIENT_FILE_MONITOR_KEY_AGREEMENT) { + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_KEY_EXCHANGE, client_entry->nickname); + } + + /* Save some transmission data */ + if (offset && filesize) { + unsigned long delta = time(NULL) - ftp->starttime; + + ftp->percent = ((double)offset / (double)filesize) * (double)100.0; + if (delta) + ftp->kps = (double)((offset / (double)delta) + 1023) / (double)1024; + else + ftp->kps = (double)(offset + 1023) / (double)1024; + ftp->offset = offset; + ftp->filesize = filesize; + } + + if (status == SILC_CLIENT_FILE_MONITOR_SEND) { + if (offset == 0) { + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_TRANSMIT, filepath, fsize, + client_entry->nickname); + ftp->starttime = time(NULL); + } + if (offset == filesize) { + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_TRANSMITTED, filepath, fsize, + client_entry->nickname, ftp->kps); + silc_schedule_task_add(silc_client->schedule, 0, + silc_client_file_close_later, ftp, + 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + if (ftp == server->current_session) + server->current_session = NULL; + silc_dlist_del(server->ftp_sessions, ftp); + } + } + + if (status == SILC_CLIENT_FILE_MONITOR_RECEIVE) { + if (offset == 0) { + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_RECEIVE, filepath, fsize, + client_entry->nickname); + ftp->starttime = time(NULL); + } + + if (offset == filesize) { + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_RECEIVED, filepath, fsize, + client_entry->nickname, ftp->kps); + silc_schedule_task_add(silc_client->schedule, 0, + silc_client_file_close_later, ftp, + 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + if (ftp == server->current_session) + server->current_session = NULL; + silc_dlist_del(server->ftp_sessions, ftp); + } + } +} + +typedef struct { + SILC_SERVER_REC *server; + char *data; + char *nick; + WI_ITEM_REC *item; +} *FileGetClients; + +static void silc_client_command_file_get_clients(SilcClient client, + SilcClientConnection conn, + SilcClientEntry *clients, + uint32 clients_count, + void *context) +{ + FileGetClients internal = (FileGetClients)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 file", 3, internal->data, internal->server, + internal->item); + + silc_free(internal->data); + silc_free(internal->nick); + silc_free(internal); +} + +static void command_file(const char *data, SILC_SERVER_REC *server, + WI_ITEM_REC *item) +{ + SilcClientConnection conn; + SilcClientEntry *entrys, client_entry; + SilcClientFileError ret; + uint32 entry_count; + char *nickname = NULL, *tmp; + unsigned char **argv; + uint32 argc; + uint32 *argv_lens, *argv_types; + int type = 0; + FtpSession ftp; + char *local_ip = NULL; + uint32 local_port = 0; + + if (!server || !IS_SILC_SERVER(server) || !server->connected) + cmd_return_error(CMDERR_NOT_CONNECTED); + + conn = server->conn; + + /* Now parse all arguments */ + tmp = g_strconcat("FILE", " ", data, NULL); + silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 6); + g_free(tmp); + + if (argc == 1) + type = 4; + + if (argc >= 2) { + if (!strcasecmp(argv[1], "send")) + type = 1; + if (!strcasecmp(argv[1], "receive")) + type = 2; + if (!strcasecmp(argv[1], "close")) + type = 3; + } + + if (type == 0) + cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); + + switch (type) { + case 1: + if (argc < 4) + cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); + + /* Parse the typed nickname. */ + if (!silc_parse_userfqdn(argv[3], &nickname, NULL)) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[3]); + goto out; + } + + /* Find client entry */ + entrys = silc_client_get_clients_local(silc_client, conn, nickname, + argv[3], &entry_count); + if (!entrys) { + FileGetClients 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[3], + silc_client_command_file_get_clients, inter); + goto out; + } + client_entry = entrys[0]; + silc_free(entrys); + + if (argc >= 5) + local_ip = argv[4]; + if (argc >= 6) + local_port = atoi(argv[5]); + + ftp = silc_calloc(1, sizeof(*ftp)); + ftp->session_id = + silc_client_file_send(silc_client, conn, silc_client_file_monitor, + server, local_ip, local_port, + client_entry, argv[2]); + + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_SEND, client_entry->nickname, + argv[2]); + + ftp->client_entry = client_entry; + ftp->filepath = strdup(argv[2]); + ftp->conn = conn; + ftp->send = TRUE; + silc_dlist_add(server->ftp_sessions, ftp); + server->current_session = ftp; + + break; + + case 2: + /* Parse the typed nickname. */ + if (argc >= 3) { + if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]); + goto out; + } + + /* Find client entry */ + entrys = silc_client_get_clients_local(silc_client, conn, nickname, + argv[2], &entry_count); + if (!entrys) { + FileGetClients 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_command_file_get_clients, inter); + goto out; + } + client_entry = entrys[0]; + silc_free(entrys); + } else { + if (!server->current_session) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_NA); + goto out; + } + + ret = silc_client_file_receive(silc_client, conn, + silc_client_file_monitor, server, + server->current_session->session_id); + if (ret != SILC_CLIENT_FILE_OK) { + if (ret == SILC_CLIENT_FILE_ALREADY_STARTED) + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_ALREADY_STARTED, + server->current_session->client_entry->nickname); + else + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_CLIENT_NA, + server->current_session->client_entry->nickname); + } + + goto out; + } + + silc_dlist_start(server->ftp_sessions); + while ((ftp = silc_dlist_get(server->ftp_sessions)) != SILC_LIST_END) { + if (ftp->client_entry == client_entry && !ftp->filepath) { + ret = silc_client_file_receive(silc_client, conn, + silc_client_file_monitor, server, + ftp->session_id); + if (ret != SILC_CLIENT_FILE_OK) { + if (ret == SILC_CLIENT_FILE_ALREADY_STARTED) + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_ALREADY_STARTED, + client_entry->nickname); + else + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_CLIENT_NA, + client_entry->nickname); + } + break; + } + } + + if (ftp == SILC_LIST_END) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_CLIENT_NA, + client_entry->nickname); + goto out; + } + break; + + case 3: + /* Parse the typed nickname. */ + if (argc >= 3) { + if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]); + goto out; + } + + /* Find client entry */ + entrys = silc_client_get_clients_local(silc_client, conn, nickname, + argv[2], &entry_count); + if (!entrys) { + FileGetClients 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_command_file_get_clients, inter); + goto out; + } + client_entry = entrys[0]; + silc_free(entrys); + } else { + if (!server->current_session) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_NA); + goto out; + } + + silc_client_file_close(silc_client, conn, + server->current_session->session_id); + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_CLOSED, + server->current_session->client_entry->nickname, + server->current_session->filepath ? + server->current_session->filepath : "[N/A]"); + silc_dlist_del(server->ftp_sessions, server->current_session); + silc_free(server->current_session->filepath); + silc_free(server->current_session); + server->current_session = NULL; + goto out; + } + + silc_dlist_start(server->ftp_sessions); + while ((ftp = silc_dlist_get(server->ftp_sessions)) != SILC_LIST_END) { + if (ftp->client_entry == client_entry) { + silc_client_file_close(silc_client, conn, ftp->session_id); + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_CLOSED, + client_entry->nickname, + ftp->filepath ? ftp->filepath : "[N/A]"); + if (ftp == server->current_session) + server->current_session = NULL; + silc_dlist_del(server->ftp_sessions, ftp); + silc_free(ftp->filepath); + silc_free(ftp); + break; + } + } + + if (ftp == SILC_LIST_END) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_CLIENT_NA, + client_entry->nickname); + goto out; + } + break; + + case 4: + + if (!silc_dlist_count(server->ftp_sessions)) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_NA); + goto out; + } + + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_SHOW_HEADER); + + silc_dlist_start(server->ftp_sessions); + while ((ftp = silc_dlist_get(server->ftp_sessions)) != SILC_LIST_END) { + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_SHOW_LINE, + ftp->client_entry->nickname, + ftp->send ? "send" : "receive", + (uint32)(ftp->offset + 1023) / 1024, + (uint32)(ftp->filesize + 1023) / 1024, + ftp->percent, ftp->kps, + ftp->filepath ? ftp->filepath : "[N/A]"); + } + + break; + + default: + break; + } + + out: + silc_free(nickname); } void silc_server_init(void) @@ -402,6 +873,7 @@ void silc_server_init(void) command_bind("shutdown", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("getkey", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("sconnect", MODULE_NAME, (SIGNAL_FUNC) command_sconnect); + command_bind("file", MODULE_NAME, (SIGNAL_FUNC) command_file); command_set_options("connect", "+silcnet"); } @@ -435,4 +907,20 @@ void silc_server_deinit(void) command_unbind("shutdown", (SIGNAL_FUNC) command_self); command_unbind("getkey", (SIGNAL_FUNC) command_self); command_unbind("sconnect", (SIGNAL_FUNC) command_sconnect); + command_unbind("file", (SIGNAL_FUNC) command_file); +} + +void silc_server_free_ftp(SILC_SERVER_REC *server, + SilcClientEntry client_entry) +{ + FtpSession ftp; + + silc_dlist_start(server->ftp_sessions); + while ((ftp = silc_dlist_get(server->ftp_sessions)) != SILC_LIST_END) { + if (ftp->client_entry == client_entry) { + silc_dlist_del(server->ftp_sessions, ftp); + silc_free(ftp->filepath); + silc_free(ftp); + } + } }