#endif
static int idletag = -1;
+static int running = 0;
/* SILC Client */
SilcClient silc_client = NULL;
SILC_LOG_ERROR(("Unknown cipher `%s'", cipher));
#ifdef SILC_PLUGIN
init_failed = -1;
- returnn;
+ return;
#else
exit(1);
#endif
SILC_LOG_ERROR(("Unknown hash function `%s'", hash));
#ifdef SILC_PLUGIN
init_failed = -1;
- returnn;
+ return;
#else
exit(1);
#endif
SILC_LOG_ERROR(("Unknown HMAC `%s'", hmac));
#ifdef SILC_PLUGIN
init_failed = -1;
- returnn;
+ return;
#else
exit(1);
#endif
SilcUInt32 *argv_lens=NULL, *argv_types=NULL, argc=0;
int i;
unsigned char privkey[128], pubkey[128];
-
+
memset(privkey, 0, sizeof(privkey));
memset(pubkey, 0, sizeof(pubkey));
snprintf(pubkey, sizeof(pubkey) - 1, "%s/%s", get_irssi_dir(),
sig_setup_changed();
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_CONFIG_DEBUG,
- (settings_get_bool("debug") == TRUE ?
+ (settings_get_bool("debug") == TRUE ?
"enabled" : "disabled"));
goto out;
#endif
rec = g_new0(CREATE_KEY_REC, 1);
rec->pkcs = (pkcs == NULL ? NULL : g_strdup(pkcs));
rec->bits = bits;
-
+
keyboard_entry_redirect((SIGNAL_FUNC) create_key_passphrase,
format_get_text("fe-common/silc", NULL, NULL,
NULL, SILCTXT_CONFIG_PASS_ASK2),
/* Change the passphrase of the private key file */
#ifdef SILC_PLUGIN
CREATE_KEY_REC *rec;
-
+
rec = g_new0(CREATE_KEY_REC, 1);
rec->file = g_strdup((argc == 3 ? argv[2] : privkey));
#undef FUNCTION_EXIT
/* 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);
- signal_emit("chat protocol deinit", 1,
- chat_protocol_find("SILC"));
-}
-
-static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
-{
- silc_client_stop(silc_client, silc_stopped, NULL);
+ *(int*)context = -1;
}
/* Called to indicate the client library is running. */
static void
silc_running(SilcClient client, void *context)
{
+ running = 1;
SILC_LOG_DEBUG(("Client library is running"));
}
settings_add_str("server", "session_filename", "session.$chatnet");
settings_add_bool("server", "sign_channel_messages", FALSE);
settings_add_bool("server", "sign_private_messages", FALSE);
+ settings_add_str("silc", "nickname_format", "%n#%a");
/* Requested Attributes settings */
settings_add_bool("silc", "attr_allow", TRUE);
#ifndef SILC_PLUGIN
signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
#endif
- signal_add("gui exit", (SIGNAL_FUNC) sig_gui_quit);
#if defined (SILC_PLUGIN) && defined (SILC_DEBUG)
if (settings_get_bool("debug") == TRUE)
/* Initialize client parameters */
memset(¶ms, 0, sizeof(params));
- strcat(params.nickname_format, "%n@%h%a");
+ strcat(params.nickname_format, settings_get_str("nickname_format"));
/* Allocate SILC client */
silc_client = silc_client_alloc(&ops, ¶ms, NULL, silc_version_string);
if (idletag != -1)
g_source_remove(idletag);
+ if (running) {
+ int stopped = 0;
+ silc_client_stop(silc_client, silc_stopped, &stopped);
+ while (!stopped)
+ silc_client_run_one(silc_client);
+ }
+
if (opt_hostname)
silc_free(opt_hostname);
if (opt_nickname)
g_free(opt_nickname);
signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
- signal_remove("gui exit", (SIGNAL_FUNC) sig_gui_quit);
#ifdef SILC_PLUGIN
command_unbind("silc", (SIGNAL_FUNC) silc_opt_callback);
#else
signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
#endif
+ signal_emit("chat protocol deinit", 1, chat_protocol_find("SILC"));
+
silc_hash_free(sha1hash);
silc_queue_deinit();
chat_protocol_unregister("SILC");
- silc_pkcs_public_key_free(irssi_pubkey);
- silc_pkcs_private_key_free(irssi_privkey);
+ if (irssi_pubkey)
+ silc_pkcs_public_key_free(irssi_pubkey);
+ if (irssi_privkey)
+ silc_pkcs_private_key_free(irssi_privkey);
silc_client_free(silc_client);
}