static int init_failed = 0;
#endif
-static int idletag = -1;
static int running = 0;
/* SILC Client */
void silc_core_deinit(void);
#endif
-static int my_silc_scheduler(void)
+static gboolean my_silc_scheduler(gpointer data)
{
+ SILC_LOG_DEBUG(("Timeout"));
silc_client_run_one(silc_client);
- return 1;
+ return FALSE;
+}
+
+static gboolean my_silc_scheduler_fd(GIOChannel *source,
+ GIOCondition condition,
+ gpointer data)
+{
+ SILC_LOG_DEBUG(("I/O event, %d", SILC_PTR_TO_32(data)));
+ silc_client_run_one(silc_client);
+ return TRUE;
+}
+
+static void scheduler_notify_cb(SilcSchedule schedule,
+ SilcBool added, SilcTask task,
+ SilcBool fd_task, SilcUInt32 fd,
+ SilcTaskEvent event,
+ long seconds, long useconds,
+ void *context)
+{
+ if (added) {
+ if (fd_task) {
+ /* Add fd */
+ GIOChannel *ch;
+ guint e = 0;
+
+ SILC_LOG_DEBUG(("Add fd %d, events %d", fd, event));
+ g_source_remove_by_user_data(SILC_32_TO_PTR(fd));
+
+ if (event & SILC_TASK_READ)
+ e |= (G_IO_IN | G_IO_PRI | G_IO_HUP | G_IO_ERR);
+ if (event & SILC_TASK_WRITE)
+ e |= (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL);
+
+ if (e) {
+ ch = g_io_channel_unix_new(fd);
+ g_io_add_watch(ch, e, my_silc_scheduler_fd, SILC_32_TO_PTR(fd));
+ g_io_channel_unref(ch);
+ }
+ } else {
+ /* Add timeout */
+ guint t;
+
+ t = (seconds * 1000) + (useconds / 1000);
+ SILC_LOG_DEBUG(("interval %d msec", t));
+ g_timeout_add(t, my_silc_scheduler, NULL);
+ }
+ } else {
+ if (fd_task) {
+ /* Remove fd */
+ g_source_remove_by_user_data(SILC_32_TO_PTR(fd));
+ }
+ }
}
static CHATNET_REC *create_chatnet(void)
#endif
}
}
-
- /* Register other defaults */
- silc_cipher_register_default();
}
static void silc_register_hash(SilcClient client, const char *hash)
#endif
}
}
-
- /* Register other defaults */
- silc_hash_register_default();
}
static void silc_register_hmac(SilcClient client, const char *hmac)
#endif
}
}
-
- /* Register other defaults */
- silc_hmac_register_default();
}
/* Finalize init. Init finish signal calls this. */
if ((argc == 2) && (strcasecmp(argv[1], "list-ciphers") == 0)) {
#else
if (strcmp(opt->longName, "list-ciphers") == 0) {
- silc_cipher_register_default();
#endif
silc_client_list_ciphers();
FUNCTION_EXIT;
if ((argc == 2) && (strcasecmp(argv[1], "list-hash-funcs") == 0)) {
#else
if (strcmp(opt->longName, "list-hash-funcs") == 0) {
- silc_hash_register_default();
#endif
silc_client_list_hash_funcs();
FUNCTION_EXIT;
if ((argc == 2) && (strcasecmp(argv[1], "list-hmacs") == 0)) {
#else
if (strcmp(opt->longName, "list-hmacs") == 0) {
- silc_hmac_register_default();
#endif
silc_client_list_hmacs();
FUNCTION_EXIT;
if ((argc == 2) && (strcasecmp(argv[1], "list-pkcs") == 0)) {
#else
if (strcmp(opt->longName, "list-pkcs") == 0) {
- silc_pkcs_register_default();
#endif
silc_client_list_pkcs();
FUNCTION_EXIT;
MSGLEVEL_CRAP, SILCTXT_CONFIG_NEXTTIME);
goto out;
#else
- silc_cipher_register_default();
- silc_pkcs_register_default();
- silc_hash_register_default();
- silc_hmac_register_default();
+ silc_crypto_init(NULL);
silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL,
NULL, NULL, NULL, NULL, TRUE);
exit(0);
ENTRY_REDIRECT_FLAG_HIDDEN, rec);
goto out;
#else
- silc_cipher_register_default();
- silc_pkcs_register_default();
- silc_hash_register_default();
- silc_hmac_register_default();
+ silc_crypto_init(NULL);
silc_change_private_key_passphrase(arg, NULL, NULL);
exit(0);
#endif
#ifndef SILC_PLUGIN
if (strcmp(opt->longName, "show-key") == 0) {
/* Dump the key */
- silc_cipher_register_default();
- silc_pkcs_register_default();
- silc_hash_register_default();
- silc_hmac_register_default();
+ silc_crypto_init(NULL);
silc_show_public_key_file((char *)arg);
exit(0);
}
return;
}
+ silc_schedule_set_notify(silc_client->schedule, scheduler_notify_cb, NULL);
+
silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL);
silc_log_set_callback(SILC_LOG_WARNING, silc_log_misc, NULL);
silc_log_set_callback(SILC_LOG_ERROR, silc_log_misc, NULL);
silc_hash_alloc("sha1", &sha1hash);
- /* register SILC scheduler */
- idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+ /* Run SILC scheduler */
+ my_silc_scheduler(NULL);
}
/* Init SILC. Called from src/fe-text/silc.c */
/* Initialize client parameters */
memset(¶ms, 0, sizeof(params));
strcat(params.nickname_format, settings_get_str("nickname_format"));
+ params.full_channel_names = TRUE;
/* Allocate SILC client */
silc_client = silc_client_alloc(&ops, ¶ms, NULL, silc_version_string);
if (init_failed)
return;
#endif
- silc_pkcs_register_default();
#ifdef SILC_PLUGIN
command_bind("silc", MODULE_NAME, (SIGNAL_FUNC) silc_opt_callback);
void silc_core_deinit(void)
{
- if (idletag != -1)
- g_source_remove(idletag);
-
if (running) {
- int stopped = 0;
- silc_client_stop(silc_client, silc_stopped, &stopped);
+ volatile int stopped = 0;
+ silc_client_stop(silc_client, silc_stopped, (void *)&stopped);
while (!stopped)
silc_client_run_one(silc_client);
}
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);
}