X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-servers.c;h=03ccd79f7426e2c27bc9a24706e65bac7b7556c1;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=91733413b26197a384394a634b650fc45f512e21;hpb=28bb558c7ca273dbcff929f3f376c54b00e72a5f;p=silc.git diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c index 91733413..03ccd79f 100644 --- a/apps/irssi/src/silc/core/silc-servers.c +++ b/apps/irssi/src/silc/core/silc-servers.c @@ -37,9 +37,11 @@ #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" +#include "fe-common/silc/module-formats.h" void silc_servers_reconnect_init(void); void silc_servers_reconnect_deinit(void); @@ -50,7 +52,7 @@ static void silc_send_channel(SILC_SERVER_REC *server, SILC_CHANNEL_REC *rec; rec = silc_channel_find(server, channel); - if (rec == NULL) + if (rec == NULL || rec->entry == NULL) return; silc_client_send_channel_message(silc_client, server->conn, rec->entry, @@ -60,27 +62,63 @@ 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 + resolved from the server. */ + static void silc_send_msg_clients(SilcClient client, SilcClientConnection conn, SilcClientEntry *clients, - uint32 clients_count, + SilcUInt32 clients_count, 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); @@ -89,13 +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; - - rec = g_new0(PRIVMSG_REC, 1); - rec->nick = g_strdup(nick); - rec->msg = g_strdup(msg); - - silc_client_get_clients(silc_client, server->conn, - nick, "", silc_send_msg_clients, rec); + SilcClientEntry *clients; + SilcUInt32 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 */ + 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, NULL, silc_send_msg_clients, rec); + silc_free(nickname); + return; + } + + /* Send the private message directly */ + 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) @@ -103,9 +164,9 @@ static int isnickflag_func(char flag) return flag == '@' || flag == '+'; } -static int ischannel_func(const char *data) +static int ischannel_func(SERVER_REC *server, const char *data) { - return *data == '#'; + return FALSE; } const char *get_nick_flags(void) @@ -113,13 +174,14 @@ const char *get_nick_flags(void) return "@\0\0"; } -static void send_message(SILC_SERVER_REC *server, char *target, char *msg) +static void send_message(SILC_SERVER_REC *server, char *target, + char *msg, int target_type) { g_return_if_fail(server != NULL); g_return_if_fail(target != NULL); g_return_if_fail(msg != NULL); - if (*target == '#') + if (target_type == SEND_TARGET_CHANNEL) silc_send_channel(server, target, msg); else silc_send_msg(server, target, msg); @@ -140,13 +202,9 @@ static void sig_connected(SILC_SERVER_REC *server) server->conn = conn; fd = g_io_channel_unix_get_fd(net_sendbuffer_handle(server->handle)); - if (!silc_client_start_key_exchange(silc_client, conn, fd)) { - /* some internal error occured */ - server_disconnect(SERVER(server)); - signal_stop(); - return; - } + silc_client_start_key_exchange(silc_client, conn, fd); + server->ftp_sessions = silc_dlist_init(); server->isnickflag = isnickflag_func; server->ischannel = ischannel_func; server->get_nick_flags = get_nick_flags; @@ -155,10 +213,12 @@ 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) { + + silc_dlist_uninit(server->ftp_sessions); + + if (server->conn && server->conn->sock != NULL) { silc_client_close_connection(silc_client, NULL, server->conn); /* SILC closes the handle */ @@ -187,8 +247,10 @@ SILC_SERVER_REC *silc_server_connect(SILC_SERVER_CONNECT_REC *conn) if (server->connrec->port <= 0) server->connrec->port = 706; + server_connect_ref(SERVER_CONNECT(conn)); + if (!server_start_connect((SERVER_REC *) server)) { - server_connect_free(SERVER_CONNECT(conn)); + server_connect_unref(SERVER_CONNECT(conn)); g_free(server); return NULL; } @@ -223,24 +285,64 @@ char *silc_server_get_channels(SILC_SERVER_REC *server) return ret; } +/* Syntaxes of all SILC commands for HELP files (the help file generation + will snoop these from here). */ + +/* SYNTAX: BAN [+|-[[@[![@hostname>]]]]] */ +/* SYNTAX: CMODE +|- [{ }] */ +/* 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 [] */ +/* SYNTAX: KICK [@] [] */ +/* SYNTAX: KILL [@] [] */ +/* SYNTAX: OPER [-pubkey] */ +/* SYNTAX: SILCOPER [-pubkey] */ +/* SYNTAX: TOPIC [] */ +/* SYNTAX: UMODE +|- */ +/* SYNTAX: WHOIS [@] [] */ +/* SYNTAX: WHOWAS [@] [] */ +/* SYNTAX: CLOSE [] */ +/* SYNTAX: SHUTDOWN */ +/* SYNTAX: MOTD [] */ +/* SYNTAX: LIST [] */ +/* SYNTAX: ME */ +/* SYNTAX: ACTION */ +/* SYNTAX: AWAY [] */ +/* SYNTAX: INFO [] */ +/* SYNTAX: NICK */ +/* SYNTAX: NOTICE */ +/* SYNTAX: PART [] */ +/* 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) { - uint32 argc = 0; + SilcUInt32 argc = 0; unsigned char **argv; - uint32 *argv_lens, *argv_types; + SilcUInt32 *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); + tmpcmd = g_strdup(command); + g_strup(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, @@ -259,41 +361,482 @@ void silc_command_exec(SILC_SERVER_REC *server, ctx->argv_types = argv_types; /* Execute command */ - (*cmd->cb)(ctx); + silc_client_command_call(cmd, ctx); } -static void command_users(const char *data, SILC_SERVER_REC *server, - WI_ITEM_REC *item) +/* Generic command function to call any SILC command directly. */ + +static void command_self(const char *data, SILC_SERVER_REC *server, + WI_ITEM_REC *item) { - signal_emit("command names", 3, data, server, item); + if (!IS_SILC_SERVER(server) || !server->connected) { + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Not connected to server"); + return; + } + + if (IS_SILC_CHANNEL(item)) { + SILC_CHANNEL_REC *chanrec; + chanrec = silc_channel_find(server, item->name); + if (chanrec) + server->conn->current_channel = chanrec->entry; + } + + silc_command_exec(server, current_command, data); + signal_stop(); } -static void command_self(const char *data, SILC_SERVER_REC *server) +/* SCONNECT command. Calls actually SILC's CONNECT command since Irssi + has CONNECT command for other purposes. */ + +static void command_sconnect(const char *data, SILC_SERVER_REC *server) { if (!IS_SILC_SERVER(server) || !server->connected) { printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Not connected to server"); return; } - silc_command_exec(server, current_command, data); + silc_command_exec(server, "CONNECT", data); signal_stop(); } -static void event_text(const char *line, SILC_SERVER_REC *server, - WI_ITEM_REC *item) +/* 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, + SilcUInt64 offset, + SilcUInt64 filesize, + SilcClientEntry client_entry, + SilcUInt32 session_id, + const char *filepath, + void *context) { - char *str; + 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; + } + } - g_return_if_fail(line != NULL); + 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 (!IS_SILC_ITEM(item)) + 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, + SilcUInt32 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; + } - str = g_strdup_printf("%s %s", item->name, line); - signal_emit("command msg", 3, str, server, item); - g_free(str); + signal_emit("command file", 3, internal->data, internal->server, + internal->item); - signal_stop(); + 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; + SilcUInt32 entry_count; + char *nickname = NULL, *tmp; + unsigned char **argv; + SilcUInt32 argc; + SilcUInt32 *argv_lens, *argv_types; + int type = 0; + FtpSession ftp; + char *local_ip = NULL; + SilcUInt32 local_port = 0; + SilcUInt32 session_id; + + 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]); + + ret = + silc_client_file_send(silc_client, conn, silc_client_file_monitor, + server, local_ip, local_port, + client_entry, argv[2], &session_id); + if (ret == SILC_CLIENT_FILE_OK) { + ftp = silc_calloc(1, sizeof(*ftp)); + ftp->session_id = session_id; + + 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; + } else { + if (ret == SILC_CLIENT_FILE_ALREADY_STARTED) + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_FILE_ALREADY_STARTED, + client_entry->nickname); + if (ret == SILC_CLIENT_FILE_NO_SUCH_FILE) + printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, + SILCTXT_FILE_ERROR_NO_SUCH_FILE, + client_entry->nickname, argv[2]); + } + + 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", + (SilcUInt32)(ftp->offset + 1023) / 1024, + (SilcUInt32)(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) @@ -302,7 +845,6 @@ void silc_server_init(void) signal_add_first("server connected", (SIGNAL_FUNC) sig_connected); signal_add("server disconnected", (SIGNAL_FUNC) sig_disconnected); - signal_add("send text", (SIGNAL_FUNC) event_text); command_bind("whois", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("whowas", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("nick", MODULE_NAME, (SIGNAL_FUNC) command_self); @@ -312,18 +854,20 @@ void silc_server_init(void) command_bind("users", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("list", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("ban", MODULE_NAME, (SIGNAL_FUNC) command_self); + command_bind("oper", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("silcoper", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("umode", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("invite", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("kill", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("kick", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("info", MODULE_NAME, (SIGNAL_FUNC) command_self); - command_bind("connect", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("ping", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("motd", MODULE_NAME, (SIGNAL_FUNC) command_self); command_bind("close", MODULE_NAME, (SIGNAL_FUNC) command_self); 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"); } @@ -334,7 +878,6 @@ void silc_server_deinit(void) signal_remove("server connected", (SIGNAL_FUNC) sig_connected); signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected); - signal_remove("send text", (SIGNAL_FUNC) event_text); command_unbind("whois", (SIGNAL_FUNC) command_self); command_unbind("whowas", (SIGNAL_FUNC) command_self); command_unbind("nick", (SIGNAL_FUNC) command_self); @@ -343,17 +886,34 @@ void silc_server_deinit(void) command_unbind("cumode", (SIGNAL_FUNC) command_self); command_unbind("users", (SIGNAL_FUNC) command_self); command_unbind("list", (SIGNAL_FUNC) command_self); + command_unbind("oper", (SIGNAL_FUNC) command_self); command_unbind("silcoper", (SIGNAL_FUNC) command_self); command_unbind("umode", (SIGNAL_FUNC) command_self); command_unbind("invite", (SIGNAL_FUNC) command_self); command_unbind("kill", (SIGNAL_FUNC) command_self); command_unbind("kick", (SIGNAL_FUNC) command_self); command_unbind("info", (SIGNAL_FUNC) command_self); - command_unbind("connect", (SIGNAL_FUNC) command_self); command_unbind("ping", (SIGNAL_FUNC) command_self); command_unbind("motd", (SIGNAL_FUNC) command_self); command_unbind("ban", (SIGNAL_FUNC) command_self); command_unbind("close", (SIGNAL_FUNC) command_self); 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); + } + } }