Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2001 - 2007 Pekka Riikonen
+ Copyright (C) 2001 - 2014 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
#include "fe-common/core/keyboard.h"
#include "fe-common/silc/module-formats.h"
-#ifndef SILC_PLUGIN
-/* Command line option variables */
+#ifdef SILC_PLUGIN
+static int init_failed = 0;
+#else
static char *opt_pkcs = NULL;
static int opt_bits = 0;
-#else
-static int init_failed = 0;
#endif
-static int idletag = -1;
+static int running = 0;
/* SILC Client */
SilcClient silc_client = NULL;
SilcPublicKey irssi_pubkey = NULL;
SilcPrivateKey irssi_privkey = NULL;
-char *opt_nickname = NULL;
char *opt_hostname = NULL;
/* Default hash function */
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
#ifdef SILC_DEBUG
-static bool silc_irssi_debug_print(char *file, char *function, int line,
- char *message, void *context)
+static SilcBool silc_irssi_debug_print(char *file, char *function, int line,
+ char *message, void *context)
{
printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP,
"DEBUG: %s:%d: %s", function, line, message);
}
#endif
-static void sig_setup_changed(void)
+static void silc_sig_setup_changed(void)
{
#ifdef SILC_DEBUG
bool debug = settings_get_bool("debug");
/* Log callbacks */
-static bool silc_log_misc(SilcLogType type, char *message, void *context)
+static SilcBool silc_log_misc(SilcLogType type, char *message, void *context)
{
printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s: %s",
(type == SILC_LOG_INFO ? "[Info]" :
return TRUE;
}
-static bool silc_log_stderr(SilcLogType type, char *message, void *context)
+static SilcBool silc_log_stderr(SilcLogType type, char *message, void *context)
{
fprintf(stderr, "%s: %s\n",
(type == SILC_LOG_INFO ? "[Info]" :
/* Finalize init. Init finish signal calls this. */
#ifdef SILC_PLUGIN
-#define FUNCTION_EXIT goto out
void silc_opt_callback(const char *data, SERVER_REC *server,
WI_ITEM_REC *item)
-#else
-#define FUNCTION_EXIT exit(0)
-void silc_opt_callback(poptContext con,
- enum poptCallbackReason reason,
- const struct poptOption *opt,
- const char *arg, void *data)
-#endif
{
-#ifdef SILC_PLUGIN
unsigned char **argv=NULL, *tmp;
SilcUInt32 *argv_lens=NULL, *argv_types=NULL, argc=0;
int i;
if (argc < 2)
goto err;
-#else
- if (strcmp(opt->longName, "nick") == 0) {
- g_free(opt_nickname);
- opt_nickname = g_strdup(arg);
- }
- if (strcmp(opt->longName, "hostname") == 0) {
- silc_free(opt_hostname);
- opt_hostname = strdup(arg);
- }
-#endif
-
-#ifdef SILC_PLUGIN
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;
+ goto out;
}
-#ifdef SILC_PLUGIN
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;
+ goto out;
}
-#ifdef SILC_PLUGIN
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;
+ goto out;
}
-#ifdef SILC_PLUGIN
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;
+ goto out;
}
-#ifdef SILC_PLUGIN
if ((argc < 5) && (strcasecmp(argv[1], "debug") == 0)) {
-#else
- if (strcmp(opt->longName, "debug") == 0) {
- silc_log_debug(TRUE);
- silc_log_debug_hexdump(TRUE);
- silc_log_set_debug_string(arg);
-#endif
-#ifdef SILC_PLUGIN
if (argc == 2) {
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_CONFIG_DEBUG,
(i_debug == TRUE ? "enabled" : "disabled"));
goto out;
}
-#endif
#ifndef SILC_DEBUG
-#ifdef SILC_PLUGIN
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_CONFIG_NODEBUG);
#else
- fprintf(stdout,
- "Run-time debugging is not enabled. To enable it recompile\n"
- "the client with --enable-debug configuration option.\n");
- sleep(1);
-#endif
-#else
-#ifdef SILC_PLUGIN
if (strcasecmp(argv[2], "on") == 0) {
settings_set_bool("debug", TRUE);
if (argc == 4)
settings_set_bool("debug", FALSE);
} else
goto err;
- sig_setup_changed();
+ silc_sig_setup_changed();
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_CONFIG_DEBUG,
(settings_get_bool("debug") == TRUE ?
"enabled" : "disabled"));
goto out;
-#endif
#endif
}
-#ifdef SILC_PLUGIN
if (strcasecmp(argv[1], "create-key-pair") == 0) {
-#else
- if (strcmp(opt->longName, "create-key-pair") == 0) {
-#endif
/* Create new key pair and exit */
-#ifdef SILC_PLUGIN
char *endptr, *pkcs=NULL;
long int val;
int bits=0;
printformat_module("fe-common/silc", NULL, NULL,
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_create_key_pair(opt_pkcs, opt_bits, NULL, NULL,
- NULL, NULL, NULL, NULL, TRUE);
- exit(0);
-#endif
}
-#ifdef SILC_PLUGIN
if ((argc < 4) && (strcasecmp(argv[1], "passphrase-change") == 0)) {
-#else
- if (strcmp(opt->longName, "passphrase-change") == 0) {
-#endif
/* Change the passphrase of the private key file */
-#ifdef SILC_PLUGIN
CREATE_KEY_REC *rec;
rec = g_new0(CREATE_KEY_REC, 1);
NULL, SILCTXT_CONFIG_PASS_ASK1),
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_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_show_public_key_file((char *)arg);
- exit(0);
}
-#endif
-#ifdef SILC_PLUGIN
err:
printformat_module("fe-common/silc", NULL, NULL,
MSGLEVEL_CRAP, SILCTXT_CONFIG_UNKNOWN,
silc_free(argv);
silc_free(argv_lens);
silc_free(argv_types);
-#endif
}
-#undef FUNCTION_EXIT
+#endif /* SILC_PLUGIN */
/* Called to indicate the client library has stopped. */
static void
static void
silc_running(SilcClient client, void *context)
{
+ running = 1;
SILC_LOG_DEBUG(("Client library is running"));
}
}
/* Initialize the SILC client */
- opt_hostname = (opt_hostname ? opt_hostname : silc_net_localhost());
+ opt_hostname = (char *)settings_get_str("hostname");
+ if (!opt_hostname || *opt_hostname == '\0')
+ opt_hostname = silc_net_localhost();
if (!silc_client_init(silc_client, settings_get_str("user_name"),
opt_hostname, settings_get_str("real_name"),
silc_running, NULL)) {
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);
+}
+
+#ifndef SILC_PLUGIN
+static gboolean list_ciphers(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_cipher_register_default();
+ silc_client_list_ciphers();
+ exit(0);
+ return TRUE;
+}
+
+static gboolean list_hash_funcs(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_hash_register_default();
+ silc_client_list_hash_funcs();
+ exit(0);
+ return TRUE;
+}
+
+static gboolean list_hmacs(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_hmac_register_default();
+ silc_client_list_hmacs();
+ exit(0);
+ return TRUE;
+}
+
+static gboolean list_pkcs(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_pkcs_register_default();
+ silc_client_list_pkcs();
+ exit(0);
+ return TRUE;
+}
+
+#ifdef SILC_DEBUG
+static gboolean enable_debug(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ /* Set debug string setting but don't enable it. User must be
+ /set enable on to get the debugs. */
+ settings_set_str("debug_string", (char *)value);
+
+ /* Default debugging when -d was given in command line */
+ silc_log_debug(TRUE);
+ silc_log_debug_hexdump(TRUE);
+ silc_log_set_debug_string((char *)value);
+ return TRUE;
+}
+#else
+static gboolean enable_debug(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ fprintf(stdout,
+ "Run-time debugging is not enabled. To enable it recompile\n"
+ "the client with --enable-debug configuration option.\n");
+ sleep(1);
+ return TRUE;
+}
+#endif /* SILC_DEBUG */
+
+static gboolean create_keypair(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_cipher_register_default();
+ silc_pkcs_register_default();
+ silc_hash_register_default();
+ silc_hmac_register_default();
+ silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL, NULL, NULL,
+ NULL, NULL, TRUE);
+ exit(0);
+ return TRUE;
+}
+
+static gboolean change_passphrase(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_cipher_register_default();
+ silc_pkcs_register_default();
+ silc_hash_register_default();
+ silc_hmac_register_default();
+ silc_change_private_key_passphrase((char *)value, NULL, NULL);
+ exit(0);
+ return TRUE;
+}
+
+static gboolean show_key(const gchar *option_name, const gchar *value,
+ gpointer data, GError **error)
+{
+ silc_cipher_register_default();
+ silc_pkcs_register_default();
+ silc_hash_register_default();
+ silc_hmac_register_default();
+ silc_show_public_key_file((char *)value);
+ exit(0);
+ return TRUE;
}
+#endif /* !SILC_PLUGIN */
/* Init SILC. Called from src/fe-text/silc.c */
void silc_core_init(void)
{
#ifndef SILC_PLUGIN
- static struct poptOption silc_options[] = {
- { NULL, '\0', POPT_ARG_CALLBACK, (void *)&silc_opt_callback, '\0', NULL },
- { "list-ciphers", 0, POPT_ARG_NONE, NULL, 0,
- "List supported ciphers", NULL },
- { "list-hash-funcs", 0, POPT_ARG_NONE, NULL, 0,
- "List supported hash functions", NULL },
- { "list-hmacs", 0, POPT_ARG_NONE, NULL, 0,
+ static GOptionEntry silc_options[] = {
+ { "list-ciphers", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+ list_ciphers, "List supported ciphers", NULL },
+ { "list-hash-funcs", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+ list_hash_funcs, "List supported hash functions", NULL },
+ { "list-hmacs", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, list_hmacs,
"List supported HMACs", NULL },
- { "list-pkcs", 0, POPT_ARG_NONE, NULL, 0,
+ { "list-pkcs", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, list_pkcs,
"List supported PKCSs", NULL },
-#ifdef SILC_DEBUG
- { "debug", 'd', POPT_ARG_STRING, NULL, 0,
- "Enable debugging", "STRING" },
-#endif /* SILC_DEBUG */
- { "create-key-pair", 'C', POPT_ARG_NONE, NULL, 0,
- "Create new public key pair", NULL },
- { "pkcs", 0, POPT_ARG_STRING, &opt_pkcs, 0,
+ { "debug", 'd', 0, G_OPTION_ARG_CALLBACK, enable_debug,
+ "Enable debugging", NULL },
+ { "create-key-pair", 'C', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+ create_keypair, "Create new public key pair", NULL },
+ { "pkcs", 0, 0, G_OPTION_ARG_STRING, &opt_pkcs,
"Set the PKCS of the public key pair (-C)", "PKCS" },
- { "bits", 0, POPT_ARG_INT, &opt_bits, 0,
+ { "bits", 0, 0, G_OPTION_ARG_INT, &opt_bits,
"Set the length of the public key pair (-C)", "VALUE" },
- { "passphrase-change", 'P', POPT_ARG_STRING, NULL, 0,
+ { "passphrase-change", 'P', 0, G_OPTION_ARG_CALLBACK, change_passphrase,
"Change the passphrase of private key file", "FILE" },
- { "show-key", 'S', POPT_ARG_STRING, NULL, 0,
+ { "show-key", 'S', 0, G_OPTION_ARG_CALLBACK, show_key,
"Show the contents of the public key", "FILE" },
- { NULL, '\0', 0, NULL }
+ { NULL }
};
#endif
settings_add_str("debug", "debug_string", "");
#endif
- signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+ signal_add("setup changed", (SIGNAL_FUNC) silc_sig_setup_changed);
#ifndef SILC_PLUGIN
signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
-#endif
+#endif /* !SILC_PLUGIN */
#if defined (SILC_PLUGIN) && defined (SILC_DEBUG)
if (settings_get_bool("debug") == TRUE)
- sig_setup_changed();
+ silc_sig_setup_changed();
#endif
silc_init_userinfo();
/* 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);
void silc_core_deinit(void)
{
- if (idletag != -1)
- g_source_remove(idletag);
-
- 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);
+ if (running) {
+ volatile int stopped = 0;
+ silc_client_stop(silc_client, silc_stopped, (void *)&stopped);
+ while (!stopped)
+ silc_client_run_one(silc_client);
+ }
- signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+ signal_remove("setup changed", (SIGNAL_FUNC) silc_sig_setup_changed);
#ifdef SILC_PLUGIN
command_unbind("silc", (SIGNAL_FUNC) silc_opt_callback);
#else
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);
}
projects / silc.git / blobdiff