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);
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;
}
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),
/* Find client entry */
clients = silc_client_get_clients_local(silc_client, server->conn,
nickname, nick, &clients_count);
- silc_free(nickname);
-
if (!clients) {
rec = g_new0(PRIVMSG_REC, 1);
rec->nick = g_strdup(nick);
/* 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);
}
return NULL;
}
+ server->ftp_sessions = silc_dlist_init();
+
return server;
}
/* SYNTAX: PING */
/* SYNTAX: SCONNECT <server> [<port>] */
/* SYNTAX: USERS <channel> */
+/* SYNTAX: FILE SEND <filepath> <nickname> [<local IP> [<local port>]] */
+/* SYNTAX: FILE RECEIVE [<nickname>] */
+/* SYNTAX: FILE CLOSE [<nickname>] */
+/* SYNTAX: FILE */
+/* SYNTAX: JOIN <channel> [<passphrase>] [-cipher <cipher>] [-hmac <hmac>] [-founder <-pubkey|passwd>] */
void silc_command_exec(SILC_SERVER_REC *server,
const char *command, const char *args)
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,
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. */
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)
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");
}
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);
+ }
+ }
}