Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2001 - 2006 Pekka Riikonen
+ Copyright (C) 2001 - 2007 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
return TRUE;
}
-static void silc_nickname_format_parse(const char *nickname,
- char **ret_nickname)
-{
- char nick[128 + 1];
- silc_parse_userfqdn(nickname, nick, sizeof(nick), NULL, 0);
- *ret_nickname = strdup(nick);
-}
-
static void silc_register_cipher(SilcClient client, const char *cipher)
{
int i;
}
}
+/* Called to indicate the client library has stopped. */
+
+static void
+silc_stopped(SilcClient client, void *context)
+{
+ SILC_LOG_DEBUG(("Client library has stopped"));
+ if (idletag != -1)
+ g_source_remove(idletag);
+}
+
+static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
+{
+ silc_client_stop(silc_client, silc_stopped, NULL);
+}
+
+/* Called to indicate the client library is running. */
+
+static void
+silc_running(SilcClient client, void *context)
+{
+ SILC_LOG_DEBUG(("Client library is running"));
+}
+
static void sig_init_finished(void)
{
/* Check ~/.silc directory and public and private keys */
if (!silc_client_check_silc_dir()) {
sleep(1);
- signal_emit("gui exit", 0);
+ exit(1);
return;
}
/* Load public and private key */
if (!silc_client_load_keys(silc_client)) {
sleep(1);
- signal_emit("gui exit", 0);
+ exit(1);
return;
}
/* Initialize the SILC client */
if (!silc_client_init(silc_client, settings_get_str("user_name"),
opt_hostname ? opt_hostname : silc_net_localhost(),
- settings_get_str("real_name"))) {
+ settings_get_str("real_name"), silc_running, NULL)) {
sleep(1);
- signal_emit("gui exit", 0);
+ exit(1);
return;
}
settings_add_int("server", "key_exchange_timeout_secs", 120);
settings_add_int("server", "key_exchange_rekey_secs", 3600);
settings_add_bool("server", "key_exchange_rekey_pfs", FALSE);
- settings_add_int("server", "connauth_request_secs", 2);
settings_add_int("server", "heartbeat", 300);
settings_add_bool("server", "ignore_message_signatures", FALSE);
settings_add_str("server", "session_filename", "session.$chatnet");
signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+ signal_add("gui exit", (SIGNAL_FUNC) sig_gui_quit);
silc_init_userinfo();
/* Initialize client parameters */
memset(¶ms, 0, sizeof(params));
strcat(params.nickname_format, "%n@%h%a");
- params.nickname_parse = silc_nickname_format_parse;
- params.connauth_request_secs = settings_get_int("connauth_request_secs");
/* Allocate SILC client */
silc_client = silc_client_alloc(&ops, ¶ms, NULL, silc_version_string);
chat_protocol_find("SILC"));
signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+ signal_remove("gui exit", (SIGNAL_FUNC) sig_gui_quit);
silc_queue_deinit();
silc_server_deinit();