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=e63578f0cabe506ddea53094d8ef6e84be7ae8d5;hpb=b3c198997d2adb79fb3c2e48cba9d0511badd9f0;p=silc.git diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c index e63578f0..03ccd79f 100644 --- a/apps/irssi/src/silc/core/silc-servers.c +++ b/apps/irssi/src/silc/core/silc-servers.c @@ -71,7 +71,7 @@ typedef struct { static void silc_send_msg_clients(SilcClient client, SilcClientConnection conn, SilcClientEntry *clients, - uint32 clients_count, + SilcUInt32 clients_count, void *context) { PRIVMSG_REC *rec = context; @@ -80,7 +80,8 @@ static void silc_send_msg_clients(SilcClient client, char *nickname = NULL; if (!clients_count) { - printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s", rec->nick); + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, + "%s: There is no such client", rec->nick); } else { if (clients_count > 1) { silc_parse_userfqdn(rec->nick, &nickname, NULL); @@ -91,8 +92,8 @@ static void silc_send_msg_clients(SilcClient client, nickname, rec->nick, &clients_count); if (!clients) { - printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s", - rec->nick); + printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, + "%s: There is no such client", rec->nick); silc_free(nickname); goto out; } @@ -101,6 +102,16 @@ static void silc_send_msg_clients(SilcClient client, 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), @@ -117,7 +128,7 @@ static void silc_send_msg(SILC_SERVER_REC *server, char *nick, char *msg) { PRIVMSG_REC *rec; SilcClientEntry *clients; - uint32 clients_count; + SilcUInt32 clients_count; char *nickname = NULL; if (!silc_parse_userfqdn(nick, &nickname, NULL)) { @@ -153,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) @@ -163,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); @@ -190,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; @@ -207,7 +215,9 @@ static void sig_disconnected(SILC_SERVER_REC *server) { if (!IS_SILC_SERVER(server)) return; - + + silc_dlist_uninit(server->ftp_sessions); + if (server->conn && server->conn->sock != NULL) { silc_client_close_connection(silc_client, NULL, server->conn); @@ -237,14 +247,14 @@ 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; } - server->ftp_sessions = silc_dlist_init(); - return server; } @@ -285,7 +295,7 @@ char *silc_server_get_channels(SILC_SERVER_REC *server) /* SYNTAX: INVITE [[@hostname>] */ /* SYNTAX: INVITE [+|-[[@[![@hostname>]]]]] */ /* SYNTAX: KEY MSG set|unset|list|agreement|negotiate [] */ -/* SYNTAX: KEY CHANNEL set|unset|list|agreement|negotiate [] */ +/* SYNTAX: KEY CHANNEL set|unset|list [] */ /* SYNTAX: KICK [@] [] */ /* SYNTAX: KILL [@] [] */ /* SYNTAX: OPER [-pubkey] */ @@ -308,30 +318,31 @@ char *silc_server_get_channels(SILC_SERVER_REC *server) /* SYNTAX: PING */ /* SYNTAX: SCONNECT [] */ /* SYNTAX: USERS */ -/* SYNTAX: FILE SEND */ +/* 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); + 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, @@ -350,7 +361,7 @@ void silc_command_exec(SILC_SERVER_REC *server, ctx->argv_types = argv_types; /* Execute command */ - (*cmd->cb)(ctx, NULL); + silc_client_command_call(cmd, ctx); } /* Generic command function to call any SILC command directly. */ @@ -388,23 +399,6 @@ static void command_sconnect(const char *data, SILC_SERVER_REC *server) signal_stop(); } -static void event_text(const char *line, SILC_SERVER_REC *server, - WI_ITEM_REC *item) -{ - char *str; - - g_return_if_fail(line != NULL); - - if (!IS_SILC_ITEM(item)) - return; - - str = g_strdup_printf("%s %s", item->name, line); - signal_emit("command msg", 3, str, server, item); - g_free(str); - - signal_stop(); -} - /* FILE command */ SILC_TASK_CALLBACK(silc_client_file_close_later) @@ -421,10 +415,11 @@ SILC_TASK_CALLBACK(silc_client_file_close_later) static void silc_client_file_monitor(SilcClient client, SilcClientConnection conn, SilcClientMonitorStatus status, - uint64 offset, - uint64 filesize, + SilcClientFileError error, + SilcUInt64 offset, + SilcUInt64 filesize, SilcClientEntry client_entry, - uint32 session_id, + SilcUInt32 session_id, const char *filepath, void *context) { @@ -432,13 +427,11 @@ static void silc_client_file_monitor(SilcClient client, FtpSession ftp; char fsize[32]; - snprintf(fsize, sizeof(fsize) - 1, "%llu", (filesize / 1024)); + 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->client_entry == client_entry) { - ftp->session_id = session_id; - + if (ftp->session_id == session_id) { if (!ftp->filepath && filepath) ftp->filepath = strdup(filepath); break; @@ -449,8 +442,18 @@ static void silc_client_file_monitor(SilcClient client, return; if (status == SILC_CLIENT_FILE_MONITOR_ERROR) { - printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, - SILCTXT_FILE_ERROR, client_entry->nickname); + 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); @@ -464,6 +467,19 @@ static void silc_client_file_monitor(SilcClient client, 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, @@ -504,15 +520,6 @@ static void silc_client_file_monitor(SilcClient client, silc_dlist_del(server->ftp_sessions, ftp); } } - - /* Save some transmission data */ - if (offset && filesize) { - ftp->percent = ((double)offset / (double)filesize) * (double)100.0; - ftp->kps = (double)((offset / (double)(time(NULL) - ftp->starttime)) + - 1023) / (double)1024; - ftp->offset = offset; - ftp->filesize = filesize; - } } typedef struct { @@ -525,7 +532,7 @@ typedef struct { static void silc_client_command_file_get_clients(SilcClient client, SilcClientConnection conn, SilcClientEntry *clients, - uint32 clients_count, + SilcUInt32 clients_count, void *context) { FileGetClients internal = (FileGetClients)context; @@ -553,13 +560,16 @@ static void command_file(const char *data, SILC_SERVER_REC *server, SilcClientConnection conn; SilcClientEntry *entrys, client_entry; SilcClientFileError ret; - uint32 entry_count; + SilcUInt32 entry_count; char *nickname = NULL, *tmp; unsigned char **argv; - uint32 argc; - uint32 *argv_lens, *argv_types; + 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); @@ -568,7 +578,7 @@ static void command_file(const char *data, SILC_SERVER_REC *server, /* Now parse all arguments */ tmp = g_strconcat("FILE", " ", data, NULL); - silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 4); + silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 6); g_free(tmp); if (argc == 1) @@ -614,19 +624,39 @@ static void command_file(const char *data, SILC_SERVER_REC *server, client_entry = entrys[0]; silc_free(entrys); - silc_client_file_send(silc_client, conn, silc_client_file_monitor, - server, client_entry, argv[2]); - printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, - SILCTXT_FILE_SEND, client_entry->nickname, - argv[2]); + 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; - ftp = silc_calloc(1, sizeof(*ftp)); - 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; + 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; @@ -663,7 +693,6 @@ static void command_file(const char *data, SILC_SERVER_REC *server, ret = silc_client_file_receive(silc_client, conn, silc_client_file_monitor, server, - server->current_session->client_entry, server->current_session->session_id); if (ret != SILC_CLIENT_FILE_OK) { if (ret == SILC_CLIENT_FILE_ALREADY_STARTED) @@ -681,10 +710,9 @@ static void command_file(const char *data, SILC_SERVER_REC *server, silc_dlist_start(server->ftp_sessions); while ((ftp = silc_dlist_get(server->ftp_sessions)) != SILC_LIST_END) { - if (ftp->client_entry == client_entry) { + if (ftp->client_entry == client_entry && !ftp->filepath) { ret = silc_client_file_receive(silc_client, conn, silc_client_file_monitor, server, - ftp->client_entry, ftp->session_id); if (ret != SILC_CLIENT_FILE_OK) { if (ret == SILC_CLIENT_FILE_ALREADY_STARTED) @@ -739,44 +767,30 @@ static void command_file(const char *data, SILC_SERVER_REC *server, goto out; } - ret = silc_client_file_close(silc_client, conn, - 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); - } else { - printformat_module("fe-common/silc", server, NULL, - MSGLEVEL_CRAP, SILCTXT_FILE_CLOSED, - server->current_session->client_entry->nickname); - } + 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) { - ret = silc_client_file_close(silc_client, conn, 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); - } else { - printformat_module("fe-common/silc", server, NULL, - MSGLEVEL_CRAP, SILCTXT_FILE_CLOSED, - client_entry->nickname); - } - + 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); @@ -809,8 +823,8 @@ static void command_file(const char *data, SILC_SERVER_REC *server, MSGLEVEL_CRAP, SILCTXT_FILE_SHOW_LINE, ftp->client_entry->nickname, ftp->send ? "send" : "receive", - (uint32)(ftp->offset + 1023) / 1024, - (uint32)(ftp->filesize + 1023) / 1024, + (SilcUInt32)(ftp->offset + 1023) / 1024, + (SilcUInt32)(ftp->filesize + 1023) / 1024, ftp->percent, ftp->kps, ftp->filepath ? ftp->filepath : "[N/A]"); } @@ -831,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); @@ -865,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); @@ -902,7 +914,6 @@ void silc_server_free_ftp(SILC_SERVER_REC *server, silc_dlist_del(server->ftp_sessions, ftp); silc_free(ftp->filepath); silc_free(ftp); - break; } } }